Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dcs-plan
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
INET-TWO
server
dcs-plan
Commits
52d141d5
Commit
52d141d5
authored
Aug 01, 2024
by
wangqiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改标记todo的内容
parent
6eb97009
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
108 additions
and
90 deletions
+108
-90
ExtPlanVO.java
...src/main/java/com/yonde/dcs/plan/common/vo/ExtPlanVO.java
+106
-85
ExtPlanServiceImpl.java
.../yonde/dcs/plan/core/service/impl/ExtPlanServiceImpl.java
+2
-5
No files found.
dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtPlanVO.java
View file @
52d141d5
...
...
@@ -30,34 +30,39 @@ import com.yonde.dex.basedata.entity.vo.IdOnlyVO;
import
cn.hutool.core.convert.Convert
;
import
cn.hutool.core.lang.TypeReference
;
import
com.yonde.dex.basedata.entity.data.VersionRelationType
;
import
com.yonde.dex.basedata.entity.vo.DxIdVOEmbeddable
;
import
com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOHolder
;
import
com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOHolder
;
import
com.yonde.dex.version.plugin.common.entity.DxIterationVOEmbeddable
;
import
com.yonde.dcs.plan.common.vo.ExtPlanDocLinkVO
;
import
com.yonde.dex.basedata.entity.users.DxUserVO
;
import
com.yonde.dex.lcycle.plugin.common.entity.DxLifecycleManageBaseVOHolder
;
import
com.yonde.dex.lcycle.plugin.common.entity.DxLifecycleManageBaseVOEmbeddable
;
import
com.yonde.dex.basedata.entity.vo.DxIdVOEmbeddable
;
import
com.yonde.dex.tree.plugin.common.entity.DxTreeContextVOEmbeddable
;
import
com.yonde.dex.basedata.entity.vo.IdVO
;
import
com.yonde.dex.
dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOHolder
;
import
com.yonde.dex.
secretcode.plugin.common.entity.DxSecretVOEmbeddable
;
import
com.yonde.dex.tree.plugin.common.entity.DxTreeContextVOHolder
;
import
com.yonde.d
ex.version.plugin.common.entity.DxIterationVOEmbeddable
;
import
com.yonde.d
cs.plan.common.vo.ExtPlanReplyLinkVO
;
import
com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOEmbeddable
;
import
com.yonde.dex.version.plugin.common.entity.DxIterationVOHolder
;
import
com.yonde.dex.basedata.entity.users.DxUserVO
;
/**
* @description: ExtPlan-VO
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:06
**/
* @description: ExtPlan-VO
* @author: dexadmin
* @version: V
* @date: 2024-8-1 18:16:27
**/
@JsonTypeInfo
(
use
=
JsonTypeInfo
.
Id
.
CLASS
,
property
=
"dxClassname"
,
visible
=
true
,
defaultImpl
=
ExtPlanVO
.
class
)
@EqualsAndHashCode
(
callSuper
=
true
)
@Data
@ToString
(
callSuper
=
true
)
public
class
ExtPlanVO
extends
IdOnlyVO
implements
IdVO
,
DxTreeContextVOHolder
<
ExtPlanVO
>
,
DxLifecycleManageBaseVOHolder
,
DxIterationVOHolder
<
ExtPlanVO
>
,
DxObjFileLinkVOHolder
{
public
class
ExtPlanVO
extends
IdOnlyVO
implements
IdVO
,
DxTreeContextVOHolder
<
ExtPlanVO
>
,
DxLifecycleManageBaseVOHolder
,
DxIterationVOHolder
<
ExtPlanVO
>
,
DxObjFileLinkVOHolder
,
DxSecretVOHolder
{
public
static
final
String
DX_OBJ_FILE_LINK_EMBEDDABLE_PROP_NAME
=
"dxObjFileLinkEmbeddable"
;
public
static
final
String
DX_TREE_CONTEXT_EMBEDDABLE_PROP_NAME
=
"dxTreeContextEmbeddable"
;
public
static
final
String
DX_LIFECYCLE_MANAGE_BASE_EMBEDDABLE_PROP_NAME
=
"dxLifecycleManageBaseEmbeddable"
;
public
static
final
String
DX_ID_EMBEDDABLE_PROP_NAME
=
"dxIdEmbeddable"
;
public
static
final
String
DX_SECRET_EMBEDDABLE_PROP_NAME
=
"dxSecretEmbeddable"
;
public
static
final
String
DX_ITERATION_EMBEDDABLE_PROP_NAME
=
"dxIterationEmbeddable"
;
public
static
final
String
ACTUAL_COMPLATE_TIME_PROP_NAME
=
"actualComplateTime"
;
public
static
final
String
ACTUAL_START_TIME_PROP_NAME
=
"actualStartTime"
;
...
...
@@ -67,6 +72,8 @@ public class ExtPlanVO extends IdOnlyVO implements IdVO ,DxTreeContextVOHolder<E
public
static
final
String
COMPLETION_PROP_NAME
=
"completion"
;
public
static
final
String
CONSTRUCT_PERIOD_PROP_NAME
=
"constructPeriod"
;
public
static
final
String
CONTRACT_NO_PROP_NAME
=
"contractNo"
;
public
static
final
String
EXT_PLAN_DOC_LINKS_PROP_NAME
=
"extPlanDocLinks"
;
public
static
final
String
EXT_PLAN_REPLY_LINKS_PROP_NAME
=
"extPlanReplyLinks"
;
public
static
final
String
FEEDBACK_DESCRIPT_PROP_NAME
=
"feedbackDescript"
;
public
static
final
String
FEEDBACK_TYPE_PROP_NAME
=
"feedbackType"
;
public
static
final
String
FILE_CODE_PROP_NAME
=
"fileCode"
;
...
...
@@ -122,9 +129,14 @@ public class ExtPlanVO extends IdOnlyVO implements IdVO ,DxTreeContextVOHolder<E
*/
@DexEmbedded
()
@JsonIgnore
private
Dx
IterationVOEmbeddable
<
ExtPlanVO
>
dxIteration
Embeddable
;
private
Dx
SecretVOEmbeddable
dxSecret
Embeddable
;
private
List
<
ExtPlanDocLinkVO
>
extPlanDocLinkVO
;
/**
* 扩展VO属性
*/
@DexEmbedded
()
@JsonIgnore
private
DxIterationVOEmbeddable
<
ExtPlanVO
>
dxIterationEmbeddable
;
/**
* 实际完成时间
...
...
@@ -166,6 +178,20 @@ public class ExtPlanVO extends IdOnlyVO implements IdVO ,DxTreeContextVOHolder<E
*/
private
String
contractNo
;
/**
* 计划文档关系集合
*/
@RelationProperty
(
refProperty
=
"source"
)
@VersionProperty
(
curVersion
=
VersionRelationType
.
VERSION
,
refVersion
=
VersionRelationType
.
NONE
)
private
List
<
ExtPlanDocLinkVO
>
extPlanDocLinks
;
/**
* ExtPlanReplyLink集合
*/
@RelationProperty
(
refProperty
=
"source"
)
@VersionProperty
(
curVersion
=
VersionRelationType
.
VERSION
,
refVersion
=
VersionRelationType
.
NONE
)
private
List
<
ExtPlanReplyLinkVO
>
extPlanReplyLinks
;
/**
* 反馈情况说明
*/
...
...
@@ -271,11 +297,6 @@ public class ExtPlanVO extends IdOnlyVO implements IdVO ,DxTreeContextVOHolder<E
*/
private
String
verifier
;
/**
* 密级
*/
private
String
secretCode
;
}
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/service/impl/ExtPlanServiceImpl.java
View file @
52d141d5
...
...
@@ -472,11 +472,8 @@ public class ExtPlanServiceImpl<V extends ExtPlanVO> implements ExtPlanService<V
switch
(
extPlanVO
.
getState
())
{
//未完成
case
Constants
.
UNFINISHED
:
//todo wq: 2.0是使用extPlanVO.getSourcePlanDocLink,但是在4.1未找到,先手动在VO中添加该属性。先将下面2行代码注释
// if ("交付文件类".equals(extPlanVO.getFeedbackType()) && !CollectionUtils.isEmpty(extPlanVO.getSourcePlanDocLink())) {
// for (PlanDocLinkVO planDocLink : extPlanVO.getSourcePlanDocLink()) {
if
(
"交付文件类"
.
equals
(
extPlanVO
.
getFeedbackType
())
&&
!
CollectionUtils
.
isEmpty
(
extPlanVO
.
getExtPlanDocLinkVO
()))
{
for
(
ExtPlanDocLinkVO
planDocLink
:
extPlanVO
.
getExtPlanDocLinkVO
())
{
if
(
"交付文件类"
.
equals
(
extPlanVO
.
getFeedbackType
())
&&
!
CollectionUtils
.
isEmpty
(
extPlanVO
.
getExtPlanDocLinks
()))
{
for
(
ExtPlanDocLinkVO
planDocLink
:
extPlanVO
.
getExtPlanDocLinks
())
{
if
(!
ObjectUtils
.
isEmpty
(
planDocLink
.
getTarget
()))
{
if
(!
extPlanVO
.
getNumber
().
equals
(
excelVO
.
getNumber
()))
{
stringBuffer
.
append
(
String
.
format
(
"第%s行的计划编号不允许修改"
,
i
+
1
)
+
"</br>"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment