diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java index 20648a4..2eb71e2 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java @@ -568,17 +568,6 @@ public class GovProjectCollectionManage { baseProjId = BizProjectContant.ProjectCollection.DRAFT; } - BeanUtil.copyProperties(base, draft, CopyOptions.create() - .setIgnoreError(Boolean.TRUE).setIgnoreNullValue(Boolean.TRUE)); - draft.setBaseProjId(baseProjId); - draft.setBaseProjName(baseProjName); - draft.setIsEffective(BizProjectContant.ProjectCollection.IS_EFFECTIVE); - draft.setAreaCode(RegionConst.RC_LS); - draft.setBizTime(LocalDateTime.now()); - draft.setUpdateBy(user.getUsername()); - draft.setUpdateOn(LocalDateTime.now()); - draft.setOp(BizProjectContant.ProjectCollection.OP_INSERT); - // 2.保存 申报信息 GovBizProjectApplyDTO apply = saveDTO.getApply(); BeanUtil.copyProperties(apply, draft, CopyOptions.create() @@ -630,6 +619,18 @@ public class GovProjectCollectionManage { draft.setProcure(JSON.toJSONString(procures)); } + //最后再保存 基本信息 + BeanUtil.copyProperties(base, draft, CopyOptions.create() + .setIgnoreError(Boolean.TRUE).setIgnoreNullValue(Boolean.TRUE)); + draft.setBaseProjId(baseProjId); + draft.setBaseProjName(baseProjName); + draft.setIsEffective(BizProjectContant.ProjectCollection.IS_EFFECTIVE); + draft.setAreaCode(RegionConst.RC_LS); + draft.setBizTime(LocalDateTime.now()); + draft.setUpdateBy(user.getUsername()); + draft.setUpdateOn(LocalDateTime.now()); + draft.setOp(BizProjectContant.ProjectCollection.OP_INSERT); + draftService.saveOrUpdate(draft); return BizConst.SAVE_SUCCESS;