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
087cdb96
Commit
087cdb96
authored
Aug 29, 2024
by
wangqiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
生成采购计划代码导入工程中
parent
39057092
Hide whitespace changes
Inline
Side-by-side
Showing
33 changed files
with
405 additions
and
114 deletions
+405
-114
pom.xml
dcs-plan-build-lib/pom.xml
+2
-2
pom.xml
dcs-plan-build-thirdLib/pom.xml
+2
-2
pom.xml
dcs-plan-common/pom.xml
+3
-3
ExtPuchasePlanAttributeVO.java
...m/yonde/dcs/plan/common/vo/ExtPuchasePlanAttributeVO.java
+65
-19
ExtPurchasePlanDocLinkVO.java
...om/yonde/dcs/plan/common/vo/ExtPurchasePlanDocLinkVO.java
+4
-4
pom.xml
dcs-plan-core/pom.xml
+4
-4
ExtIDEPlanController.java
.../yonde/dcs/plan/core/controller/ExtIDEPlanController.java
+33
-0
ExtIEDPlanDocLinkController.java
...dcs/plan/core/controller/ExtIEDPlanDocLinkController.java
+35
-0
ExtPuchasePlanAttributeController.java
...an/core/controller/ExtPuchasePlanAttributeController.java
+35
-0
ExtPurchasePlanDocLinkController.java
...lan/core/controller/ExtPurchasePlanDocLinkController.java
+35
-0
ExtPuchasePlanAttributeControllerShadow.java
...oller/shadow/ExtPuchasePlanAttributeControllerShadow.java
+11
-11
ExtPurchasePlanDocLinkControllerShadow.java
...roller/shadow/ExtPurchasePlanDocLinkControllerShadow.java
+1
-1
ExtPuchasePlanAttributeRepository.java
...an/core/repository/ExtPuchasePlanAttributeRepository.java
+12
-0
ExtPurchasePlanDocLinkRepository.java
...lan/core/repository/ExtPurchasePlanDocLinkRepository.java
+1
-1
ExtPurchasePlanRepository.java
...e/dcs/plan/core/repository/ExtPurchasePlanRepository.java
+0
-12
ExtPuchasePlanAttributeRepositoryShadow.java
...itory/shadow/ExtPuchasePlanAttributeRepositoryShadow.java
+6
-5
ExtPurchasePlanDocLinkRepositoryShadow.java
...sitory/shadow/ExtPurchasePlanDocLinkRepositoryShadow.java
+1
-1
ExtPuchasePlanAttributeService.java
...dcs/plan/core/service/ExtPuchasePlanAttributeService.java
+13
-0
ExtPurchasePlanDocLinkService.java
.../dcs/plan/core/service/ExtPurchasePlanDocLinkService.java
+1
-1
ExtPurchasePlanService.java
...m/yonde/dcs/plan/core/service/ExtPurchasePlanService.java
+0
-13
ExtPuchasePlanAttributeServiceImpl.java
...core/service/impl/ExtPuchasePlanAttributeServiceImpl.java
+34
-0
ExtPuchasePlanAttributeServiceShadow.java
.../service/shadow/ExtPuchasePlanAttributeServiceShadow.java
+20
-0
ExtPurchasePlanDocLinkServiceShadow.java
...e/service/shadow/ExtPurchasePlanDocLinkServiceShadow.java
+1
-1
pom.xml
dcs-plan-entity/pom.xml
+4
-4
ExtPuchasePlanAttribute.java
...com/yonde/dcs/plan/entity/po/ExtPuchasePlanAttribute.java
+45
-13
ExtPurchasePlanDocLink.java
.../com/yonde/dcs/plan/entity/po/ExtPurchasePlanDocLink.java
+1
-1
pom.xml
dcs-plan-feign/pom.xml
+4
-4
ExtPuchasePlanAttributeServiceFeign.java
...e/dcs/plan/feign/ExtPuchasePlanAttributeServiceFeign.java
+19
-0
ExtPurchasePlanDocLinkServiceFeign.java
...de/dcs/plan/feign/ExtPurchasePlanDocLinkServiceFeign.java
+1
-1
ExtPuchasePlanAttributeServiceFeignShadow.java
...ign/shadow/ExtPuchasePlanAttributeServiceFeignShadow.java
+6
-5
ExtPurchasePlanDocLinkServiceFeignShadow.java
...eign/shadow/ExtPurchasePlanDocLinkServiceFeignShadow.java
+1
-1
pom.xml
dcs-plan-server/pom.xml
+3
-3
pom.xml
pom.xml
+2
-2
No files found.
dcs-plan-build-lib/pom.xml
View file @
087cdb96
...
...
@@ -6,7 +6,7 @@
<parent>
<groupId>
com.yonde.dcs
</groupId>
<artifactId>
dcs-plan
</artifactId>
<version>
4.1-RELEASE
</version>
<version>
4.1-
20240826-
RELEASE
</version>
</parent>
<artifactId>
dcs-plan-build-lib
</artifactId>
...
...
@@ -21,7 +21,7 @@
<dependency>
<groupId>
com.yonde.dcs
</groupId>
<artifactId>
dcs-plan-core
</artifactId>
<version>
4.1-RELEASE
</version>
<version>
4.1-
20240826-
RELEASE
</version>
</dependency>
</dependencies>
...
...
dcs-plan-build-thirdLib/pom.xml
View file @
087cdb96
...
...
@@ -6,7 +6,7 @@
<parent>
<groupId>
com.yonde.dcs
</groupId>
<artifactId>
dcs-plan
</artifactId>
<version>
4.1-RELEASE
</version>
<version>
4.1-
20240826-
RELEASE
</version>
</parent>
<artifactId>
dcs-plan-build-thirdLib
</artifactId>
...
...
@@ -21,7 +21,7 @@
<dependency>
<groupId>
com.yonde.dcs
</groupId>
<artifactId>
dcs-plan-core
</artifactId>
<version>
4.1-RELEASE
</version>
<version>
4.1-
20240826-
RELEASE
</version>
</dependency>
</dependencies>
...
...
dcs-plan-common/pom.xml
View file @
087cdb96
...
...
@@ -4,12 +4,12 @@
<parent>
<groupId>
com.yonde.dcs
</groupId>
<artifactId>
dcs-plan
</artifactId>
<version>
4.1-RELEASE
</version>
<version>
4.1-
20240826-
RELEASE
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
dcs-plan-common
</artifactId>
<version>
4.1-RELEASE
</version>
<version>
4.1-
20240826-
RELEASE
</version>
<properties>
<maven.compiler.source>
8
</maven.compiler.source>
<maven.compiler.target>
8
</maven.compiler.target>
...
...
@@ -43,7 +43,7 @@
<dependency>
<groupId>
com.yonde.dcs
</groupId>
<artifactId>
dcs-doc-expand-common
</artifactId>
<version>
4.1-RELEASE
</version>
<version>
4.1-
20240826-
RELEASE
</version>
</dependency>
...
...
dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtPu
rchasePlan
VO.java
→
dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtPu
chasePlanAttribute
VO.java
View file @
087cdb96
...
...
@@ -39,6 +39,8 @@ import com.yonde.dex.version.plugin.common.entity.DxIterationVOEmbeddable;
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.logicdelete.plugin.common.entity.DxLogicDeleteVOHolder
;
import
com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOEmbeddable
;
import
com.yonde.dex.basedata.entity.vo.IdVO
;
import
com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOEmbeddable
;
import
com.yonde.dcs.plan.common.vo.ExtPurchasePlanDocLinkVO
;
...
...
@@ -46,28 +48,35 @@ import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOEmbedda
import
com.yonde.dex.version.plugin.common.entity.DxIterationVOHolder
;
/**
* @description: ExtPu
rchasePlan
-VO
* @description: ExtPu
chasePlanAttribute
-VO
* @author: dexadmin
* @version: V
* @date: 2024-8-29
9:31:22
* @date: 2024-8-29
17:14:49
**/
@JsonTypeInfo
(
use
=
JsonTypeInfo
.
Id
.
CLASS
,
property
=
"dxClassname"
,
visible
=
true
,
defaultImpl
=
ExtPu
rchasePlan
VO
.
class
)
@JsonTypeInfo
(
use
=
JsonTypeInfo
.
Id
.
CLASS
,
property
=
"dxClassname"
,
visible
=
true
,
defaultImpl
=
ExtPu
chasePlanAttribute
VO
.
class
)
@EqualsAndHashCode
(
callSuper
=
true
)
@Data
@ToString
(
callSuper
=
true
)
public
class
ExtPu
rchasePlanVO
extends
IdOnlyVO
implements
IdVO
,
DxIterationVOHolder
<
ExtPurchasePlanVO
>
,
DxContextVOHolder
,
DxLifecycleManageBaseVOHolder
,
DxObjFileLink
VOHolder
,
DxSecretVOHolder
{
public
class
ExtPu
chasePlanAttributeVO
extends
IdOnlyVO
implements
DxIterationVOHolder
<
ExtPuchasePlanAttributeVO
>
,
IdVO
,
DxContextVOHolder
,
DxLifecycleManageBaseVOHolder
,
DxObjFileLinkVOHolder
,
DxLogicDelete
VOHolder
,
DxSecretVOHolder
{
public
static
final
String
DX_CONTEXT_EMBEDDABLE_PROP_NAME
=
"dxContextEmbeddable"
;
public
static
final
String
DX_OBJ_FILE_LINK_EMBEDDABLE_PROP_NAME
=
"dxObjFileLinkEmbeddable"
;
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
=
"dxSecret
Embeddable"
;
public
static
final
String
DX_
LOGIC_DELETE_EMBEDDABLE_PROP_NAME
=
"dxLogicDelete
Embeddable"
;
public
static
final
String
DX_ITERATION_EMBEDDABLE_PROP_NAME
=
"dxIterationEmbeddable"
;
public
static
final
String
DX_SECRET_EMBEDDABLE_PROP_NAME
=
"dxSecretEmbeddable"
;
public
static
final
String
CONTRACT_ACTUAL_DELIVERY_TIME_PROP_NAME
=
"contractActualDeliveryTime"
;
public
static
final
String
CONTRACT_ACTUAL_SIGNING_TIME_PROP_NAME
=
"contractActualSigningTime"
;
public
static
final
String
CONTRACT_DELIVERY_TIME_PROP_NAME
=
"contractDeliveryTime"
;
public
static
final
String
CONTRACT_SIGNING_TIME_PROP_NAME
=
"contractSigningTime"
;
public
static
final
String
EXT_PURCHASE_PLAN_DOC_LINKS_PROP_NAME
=
"extPurchasePlanDocLinks"
;
public
static
final
String
FILE_CODE_PROP_NAME
=
"fileCode"
;
public
static
final
String
FILE_NAME_PROP_NAME
=
"fileName"
;
public
static
final
String
PROJECT_CODE_PROP_NAME
=
"projectCode"
;
public
static
final
String
PURCHASE_PLAN_FILE_PROP_NAME
=
"purchasePlanFile"
;
public
static
final
String
OUTSOURCE_PROJECT_NAME_PROP_NAME
=
"outsourceProjectName"
;
public
static
final
String
PLAN_CODE_PROP_NAME
=
"planCode"
;
public
static
final
String
PUR_DESIGN_FILE_ACTUAL_SUBMIT_TIME_PROP_NAME
=
"purDesignFileActualSubmitTime"
;
public
static
final
String
PUR_DESIGN_FILE_MANAGER_PROP_NAME
=
"purDesignFileManager"
;
public
static
final
String
PUR_DESIGN_FILE_SUBMIT_TIME_PROP_NAME
=
"purDesignFileSubmitTime"
;
public
static
final
String
PURCHASE_BUDGET_PROP_NAME
=
"purchaseBudget"
;
/**
* 扩展VO属性
...
...
@@ -102,14 +111,41 @@ public class ExtPurchasePlanVO extends IdOnlyVO implements IdVO ,DxIterationVOHo
*/
@DexEmbedded
()
@JsonIgnore
private
DxSecretVOEmbeddable
dxSecretEmbeddable
;
private
DxLogicDeleteVOEmbeddable
dxLogicDeleteEmbeddable
;
/**
* 扩展VO属性
*/
@DexEmbedded
()
@JsonIgnore
private
DxIterationVOEmbeddable
<
ExtPuchasePlanAttributeVO
>
dxIterationEmbeddable
;
/**
* 扩展VO属性
*/
@DexEmbedded
()
@JsonIgnore
private
DxIterationVOEmbeddable
<
ExtPurchasePlanVO
>
dxIterationEmbeddable
;
private
DxSecretVOEmbeddable
dxSecretEmbeddable
;
/**
* 合同实际交付时间
*/
private
LocalDateTime
contractActualDeliveryTime
;
/**
* 合同实际签订时间
*/
private
LocalDateTime
contractActualSigningTime
;
/**
* 合同交付时间
*/
private
LocalDateTime
contractDeliveryTime
;
/**
* 合同签订时间
*/
private
LocalDateTime
contractSigningTime
;
/**
* 采购计划文档关系集合
...
...
@@ -119,24 +155,34 @@ public class ExtPurchasePlanVO extends IdOnlyVO implements IdVO ,DxIterationVOHo
private
List
<
ExtPurchasePlanDocLinkVO
>
extPurchasePlanDocLinks
;
/**
* 文件编号
* 外协项目名称
*/
private
String
outsourceProjectName
;
/**
* 计划编码
*/
private
String
planCode
;
/**
* 采购技术文件实际提交时间
*/
private
String
fileCod
e
;
private
LocalDateTime
purDesignFileActualSubmitTim
e
;
/**
*
文件名称
*
采购技术文件负责人
*/
private
String
fileName
;
private
String
purDesignFileManager
;
/**
*
项目代号
*
采购技术文件提交时间
*/
private
String
projectCod
e
;
private
LocalDateTime
purDesignFileSubmitTim
e
;
/**
* 采购
计划文件
* 采购
预算
*/
private
String
purchase
PlanFile
;
private
String
purchase
Budget
;
}
...
...
dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtPurchasePlanDocLinkVO.java
View file @
087cdb96
...
...
@@ -30,7 +30,7 @@ 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.dcs.plan.common.vo.ExtPu
rchasePlan
VO
;
import
com.yonde.dcs.plan.common.vo.ExtPu
chasePlanAttribute
VO
;
import
com.yonde.dex.basedata.entity.vo.DxIdVOEmbeddable
;
import
com.yonde.dex.basedata.entity.vo.IdVO
;
import
com.yonde.dex.linkdata.plugin.common.DxLinkDataVOHolder
;
...
...
@@ -42,7 +42,7 @@ import com.yonde.dex.basedata.entity.users.DxUserVO;
* @description: ExtPurchasePlanDocLink-VO
* @author: dexadmin
* @version: V
* @date: 2024-8-29
9:31:22
* @date: 2024-8-29
17:14:50
**/
@JsonTypeInfo
(
use
=
JsonTypeInfo
.
Id
.
CLASS
,
property
=
"dxClassname"
,
visible
=
true
,
defaultImpl
=
ExtPurchasePlanDocLinkVO
.
class
)
@EqualsAndHashCode
(
callSuper
=
true
)
...
...
@@ -50,7 +50,7 @@ import com.yonde.dex.basedata.entity.users.DxUserVO;
@ToString
(
callSuper
=
true
)
@DexTypeVersionProp
(
propName
=
"target"
,
join
=
@VersionProperty
(
curVersion
=
VersionRelationType
.
NONE
,
refVersion
=
VersionRelationType
.
VERSION
))
@DexTypeVersionProp
(
propName
=
"source"
,
join
=
@VersionProperty
(
curVersion
=
VersionRelationType
.
NONE
,
refVersion
=
VersionRelationType
.
VERSION
))
public
class
ExtPurchasePlanDocLinkVO
extends
IdOnlyVO
implements
DxLinkDataVOHolder
<
ExtPurchasePlanVO
,
DxDocumentVO
>
,
IdVO
{
public
class
ExtPurchasePlanDocLinkVO
extends
IdOnlyVO
implements
IdVO
,
DxLinkDataVOHolder
<
ExtPuchasePlanAttributeVO
,
DxDocumentVO
>
{
public
static
final
String
DX_ID_EMBEDDABLE_PROP_NAME
=
"dxIdEmbeddable"
;
public
static
final
String
DX_LINK_DATA_EMBEDDABLE_PROP_NAME
=
"dxLinkDataEmbeddable"
;
...
...
@@ -67,7 +67,7 @@ public class ExtPurchasePlanDocLinkVO extends IdOnlyVO implements DxLinkDataVOHo
*/
@DexEmbedded
()
@JsonIgnore
private
DxLinkDataVOEmbeddable
<
ExtPu
rchasePlan
VO
,
DxDocumentVO
>
dxLinkDataEmbeddable
;
private
DxLinkDataVOEmbeddable
<
ExtPu
chasePlanAttribute
VO
,
DxDocumentVO
>
dxLinkDataEmbeddable
;
}
...
...
dcs-plan-core/pom.xml
View file @
087cdb96
...
...
@@ -4,12 +4,12 @@
<parent>
<groupId>
com.yonde.dcs
</groupId>
<artifactId>
dcs-plan
</artifactId>
<version>
4.1-RELEASE
</version>
<version>
4.1-
20240826-
RELEASE
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
dcs-plan-core
</artifactId>
<version>
4.1-RELEASE
</version>
<version>
4.1-
20240826-
RELEASE
</version>
<properties>
<maven.compiler.source>
8
</maven.compiler.source>
<maven.compiler.target>
8
</maven.compiler.target>
...
...
@@ -19,12 +19,12 @@
<dependency>
<groupId>
com.yonde.dcs
</groupId>
<artifactId>
dcs-plan-feign
</artifactId>
<version>
4.1-RELEASE
</version>
<version>
4.1-
20240826-
RELEASE
</version>
</dependency>
<dependency>
<groupId>
com.yonde.dcs
</groupId>
<artifactId>
dcs-plan-entity
</artifactId>
<version>
4.1-RELEASE
</version>
<version>
4.1-
20240826-
RELEASE
</version>
</dependency>
<dependency>
<groupId>
com.yonde.dex
</groupId>
...
...
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/ExtIDEPlanController.java
0 → 100644
View file @
087cdb96
package
com
.
yonde
.
dcs
.
plan
.
core
.
controller
;
import
org.springframework.stereotype.Controller
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.validation.annotation.Validated
;
import
java.util.List
;
import
com.yonde.dcs.plan.common.vo.ExtIDEPlanVO
;
import
org.springframework.beans.factory.annotation.Qualifier
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
io.swagger.annotations.Api
;
import
org.springframework.web.bind.annotation.*
;
import
com.yonde.dcs.plan.core.service.ExtIDEPlanService
;
import
com.yonde.dex.basedata.entity.api.ApiResult
;
import
com.yonde.dcs.plan.core.controller.shadow.ExtIDEPlanControllerShadow
;
import
javax.annotation.Resource
;
import
org.springframework.stereotype.Controller
;
/**
* @description: ExtIDEPlan-Controller
* @author: dexadmin
* @version: V
* @date: 2024-8-29 17:14:49
**/
@Api
(
tags
=
"ExtIDEPlan管理服务"
)
@RequestMapping
(
"/ExtIDEPlan"
)
@ResponseBody
()
@Controller
(
ExtIDEPlanController
.
BEAN_NAME
)
public
class
ExtIDEPlanController
<
V
extends
ExtIDEPlanVO
,
S
extends
ExtIDEPlanService
<
V
>>
extends
ExtIDEPlanControllerShadow
<
V
,
S
>
{
}
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/ExtIEDPlanDocLinkController.java
0 → 100644
View file @
087cdb96
package
com
.
yonde
.
dcs
.
plan
.
core
.
controller
;
import
org.springframework.stereotype.Controller
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.validation.annotation.Validated
;
import
java.util.List
;
import
com.yonde.dcs.plan.common.vo.ExtIEDPlanDocLinkVO
;
import
org.springframework.beans.factory.annotation.Qualifier
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
io.swagger.annotations.Api
;
import
org.springframework.web.bind.annotation.*
;
import
com.yonde.dcs.plan.core.service.ExtIEDPlanDocLinkService
;
import
com.yonde.dex.basedata.entity.api.ApiResult
;
import
com.yonde.dcs.plan.core.controller.shadow.ExtIEDPlanDocLinkControllerShadow
;
import
javax.annotation.Resource
;
import
com.yonde.dex.basedata.auth.annos.BasePermission
;
import
org.springframework.stereotype.Controller
;
/**
* @description: ExtIEDPlanDocLink-Controller
* @author: dexadmin
* @version: V
* @date: 2024-8-29 17:14:49
**/
@Api
(
tags
=
"ExtIEDPlanDocLink管理服务"
)
@RequestMapping
(
"/ExtIEDPlanDocLink"
)
@ResponseBody
()
@Controller
(
ExtIEDPlanDocLinkController
.
BEAN_NAME
)
@BasePermission
(
"inet-plan:ExtIEDPlanDocLink"
)
public
class
ExtIEDPlanDocLinkController
<
V
extends
ExtIEDPlanDocLinkVO
,
S
extends
ExtIEDPlanDocLinkService
<
V
>>
extends
ExtIEDPlanDocLinkControllerShadow
<
V
,
S
>
{
}
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/ExtPuchasePlanAttributeController.java
0 → 100644
View file @
087cdb96
package
com
.
yonde
.
dcs
.
plan
.
core
.
controller
;
import
org.springframework.stereotype.Controller
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.validation.annotation.Validated
;
import
java.util.List
;
import
com.yonde.dcs.plan.common.vo.ExtPuchasePlanAttributeVO
;
import
org.springframework.beans.factory.annotation.Qualifier
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
io.swagger.annotations.Api
;
import
org.springframework.web.bind.annotation.*
;
import
com.yonde.dcs.plan.core.service.ExtPuchasePlanAttributeService
;
import
com.yonde.dex.basedata.entity.api.ApiResult
;
import
com.yonde.dcs.plan.core.controller.shadow.ExtPuchasePlanAttributeControllerShadow
;
import
javax.annotation.Resource
;
import
com.yonde.dex.basedata.auth.annos.BasePermission
;
import
org.springframework.stereotype.Controller
;
/**
* @description: ExtPuchasePlanAttribute-Controller
* @author: dexadmin
* @version: V
* @date: 2024-8-29 17:14:49
**/
@Api
(
tags
=
"ExtPuchasePlanAttribute管理服务"
)
@RequestMapping
(
"/ExtPuchasePlanAttribute"
)
@ResponseBody
()
@BasePermission
(
"inet-plan:ExtPuchasePlanAttribute"
)
@Controller
(
ExtPuchasePlanAttributeController
.
BEAN_NAME
)
public
class
ExtPuchasePlanAttributeController
<
V
extends
ExtPuchasePlanAttributeVO
,
S
extends
ExtPuchasePlanAttributeService
<
V
>>
extends
ExtPuchasePlanAttributeControllerShadow
<
V
,
S
>
{
}
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/ExtPurchasePlanDocLinkController.java
0 → 100644
View file @
087cdb96
package
com
.
yonde
.
dcs
.
plan
.
core
.
controller
;
import
org.springframework.stereotype.Controller
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.validation.annotation.Validated
;
import
java.util.List
;
import
com.yonde.dcs.plan.common.vo.ExtPurchasePlanDocLinkVO
;
import
org.springframework.beans.factory.annotation.Qualifier
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
io.swagger.annotations.Api
;
import
org.springframework.web.bind.annotation.*
;
import
com.yonde.dcs.plan.core.service.ExtPurchasePlanDocLinkService
;
import
com.yonde.dex.basedata.entity.api.ApiResult
;
import
com.yonde.dcs.plan.core.controller.shadow.ExtPurchasePlanDocLinkControllerShadow
;
import
javax.annotation.Resource
;
import
com.yonde.dex.basedata.auth.annos.BasePermission
;
import
org.springframework.stereotype.Controller
;
/**
* @description: ExtPurchasePlanDocLink-Controller
* @author: dexadmin
* @version: V
* @date: 2024-8-29 17:14:50
**/
@Api
(
tags
=
"ExtPurchasePlanDocLink管理服务"
)
@RequestMapping
(
"/ExtPurchasePlanDocLink"
)
@ResponseBody
()
@BasePermission
(
"inet-plan:ExtPurchasePlanDocLink"
)
@Controller
(
ExtPurchasePlanDocLinkController
.
BEAN_NAME
)
public
class
ExtPurchasePlanDocLinkController
<
V
extends
ExtPurchasePlanDocLinkVO
,
S
extends
ExtPurchasePlanDocLinkService
<
V
>>
extends
ExtPurchasePlanDocLinkControllerShadow
<
V
,
S
>
{
}
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/shadow/ExtPu
rchasePlan
ControllerShadow.java
→
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/shadow/ExtPu
chasePlanAttribute
ControllerShadow.java
View file @
087cdb96
...
...
@@ -3,13 +3,13 @@ package com.yonde.dcs.plan.core.controller.shadow;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.validation.annotation.Validated
;
import
java.util.List
;
import
com.yonde.dcs.plan.common.vo.ExtPu
rchasePlan
VO
;
import
com.yonde.dcs.plan.common.vo.ExtPu
chasePlanAttribute
VO
;
import
org.springframework.beans.factory.annotation.Qualifier
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
io.swagger.annotations.Api
;
import
org.springframework.web.bind.annotation.*
;
import
com.yonde.dcs.plan.core.service.ExtPu
rchasePlan
Service
;
import
com.yonde.dcs.plan.core.service.impl.ExtPu
rchasePlan
ServiceImpl
;
import
com.yonde.dcs.plan.core.service.ExtPu
chasePlanAttribute
Service
;
import
com.yonde.dcs.plan.core.service.impl.ExtPu
chasePlanAttribute
ServiceImpl
;
import
com.yonde.dex.basedata.entity.api.ApiResult
;
import
javax.annotation.Resource
;
import
com.yonde.dex.basedata.auth.annos.PermissionObject
;
...
...
@@ -25,29 +25,29 @@ import com.yonde.dex.baseweb.AbstractBaseController;
import
com.yonde.dex.basedata.entity.api.ApiResult
;
/**
* @description: ExtPu
rchasePlan
-Controller
* @description: ExtPu
chasePlanAttribute
-Controller
* @author: dexadmin
* @version: V
* @date: 2024-8-29
9:31:22
* @date: 2024-8-29
17:14:49
**/
@BasePermission
(
"inet-plan:ExtPu
rchasePlan
"
)
public
class
ExtPu
rchasePlanControllerShadow
<
V
extends
ExtPurchasePlanVO
,
S
extends
ExtPurchasePlan
Service
<
V
>>
implements
AbstractBaseController
<
V
,
S
>
,
AbstractLifecycleBaseController
<
V
,
S
>
,
AbstractVersionBaseController
<
V
,
S
>
,
DxObjFileLinkController
<
V
,
S
>{
@BasePermission
(
"inet-plan:ExtPu
chasePlanAttribute
"
)
public
class
ExtPu
chasePlanAttributeControllerShadow
<
V
extends
ExtPuchasePlanAttributeVO
,
S
extends
ExtPuchasePlanAttribute
Service
<
V
>>
implements
AbstractBaseController
<
V
,
S
>
,
AbstractLifecycleBaseController
<
V
,
S
>
,
AbstractVersionBaseController
<
V
,
S
>
,
DxObjFileLinkController
<
V
,
S
>{
public
static
final
String
BEAN_NAME
=
"extPu
rchasePlan
Controller"
;
public
static
final
String
BEAN_NAME
=
"extPu
chasePlanAttribute
Controller"
;
/**
* 注入
*/
@Resource
(
name
=
ExtPu
rchasePlan
ServiceImpl
.
BEAN_NAME
)
private
ExtPu
rchasePlanService
<
V
>
extPurchasePlan
Service
;
@Resource
(
name
=
ExtPu
chasePlanAttribute
ServiceImpl
.
BEAN_NAME
)
private
ExtPu
chasePlanAttributeService
<
V
>
extPuchasePlanAttribute
Service
;
/**
* getService
*/
@Override
public
S
getService
()
{
return
(
S
)
this
.
extPu
rchasePlan
Service
;
return
(
S
)
this
.
extPu
chasePlanAttribute
Service
;
}
}
...
...
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/controller/shadow/ExtPurchasePlanDocLinkControllerShadow.java
View file @
087cdb96
...
...
@@ -20,7 +20,7 @@ import com.yonde.dex.baseweb.AbstractBaseController;
* @description: ExtPurchasePlanDocLink-Controller
* @author: dexadmin
* @version: V
* @date: 2024-8-29
9:31:22
* @date: 2024-8-29
17:14:50
**/
@BasePermission
(
"inet-plan:ExtPurchasePlanDocLink"
)
public
class
ExtPurchasePlanDocLinkControllerShadow
<
V
extends
ExtPurchasePlanDocLinkVO
,
S
extends
ExtPurchasePlanDocLinkService
<
V
>>
implements
AbstractBaseController
<
V
,
S
>
,
DxLinkDataController
<
V
,
S
>{
...
...
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/ExtPuchasePlanAttributeRepository.java
0 → 100644
View file @
087cdb96
package
com
.
yonde
.
dcs
.
plan
.
core
.
repository
;
import
com.yonde.dcs.plan.entity.po.ExtPuchasePlanAttribute
;
import
com.yonde.dcs.plan.core.repository.shadow.ExtPuchasePlanAttributeRepositoryShadow
;
/**
* @description: ExtPuchasePlanAttribute-repository
* @author: dexadmin
* @version: V
* @date: 2024-8-29 17:14:49
**/
public
interface
ExtPuchasePlanAttributeRepository
<
P
extends
ExtPuchasePlanAttribute
>
extends
ExtPuchasePlanAttributeRepositoryShadow
<
P
>
{
}
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/ExtPurchasePlanDocLinkRepository.java
View file @
087cdb96
...
...
@@ -6,7 +6,7 @@ import com.yonde.dcs.plan.core.repository.shadow.ExtPurchasePlanDocLinkRepositor
* @description: ExtPurchasePlanDocLink-repository
* @author: dexadmin
* @version: V
* @date: 2024-8-29
9:31:22
* @date: 2024-8-29
17:14:50
**/
public
interface
ExtPurchasePlanDocLinkRepository
<
P
extends
ExtPurchasePlanDocLink
>
extends
ExtPurchasePlanDocLinkRepositoryShadow
<
P
>
{
}
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/ExtPurchasePlanRepository.java
deleted
100644 → 0
View file @
39057092
package
com
.
yonde
.
dcs
.
plan
.
core
.
repository
;
import
com.yonde.dcs.plan.entity.po.ExtPurchasePlan
;
import
com.yonde.dcs.plan.core.repository.shadow.ExtPurchasePlanRepositoryShadow
;
/**
* @description: ExtPurchasePlan-repository
* @author: dexadmin
* @version: V
* @date: 2024-8-29 9:31:22
**/
public
interface
ExtPurchasePlanRepository
<
P
extends
ExtPurchasePlan
>
extends
ExtPurchasePlanRepositoryShadow
<
P
>
{
}
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/shadow/ExtPu
rchasePlan
RepositoryShadow.java
→
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/shadow/ExtPu
chasePlanAttribute
RepositoryShadow.java
View file @
087cdb96
package
com
.
yonde
.
dcs
.
plan
.
core
.
repository
.
shadow
;
import
com.yonde.dcs.plan.entity.po.ExtPu
rchasePlan
;
import
com.yonde.dcs.plan.entity.po.ExtPu
chasePlanAttribute
;
import
org.springframework.data.repository.NoRepositoryBean
;
import
com.yonde.dex.context.plugin.core.repository.DxContextPluginRepository
;
import
com.yonde.dex.logicdelete.plugin.core.repository.DxLogicDeleteRepository
;
import
com.yonde.dex.dao.business.repository.BaseRepository
;
import
com.yonde.dex.secretcode.plugin.core.repositroy.DxSecretCodePluginRepository
;
import
com.yonde.dex.version.plugin.core.repository.DxIterationRepository
;
import
com.yonde.dex.lcycle.plugin.core.repository.DxLifecycleManageBaseRepository
;
import
com.yonde.dex.dfs.objfilelink.plugin.core.repository.DxObjFileLinkPluginRepository
;
/**
* @description: ExtPu
rchasePlan
-repository
* @description: ExtPu
chasePlanAttribute
-repository
* @author: dexadmin
* @version: V
* @date: 2024-8-29
9:31:22
* @date: 2024-8-29
17:14:49
**/
@NoRepositoryBean
public
interface
ExtPu
rchasePlanRepositoryShadow
<
P
extends
ExtPurchasePlan
>
extends
DxContextPluginRepository
<
P
>
,
DxObjFileLinkPluginRepository
<
P
>
,
DxLifecycleManageBaseRepository
<
P
>
,
BaseRepository
<
P
>
,
DxSecretCodePluginRepository
<
P
>
,
DxIteratio
nRepository
<
P
>
{
public
interface
ExtPu
chasePlanAttributeRepositoryShadow
<
P
extends
ExtPuchasePlanAttribute
>
extends
DxContextPluginRepository
<
P
>
,
DxObjFileLinkPluginRepository
<
P
>
,
DxLifecycleManageBaseRepository
<
P
>
,
BaseRepository
<
P
>
,
DxLogicDeleteRepository
<
P
>
,
DxIterationRepository
<
P
>
,
DxSecretCodePlugi
nRepository
<
P
>
{
String
BEAN_NAME
=
"extPu
rchasePlan
Repository"
;
String
BEAN_NAME
=
"extPu
chasePlanAttribute
Repository"
;
}
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/shadow/ExtPurchasePlanDocLinkRepositoryShadow.java
View file @
087cdb96
...
...
@@ -8,7 +8,7 @@ import com.yonde.dex.linkdata.plugin.core.repository.DxLinkDataRepository;
* @description: ExtPurchasePlanDocLink-repository
* @author: dexadmin
* @version: V
* @date: 2024-8-29
9:31:22
* @date: 2024-8-29
17:14:50
**/
@NoRepositoryBean
public
interface
ExtPurchasePlanDocLinkRepositoryShadow
<
P
extends
ExtPurchasePlanDocLink
>
extends
BaseRepository
<
P
>
,
DxLinkDataRepository
<
P
>
{
...
...
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/service/ExtPuchasePlanAttributeService.java
0 → 100644
View file @
087cdb96
package
com
.
yonde
.
dcs
.
plan
.
core
.
service
;
import
com.yonde.dcs.plan.common.vo.ExtPuchasePlanAttributeVO
;
import
com.yonde.dcs.plan.core.service.shadow.ExtPuchasePlanAttributeServiceShadow
;
/**
* @description: ExtPuchasePlanAttribute-service
* @author: dexadmin
* @version: V
* @date: 2024-8-29 17:14:49
**/
public
interface
ExtPuchasePlanAttributeService
<
V
extends
ExtPuchasePlanAttributeVO
>
extends
ExtPuchasePlanAttributeServiceShadow
<
V
>
{
}
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/service/ExtPurchasePlanDocLinkService.java
View file @
087cdb96
...
...
@@ -6,7 +6,7 @@ import com.yonde.dcs.plan.core.service.shadow.ExtPurchasePlanDocLinkServiceShado
* @description: ExtPurchasePlanDocLink-service
* @author: dexadmin
* @version: V
* @date: 2024-8-29
9:31:22
* @date: 2024-8-29
17:14:50
**/
public
interface
ExtPurchasePlanDocLinkService
<
V
extends
ExtPurchasePlanDocLinkVO
>
extends
ExtPurchasePlanDocLinkServiceShadow
<
V
>
{
...
...
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/service/ExtPurchasePlanService.java
deleted
100644 → 0
View file @
39057092
package
com
.
yonde
.
dcs
.
plan
.
core
.
service
;
import
com.yonde.dcs.plan.common.vo.ExtPurchasePlanVO
;
import
com.yonde.dcs.plan.core.service.shadow.ExtPurchasePlanServiceShadow
;
/**
* @description: ExtPurchasePlan-service
* @author: dexadmin
* @version: V
* @date: 2024-8-29 9:31:22
**/
public
interface
ExtPurchasePlanService
<
V
extends
ExtPurchasePlanVO
>
extends
ExtPurchasePlanServiceShadow
<
V
>
{
}
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/service/impl/ExtPu
rchasePlan
ServiceImpl.java
→
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/service/impl/ExtPu
chasePlanAttribute
ServiceImpl.java
View file @
087cdb96
...
...
@@ -3,31 +3,31 @@ package com.yonde.dcs.plan.core.service.impl;
import
org.springframework.stereotype.Service
;
import
io.swagger.annotations.ApiOperation
;
import
java.util.List
;
import
com.yonde.dcs.plan.common.vo.ExtPu
rchasePlan
VO
;
import
com.yonde.dcs.plan.common.vo.ExtPu
chasePlanAttribute
VO
;
import
org.springframework.beans.factory.annotation.Qualifier
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.web.bind.annotation.*
;
import
com.yonde.dcs.plan.core.service.ExtPu
rchasePlan
Service
;
import
com.yonde.dcs.plan.core.repository.ExtPu
rchasePlan
Repository
;
import
com.yonde.dcs.plan.entity.po.ExtPu
rchasePlan
;
import
com.yonde.dcs.plan.core.service.ExtPu
chasePlanAttribute
Service
;
import
com.yonde.dcs.plan.core.repository.ExtPu
chasePlanAttribute
Repository
;
import
com.yonde.dcs.plan.entity.po.ExtPu
chasePlanAttribute
;
import
javax.annotation.Resource
;
/**
* @description: ExtPu
rchasePlan
-ServiceImpl
* @description: ExtPu
chasePlanAttribute
-ServiceImpl
* @author: dexadmin
* @version: V
* @date: 2024-8-29
9:31:22
* @date: 2024-8-29
17:14:49
**/
@Slf4j
@Service
(
ExtPu
rchasePlan
ServiceImpl
.
BEAN_NAME
)
public
class
ExtPu
rchasePlanServiceImpl
<
V
extends
ExtPurchasePlanVO
>
implements
ExtPurchasePlan
Service
<
V
>{
@Service
(
ExtPu
chasePlanAttribute
ServiceImpl
.
BEAN_NAME
)
public
class
ExtPu
chasePlanAttributeServiceImpl
<
V
extends
ExtPuchasePlanAttributeVO
>
implements
ExtPuchasePlanAttribute
Service
<
V
>{
public
static
final
String
BEAN_NAME
=
"extPu
rchasePlan
ServiceImpl"
;
public
static
final
String
BEAN_NAME
=
"extPu
chasePlanAttribute
ServiceImpl"
;
@Autowired
ExtPu
rchasePlanRepository
<
ExtPurchasePlan
>
extPurchasePlan
Repository
;
ExtPu
chasePlanAttributeRepository
<
ExtPuchasePlanAttribute
>
extPuchasePlanAttribute
Repository
;
}
...
...
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/service/shadow/ExtPu
rchasePlan
ServiceShadow.java
→
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/service/shadow/ExtPu
chasePlanAttribute
ServiceShadow.java
View file @
087cdb96
package
com
.
yonde
.
dcs
.
plan
.
core
.
service
.
shadow
;
import
com.yonde.dcs.plan.common.vo.ExtPu
rchasePlan
VO
;
import
com.yonde.dcs.plan.feign.ExtPu
rchasePlan
ServiceFeign
;
import
com.yonde.dcs.plan.common.vo.ExtPu
chasePlanAttribute
VO
;
import
com.yonde.dcs.plan.feign.ExtPu
chasePlanAttribute
ServiceFeign
;
import
com.yonde.dex.dao.service.BaseIdEntityService
;
import
com.yonde.dex.secretcode.plugin.core.service.SecretCodePluginService
;
import
com.yonde.dex.version.plugin.core.service.IterationService
;
import
com.yonde.dex.context.plugin.core.service.ContextPluginService
;
import
com.yonde.dex.lcycle.plugin.core.service.LifecycleBaseService
;
import
com.yonde.dex.logicdelete.plugin.core.service.LogicDeleteService
;
import
com.yonde.dex.dfs.objfilelink.plugin.core.service.ObjFileLinkPluginService
;
/**
* @description: ExtPu
rchasePlan
-service
* @description: ExtPu
chasePlanAttribute
-service
* @author: dexadmin
* @version: V
* @date: 2024-8-29
9:31:22
* @date: 2024-8-29
17:14:49
**/
public
interface
ExtPu
rchasePlanServiceShadow
<
V
extends
ExtPurchasePlanVO
>
extends
ExtPurchasePlanServiceFeign
<
V
>,
ContextPluginService
<
V
>
,
ObjFileLinkPluginService
<
V
>
,
LifecycleBaseService
<
V
>
,
BaseIdEntityService
<
V
>
,
SecretCodePluginService
<
V
>
,
Iteratio
nService
<
V
>
{
public
interface
ExtPu
chasePlanAttributeServiceShadow
<
V
extends
ExtPuchasePlanAttributeVO
>
extends
ExtPuchasePlanAttributeServiceFeign
<
V
>,
ContextPluginService
<
V
>
,
ObjFileLinkPluginService
<
V
>
,
LifecycleBaseService
<
V
>
,
BaseIdEntityService
<
V
>
,
LogicDeleteService
<
V
>
,
IterationService
<
V
>
,
SecretCodePlugi
nService
<
V
>
{
}
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/service/shadow/ExtPurchasePlanDocLinkServiceShadow.java
View file @
087cdb96
...
...
@@ -8,7 +8,7 @@ import com.yonde.dex.dao.service.BaseIdEntityService;
* @description: ExtPurchasePlanDocLink-service
* @author: dexadmin
* @version: V
* @date: 2024-8-29
9:31:22
* @date: 2024-8-29
17:14:50
**/
public
interface
ExtPurchasePlanDocLinkServiceShadow
<
V
extends
ExtPurchasePlanDocLinkVO
>
extends
ExtPurchasePlanDocLinkServiceFeign
<
V
>,
BaseIdEntityService
<
V
>
,
DxLinkDataService
<
V
>
{
...
...
dcs-plan-entity/pom.xml
View file @
087cdb96
...
...
@@ -4,12 +4,12 @@
<parent>
<groupId>
com.yonde.dcs
</groupId>
<artifactId>
dcs-plan
</artifactId>
<version>
4.1-RELEASE
</version>
<version>
4.1-
20240826-
RELEASE
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
dcs-plan-entity
</artifactId>
<version>
4.1-RELEASE
</version>
<version>
4.1-
20240826-
RELEASE
</version>
<properties>
<maven.compiler.source>
8
</maven.compiler.source>
<maven.compiler.target>
8
</maven.compiler.target>
...
...
@@ -19,7 +19,7 @@
<dependency>
<groupId>
com.yonde.dcs
</groupId>
<artifactId>
dcs-plan-common
</artifactId>
<version>
4.1-RELEASE
</version>
<version>
4.1-
20240826-
RELEASE
</version>
</dependency>
<dependency>
<groupId>
com.yonde.dex
</groupId>
...
...
@@ -54,7 +54,7 @@
<dependency>
<groupId>
com.yonde.dex
</groupId>
<artifactId>
dex-context-plugin-entities
</artifactId>
<version>
4.1-202408
09
-RELEASE
</version>
<version>
4.1-202408
26
-RELEASE
</version>
<scope>
compile
</scope>
</dependency>
</dependencies>
...
...
dcs-plan-entity/src/main/java/com/yonde/dcs/plan/entity/po/ExtPu
rchasePlan
.java
→
dcs-plan-entity/src/main/java/com/yonde/dcs/plan/entity/po/ExtPu
chasePlanAttribute
.java
View file @
087cdb96
...
...
@@ -29,26 +29,28 @@ import com.yonde.dex.dfs.objfilelink.plugin.entities.DxObjFileLinkEmbeddable;
import
com.yonde.dex.context.plugin.entities.DxContextEmbeddable
;
import
com.yonde.dex.dao.entity.base.IdOnlyEntity
;
import
com.yonde.dex.version.plugin.entities.DxIterationHolder
;
import
com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteHolder
;
import
com.yonde.dex.dao.entity.base.IdEntity
;
import
javax.persistence.Column
;
import
com.yonde.dex.secretcode.plugin.entities.DxSecretHolder
;
import
com.yonde.dex.lcycle.plugin.entities.DxLifecycleManageBaseHolder
;
import
com.yonde.dex.dao.entity.base.DxIdEntityEmbeddable
;
import
com.yonde.dex.secretcode.plugin.entities.DxSecretEmbeddable
;
import
com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteEmbeddable
;
import
com.yonde.dex.version.plugin.entities.DxIterationEmbeddable
;
/**
* @description: ExtPu
rchasePlan
-PO实体
* @description: ExtPu
chasePlanAttribute
-PO实体
* @author: dexadmin
* @version: V
* @date: 2024-8-29
9:31:22
* @date: 2024-8-29
17:14:49
**/
@Entity
@EqualsAndHashCode
(
callSuper
=
true
)
@NoArgsConstructor
@Data
@Table
(
name
=
"EXT_PU
RCHASE_PLAN
"
)
public
class
ExtPu
rchasePlan
extends
IdOnlyEntity
implements
DxContextHolder
,
DxObjFileLinkHolder
,
DxLifecycleManageBaseHolder
,
IdEntity
,
DxSecretHolder
,
DxIteration
Holder
{
@Table
(
name
=
"EXT_PU
CHASE_PLAN_ATTRIBUTE
"
)
public
class
ExtPu
chasePlanAttribute
extends
IdOnlyEntity
implements
DxContextHolder
,
DxObjFileLinkHolder
,
DxLifecycleManageBaseHolder
,
IdEntity
,
DxLogicDeleteHolder
,
DxIterationHolder
,
DxSecret
Holder
{
/**
* 扩展PO属性
...
...
@@ -79,7 +81,7 @@ public class ExtPurchasePlan extends IdOnlyEntity implements DxContextHolder ,Dx
*/
@DexEmbedded
()
@Embedded
()
private
Dx
SecretEmbeddable
dxSecret
Embeddable
;
private
Dx
LogicDeleteEmbeddable
dxLogicDelete
Embeddable
;
/**
* 扩展PO属性
*/
...
...
@@ -87,21 +89,51 @@ public class ExtPurchasePlan extends IdOnlyEntity implements DxContextHolder ,Dx
@Embedded
()
private
DxIterationEmbeddable
dxIterationEmbeddable
;
/**
* 文件编号
* 扩展PO属性
*/
@DexEmbedded
()
@Embedded
()
private
DxSecretEmbeddable
dxSecretEmbeddable
;
/**
* 合同实际交付时间
*/
private
LocalDateTime
contractActualDeliveryTime
;
/**
* 合同实际签订时间
*/
private
LocalDateTime
contractActualSigningTime
;
/**
* 合同交付时间
*/
private
LocalDateTime
contractDeliveryTime
;
/**
* 合同签订时间
*/
private
LocalDateTime
contractSigningTime
;
/**
* 外协项目名称
*/
private
String
outsourceProjectName
;
/**
* 计划编码
*/
private
String
planCode
;
/**
* 采购技术文件实际提交时间
*/
private
String
fileCod
e
;
private
LocalDateTime
purDesignFileActualSubmitTim
e
;
/**
*
文件名称
*
采购技术文件负责人
*/
private
String
fileName
;
private
String
purDesignFileManager
;
/**
*
项目代号
*
采购技术文件提交时间
*/
private
String
projectCod
e
;
private
LocalDateTime
purDesignFileSubmitTim
e
;
/**
* 采购
计划文件
* 采购
预算
*/
private
String
purchase
PlanFile
;
private
String
purchase
Budget
;
}
dcs-plan-entity/src/main/java/com/yonde/dcs/plan/entity/po/ExtPurchasePlanDocLink.java
View file @
087cdb96
...
...
@@ -33,7 +33,7 @@ import com.yonde.dex.linkdata.plugin.entities.DxLinkDataEmbeddable;
* @description: ExtPurchasePlanDocLink-PO实体
* @author: dexadmin
* @version: V
* @date: 2024-8-29
9:31:22
* @date: 2024-8-29
17:14:50
**/
@Entity
@EqualsAndHashCode
(
callSuper
=
true
)
...
...
dcs-plan-feign/pom.xml
View file @
087cdb96
...
...
@@ -4,7 +4,7 @@
<parent>
<groupId>
com.yonde.dcs
</groupId>
<artifactId>
dcs-plan
</artifactId>
<version>
4.1-RELEASE
</version>
<version>
4.1-
20240826-
RELEASE
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
@@ -18,7 +18,7 @@
<dependency>
<groupId>
com.yonde.dcs
</groupId>
<artifactId>
dcs-plan-common
</artifactId>
<version>
4.1-RELEASE
</version>
<version>
4.1-
20240826-
RELEASE
</version>
</dependency>
<dependency>
<groupId>
com.yonde.dex
</groupId>
...
...
@@ -47,12 +47,12 @@
<dependency>
<groupId>
com.yonde.dcs
</groupId>
<artifactId>
dcs-doc-feign
</artifactId>
<version>
4.1-RELEASE
</version>
<version>
4.1-
20240826-
RELEASE
</version>
</dependency>
<dependency>
<groupId>
com.yonde.dex
</groupId>
<artifactId>
dex-basic-service-feign
</artifactId>
<version>
4.1-RELEASE
</version>
<version>
4.1-
20240826-
RELEASE
</version>
</dependency>
</dependencies>
...
...
dcs-plan-feign/src/main/java/com/yonde/dcs/plan/feign/ExtPu
rchasePlan
ServiceFeign.java
→
dcs-plan-feign/src/main/java/com/yonde/dcs/plan/feign/ExtPu
chasePlanAttribute
ServiceFeign.java
View file @
087cdb96
package
com
.
yonde
.
dcs
.
plan
.
feign
;
import
com.yonde.dcs.plan.common.vo.ExtPu
rchasePlan
VO
;
import
com.yonde.dcs.plan.common.vo.ExtPu
chasePlanAttribute
VO
;
import
io.swagger.annotations.Api
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.web.bind.annotation.*
;
import
com.yonde.dcs.plan.feign.shadow.ExtPu
rchasePlan
ServiceFeignShadow
;
import
com.yonde.dcs.plan.feign.shadow.ExtPu
chasePlanAttribute
ServiceFeignShadow
;
/**
* @description: ExtPu
rchasePlan
-Feign
* @description: ExtPu
chasePlanAttribute
-Feign
* @author: dexadmin
* @version: V
* @date: 2024-8-29
9:31:22
* @date: 2024-8-29
17:14:49
**/
@Api
(
tags
=
"ExtPu
rchasePlan
-FEIGN"
)
@FeignClient
(
value
=
"${dcs.feign.INET-PLAN}"
,
path
=
"/ExtPu
rchasePlan
"
)
public
interface
ExtPu
rchasePlanServiceFeign
<
V
extends
ExtPurchasePlanVO
>
extends
ExtPurchasePlan
ServiceFeignShadow
<
V
>
{
@Api
(
tags
=
"ExtPu
chasePlanAttribute
-FEIGN"
)
@FeignClient
(
value
=
"${dcs.feign.INET-PLAN}"
,
path
=
"/ExtPu
chasePlanAttribute
"
)
public
interface
ExtPu
chasePlanAttributeServiceFeign
<
V
extends
ExtPuchasePlanAttributeVO
>
extends
ExtPuchasePlanAttribute
ServiceFeignShadow
<
V
>
{
}
dcs-plan-feign/src/main/java/com/yonde/dcs/plan/feign/ExtPurchasePlanDocLinkServiceFeign.java
View file @
087cdb96
...
...
@@ -10,7 +10,7 @@ import com.yonde.dcs.plan.feign.shadow.ExtPurchasePlanDocLinkServiceFeignShadow;
* @description: ExtPurchasePlanDocLink-Feign
* @author: dexadmin
* @version: V
* @date: 2024-8-29
9:31:22
* @date: 2024-8-29
17:14:50
**/
@Api
(
tags
=
"ExtPurchasePlanDocLink-FEIGN"
)
@FeignClient
(
value
=
"${dcs.feign.INET-PLAN}"
,
path
=
"/ExtPurchasePlanDocLink"
)
...
...
dcs-plan-feign/src/main/java/com/yonde/dcs/plan/feign/shadow/ExtPu
rchasePlan
ServiceFeignShadow.java
→
dcs-plan-feign/src/main/java/com/yonde/dcs/plan/feign/shadow/ExtPu
chasePlanAttribute
ServiceFeignShadow.java
View file @
087cdb96
package
com
.
yonde
.
dcs
.
plan
.
feign
.
shadow
;
import
com.yonde.dcs.plan.common.vo.ExtPu
rchasePlan
VO
;
import
com.yonde.dcs.plan.common.vo.ExtPu
chasePlanAttribute
VO
;
import
io.swagger.annotations.Api
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.web.bind.annotation.*
;
...
...
@@ -11,15 +11,16 @@ import com.yonde.dex.version.plugin.feign.BaseVersionFeign;
import
org.springframework.web.bind.annotation.*
;
import
com.yonde.dex.version.plugin.common.entity.DxIterationVOHolder
;
import
com.yonde.dex.context.plugin.feign.ContextPluginFeign
;
import
com.yonde.dex.logicdelete.plugin.feign.LogicDeleteFeign
;
/**
* @description: ExtPu
rchasePlan
-Feign
* @description: ExtPu
chasePlanAttribute
-Feign
* @author: dexadmin
* @version: V
* @date: 2024-8-29
9:31:22
* @date: 2024-8-29
17:14:49
**/
public
interface
ExtPu
rchasePlanServiceFeignShadow
<
V
extends
ExtPurchasePlanVO
>
extends
ContextPluginFeign
<
V
>
,
BaseLifecycleManageFeign
<
V
>
,
BaseFeign
<
V
>
,
SecretCodeFeign
<
V
>
,
BaseVersion
Feign
<
V
>
{
public
interface
ExtPu
chasePlanAttributeServiceFeignShadow
<
V
extends
ExtPuchasePlanAttributeVO
>
extends
ContextPluginFeign
<
V
>
,
BaseLifecycleManageFeign
<
V
>
,
BaseFeign
<
V
>
,
LogicDeleteFeign
<
V
>
,
BaseVersionFeign
<
V
>
,
SecretCode
Feign
<
V
>
{
String
BEAN_NAME
=
"extPu
rchasePlan
ServiceFeign"
;
String
BEAN_NAME
=
"extPu
chasePlanAttribute
ServiceFeign"
;
}
dcs-plan-feign/src/main/java/com/yonde/dcs/plan/feign/shadow/ExtPurchasePlanDocLinkServiceFeignShadow.java
View file @
087cdb96
...
...
@@ -11,7 +11,7 @@ import com.yonde.dex.linkdata.plugin.feign.DxLinkDataFeign;
* @description: ExtPurchasePlanDocLink-Feign
* @author: dexadmin
* @version: V
* @date: 2024-8-29
9:31:22
* @date: 2024-8-29
17:14:50
**/
public
interface
ExtPurchasePlanDocLinkServiceFeignShadow
<
V
extends
ExtPurchasePlanDocLinkVO
>
extends
BaseFeign
<
V
>
,
DxLinkDataFeign
<
V
>
{
...
...
dcs-plan-server/pom.xml
View file @
087cdb96
...
...
@@ -4,12 +4,12 @@
<parent>
<groupId>
com.yonde.dcs
</groupId>
<artifactId>
dcs-plan
</artifactId>
<version>
4.1-RELEASE
</version>
<version>
4.1-
20240826-
RELEASE
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<packaging>
jar
</packaging>
<artifactId>
dcs-plan-server
</artifactId>
<version>
4.1-RELEASE
</version>
<version>
4.1-
20240826-
RELEASE
</version>
<properties>
<java.version>
1.8
</java.version>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
...
...
@@ -20,7 +20,7 @@
<dependency>
<groupId>
com.yonde.dcs
</groupId>
<artifactId>
dcs-plan-core
</artifactId>
<version>
4.1-RELEASE
</version>
<version>
4.1-
20240826-
RELEASE
</version>
</dependency>
<!--公共依赖-->
...
...
pom.xml
View file @
087cdb96
...
...
@@ -4,12 +4,12 @@
<parent>
<groupId>
com.yonde.dcs
</groupId>
<artifactId>
dcs-integration-dependences
</artifactId>
<version>
4.1-202408
09
-RELEASE
</version>
<version>
4.1-202408
26
-RELEASE
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<packaging>
pom
</packaging>
<artifactId>
dcs-plan
</artifactId>
<version>
4.1-RELEASE
</version>
<version>
4.1-
20240826-
RELEASE
</version>
<groupId>
com.yonde.dcs
</groupId>
<modules>
<module>
dcs-plan-core
</module>
...
...
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