diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/common/enums/MesApprovalRecordBizTypeEnum.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/common/enums/MesApprovalRecordBizTypeEnum.java index 4b3738e05..f7d0354a4 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/common/enums/MesApprovalRecordBizTypeEnum.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/common/enums/MesApprovalRecordBizTypeEnum.java @@ -23,6 +23,7 @@ public enum MesApprovalRecordBizTypeEnum { BATCH_PLANNING_TASK("槽液任务/审核"), PLATE_GOODS_RECORD("镀层物料需求申报/审核"), PLATE_GOODS_APPLY("镀层物料添加量申报/审核"), + PROCESS_MANAGEMENT_PROJECT_APPROVAL("流程管理立项审批/审核"), ; private final String desc; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/impl/FmProjectApplicationServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/impl/FmProjectApplicationServiceImpl.java index cdad78168..d277ad06f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/impl/FmProjectApplicationServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/impl/FmProjectApplicationServiceImpl.java @@ -40,8 +40,11 @@ import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; +import org.springblade.desk.common.enums.MesApprovalRecordBizTypeEnum; import org.springblade.desk.common.feign.MesNotifyMessageClient; import org.springblade.desk.common.pojo.entity.MesNotifyMessageEntity; +import org.springblade.desk.common.service.IMesApprovalRecordService; +import org.springblade.desk.dashboard.constant.BatchConstant; import org.springblade.desk.oem.pojo.entity.OemSettlementApprovalEntity; import org.springblade.desk.process.excel.FmProjectApplicationExcel; import org.springblade.desk.process.mapper.FmProjectApplicationMapper; @@ -52,15 +55,14 @@ import org.springblade.desk.process.service.IFmProjectApplicationService; import org.springblade.desk.process.service.IFmProjectMilestoneService; import org.springblade.system.feign.IUserClient; import org.springblade.system.pojo.entity.User; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.List; -import java.util.Objects; +import java.util.*; import java.util.stream.Collectors; /** @@ -78,6 +80,9 @@ public class FmProjectApplicationServiceImpl extends BaseServiceImpl selectFmProjectApplicationPage(IPage page, FmProjectApplicationVO fmProjectApplication) { return page.setRecords(baseMapper.selectFmProjectApplicationPage(page, fmProjectApplication)); @@ -174,6 +179,10 @@ public class FmProjectApplicationServiceImpl extends BaseServiceImpl