|
|
@@ -13,16 +13,11 @@ import com.alibaba.excel.EasyExcel; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.Wrapper; |
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
|
|
|
import com.baomidou.mybatisplus.core.toolkit.support.SFunction; |
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
|
|
|
import com.google.common.collect.Lists; |
|
|
|
import com.hz.pm.api.common.enumeration.ProjectProcessType; |
|
|
|
import com.hz.pm.api.common.helper.UserInfoHelper; |
|
|
|
import com.hz.pm.api.common.model.constant.ExistsSqlConst; |
|
|
|
import com.hz.pm.api.common.statemachine.event.AbstractStateChangeEvent; |
|
|
|
import com.hz.pm.api.common.statemachine.event.AdaptStateChangeEvent; |
|
|
|
import com.hz.pm.api.common.statemachine.event.SelfTestStateChangeEvent; |
|
|
|
import com.hz.pm.api.common.statemachine.event.TestValidStateChangeEvent; |
|
|
|
import com.hz.pm.api.common.statemachine.util.*; |
|
|
|
import com.hz.pm.api.common.util.*; |
|
|
|
import com.hz.pm.api.external.MhApiClient; |
|
|
@@ -41,13 +36,12 @@ import com.hz.pm.api.projectdeclared.model.enumerization.PurchaseScopeEnum; |
|
|
|
import com.hz.pm.api.projectdeclared.model.enumerization.PurchaseSourceTypeEnum; |
|
|
|
import com.hz.pm.api.projectdeclared.model.req.*; |
|
|
|
import com.hz.pm.api.projectdeclared.model.req.SubmitPurchaseNoticeReq.PurchaseNoticeTenderDTO; |
|
|
|
import com.hz.pm.api.projectdeclared.model.vo.PurchaseVO; |
|
|
|
import com.hz.pm.api.projectdeclared.model.vo.PurchaseAdaptionListVO; |
|
|
|
import com.hz.pm.api.projectdeclared.model.vo.PurchaseVO; |
|
|
|
import com.hz.pm.api.projectdeclared.model.vo.XcfhxApplyListVO; |
|
|
|
import com.hz.pm.api.projectdeclared.model.vo.XinchuangVO; |
|
|
|
import com.hz.pm.api.projectdeclared.service.*; |
|
|
|
import com.hz.pm.api.projectdeclared.utils.ProjectIdCodeCacheUtil; |
|
|
|
import com.hz.pm.api.projectlib.entity.PurchaseStatusChange; |
|
|
|
import com.hz.pm.api.projectlib.helper.ProjectManageUtil; |
|
|
|
import com.hz.pm.api.projectlib.model.entity.Project; |
|
|
|
import com.hz.pm.api.projectlib.model.entity.ProjectInst; |
|
|
@@ -504,6 +498,7 @@ public class PurchaseManage { |
|
|
|
adaption.setBidId(w.getId()); |
|
|
|
Project project = projectMap.get(w.getProjectId()); |
|
|
|
adaption.setProjectName(project.getProjectName()); |
|
|
|
adaption.setStatus(w.getStatus()); |
|
|
|
adaption.setBuildOrg(project.getBuildOrgName()); |
|
|
|
adaption.setProjectStatus(project.getStatus()); |
|
|
|
adaption.setBizName(w.getBidName()); |
|
|
|