Skip to content

D
dcs-plan
Commit 1399d312 authored by wangqiang's avatar wangqiang
Browse files
Options

模型增加密集和容器从新生成代码，将重新生成的代码进行替换，其中替换有VO、PO、shadow。

parent f03c4259
Hide whitespace changes
Inline Side-by-side
Showing with 1101 additions and 375 deletions
dcs-plan-auto-task/pom.xml deleted 100644 → 0
View file @ f03c4259
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.yonde.dcs</groupId>
<artifactId>dcs-plan</artifactId>
<version>4.1-RELEASE</version>
</parent>
<groupId>com.yonde</groupId>
<artifactId>dcs-plan-auto-task</artifactId>
<version>4.1-RELEASE</version>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
</project>
\ No newline at end of file
dcs-plan-auto-task/src/main/java/com/yonde/auto/task/AutoTaskService.java deleted 100644 → 0
View file @ f03c4259
package com.yonde.auto.task;
public interface AutoTaskService {
}
dcs-plan-auto-task/src/main/java/com/yonde/auto/task/impl/AutoTaskServiceImpl.java deleted 100644 → 0
View file @ f03c4259
package com.yonde.auto.task.impl;
import com.yonde.auto.task.AutoTaskService;
public class AutoTaskServiceImpl implements AutoTaskService {
}
dcs-plan-common/pom.xml
View file @ 1399d312
......@@ -69,6 +69,12 @@
<artifactId>aspose-words</artifactId>
<version>23.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.17.1</version>
<scope>compile</scope>
</dependency>
</dependencies>
......
dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtContractExpensesVO.java
View file @ 1399d312
......@@ -36,20 +36,23 @@ import com.yonde.dex.basedata.entity.vo.DxIdVOEmbeddable;
import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOEmbeddable;
import com.yonde.dcs.plan.common.vo.ExtIncomeContractVO;
import com.yonde.dex.basedata.entity.vo.IdVO;
import com.yonde.dex.context.plugin.common.entity.DxContextVOEmbeddable;
import com.yonde.dex.context.plugin.common.entity.DxContextVOHolder;
import com.yonde.dex.basedata.entity.users.DxUserVO;
/**
* @description: ExtContractExpenses-VO
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:06
* @date: 2024-8-15 9:25:35
**/
@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtContractExpensesVO.class)
@EqualsAndHashCode(callSuper = true)
@Data
@ToString(callSuper = true)
public class ExtContractExpensesVO extends IdOnlyVO implements IdVO ,DxLogicDeleteVOHolder{
public class ExtContractExpensesVO extends IdOnlyVO implements IdVO ,DxContextVOHolder ,DxLogicDeleteVOHolder{
public static final String DX_CONTEXT_EMBEDDABLE_PROP_NAME = "dxContextEmbeddable";
public static final String DX_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";
public static final String DX_LOGIC_DELETE_EMBEDDABLE_PROP_NAME = "dxLogicDeleteEmbeddable";
public static final String CONTENT_PROP_NAME = "content";
......@@ -58,6 +61,13 @@ public class ExtContractExpensesVO extends IdOnlyVO implements IdVO ,DxLogicDele
public static final String EXT_INCOME_CONTRACT_ID_TYPE_PROP_NAME = "extIncomeContractIdType";
public static final String ITEM_AMOUNT_PROP_NAME = "itemAmount";
/**
* 扩展VO属性
*/
@DexEmbedded()
@JsonIgnore
private DxContextVOEmbeddable dxContextEmbeddable;
/**
* dao扩展对象
*/
......
dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtContractLinkVO.java
View file @ 1399d312
......@@ -32,6 +32,8 @@ 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.basedata.entity.vo.IdVO;
import com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOHolder;
import com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOEmbeddable;
import com.yonde.dex.linkdata.plugin.common.DxLinkDataVOHolder;
import com.yonde.dex.linkdata.plugin.common.DxLinkDataVOEmbeddable;
import com.yonde.dex.basedata.entity.users.DxUserVO;
......@@ -40,15 +42,16 @@ import com.yonde.dex.basedata.entity.users.DxUserVO;
* @description: ExtContractLink-VO
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:05
* @date: 2024-8-15 9:25:35
**/
@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtContractLinkVO.class)
@EqualsAndHashCode(callSuper = true)
@Data
@ToString(callSuper = true)
public class ExtContractLinkVO extends IdOnlyVO implements IdVO ,DxLinkDataVOHolder<ExtIncomeContractVO, ExtSpendingContractVO>{
public class ExtContractLinkVO extends IdOnlyVO implements IdVO ,DxLinkDataVOHolder<ExtIncomeContractVO, ExtSpendingContractVO> ,DxSecretVOHolder{
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_LINK_DATA_EMBEDDABLE_PROP_NAME = "dxLinkDataEmbeddable";
/**
......@@ -58,6 +61,13 @@ public class ExtContractLinkVO extends IdOnlyVO implements IdVO ,DxLinkDataVOHol
@JsonIgnore
private DxIdVOEmbeddable dxIdEmbeddable;
/**
* 扩展VO属性
*/
@DexEmbedded()
@JsonIgnore
private DxSecretVOEmbeddable dxSecretEmbeddable;
/**
* 扩展VO属性
*/
......
dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtDisReocredLinkVO.java
View file @ 1399d312
......@@ -42,7 +42,7 @@ import com.yonde.dex.basedata.entity.users.DxUserVO;
* @description: ExtDisReocredLink-VO
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:06
* @date: 2024-8-15 9:25:36
**/
@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtDisReocredLinkVO.class)
@EqualsAndHashCode(callSuper = true)
......
dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtDistributeRecordVO.java
View file @ 1399d312
......@@ -34,23 +34,27 @@ import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOHolder;
import com.yonde.dex.basedata.entity.vo.DxIdVOEmbeddable;
import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOEmbeddable;
import com.yonde.dex.basedata.entity.vo.IdVO;
import com.yonde.dcs.plan.common.vo.ExtDisReocredLinkVO;
import com.yonde.dex.context.plugin.common.entity.DxContextVOEmbeddable;
import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOHolder;
import com.yonde.dex.context.plugin.common.entity.DxContextVOHolder;
import com.yonde.dex.user.common.vo.DxUserInfoVO;
import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOEmbeddable;
import com.yonde.dex.basedata.entity.users.DxUserVO;
/**
* @description: ExtDistributeRecord-VO
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:06
**/
* @description: ExtDistributeRecord-VO
* @author: dexadmin
* @version: V
* @date: 2024-8-15 10:13:39
**/
@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtDistributeRecordVO.class)
@EqualsAndHashCode(callSuper = true)
@Data
@ToString(callSuper = true)
public class ExtDistributeRecordVO extends IdOnlyVO implements IdVO ,DxObjFileLinkVOHolder ,DxLogicDeleteVOHolder{
public class ExtDistributeRecordVO extends IdOnlyVO implements IdVO ,DxContextVOHolder ,DxObjFileLinkVOHolder ,DxLogicDeleteVOHolder{
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_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";
public static final String DX_LOGIC_DELETE_EMBEDDABLE_PROP_NAME = "dxLogicDeleteEmbeddable";
......@@ -63,11 +67,12 @@ public class ExtDistributeRecordVO extends IdOnlyVO implements IdVO ,DxObjFileLi
public static final String DISTRIBUTE_REMARK_PROP_NAME = "distributeRemark";
public static final String DISTRIBUTE_TYPE_PROP_NAME = "distributeType";
public static final String DUE_TIME_PROP_NAME = "dueTime";
public static final String DX_USER_INFO_PROP_NAME = "dxUserInfo";
public static final String DX_USER_INFO_ID_PROP_NAME = "dxUserInfoId";
public static final String DX_USER_INFO_ID_TYPE_PROP_NAME = "dxUserInfoIdType";
public static final String EXT_DIS_REOCRED_LINKS_PROP_NAME = "extDisReocredLinks";
public static final String FOREIGN_UNIT_ISSUED_PROP_NAME = "foreignUnitIssued";
public static final String FOREIGN_UNIT_RECEIVE_PROP_NAME = "foreignUnitReceive";
public static final String HANDLE_PROP_NAME = "handle";
public static final String HANDLE_ID_PROP_NAME = "handleId";
public static final String HANDLE_ID_TYPE_PROP_NAME = "handleIdType";
public static final String OPERATION_TIME_PROP_NAME = "operationTime";
public static final String RECEIVE_REMARK_PROP_NAME = "receiveRemark";
public static final String RECEIVE_TASK_TYPE_PROP_NAME = "receiveTaskType";
......@@ -77,155 +82,183 @@ public class ExtDistributeRecordVO extends IdOnlyVO implements IdVO ,DxObjFileLi
public static final String REPLY_DATE_PROP_NAME = "replyDate";
public static final String REPLY_DISTRIBUTE_PROP_NAME = "replyDistribute";
public static final String SEND_FINISH_PROP_NAME = "sendFinish";
public static final String SENDER_PROP_NAME = "sender";
public static final String SENDER_ID_PROP_NAME = "senderId";
public static final String SENDER_ID_TYPE_PROP_NAME = "senderIdType";
public static final String WORK_DESC_PROP_NAME = "workDesc";
/**
* 扩展VO属性
*/
* 扩展VO属性
*/
@DexEmbedded()
@JsonIgnore
private DxContextVOEmbeddable dxContextEmbeddable;
/**
* 扩展VO属性
*/
@DexEmbedded()
@JsonIgnore
private DxObjFileLinkVOEmbeddable dxObjFileLinkEmbeddable;
/**
* dao扩展对象
*/
* dao扩展对象
*/
@DexEmbedded()
@JsonIgnore
private DxIdVOEmbeddable dxIdEmbeddable;
/**
* 扩展VO属性
*/
* 扩展VO属性
*/
@DexEmbedded()
@JsonIgnore
private DxLogicDeleteVOEmbeddable dxLogicDeleteEmbeddable;
/**
* 分发记录对象Link模型集合
* 显示名称
*/
@RelationProperty(refProperty = "source")
private List<ExtDisReocredLinkVO> extDisReocredLink;
/**
* 显示名称
*/
private String boTitle;
/**
* 完成接收任务时间
*/
* 完成接收任务时间
*/
private String comReceiveTime;
/**
* Boolean
*/
* Boolean
*/
private Boolean completed;
/**
* 编号
*/
* 编号
*/
private String disNumber;
/**
* 分发单位
*/
* 分发单位
*/
private String distributDepart;
/**
* 分发时间
*/
* 分发时间
*/
private LocalDateTime distributTime;
/**
* 分发备注
*/
* 分发备注
*/
private String distributeRemark;
/**
* 分发类型
*/
* 分发类型
*/
private String distributeType;
/**
* 截止时间
*/
* 截止时间
*/
private LocalDateTime dueTime;
/**
* 用户信息
*/
@ReferenceProperty(baseProperty = "dxUserInfoId")
* ExtDisReocredLink集合
*/
@RelationProperty(refProperty = "extDistributeRecord")
@VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.NONE)
private DxUserInfoVO dxUserInfo;
private List<ExtDisReocredLinkVO> extDisReocredLinks;
/**
* 用户信息
*/
private Long dxUserInfoId;
* 外单位(发)
*/
private String foreignUnitIssued;
/**
* 用户信息
*/
private String dxUserInfoIdType;
* 外单位(收)
*/
private String foreignUnitReceive;
/**
* 外单位(发)
*/
private String foreignUnitIssued;
* 操作人
*/
@ReferenceProperty(baseProperty = "handleId")
@VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.NONE)
private DxUserInfoVO handle;
/**
* 外单位(收)
*/
private String foreignUnitReceive;
* 操作人
*/
private Long handleId;
/**
* 操作时间
*/
* 操作人
*/
private String handleIdType;
/**
* 操作时间
*/
private LocalDateTime operationTime;
/**
* 接收备注
*/
* 接收备注
*/
private String receiveRemark;
/**
* 接收任务类型
*/
* 接收任务类型
*/
private String receiveTaskType;
/**
* 接收时间
*/
* 接收时间
*/
private LocalDateTime receiveTime;
/**
* 接收类型
*/
* 接收类型
*/
private String receiveType;
/**
* 接收单位
*/
* 接收单位
*/
private String receiver;
/**
* 要求回复日期
*/
* 要求回复日期
*/
private String replyDate;
/**
* 分发是否需回复
*/
* 分发是否需回复
*/
private String replyDistribute;
/**
* 发送任务是否结束
*/
* 发送任务是否结束
*/
private Boolean sendFinish;
/**
* 工作说明
*/
* 分发人
*/
@ReferenceProperty(baseProperty = "senderId")
@VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.NONE)
private DxUserInfoVO sender;
/**
* 分发人
*/
private Long senderId;
/**
* 分发人
*/
private String senderIdType;
/**
* 工作说明
*/
private String workDesc;
}
......
dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtECRVO.java
View file @ 1399d312
......@@ -30,30 +30,33 @@ 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.context.plugin.common.entity.DxContextVOEmbeddable;
import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOHolder;
import com.yonde.dex.context.plugin.common.entity.DxContextVOHolder;
import com.yonde.dex.basedata.entity.users.DxUserVO;
import com.yonde.dcs.plan.common.vo.ExtOriginObjLinkVO;
import com.yonde.dex.lcycle.plugin.common.entity.DxLifecycleManageBaseVOHolder;
import com.yonde.dcs.plan.common.vo.ExtUpgradeObjLinkVO;
import com.yonde.dex.lcycle.plugin.common.entity.DxLifecycleManageBaseVOEmbeddable;
import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOHolder;
import com.yonde.dex.basedata.entity.vo.DxIdVOEmbeddable;
import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOEmbeddable;
import com.yonde.dex.basedata.entity.vo.IdVO;
import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOHolder;
import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOEmbeddable;
import com.yonde.dex.basedata.entity.users.DxUserVO;
/**
* @description: ExtECR-VO
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:04
* @date: 2024-8-15 9:25:34
**/
@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtECRVO.class)
@EqualsAndHashCode(callSuper = true)
@Data
@ToString(callSuper = true)
public class ExtECRVO extends IdOnlyVO implements IdVO ,DxLifecycleManageBaseVOHolder ,DxObjFileLinkVOHolder ,DxLogicDeleteVOHolder{
public class ExtECRVO extends IdOnlyVO implements IdVO ,DxContextVOHolder ,DxLifecycleManageBaseVOHolder ,DxObjFileLinkVOHolder ,DxLogicDeleteVOHolder{
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";
......@@ -63,6 +66,13 @@ public class ExtECRVO extends IdOnlyVO implements IdVO ,DxLifecycleManageBaseVOH
public static final String EXT_ORIGIN_OBJ_LINKS_PROP_NAME = "extOriginObjLinks";
public static final String EXT_UPGRADE_OBJ_LINKS_PROP_NAME = "extUpgradeObjLinks";
/**
* 扩展VO属性
*/
@DexEmbedded()
@JsonIgnore
private DxContextVOEmbeddable dxContextEmbeddable;
/**
* 扩展VO属性
*/
......
dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtExpectPayDetailsVO.java
View file @ 1399d312
......@@ -36,28 +36,41 @@ import com.yonde.dex.basedata.entity.vo.DxIdVOEmbeddable;
import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOEmbeddable;
import com.yonde.dcs.plan.common.vo.ExtIncomeContractVO;
import com.yonde.dex.basedata.entity.vo.IdVO;
import com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOHolder;
import com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOEmbeddable;
import com.yonde.dex.context.plugin.common.entity.DxContextVOEmbeddable;
import com.yonde.dex.context.plugin.common.entity.DxContextVOHolder;
import com.yonde.dex.basedata.entity.users.DxUserVO;
/**
* @description: ExtExpectPayDetails-VO
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:05
* @date: 2024-8-15 9:25:35
**/
@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtExpectPayDetailsVO.class)
@EqualsAndHashCode(callSuper = true)
@Data
@ToString(callSuper = true)
public class ExtExpectPayDetailsVO extends IdOnlyVO implements IdVO ,DxLogicDeleteVOHolder{
public class ExtExpectPayDetailsVO extends IdOnlyVO implements IdVO ,DxContextVOHolder ,DxLogicDeleteVOHolder ,DxSecretVOHolder{
public static final String DX_CONTEXT_EMBEDDABLE_PROP_NAME = "dxContextEmbeddable";
public static final String DX_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";
public static final String DX_LOGIC_DELETE_EMBEDDABLE_PROP_NAME = "dxLogicDeleteEmbeddable";
public static final String DX_SECRET_EMBEDDABLE_PROP_NAME = "dxSecretEmbeddable";
public static final String AMOUNT_PROP_NAME = "amount";
public static final String EXT_INCOME_CONTRACT_PROP_NAME = "extIncomeContract";
public static final String EXT_INCOME_CONTRACT_ID_PROP_NAME = "extIncomeContractId";
public static final String EXT_INCOME_CONTRACT_ID_TYPE_PROP_NAME = "extIncomeContractIdType";
public static final String YEARS_PROP_NAME = "years";
/**
* 扩展VO属性
*/
@DexEmbedded()
@JsonIgnore
private DxContextVOEmbeddable dxContextEmbeddable;
/**
* dao扩展对象
*/
......@@ -72,6 +85,13 @@ public class ExtExpectPayDetailsVO extends IdOnlyVO implements IdVO ,DxLogicDele
@JsonIgnore
private DxLogicDeleteVOEmbeddable dxLogicDeleteEmbeddable;
/**
* 扩展VO属性
*/
@DexEmbedded()
@JsonIgnore
private DxSecretVOEmbeddable dxSecretEmbeddable;
/**
* 金额
*/
......
dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtIncomeBillInfoVO.java
View file @ 1399d312
package com.yonde.dcs.plan.common.vo;
import javax.validation.constraints.NotBlank;
import java.math.BigDecimal;
import java.util.Date;
import java.time.LocalDateTime;
import java.util.ArrayList;
......@@ -32,34 +33,44 @@ 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.basedata.entity.vo.IdVO;
import com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOHolder;
import com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOEmbeddable;
import com.yonde.dex.context.plugin.common.entity.DxContextVOEmbeddable;
import com.yonde.dcs.plan.common.vo.ExtIncomeDetailVO;
import com.yonde.dex.context.plugin.common.entity.DxContextVOHolder;
import com.yonde.dex.basedata.entity.users.DxUserVO;
/**
* @description: ExtIncomeBillInfo-VO
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:05
* @date: 2024-8-15 9:25:35
**/
@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtIncomeBillInfoVO.class)
@EqualsAndHashCode(callSuper = true)
@Data
@ToString(callSuper = true)
public class ExtIncomeBillInfoVO extends IdOnlyVO implements IdVO{
public class ExtIncomeBillInfoVO extends IdOnlyVO implements IdVO ,DxContextVOHolder ,DxSecretVOHolder{
public static final String DX_CONTEXT_EMBEDDABLE_PROP_NAME = "dxContextEmbeddable";
public static final String DX_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";
public static final String AMOUNT_INVOICE_TYPE_PROP_NAME = "amountInvoiceType";
public static final String AMOUNTS_PROP_NAME = "amounts";
public static final String DX_SECRET_EMBEDDABLE_PROP_NAME = "dxSecretEmbeddable";
public static final String BILL_TYPE_PROP_NAME = "billType";
public static final String EXT_INCOME_DETAIL_PROP_NAME = "extIncomeDetail";
public static final String EXT_INCOME_DETAIL_ID_PROP_NAME = "extIncomeDetailId";
public static final String EXT_INCOME_DETAIL_ID_TYPE_PROP_NAME = "extIncomeDetailIdType";
public static final String INVOICE_CONTENT_PROP_NAME = "invoiceContent";
public static final String INVOICE_NUMBER_PROP_NAME = "invoiceNumber";
public static final String ISSUING_TIME_PROP_NAME = "issuingTime";
public static final String ISSUING_UNIT_PROP_NAME = "issuingUnit";
public static final String SPECIFICATIONS_PROP_NAME = "specifications";
public static final String REMARK_PROP_NAME = "remark";
public static final String TAX_RATE_PROP_NAME = "taxRate";
public static final String UNIT_PROP_NAME = "unit";
public static final String TICKET_AMOUNT_PROP_NAME = "ticketAmount";
public static final String TICKET_NUMBER_PROP_NAME = "ticketNumber";
/**
* 扩展VO属性
*/
@DexEmbedded()
@JsonIgnore
private DxContextVOEmbeddable dxContextEmbeddable;
/**
* dao扩展对象
......@@ -69,14 +80,16 @@ public class ExtIncomeBillInfoVO extends IdOnlyVO implements IdVO{
private DxIdVOEmbeddable dxIdEmbeddable;
/**
* 开具金额发票类型
* 扩展VO属性
*/
private String amountInvoiceType;
@DexEmbedded()
@JsonIgnore
private DxSecretVOEmbeddable dxSecretEmbeddable;
/**
* 数量
* 票据类型
*/
private Integer amounts;
private String billType;
/**
* 收入明细
......@@ -95,40 +108,30 @@ public class ExtIncomeBillInfoVO extends IdOnlyVO implements IdVO{
*/
private String extIncomeDetailIdType;
/**
* 发票内容
*/
private String invoiceContent;
/**
* 发票号码
*/
private String invoiceNumber;
/**
* 开具时间
*/
private LocalDateTime issuingTime;
/**
* 开具单位
* 备注
*/
private String issuingUnit;
private String remark;
/**
* 规格型号
* 税率
*/
private String specifications;
private Float taxRate;
/**
* 税率
* 票据金额
*/
private Float taxRate;
private BigDecimal ticketAmount;
/**
* 单位
* 票据号码
*/
private String unit;
private String ticketNumber;
}
......
dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtIncomeContractVO.java
View file @ 1399d312
......@@ -32,30 +32,36 @@ 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.ExtContractExpensesVO;
import com.yonde.dex.basedata.entity.vo.DxIdVOEmbeddable;
import com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOHolder;
import com.yonde.dex.context.plugin.common.entity.DxContextVOEmbeddable;
import com.yonde.dex.context.plugin.common.entity.DxContextVOHolder;
import com.yonde.dex.basedata.entity.users.DxUserVO;
import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOHolder;
import com.yonde.dcs.plan.common.vo.ExtExpectPayDetailsVO;
import com.yonde.dex.basedata.entity.vo.DxIdVOEmbeddable;
import com.yonde.dcs.plan.common.vo.ExtContractLinkVO;
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.ExtIncomeDetailVO;
import com.yonde.dex.basedata.entity.users.DxUserVO;
import com.yonde.dcs.plan.common.vo.ExtPaymentDetailsVO;
/**
* @description: ExtIncomeContract-VO
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:06
* @date: 2024-8-15 9:25:36
**/
@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtIncomeContractVO.class)
@EqualsAndHashCode(callSuper = true)
@Data
@ToString(callSuper = true)
public class ExtIncomeContractVO extends IdOnlyVO implements IdVO ,DxLogicDeleteVOHolder{
public class ExtIncomeContractVO extends IdOnlyVO implements IdVO ,DxContextVOHolder ,DxLogicDeleteVOHolder ,DxSecretVOHolder{
public static final String DX_CONTEXT_EMBEDDABLE_PROP_NAME = "dxContextEmbeddable";
public static final String DX_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";
public static final String DX_LOGIC_DELETE_EMBEDDABLE_PROP_NAME = "dxLogicDeleteEmbeddable";
public static final String DX_SECRET_EMBEDDABLE_PROP_NAME = "dxSecretEmbeddable";
public static final String BILL_AMOUNT_PROP_NAME = "billAmount";
public static final String BILL_NUMBER_PROP_NAME = "billNumber";
public static final String BILL_STATUS_PROP_NAME = "billStatus";
......@@ -88,6 +94,13 @@ public class ExtIncomeContractVO extends IdOnlyVO implements IdVO ,DxLogicDelete
public static final String TO_BEDISBURSED_PROP_NAME = "toBedisbursed";
public static final String TRIAL_PRICE_PROP_NAME = "trialPrice";
/**
* 扩展VO属性
*/
@DexEmbedded()
@JsonIgnore
private DxContextVOEmbeddable dxContextEmbeddable;
/**
* dao扩展对象
*/
......@@ -102,6 +115,13 @@ public class ExtIncomeContractVO extends IdOnlyVO implements IdVO ,DxLogicDelete
@JsonIgnore
private DxLogicDeleteVOEmbeddable dxLogicDeleteEmbeddable;
/**
* 扩展VO属性
*/
@DexEmbedded()
@JsonIgnore
private DxSecretVOEmbeddable dxSecretEmbeddable;
/**
* 票据金额
*/
......@@ -260,7 +280,7 @@ public class ExtIncomeContractVO extends IdOnlyVO implements IdVO ,DxLogicDelete
/**
* 待拨付
*/
private BigDecimal toBedisbursed;
private Integer toBedisbursed;
/**
* 审价额
......
dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtIncomeDetailVO.java
View file @ 1399d312
......@@ -36,6 +36,8 @@ import com.yonde.dex.basedata.entity.vo.DxIdVOEmbeddable;
import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOEmbeddable;
import com.yonde.dcs.plan.common.vo.ExtIncomeContractVO;
import com.yonde.dex.basedata.entity.vo.IdVO;
import com.yonde.dex.context.plugin.common.entity.DxContextVOEmbeddable;
import com.yonde.dex.context.plugin.common.entity.DxContextVOHolder;
import com.yonde.dcs.plan.common.vo.ExtIncomeBillInfoVO;
import com.yonde.dex.basedata.entity.users.DxUserVO;
......@@ -43,14 +45,15 @@ import com.yonde.dex.basedata.entity.users.DxUserVO;
* @description: ExtIncomeDetail-VO
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:05
* @date: 2024-8-15 9:25:35
**/
@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtIncomeDetailVO.class)
@EqualsAndHashCode(callSuper = true)
@Data
@ToString(callSuper = true)
public class ExtIncomeDetailVO extends IdOnlyVO implements IdVO ,DxLogicDeleteVOHolder{
public class ExtIncomeDetailVO extends IdOnlyVO implements IdVO ,DxContextVOHolder ,DxLogicDeleteVOHolder{
public static final String DX_CONTEXT_EMBEDDABLE_PROP_NAME = "dxContextEmbeddable";
public static final String DX_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";
public static final String DX_LOGIC_DELETE_EMBEDDABLE_PROP_NAME = "dxLogicDeleteEmbeddable";
public static final String AMOUNT_PROP_NAME = "amount";
......@@ -65,6 +68,13 @@ public class ExtIncomeDetailVO extends IdOnlyVO implements IdVO ,DxLogicDeleteVO
public static final String PAY_SITUATION_PROP_NAME = "paySituation";
public static final String PAY_TIME_PROP_NAME = "payTime";
/**
* 扩展VO属性
*/
@DexEmbedded()
@JsonIgnore
private DxContextVOEmbeddable dxContextEmbeddable;
/**
* dao扩展对象
*/
......@@ -87,7 +97,7 @@ public class ExtIncomeDetailVO extends IdOnlyVO implements IdVO ,DxLogicDeleteVO
/**
* 到账时间
*/
private Date arrivalTime;
private LocalDateTime arrivalTime;
/**
* 票据开具
......
dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtOriginObjLinkVO.java
View file @ 1399d312
......@@ -43,7 +43,7 @@ import com.yonde.dex.basedata.entity.users.DxUserVO;
* @description: ExtOriginObjLink-VO
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:04
* @date: 2024-8-15 9:25:34
**/
@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtOriginObjLinkVO.class)
@EqualsAndHashCode(callSuper = true)
......
dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtPaymentDetailsVO.java
View file @ 1399d312
......@@ -36,20 +36,23 @@ import com.yonde.dex.basedata.entity.vo.DxIdVOEmbeddable;
import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOEmbeddable;
import com.yonde.dcs.plan.common.vo.ExtIncomeContractVO;
import com.yonde.dex.basedata.entity.vo.IdVO;
import com.yonde.dex.context.plugin.common.entity.DxContextVOEmbeddable;
import com.yonde.dex.context.plugin.common.entity.DxContextVOHolder;
import com.yonde.dex.basedata.entity.users.DxUserVO;
/**
* @description: ExtPaymentDetails-VO
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:06
* @date: 2024-8-15 9:25:35
**/
@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtPaymentDetailsVO.class)
@EqualsAndHashCode(callSuper = true)
@Data
@ToString(callSuper = true)
public class ExtPaymentDetailsVO extends IdOnlyVO implements IdVO ,DxLogicDeleteVOHolder{
public class ExtPaymentDetailsVO extends IdOnlyVO implements IdVO ,DxContextVOHolder ,DxLogicDeleteVOHolder{
public static final String DX_CONTEXT_EMBEDDABLE_PROP_NAME = "dxContextEmbeddable";
public static final String DX_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";
public static final String DX_LOGIC_DELETE_EMBEDDABLE_PROP_NAME = "dxLogicDeleteEmbeddable";
public static final String AMOUNT_PROP_NAME = "amount";
......@@ -58,6 +61,13 @@ public class ExtPaymentDetailsVO extends IdOnlyVO implements IdVO ,DxLogicDelete
public static final String EXT_INCOME_CONTRACT_ID_TYPE_PROP_NAME = "extIncomeContractIdType";
public static final String YEARS_PROP_NAME = "years";
/**
* 扩展VO属性
*/
@DexEmbedded()
@JsonIgnore
private DxContextVOEmbeddable dxContextEmbeddable;
/**
* dao扩展对象
*/
......
dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtPlanDocLinkVO.java
View file @ 1399d312
......@@ -44,14 +44,14 @@ import com.yonde.dex.basedata.entity.users.DxUserVO;
* @description: ExtPlanDocLink-VO
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:05
* @date: 2024-8-15 9:25:35
**/
@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtPlanDocLinkVO.class)
@EqualsAndHashCode(callSuper = true)
@Data
@ToString(callSuper = true)
@DexTypeVersionProp(propName = "target", join = @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.MASTER))
@DexTypeVersionProp(propName = "source", join = @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.MASTER))
@DexTypeVersionProp(propName = "target", join = @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.ITERATION))
@DexTypeVersionProp(propName = "source", join = @VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.VERSION))
public class ExtPlanDocLinkVO extends IdOnlyVO implements DxLinkDataVOHolder<ExtPlanVO, DxDocumentVO> ,IdVO ,DxLogicDeleteVOHolder{
public static final String DX_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";
......
dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtPlanReplyLinkVO.java
View file @ 1399d312
......@@ -42,7 +42,7 @@ import com.yonde.dex.basedata.entity.users.DxUserVO;
* @description: ExtPlanReplyLink-VO
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:05
* @date: 2024-8-15 9:25:36
**/
@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtPlanReplyLinkVO.class)
@EqualsAndHashCode(callSuper = true)
......
dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtPlanReplyVO.java
View file @ 1399d312
......@@ -34,6 +34,9 @@ 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.basedata.entity.vo.IdVO;
import com.yonde.dex.context.plugin.common.entity.DxContextVOEmbeddable;
import com.yonde.dcs.plan.common.vo.ExtPlanReplyLinkVO;
import com.yonde.dex.context.plugin.common.entity.DxContextVOHolder;
import com.yonde.dex.version.plugin.common.entity.DxIterationVOEmbeddable;
import com.yonde.dex.version.plugin.common.entity.DxIterationVOHolder;
import com.yonde.dex.basedata.entity.users.DxUserVO;
......@@ -42,21 +45,30 @@ import com.yonde.dex.basedata.entity.users.DxUserVO;
* @description: ExtPlanReply-VO
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:06
* @date: 2024-8-15 9:25:36
**/
@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtPlanReplyVO.class)
@EqualsAndHashCode(callSuper = true)
@Data
@ToString(callSuper = true)
public class ExtPlanReplyVO extends IdOnlyVO implements IdVO ,DxLifecycleManageBaseVOHolder ,DxIterationVOHolder<ExtPlanReplyVO>{
public class ExtPlanReplyVO extends IdOnlyVO implements IdVO ,DxContextVOHolder ,DxLifecycleManageBaseVOHolder ,DxIterationVOHolder<ExtPlanReplyVO>{
public static final String DX_CONTEXT_EMBEDDABLE_PROP_NAME = "dxContextEmbeddable";
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_ITERATION_EMBEDDABLE_PROP_NAME = "dxIterationEmbeddable";
public static final String COMPLETION_PROP_NAME = "completion";
public static final String EXT_PLAN_REPLY_LINKS_PROP_NAME = "extPlanReplyLinks";
public static final String FEEDBACK_DESCRIPT_PROP_NAME = "feedbackDescript";
public static final String UNFINISH_SITUAT_PROP_NAME = "unfinishSituat";
/**
* 扩展VO属性
*/
@DexEmbedded()
@JsonIgnore
private DxContextVOEmbeddable dxContextEmbeddable;
/**
* 扩展VO属性
*/
......@@ -83,6 +95,13 @@ public class ExtPlanReplyVO extends IdOnlyVO implements IdVO ,DxLifecycleManageB
*/
private String completion;
/**
* ExtPlanReplyLink集合
*/
@RelationProperty(refProperty = "target")
@VersionProperty(curVersion = VersionRelationType.ITERATION, refVersion = VersionRelationType.NONE)
private List<ExtPlanReplyLinkVO> extPlanReplyLinks;
/**
* 反馈情况说明
*/
......
dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtPlanVO.java
View file @ 1399d312
......@@ -32,7 +32,9 @@ 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.context.plugin.common.entity.DxContextVOEmbeddable;
import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOHolder;
import com.yonde.dex.context.plugin.common.entity.DxContextVOHolder;
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;
......@@ -47,23 +49,24 @@ import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOEmbedda
import com.yonde.dex.version.plugin.common.entity.DxIterationVOHolder;
/**
* @description: ExtPlan-VO
* @author: dexadmin
* @version: V
* @date: 2024-8-1 18:16:27
**/
* @description: ExtPlan-VO
* @author: dexadmin
* @version: V
* @date: 2024-8-15 9:25:36
**/
@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 ,DxSecretVOHolder{
public class ExtPlanVO extends IdOnlyVO implements IdVO ,DxTreeContextVOHolder<ExtPlanVO> ,DxContextVOHolder ,DxLifecycleManageBaseVOHolder ,DxIterationVOHolder<ExtPlanVO> ,DxObjFileLinkVOHolder ,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_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 DX_SECRET_EMBEDDABLE_PROP_NAME = "dxSecretEmbeddable";
public static final String ACTUAL_COMPLATE_TIME_PROP_NAME = "actualComplateTime";
public static final String ACTUAL_START_TIME_PROP_NAME = "actualStartTime";
public static final String APPROVER_PROP_NAME = "approver";
......@@ -97,204 +100,211 @@ public class ExtPlanVO extends IdOnlyVO implements IdVO ,DxTreeContextVOHolder<E
public static final String VERIFIER_PROP_NAME = "verifier";
/**
* 扩展VO属性
*/
* 扩展VO属性
*/
@DexEmbedded()
@JsonIgnore
private DxContextVOEmbeddable dxContextEmbeddable;
/**
* 扩展VO属性
*/
@DexEmbedded()
@JsonIgnore
private DxObjFileLinkVOEmbeddable dxObjFileLinkEmbeddable;
/**
* 扩展VO属性
*/
* 扩展VO属性
*/
@DexEmbedded()
@JsonIgnore
private DxTreeContextVOEmbeddable<ExtPlanVO> dxTreeContextEmbeddable;
/**
* 扩展VO属性
*/
* 扩展VO属性
*/
@DexEmbedded()
@JsonIgnore
private DxLifecycleManageBaseVOEmbeddable dxLifecycleManageBaseEmbeddable;
/**
* dao扩展对象
*/
* dao扩展对象
*/
@DexEmbedded()
@JsonIgnore
private DxIdVOEmbeddable dxIdEmbeddable;
/**
* 扩展VO属性
*/
* 扩展VO属性
*/
@DexEmbedded()
@JsonIgnore
private DxSecretVOEmbeddable dxSecretEmbeddable;
private DxIterationVOEmbeddable<ExtPlanVO> dxIterationEmbeddable;
/**
* 扩展VO属性
*/
* 扩展VO属性
*/
@DexEmbedded()
@JsonIgnore
private DxIterationVOEmbeddable<ExtPlanVO> dxIterationEmbeddable;
private DxSecretVOEmbeddable dxSecretEmbeddable;
/**
* 实际完成时间
*/
* 实际完成时间
*/
private LocalDateTime actualComplateTime;
/**
* 实际开始时间
*/
* 实际开始时间
*/
private LocalDateTime actualStartTime;
/**
* 批准者
*/
* 批准者
*/
private String approver;
/**
* 业务计划类型
*/
* 业务计划类型
*/
private String businessPlanType;
/**
* 完成时间
*/
* 完成时间
*/
private LocalDateTime completeTime;
/**
* 完成情况
*/
* 完成情况
*/
private String completion;
/**
* 工期
*/
* 工期
*/
private String constructPeriod;
/**
* 合同编号
*/
* 合同编号
*/
private String contractNo;
/**
* 计划文档关系集合
*/
* 计划文档关系集合
*/
@RelationProperty(refProperty = "source")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtPlanDocLinkVO> extPlanDocLinks;
/**
* ExtPlanReplyLink集合
*/
* ExtPlanReplyLink集合
*/
@RelationProperty(refProperty = "source")
@VersionProperty(curVersion = VersionRelationType.VERSION, refVersion = VersionRelationType.NONE)
private List<ExtPlanReplyLinkVO> extPlanReplyLinks;
/**
* 反馈情况说明
*/
* 反馈情况说明
*/
private String feedbackDescript;
/**
* 反馈类型
*/
* 反馈类型
*/
private String feedbackType;
/**
* 文件代号
*/
* 文件代号
*/
private String fileCode;
/**
* 文件名称
*/
* 文件名称
*/
private String fileName;
/**
* 文件编号
*/
* 文件编号
*/
private String fileNumber;
/**
* 文件分类
*/
* 文件分类
*/
private String fileType;
/**
* 是否产生计划任务
*/
* 是否产生计划任务
*/
private Boolean hasPlanTasks;
/**
* 操作
*/
* 操作
*/
private String operate;
/**
* 阶段状态
*/
* 阶段状态
*/
private String phaseState;
/**
* 计划执行人
*/
* 计划执行人
*/
private String planExecutor;
/**
* 计划级别
*/
* 计划级别
*/
private String planLevel;
/**
* 项目代号
*/
* 项目代号
*/
private String projectCode;
/**
* 审核者
*/
* 审核者
*/
private String review;
/**
* 开始时间
*/
* 开始时间
*/
private LocalDateTime startTime;
/**
* 父级计划编号
*/
* 父级计划编号
*/
private String superPlanCode;
/**
* 管理信息系统编码
*/
* 管理信息系统编码
*/
private String systemCode;
/**
* 任务名称
*/
* 任务名称
*/
private String taskName;
/**
* 任务编号
*/
* 任务编号
*/
private String taskNumber;
/**
* 任务完成状态
*/
* 任务完成状态
*/
private String taskState;
/**
* 未完成情况
*/
* 未完成情况
*/
private String unfinishSituat;
/**
* 审定者
*/
* 审定者
*/
private String verifier;
}
......
dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtSpendingBillInfoVO.java
View file @ 1399d312
......@@ -35,22 +35,28 @@ import com.yonde.dex.basedata.entity.vo.DxIdVOEmbeddable;
import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOEmbeddable;
import com.yonde.dcs.plan.common.vo.ExtSpendingDetailVO;
import com.yonde.dex.basedata.entity.vo.IdVO;
import com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOHolder;
import com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOEmbeddable;
import com.yonde.dex.context.plugin.common.entity.DxContextVOEmbeddable;
import com.yonde.dex.context.plugin.common.entity.DxContextVOHolder;
import com.yonde.dex.basedata.entity.users.DxUserVO;
/**
* @description: ExtSpendingBillInfo-VO
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:05
* @date: 2024-8-15 9:25:35
**/
@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtSpendingBillInfoVO.class)
@EqualsAndHashCode(callSuper = true)
@Data
@ToString(callSuper = true)
public class ExtSpendingBillInfoVO extends IdOnlyVO implements IdVO ,DxLogicDeleteVOHolder{
public class ExtSpendingBillInfoVO extends IdOnlyVO implements IdVO ,DxContextVOHolder ,DxLogicDeleteVOHolder ,DxSecretVOHolder{
public static final String DX_CONTEXT_EMBEDDABLE_PROP_NAME = "dxContextEmbeddable";
public static final String DX_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";
public static final String DX_LOGIC_DELETE_EMBEDDABLE_PROP_NAME = "dxLogicDeleteEmbeddable";
public static final String DX_SECRET_EMBEDDABLE_PROP_NAME = "dxSecretEmbeddable";
public static final String AMOUNT_INVOICE_TYPE_PROP_NAME = "amountInvoiceType";
public static final String AMOUNTS_PROP_NAME = "amounts";
public static final String EXT_SPENDING_DETAIL_PROP_NAME = "extSpendingDetail";
......@@ -64,6 +70,13 @@ public class ExtSpendingBillInfoVO extends IdOnlyVO implements IdVO ,DxLogicDele
public static final String TAX_RATE_PROP_NAME = "taxRate";
public static final String UNIT_PROP_NAME = "unit";
/**
* 扩展VO属性
*/
@DexEmbedded()
@JsonIgnore
private DxContextVOEmbeddable dxContextEmbeddable;
/**
* dao扩展对象
*/
......@@ -78,6 +91,13 @@ public class ExtSpendingBillInfoVO extends IdOnlyVO implements IdVO ,DxLogicDele
@JsonIgnore
private DxLogicDeleteVOEmbeddable dxLogicDeleteEmbeddable;
/**
* 扩展VO属性
*/
@DexEmbedded()
@JsonIgnore
private DxSecretVOEmbeddable dxSecretEmbeddable;
/**
* 开具金额发票类型
*/
......
dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtSpendingContractVO.java
View file @ 1399d312
......@@ -37,22 +37,28 @@ import com.yonde.dcs.plan.common.vo.ExtContractLinkVO;
import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOEmbeddable;
import com.yonde.dcs.plan.common.vo.ExtSpendingDetailVO;
import com.yonde.dex.basedata.entity.vo.IdVO;
import com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOHolder;
import com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOEmbeddable;
import com.yonde.dex.context.plugin.common.entity.DxContextVOEmbeddable;
import com.yonde.dex.context.plugin.common.entity.DxContextVOHolder;
import com.yonde.dex.basedata.entity.users.DxUserVO;
/**
* @description: ExtSpendingContract-VO
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:05
* @date: 2024-8-15 9:25:35
**/
@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtSpendingContractVO.class)
@EqualsAndHashCode(callSuper = true)
@Data
@ToString(callSuper = true)
public class ExtSpendingContractVO extends IdOnlyVO implements IdVO ,DxLogicDeleteVOHolder{
public class ExtSpendingContractVO extends IdOnlyVO implements IdVO ,DxContextVOHolder ,DxLogicDeleteVOHolder ,DxSecretVOHolder{
public static final String DX_CONTEXT_EMBEDDABLE_PROP_NAME = "dxContextEmbeddable";
public static final String DX_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";
public static final String DX_LOGIC_DELETE_EMBEDDABLE_PROP_NAME = "dxLogicDeleteEmbeddable";
public static final String DX_SECRET_EMBEDDABLE_PROP_NAME = "dxSecretEmbeddable";
public static final String ACCEPT_METHOD_PROP_NAME = "acceptMethod";
public static final String APPROVAL_DATE_PROP_NAME = "approvalDate";
public static final String CONTRACT_AMOUNT_PROP_NAME = "contractAmount";
......@@ -80,6 +86,13 @@ public class ExtSpendingContractVO extends IdOnlyVO implements IdVO ,DxLogicDele
public static final String TECH_LEADER_PROP_NAME = "techLeader";
public static final String UNPAID_AMOUNT_PROP_NAME = "unpaidAmount";
/**
* 扩展VO属性
*/
@DexEmbedded()
@JsonIgnore
private DxContextVOEmbeddable dxContextEmbeddable;
/**
* dao扩展对象
*/
......@@ -94,6 +107,13 @@ public class ExtSpendingContractVO extends IdOnlyVO implements IdVO ,DxLogicDele
@JsonIgnore
private DxLogicDeleteVOEmbeddable dxLogicDeleteEmbeddable;
/**
* 扩展VO属性
*/
@DexEmbedded()
@JsonIgnore
private DxSecretVOEmbeddable dxSecretEmbeddable;
/**
* 验收方法
*/
......
dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtSpendingDetailVO.java
View file @ 1399d312
......@@ -37,22 +37,28 @@ import com.yonde.dex.basedata.entity.vo.DxIdVOEmbeddable;
import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOEmbeddable;
import com.yonde.dcs.plan.common.vo.ExtSpendingContractVO;
import com.yonde.dex.basedata.entity.vo.IdVO;
import com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOHolder;
import com.yonde.dex.secretcode.plugin.common.entity.DxSecretVOEmbeddable;
import com.yonde.dex.context.plugin.common.entity.DxContextVOEmbeddable;
import com.yonde.dex.context.plugin.common.entity.DxContextVOHolder;
import com.yonde.dex.basedata.entity.users.DxUserVO;
/**
* @description: ExtSpendingDetail-VO
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:05
* @date: 2024-8-15 9:25:35
**/
@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtSpendingDetailVO.class)
@EqualsAndHashCode(callSuper = true)
@Data
@ToString(callSuper = true)
public class ExtSpendingDetailVO extends IdOnlyVO implements IdVO ,DxLogicDeleteVOHolder{
public class ExtSpendingDetailVO extends IdOnlyVO implements IdVO ,DxContextVOHolder ,DxLogicDeleteVOHolder ,DxSecretVOHolder{
public static final String DX_CONTEXT_EMBEDDABLE_PROP_NAME = "dxContextEmbeddable";
public static final String DX_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";
public static final String DX_LOGIC_DELETE_EMBEDDABLE_PROP_NAME = "dxLogicDeleteEmbeddable";
public static final String DX_SECRET_EMBEDDABLE_PROP_NAME = "dxSecretEmbeddable";
public static final String AMOUNT_PROP_NAME = "amount";
public static final String EXT_SPENDING_BILL_INFOS_PROP_NAME = "extSpendingBillInfos";
public static final String EXT_SPENDING_CONTRACT_PROP_NAME = "extSpendingContract";
......@@ -62,6 +68,13 @@ public class ExtSpendingDetailVO extends IdOnlyVO implements IdVO ,DxLogicDelete
public static final String PAYMENTS_PROP_NAME = "payments";
public static final String VOUCHER_NUMBER_PROP_NAME = "voucherNumber";
/**
* 扩展VO属性
*/
@DexEmbedded()
@JsonIgnore
private DxContextVOEmbeddable dxContextEmbeddable;
/**
* dao扩展对象
*/
......@@ -76,6 +89,13 @@ public class ExtSpendingDetailVO extends IdOnlyVO implements IdVO ,DxLogicDelete
@JsonIgnore
private DxLogicDeleteVOEmbeddable dxLogicDeleteEmbeddable;
/**
* 扩展VO属性
*/
@DexEmbedded()
@JsonIgnore
private DxSecretVOEmbeddable dxSecretEmbeddable;
/**
* 金额
*/
......
dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/ExtUpgradeObjLinkVO.java
View file @ 1399d312
......@@ -41,7 +41,7 @@ import com.yonde.dex.basedata.entity.users.DxUserVO;
* @description: ExtUpgradeObjLink-VO
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:04
* @date: 2024-8-15 9:25:34
**/
@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtUpgradeObjLinkVO.class)
@EqualsAndHashCode(callSuper = true)
......
dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/view/ExtDisReocredLinkVO.java 0 → 100644
View file @ 1399d312
package com.yonde.dcs.plan.common.vo.view;
import javax.validation.constraints.NotBlank;
import java.util.Date;
import java.time.LocalDateTime;
import java.util.ArrayList;
import cn.hutool.core.convert.Convert;
import com.yonde.dcs.plan.common.vo.ExtDistributeRecordVO;
import com.yonde.dex.basedata.entity.annotation.XmlElementProperty;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.annotation.JsonUnwrapped;
import lombok.ToString;
import com.fasterxml.jackson.annotation.JsonIgnore;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import java.math.BigInteger;
import org.springframework.data.annotation.Transient;
import lombok.experimental.Delegate;
import javax.xml.bind.annotation.*;
import javax.xml.bind.annotation.XmlAttribute;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotNull;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.yonde.dex.basedata.entity.xmladapters.LocalDateTimeXmlAdapter;
import lombok.Data;
import com.yonde.dex.basedata.entity.annotation.*;
import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor;
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.basedata.entity.vo.IdVO;
import com.yonde.dex.linkdata.plugin.common.DxLinkDataVOHolder;
import com.yonde.dex.linkdata.plugin.common.DxLinkDataVOEmbeddable;
import com.yonde.dex.basedata.entity.users.DxUserVO;
/**
* @description: ExtDisReocredLink-VO
* @author: dexadmin
* @version: V
* @date: 2024-8-15 10:55:29
**/
@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtDisReocredLinkVO.class)
@EqualsAndHashCode(callSuper = true)
@Data
@ToString(callSuper = true)
public class ExtDisReocredLinkVO extends IdOnlyVO implements IdVO ,DxLinkDataVOHolder<ExtDistributeRecordVO, IdOnlyVO>{
public static final String DX_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";
public static final String DX_LINK_DATA_EMBEDDABLE_PROP_NAME = "dxLinkDataEmbeddable";
/**
* dao扩展对象
*/
@DexEmbedded()
@JsonIgnore
private DxIdVOEmbeddable dxIdEmbeddable;
/**
* 扩展VO属性
*/
@DexEmbedded()
@JsonIgnore
private DxLinkDataVOEmbeddable<ExtDistributeRecordVO, IdOnlyVO> dxLinkDataEmbeddable;
}
dcs-plan-common/src/main/java/com/yonde/dcs/plan/common/vo/view/ExtDistributeRecordVO.java 0 → 100644
View file @ 1399d312
package com.yonde.dcs.plan.common.vo.view;
import javax.validation.constraints.NotBlank;
import java.util.Date;
import java.time.LocalDateTime;
import java.util.ArrayList;
import cn.hutool.core.convert.Convert;
import com.yonde.dex.basedata.entity.annotation.XmlElementProperty;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.annotation.JsonUnwrapped;
import lombok.ToString;
import com.fasterxml.jackson.annotation.JsonIgnore;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import java.math.BigInteger;
import org.springframework.data.annotation.Transient;
import lombok.experimental.Delegate;
import javax.xml.bind.annotation.*;
import javax.xml.bind.annotation.XmlAttribute;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotNull;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.yonde.dex.basedata.entity.xmladapters.LocalDateTimeXmlAdapter;
import lombok.Data;
import com.yonde.dex.basedata.entity.annotation.*;
import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor;
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.logicdelete.plugin.common.entity.DxLogicDeleteVOHolder;
import com.yonde.dex.basedata.entity.vo.DxIdVOEmbeddable;
import com.yonde.dex.logicdelete.plugin.common.entity.DxLogicDeleteVOEmbeddable;
import com.yonde.dex.basedata.entity.vo.IdVO;
import com.yonde.dcs.plan.common.vo.ExtDisReocredLinkVO;
import com.yonde.dex.context.plugin.common.entity.DxContextVOEmbeddable;
import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOHolder;
import com.yonde.dex.context.plugin.common.entity.DxContextVOHolder;
import com.yonde.dex.user.common.vo.DxUserInfoVO;
import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOEmbeddable;
import com.yonde.dex.basedata.entity.users.DxUserVO;
/**
* @description: ExtDistributeRecord-VO
* @author: dexadmin
* @version: V
* @date: 2024-8-15 10:55:29
**/
@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtDistributeRecordVO.class)
@EqualsAndHashCode(callSuper = true)
@Data
@ToString(callSuper = true)
public class ExtDistributeRecordVO extends IdOnlyVO implements IdVO ,DxContextVOHolder ,DxObjFileLinkVOHolder ,DxLogicDeleteVOHolder{
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_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";
public static final String DX_LOGIC_DELETE_EMBEDDABLE_PROP_NAME = "dxLogicDeleteEmbeddable";
public static final String BO_TITLE_PROP_NAME = "boTitle";
public static final String COM_RECEIVE_TIME_PROP_NAME = "comReceiveTime";
public static final String COMPLETED_PROP_NAME = "completed";
public static final String DIS_NUMBER_PROP_NAME = "disNumber";
public static final String DISTRIBUT_DEPART_PROP_NAME = "distributDepart";
public static final String DISTRIBUT_TIME_PROP_NAME = "distributTime";
public static final String DISTRIBUTE_REMARK_PROP_NAME = "distributeRemark";
public static final String DISTRIBUTE_TYPE_PROP_NAME = "distributeType";
public static final String DUE_TIME_PROP_NAME = "dueTime";
public static final String EXT_DIS_REOCRED_LINKS_PROP_NAME = "extDisReocredLinks";
public static final String FOREIGN_UNIT_ISSUED_PROP_NAME = "foreignUnitIssued";
public static final String FOREIGN_UNIT_RECEIVE_PROP_NAME = "foreignUnitReceive";
public static final String HANDLE_PROP_NAME = "handle";
public static final String HANDLE_ID_PROP_NAME = "handleId";
public static final String HANDLE_ID_TYPE_PROP_NAME = "handleIdType";
public static final String OPERATION_TIME_PROP_NAME = "operationTime";
public static final String RECEIVE_REMARK_PROP_NAME = "receiveRemark";
public static final String RECEIVE_TASK_TYPE_PROP_NAME = "receiveTaskType";
public static final String RECEIVE_TIME_PROP_NAME = "receiveTime";
public static final String RECEIVE_TYPE_PROP_NAME = "receiveType";
public static final String RECEIVER_PROP_NAME = "receiver";
public static final String REPLY_DATE_PROP_NAME = "replyDate";
public static final String REPLY_DISTRIBUTE_PROP_NAME = "replyDistribute";
public static final String SEND_FINISH_PROP_NAME = "sendFinish";
public static final String SENDER_PROP_NAME = "sender";
public static final String SENDER_ID_PROP_NAME = "senderId";
public static final String SENDER_ID_TYPE_PROP_NAME = "senderIdType";
public static final String WORK_DESC_PROP_NAME = "workDesc";
/**
* 扩展VO属性
*/
@DexEmbedded()
@JsonIgnore
private DxContextVOEmbeddable dxContextEmbeddable;
/**
* 扩展VO属性
*/
@DexEmbedded()
@JsonIgnore
private DxObjFileLinkVOEmbeddable dxObjFileLinkEmbeddable;
/**
* dao扩展对象
*/
@DexEmbedded()
@JsonIgnore
private DxIdVOEmbeddable dxIdEmbeddable;
/**
* 扩展VO属性
*/
@DexEmbedded()
@JsonIgnore
private DxLogicDeleteVOEmbeddable dxLogicDeleteEmbeddable;
/**
* 显示名称
*/
private String boTitle;
/**
* 完成接收任务时间
*/
private String comReceiveTime;
/**
* Boolean
*/
private Boolean completed;
/**
* 编号
*/
private String disNumber;
/**
* 分发单位
*/
private String distributDepart;
/**
* 分发时间
*/
private LocalDateTime distributTime;
/**
* 分发备注
*/
private String distributeRemark;
/**
* 分发类型
*/
private String distributeType;
/**
* 截止时间
*/
private LocalDateTime dueTime;
/**
* ExtDisReocredLink集合
*/
@RelationProperty(refProperty = "source")
@VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.NONE)
private List<ExtDisReocredLinkVO> extDisReocredLinks;
/**
* 外单位(发)
*/
private String foreignUnitIssued;
/**
* 外单位(收)
*/
private String foreignUnitReceive;
/**
* 操作人
*/
@ReferenceProperty(baseProperty = "handleId")
@VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.NONE)
private DxUserInfoVO handle;
/**
* 操作人
*/
private Long handleId;
/**
* 操作人
*/
private String handleIdType;
/**
* 操作时间
*/
private LocalDateTime operationTime;
/**
* 接收备注
*/
private String receiveRemark;
/**
* 接收任务类型
*/
private String receiveTaskType;
/**
* 接收时间
*/
private LocalDateTime receiveTime;
/**
* 接收类型
*/
private String receiveType;
/**
* 接收单位
*/
private String receiver;
/**
* 要求回复日期
*/
private String replyDate;
/**
* 分发是否需回复
*/
private String replyDistribute;
/**
* 发送任务是否结束
*/
private Boolean sendFinish;
/**
* 分发人
*/
@ReferenceProperty(baseProperty = "senderId")
@VersionProperty(curVersion = VersionRelationType.NONE, refVersion = VersionRelationType.NONE)
private DxUserInfoVO sender;
/**
* 分发人
*/
private Long senderId;
/**
* 分发人
*/
private String senderIdType;
/**
* 工作说明
*/
private String workDesc;
}
dcs-plan-core/pom.xml
View file @ 1399d312
......@@ -65,7 +65,15 @@
<dependency>
<groupId>com.yonde.dex</groupId>
<artifactId>dex-initialization-rule-runtime</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>com.yonde.dex</groupId>
<artifactId>dex-context-plugin-core</artifactId>
</dependency>
<dependency>
<groupId>com.yonde.dex</groupId>
<artifactId>dex-secretcode-plugin-core</artifactId>
</dependency>
</dependencies>
</project>
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/shadow/ExtContractExpensesRepositoryShadow.java
View file @ 1399d312
......@@ -2,16 +2,17 @@ package com.yonde.dcs.plan.core.repository.shadow;
import com.yonde.dcs.plan.entity.po.ExtContractExpenses;
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;
/**
* @description: ExtContractExpenses-repository
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:06
* @date: 2024-8-15 10:55:28
**/
@NoRepositoryBean
public interface ExtContractExpensesRepositoryShadow<P extends ExtContractExpenses> extends BaseRepository<P> ,DxLogicDeleteRepository<P> {
public interface ExtContractExpensesRepositoryShadow<P extends ExtContractExpenses> extends DxContextPluginRepository<P> ,BaseRepository<P> ,DxLogicDeleteRepository<P> {
String BEAN_NAME = "extContractExpensesRepository";
}
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/shadow/ExtContractLinkRepositoryShadow.java
View file @ 1399d312
......@@ -3,15 +3,16 @@ package com.yonde.dcs.plan.core.repository.shadow;
import com.yonde.dcs.plan.entity.po.ExtContractLink;
import org.springframework.data.repository.NoRepositoryBean;
import com.yonde.dex.dao.business.repository.BaseRepository;
import com.yonde.dex.secretcode.plugin.core.repositroy.DxSecretCodePluginRepository;
import com.yonde.dex.linkdata.plugin.core.repository.DxLinkDataRepository;
/**
* @description: ExtContractLink-repository
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:05
* @date: 2024-8-15 10:55:28
**/
@NoRepositoryBean
public interface ExtContractLinkRepositoryShadow<P extends ExtContractLink> extends BaseRepository<P> ,DxLinkDataRepository<P> {
public interface ExtContractLinkRepositoryShadow<P extends ExtContractLink> extends BaseRepository<P> ,DxSecretCodePluginRepository<P> ,DxLinkDataRepository<P> {
String BEAN_NAME = "extContractLinkRepository";
}
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/shadow/ExtDisReocredLinkRepositoryShadow.java
View file @ 1399d312
......@@ -2,17 +2,16 @@ package com.yonde.dcs.plan.core.repository.shadow;
import com.yonde.dcs.plan.entity.po.ExtDisReocredLink;
import org.springframework.data.repository.NoRepositoryBean;
import com.yonde.dex.logicdelete.plugin.core.repository.DxLogicDeleteRepository;
import com.yonde.dex.dao.business.repository.BaseRepository;
import com.yonde.dex.linkdata.plugin.core.repository.DxLinkDataRepository;
/**
* @description: ExtDisReocredLink-repository
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:06
* @date: 2024-8-15 10:55:29
**/
@NoRepositoryBean
public interface ExtDisReocredLinkRepositoryShadow<P extends ExtDisReocredLink> extends BaseRepository<P> ,DxLogicDeleteRepository<P> ,DxLinkDataRepository<P> {
public interface ExtDisReocredLinkRepositoryShadow<P extends ExtDisReocredLink> extends BaseRepository<P> ,DxLinkDataRepository<P> {
String BEAN_NAME = "extDisReocredLinkRepository";
}
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/shadow/ExtDistributeRecordRepositoryShadow.java
View file @ 1399d312
......@@ -2,6 +2,7 @@ package com.yonde.dcs.plan.core.repository.shadow;
import com.yonde.dcs.plan.entity.po.ExtDistributeRecord;
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.dfs.objfilelink.plugin.core.repository.DxObjFileLinkPluginRepository;
......@@ -9,10 +10,10 @@ import com.yonde.dex.dfs.objfilelink.plugin.core.repository.DxObjFileLinkPluginR
* @description: ExtDistributeRecord-repository
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:06
* @date: 2024-8-15 10:55:29
**/
@NoRepositoryBean
public interface ExtDistributeRecordRepositoryShadow<P extends ExtDistributeRecord> extends DxObjFileLinkPluginRepository<P> ,BaseRepository<P> ,DxLogicDeleteRepository<P> {
public interface ExtDistributeRecordRepositoryShadow<P extends ExtDistributeRecord> extends DxContextPluginRepository<P> ,DxObjFileLinkPluginRepository<P> ,BaseRepository<P> ,DxLogicDeleteRepository<P> {
String BEAN_NAME = "extDistributeRecordRepository";
}
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/shadow/ExtECRRepositoryShadow.java
View file @ 1399d312
......@@ -2,6 +2,7 @@ package com.yonde.dcs.plan.core.repository.shadow;
import com.yonde.dcs.plan.entity.po.ExtECR;
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.lcycle.plugin.core.repository.DxLifecycleManageBaseRepository;
......@@ -10,10 +11,10 @@ import com.yonde.dex.dfs.objfilelink.plugin.core.repository.DxObjFileLinkPluginR
* @description: ExtECR-repository
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:05
* @date: 2024-8-15 10:55:27
**/
@NoRepositoryBean
public interface ExtECRRepositoryShadow<P extends ExtECR> extends DxObjFileLinkPluginRepository<P> ,DxLifecycleManageBaseRepository<P> ,BaseRepository<P> ,DxLogicDeleteRepository<P> {
public interface ExtECRRepositoryShadow<P extends ExtECR> extends DxContextPluginRepository<P> ,DxObjFileLinkPluginRepository<P> ,DxLifecycleManageBaseRepository<P> ,BaseRepository<P> ,DxLogicDeleteRepository<P> {
String BEAN_NAME = "extECRRepository";
}
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/shadow/ExtExpectPayDetailsRepositoryShadow.java
View file @ 1399d312
......@@ -2,16 +2,18 @@ package com.yonde.dcs.plan.core.repository.shadow;
import com.yonde.dcs.plan.entity.po.ExtExpectPayDetails;
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;
/**
* @description: ExtExpectPayDetails-repository
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:05
* @date: 2024-8-15 10:55:28
**/
@NoRepositoryBean
public interface ExtExpectPayDetailsRepositoryShadow<P extends ExtExpectPayDetails> extends BaseRepository<P> ,DxLogicDeleteRepository<P> {
public interface ExtExpectPayDetailsRepositoryShadow<P extends ExtExpectPayDetails> extends DxContextPluginRepository<P> ,BaseRepository<P> ,DxLogicDeleteRepository<P> ,DxSecretCodePluginRepository<P> {
String BEAN_NAME = "extExpectPayDetailsRepository";
}
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/shadow/ExtIncomeBillInfoRepositoryShadow.java
View file @ 1399d312
......@@ -2,15 +2,17 @@ package com.yonde.dcs.plan.core.repository.shadow;
import com.yonde.dcs.plan.entity.po.ExtIncomeBillInfo;
import org.springframework.data.repository.NoRepositoryBean;
import com.yonde.dex.context.plugin.core.repository.DxContextPluginRepository;
import com.yonde.dex.dao.business.repository.BaseRepository;
import com.yonde.dex.secretcode.plugin.core.repositroy.DxSecretCodePluginRepository;
/**
* @description: ExtIncomeBillInfo-repository
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:05
* @date: 2024-8-15 10:55:28
**/
@NoRepositoryBean
public interface ExtIncomeBillInfoRepositoryShadow<P extends ExtIncomeBillInfo> extends BaseRepository<P> {
public interface ExtIncomeBillInfoRepositoryShadow<P extends ExtIncomeBillInfo> extends DxContextPluginRepository<P> ,BaseRepository<P> ,DxSecretCodePluginRepository<P> {
String BEAN_NAME = "extIncomeBillInfoRepository";
}
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/shadow/ExtIncomeContractRepositoryShadow.java
View file @ 1399d312
package com.yonde.dcs.plan.core.repository.shadow;
import com.yonde.dcs.plan.entity.po.ExtIncomeContract;
import com.yonde.dex.context.plugin.entities.DxContextHolder;
import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteHolder;
import com.yonde.dex.secretcode.plugin.entities.DxSecretHolder;
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;
/**
* @description: ExtIncomeContract-repository
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:06
* @date: 2024-8-15 10:55:29
**/
@NoRepositoryBean
public interface ExtIncomeContractRepositoryShadow<P extends ExtIncomeContract> extends BaseRepository<P> ,DxLogicDeleteRepository<P> {
public interface ExtIncomeContractRepositoryShadow<P extends ExtIncomeContract & DxContextHolder & DxLogicDeleteHolder & DxSecretHolder> extends DxContextPluginRepository<P> ,BaseRepository<P> ,DxLogicDeleteRepository<P> ,DxSecretCodePluginRepository<P> {
String BEAN_NAME = "extIncomeContractRepository";
}
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/shadow/ExtIncomeDetailRepositoryShadow.java
View file @ 1399d312
......@@ -2,16 +2,17 @@ package com.yonde.dcs.plan.core.repository.shadow;
import com.yonde.dcs.plan.entity.po.ExtIncomeDetail;
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;
/**
* @description: ExtIncomeDetail-repository
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:05
* @date: 2024-8-15 10:55:28
**/
@NoRepositoryBean
public interface ExtIncomeDetailRepositoryShadow<P extends ExtIncomeDetail> extends BaseRepository<P> ,DxLogicDeleteRepository<P> {
public interface ExtIncomeDetailRepositoryShadow<P extends ExtIncomeDetail> extends DxContextPluginRepository<P> ,BaseRepository<P> ,DxLogicDeleteRepository<P> {
String BEAN_NAME = "extIncomeDetailRepository";
}
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/shadow/ExtOriginObjLinkRepositoryShadow.java
View file @ 1399d312
......@@ -9,7 +9,7 @@ import com.yonde.dex.linkdata.plugin.core.repository.DxLinkDataRepository;
* @description: ExtOriginObjLink-repository
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:04
* @date: 2024-8-15 10:55:27
**/
@NoRepositoryBean
public interface ExtOriginObjLinkRepositoryShadow<P extends ExtOriginObjLink> extends BaseRepository<P> ,DxLogicDeleteRepository<P> ,DxLinkDataRepository<P> {
......
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/shadow/ExtPaymentDetailsRepositoryShadow.java
View file @ 1399d312
......@@ -2,16 +2,17 @@ package com.yonde.dcs.plan.core.repository.shadow;
import com.yonde.dcs.plan.entity.po.ExtPaymentDetails;
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;
/**
* @description: ExtPaymentDetails-repository
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:06
* @date: 2024-8-15 10:55:28
**/
@NoRepositoryBean
public interface ExtPaymentDetailsRepositoryShadow<P extends ExtPaymentDetails> extends BaseRepository<P> ,DxLogicDeleteRepository<P> {
public interface ExtPaymentDetailsRepositoryShadow<P extends ExtPaymentDetails> extends DxContextPluginRepository<P> ,BaseRepository<P> ,DxLogicDeleteRepository<P> {
String BEAN_NAME = "extPaymentDetailsRepository";
}
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/shadow/ExtPlanDocLinkRepositoryShadow.java
View file @ 1399d312
......@@ -9,7 +9,7 @@ import com.yonde.dex.linkdata.plugin.core.repository.DxLinkDataRepository;
* @description: ExtPlanDocLink-repository
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:05
* @date: 2024-8-15 10:55:28
**/
@NoRepositoryBean
public interface ExtPlanDocLinkRepositoryShadow<P extends ExtPlanDocLink> extends BaseRepository<P> ,DxLogicDeleteRepository<P> ,DxLinkDataRepository<P> {
......
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/shadow/ExtPlanReplyLinkRepositoryShadow.java
View file @ 1399d312
......@@ -8,7 +8,7 @@ import com.yonde.dex.linkdata.plugin.core.repository.DxLinkDataRepository;
* @description: ExtPlanReplyLink-repository
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:05
* @date: 2024-8-15 10:55:29
**/
@NoRepositoryBean
public interface ExtPlanReplyLinkRepositoryShadow<P extends ExtPlanReplyLink> extends BaseRepository<P> ,DxLinkDataRepository<P> {
......
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/shadow/ExtPlanReplyRepositoryShadow.java
View file @ 1399d312
......@@ -2,6 +2,7 @@ package com.yonde.dcs.plan.core.repository.shadow;
import com.yonde.dcs.plan.entity.po.ExtPlanReply;
import org.springframework.data.repository.NoRepositoryBean;
import com.yonde.dex.context.plugin.core.repository.DxContextPluginRepository;
import com.yonde.dex.dao.business.repository.BaseRepository;
import com.yonde.dex.version.plugin.core.repository.DxIterationRepository;
import com.yonde.dex.lcycle.plugin.core.repository.DxLifecycleManageBaseRepository;
......@@ -9,10 +10,10 @@ import com.yonde.dex.lcycle.plugin.core.repository.DxLifecycleManageBaseReposito
* @description: ExtPlanReply-repository
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:06
* @date: 2024-8-15 10:55:29
**/
@NoRepositoryBean
public interface ExtPlanReplyRepositoryShadow<P extends ExtPlanReply> extends DxLifecycleManageBaseRepository<P> ,BaseRepository<P> ,DxIterationRepository<P> {
public interface ExtPlanReplyRepositoryShadow<P extends ExtPlanReply> extends DxContextPluginRepository<P> ,DxLifecycleManageBaseRepository<P> ,BaseRepository<P> ,DxIterationRepository<P> {
String BEAN_NAME = "extPlanReplyRepository";
}
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/shadow/ExtPlanRepositoryShadow.java
View file @ 1399d312
......@@ -2,7 +2,9 @@ package com.yonde.dcs.plan.core.repository.shadow;
import com.yonde.dcs.plan.entity.po.ExtPlan;
import org.springframework.data.repository.NoRepositoryBean;
import com.yonde.dex.context.plugin.core.repository.DxContextPluginRepository;
import com.yonde.dex.dao.business.repository.BaseRepository;
import com.yonde.dex.secretcode.plugin.core.repositroy.DxSecretCodePluginRepository;
import com.yonde.dex.tree.plugin.core.repository.DxTreePluginRepository;
import com.yonde.dex.version.plugin.core.repository.DxIterationRepository;
import com.yonde.dex.lcycle.plugin.core.repository.DxLifecycleManageBaseRepository;
......@@ -11,10 +13,10 @@ import com.yonde.dex.dfs.objfilelink.plugin.core.repository.DxObjFileLinkPluginR
* @description: ExtPlan-repository
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:06
* @date: 2024-8-15 10:55:29
**/
@NoRepositoryBean
public interface ExtPlanRepositoryShadow<P extends ExtPlan> extends DxObjFileLinkPluginRepository<P> ,DxTreePluginRepository<P> ,DxLifecycleManageBaseRepository<P> ,BaseRepository<P> ,DxIterationRepository<P> {
public interface ExtPlanRepositoryShadow<P extends ExtPlan> extends DxContextPluginRepository<P> ,DxObjFileLinkPluginRepository<P> ,DxTreePluginRepository<P> ,DxLifecycleManageBaseRepository<P> ,BaseRepository<P> ,DxIterationRepository<P> ,DxSecretCodePluginRepository<P> {
String BEAN_NAME = "extPlanRepository";
}
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/shadow/ExtSpendingBillInfoRepositoryShadow.java
View file @ 1399d312
......@@ -2,16 +2,18 @@ package com.yonde.dcs.plan.core.repository.shadow;
import com.yonde.dcs.plan.entity.po.ExtSpendingBillInfo;
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;
/**
* @description: ExtSpendingBillInfo-repository
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:05
* @date: 2024-8-15 10:55:28
**/
@NoRepositoryBean
public interface ExtSpendingBillInfoRepositoryShadow<P extends ExtSpendingBillInfo> extends BaseRepository<P> ,DxLogicDeleteRepository<P> {
public interface ExtSpendingBillInfoRepositoryShadow<P extends ExtSpendingBillInfo> extends DxContextPluginRepository<P> ,BaseRepository<P> ,DxLogicDeleteRepository<P> ,DxSecretCodePluginRepository<P> {
String BEAN_NAME = "extSpendingBillInfoRepository";
}
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/shadow/ExtSpendingContractRepositoryShadow.java
View file @ 1399d312
......@@ -2,16 +2,18 @@ package com.yonde.dcs.plan.core.repository.shadow;
import com.yonde.dcs.plan.entity.po.ExtSpendingContract;
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;
/**
* @description: ExtSpendingContract-repository
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:05
* @date: 2024-8-15 10:55:28
**/
@NoRepositoryBean
public interface ExtSpendingContractRepositoryShadow<P extends ExtSpendingContract> extends BaseRepository<P> ,DxLogicDeleteRepository<P> {
public interface ExtSpendingContractRepositoryShadow<P extends ExtSpendingContract> extends DxContextPluginRepository<P> ,BaseRepository<P> ,DxLogicDeleteRepository<P> ,DxSecretCodePluginRepository<P> {
String BEAN_NAME = "extSpendingContractRepository";
}
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/shadow/ExtSpendingDetailRepositoryShadow.java
View file @ 1399d312
......@@ -2,16 +2,18 @@ package com.yonde.dcs.plan.core.repository.shadow;
import com.yonde.dcs.plan.entity.po.ExtSpendingDetail;
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;
/**
* @description: ExtSpendingDetail-repository
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:05
* @date: 2024-8-15 10:55:28
**/
@NoRepositoryBean
public interface ExtSpendingDetailRepositoryShadow<P extends ExtSpendingDetail> extends BaseRepository<P> ,DxLogicDeleteRepository<P> {
public interface ExtSpendingDetailRepositoryShadow<P extends ExtSpendingDetail> extends DxContextPluginRepository<P> ,BaseRepository<P> ,DxLogicDeleteRepository<P> ,DxSecretCodePluginRepository<P> {
String BEAN_NAME = "extSpendingDetailRepository";
}
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/repository/shadow/ExtUpgradeObjLinkRepositoryShadow.java
View file @ 1399d312
......@@ -8,7 +8,7 @@ import com.yonde.dex.linkdata.plugin.core.repository.DxLinkDataRepository;
* @description: ExtUpgradeObjLink-repository
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:04
* @date: 2024-8-15 10:55:27
**/
@NoRepositoryBean
public interface ExtUpgradeObjLinkRepositoryShadow<P extends ExtUpgradeObjLink> extends BaseRepository<P> ,DxLinkDataRepository<P> {
......
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/service/impl/ExtDistributeRecordServiceImpl.java
View file @ 1399d312
......@@ -137,7 +137,7 @@ public class ExtDistributeRecordServiceImpl<V extends ExtDistributeRecordVO> imp
disReocredLinkVO.setTargetIdType(DxEntityUtils.getModelName(ExtPlanVO.class));
disReocredLinkVO.setOperator(OperatorType.ADD);
list.add(disReocredLinkVO);
recordVO.setExtDisReocredLink(list);
recordVO.setExtDisReocredLinks(list);
recordVO.setOperator(OperatorType.ADD);
this.saveRecursion((V) recordVO);
}
......
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/service/impl/ExtIncomeContractServiceImpl.java
View file @ 1399d312
......@@ -17,6 +17,7 @@ import org.springframework.stereotype.Service;
import io.swagger.annotations.ApiOperation;
import java.math.BigDecimal;
import java.time.ZoneOffset;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
......@@ -81,7 +82,7 @@ public class ExtIncomeContractServiceImpl<V extends ExtIncomeContractVO> impleme
} else {
subtract = BigDecimalUtil.subtract(contractPrice, bigss);
}
extIncomeContractVO.setToBedisbursed(subtract);
extIncomeContractVO.setToBedisbursed(subtract.intValue());
extIncomeContractVO.setOperator(OperatorType.MODIFY);
//todo wq：暂时将extIncomeContractVO 强转为V类型
ExtIncomeContractVO extIncomeContractVO1 = this.saveRecursion((V) extIncomeContractVO);
......@@ -163,7 +164,9 @@ public class ExtIncomeContractServiceImpl<V extends ExtIncomeContractVO> impleme
Date yearLast = DateUtils.getYearLast(Integer.parseInt(year));
if (!CollectionUtils.isEmpty(extIncomeDetails)) {
for (ExtIncomeDetailVO item : extIncomeDetails) {
Date arrivalTime = item.getArrivalTime();
//TODO wq:将localtime转换位date
//Date arrivalTime = item.getArrivalTime();
Date arrivalTime =Date.from(item.getArrivalTime().atZone(ZoneOffset.ofHours(8)).toInstant());
if ((yearFirst.before(arrivalTime) || yearFirst.equals(arrivalTime)) && (yearLast.after(arrivalTime) || yearFirst.equals(arrivalTime))) {
//计算到款数据之和
bigss = bigss.add(item.getAmount());
......
dcs-plan-core/src/main/java/com/yonde/dcs/plan/core/service/impl/ExtPlanServiceImpl.java
View file @ 1399d312
......@@ -662,7 +662,7 @@ public class ExtPlanServiceImpl<V extends ExtPlanVO> implements ExtPlanService<V
public String checkReplayState(Long id) {
//通过id查询
ExtDistributeRecordVO recordVO = this.recursionDisRecordVO(id);
List<ExtDisReocredLinkVO> sourceDisReocredLink = recordVO.getExtDisReocredLink();
List<ExtDisReocredLinkVO> sourceDisReocredLink = recordVO.getExtDisReocredLinks();
if (!CollectionUtils.isEmpty(sourceDisReocredLink)) {
sourceDisReocredLink.stream().forEach(item -> {
if ("ExtPlan".equals(item.getTargetIdType())) {
......@@ -675,9 +675,8 @@ public class ExtPlanServiceImpl<V extends ExtPlanVO> implements ExtPlanService<V
});
//修改状态
recordVO.setCompleted(true);
//todo wq:recordVO.setSender(null); recordVO.setHandler(null); 在4.1中如何设置该参数？
// recordVO.setSender(null);
// recordVO.setHandler(null);
recordVO.setSender(null);
recordVO.setHandle(null);
recordVO.setOperator(OperatorType.MODIFY);
extDistributeRecordService.saveRecursion(recordVO);
}
......@@ -940,7 +939,7 @@ public class ExtPlanServiceImpl<V extends ExtPlanVO> implements ExtPlanService<V
disReocredLinkVO.setOperator(OperatorType.ADD);
list.add(disReocredLinkVO);
// recordVO.setSourceDisReocredLink(list);
recordVO.setExtDisReocredLink(list);
recordVO.setExtDisReocredLinks(list);
recordVO.setOperator(OperatorType.ADD);
distributeRecordService.saveRecursion(recordVO);
}
......
dcs-plan-entity/pom.xml
View file @ 1399d312
......@@ -45,6 +45,18 @@
<groupId>com.yonde.dex</groupId>
<artifactId>dex-tree-plugin-entities</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.12</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.yonde.dex</groupId>
<artifactId>dex-context-plugin-entities</artifactId>
<version>4.1-20240809-RELEASE</version>
<scope>compile</scope>
</dependency>
</dependencies>
......
dcs-plan-entity/src/main/java/com/yonde/dcs/plan/entity/po/ExtContractExpenses.java
View file @ 1399d312
......@@ -24,6 +24,8 @@ import javax.persistence.Entity;
import javax.persistence.Table;
import com.yonde.dex.dao.entity.base.IdEntity;
import javax.persistence.Column;
import com.yonde.dex.context.plugin.entities.DxContextHolder;
import com.yonde.dex.context.plugin.entities.DxContextEmbeddable;
import com.yonde.dex.dao.entity.base.DxIdEntityEmbeddable;
import com.yonde.dex.dao.entity.base.IdOnlyEntity;
import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteHolder;
......@@ -33,15 +35,21 @@ import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteEmbeddable;
* @description: ExtContractExpenses-PO实体
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:06
* @date: 2024-8-15 10:55:28
**/
@Entity
@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor
@Data
@Table(name = "EXT_CONTRACT_EXPENSES")
public class ExtContractExpenses extends IdOnlyEntity implements IdEntity ,DxLogicDeleteHolder{
public class ExtContractExpenses extends IdOnlyEntity implements DxContextHolder ,IdEntity ,DxLogicDeleteHolder{
/**
* 扩展PO属性
*/
@DexEmbedded()
@Embedded()
private DxContextEmbeddable dxContextEmbeddable;
/**
* dao扩展对象
*/
......
dcs-plan-entity/src/main/java/com/yonde/dcs/plan/entity/po/ExtContractLink.java
View file @ 1399d312
......@@ -24,8 +24,10 @@ import javax.persistence.Entity;
import javax.persistence.Table;
import com.yonde.dex.dao.entity.base.IdEntity;
import javax.persistence.Column;
import com.yonde.dex.secretcode.plugin.entities.DxSecretHolder;
import com.yonde.dex.linkdata.plugin.entities.DxLinkDataHolder;
import com.yonde.dex.dao.entity.base.DxIdEntityEmbeddable;
import com.yonde.dex.secretcode.plugin.entities.DxSecretEmbeddable;
import com.yonde.dex.dao.entity.base.IdOnlyEntity;
import com.yonde.dex.linkdata.plugin.entities.DxLinkDataEmbeddable;
......@@ -33,14 +35,14 @@ import com.yonde.dex.linkdata.plugin.entities.DxLinkDataEmbeddable;
* @description: ExtContractLink-PO实体
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:05
* @date: 2024-8-15 10:55:28
**/
@Entity
@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor
@Data
@Table(name = "EXT_CONTRACT_LINK")
public class ExtContractLink extends IdOnlyEntity implements IdEntity ,DxLinkDataHolder{
public class ExtContractLink extends IdOnlyEntity implements IdEntity ,DxSecretHolder ,DxLinkDataHolder{
/**
* dao扩展对象
......@@ -53,6 +55,12 @@ public class ExtContractLink extends IdOnlyEntity implements IdEntity ,DxLinkDat
*/
@DexEmbedded()
@Embedded()
private DxSecretEmbeddable dxSecretEmbeddable;
/**
* 扩展PO属性
*/
@DexEmbedded()
@Embedded()
private DxLinkDataEmbeddable dxLinkDataEmbeddable;
}
......
dcs-plan-entity/src/main/java/com/yonde/dcs/plan/entity/po/ExtDisReocredLink.java
View file @ 1399d312
......@@ -27,22 +27,20 @@ import javax.persistence.Column;
import com.yonde.dex.linkdata.plugin.entities.DxLinkDataHolder;
import com.yonde.dex.dao.entity.base.DxIdEntityEmbeddable;
import com.yonde.dex.dao.entity.base.IdOnlyEntity;
import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteHolder;
import com.yonde.dex.linkdata.plugin.entities.DxLinkDataEmbeddable;
import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteEmbeddable;
/**
* @description: ExtDisReocredLink-PO实体
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:06
* @date: 2024-8-15 10:55:29
**/
@Entity
@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor
@Data
@Table(name = "EXT_DIS_REOCRED_LINK")
public class ExtDisReocredLink extends IdOnlyEntity implements IdEntity ,DxLogicDeleteHolder ,DxLinkDataHolder{
public class ExtDisReocredLink extends IdOnlyEntity implements IdEntity ,DxLinkDataHolder{
/**
* dao扩展对象
......@@ -55,12 +53,6 @@ public class ExtDisReocredLink extends IdOnlyEntity implements IdEntity ,DxLogic
*/
@DexEmbedded()
@Embedded()
private DxLogicDeleteEmbeddable dxLogicDeleteEmbeddable;
/**
* 扩展PO属性
*/
@DexEmbedded()
@Embedded()
private DxLinkDataEmbeddable dxLinkDataEmbeddable;
}
......
dcs-plan-entity/src/main/java/com/yonde/dcs/plan/entity/po/ExtDistributeRecord.java
View file @ 1399d312
......@@ -24,8 +24,10 @@ import javax.persistence.Entity;
import javax.persistence.Table;
import com.yonde.dex.dao.entity.base.IdEntity;
import javax.persistence.Column;
import com.yonde.dex.context.plugin.entities.DxContextHolder;
import com.yonde.dex.dfs.objfilelink.plugin.entities.DxObjFileLinkHolder;
import com.yonde.dex.dfs.objfilelink.plugin.entities.DxObjFileLinkEmbeddable;
import com.yonde.dex.context.plugin.entities.DxContextEmbeddable;
import com.yonde.dex.dao.entity.base.DxIdEntityEmbeddable;
import com.yonde.dex.dao.entity.base.IdOnlyEntity;
import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteHolder;
......@@ -35,15 +37,21 @@ import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteEmbeddable;
* @description: ExtDistributeRecord-PO实体
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:06
* @date: 2024-8-15 10:55:29
**/
@Entity
@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor
@Data
@Table(name = "EXT_DISTRIBUTE_RECORD")
public class ExtDistributeRecord extends IdOnlyEntity implements DxObjFileLinkHolder ,IdEntity ,DxLogicDeleteHolder{
public class ExtDistributeRecord extends IdOnlyEntity implements DxContextHolder ,DxObjFileLinkHolder ,IdEntity ,DxLogicDeleteHolder{
/**
* 扩展PO属性
*/
@DexEmbedded()
@Embedded()
private DxContextEmbeddable dxContextEmbeddable;
/**
* 扩展PO属性
*/
......@@ -99,14 +107,6 @@ public class ExtDistributeRecord extends IdOnlyEntity implements DxObjFileLinkHo
*/
private LocalDateTime dueTime;
/**
* 用户信息的id
*/
private Long dxUserInfoId;
/**
* 用户信息的类型
*/
private String dxUserInfoIdType;
/**
* 外单位(发)
*/
private String foreignUnitIssued;
......@@ -115,6 +115,14 @@ public class ExtDistributeRecord extends IdOnlyEntity implements DxObjFileLinkHo
*/
private String foreignUnitReceive;
/**
* 操作人的id
*/
private Long handleId;
/**
* 操作人的类型
*/
private String handleIdType;
/**
* 操作时间
*/
private LocalDateTime operationTime;
......@@ -151,6 +159,14 @@ public class ExtDistributeRecord extends IdOnlyEntity implements DxObjFileLinkHo
*/
private Boolean sendFinish;
/**
* 分发人的id
*/
private Long senderId;
/**
* 分发人的类型
*/
private String senderIdType;
/**
* 工作说明
*/
private String workDesc;
......
dcs-plan-entity/src/main/java/com/yonde/dcs/plan/entity/po/ExtECR.java
View file @ 1399d312
......@@ -25,8 +25,10 @@ import javax.persistence.Table;
import com.yonde.dex.lcycle.plugin.entities.DxLifecycleManageBaseEmbeddable;
import com.yonde.dex.dao.entity.base.IdEntity;
import javax.persistence.Column;
import com.yonde.dex.context.plugin.entities.DxContextHolder;
import com.yonde.dex.dfs.objfilelink.plugin.entities.DxObjFileLinkHolder;
import com.yonde.dex.dfs.objfilelink.plugin.entities.DxObjFileLinkEmbeddable;
import com.yonde.dex.context.plugin.entities.DxContextEmbeddable;
import com.yonde.dex.lcycle.plugin.entities.DxLifecycleManageBaseHolder;
import com.yonde.dex.dao.entity.base.DxIdEntityEmbeddable;
import com.yonde.dex.dao.entity.base.IdOnlyEntity;
......@@ -37,15 +39,21 @@ import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteEmbeddable;
* @description: ExtECR-PO实体
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:04
* @date: 2024-8-15 10:55:27
**/
@Entity
@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor
@Data
@Table(name = "EXT_ECR")
public class ExtECR extends IdOnlyEntity implements DxObjFileLinkHolder ,DxLifecycleManageBaseHolder ,IdEntity ,DxLogicDeleteHolder{
public class ExtECR extends IdOnlyEntity implements DxContextHolder ,DxObjFileLinkHolder ,DxLifecycleManageBaseHolder ,IdEntity ,DxLogicDeleteHolder{
/**
* 扩展PO属性
*/
@DexEmbedded()
@Embedded()
private DxContextEmbeddable dxContextEmbeddable;
/**
* 扩展PO属性
*/
......
dcs-plan-entity/src/main/java/com/yonde/dcs/plan/entity/po/ExtExpectPayDetails.java
View file @ 1399d312
......@@ -24,7 +24,11 @@ import javax.persistence.Entity;
import javax.persistence.Table;
import com.yonde.dex.dao.entity.base.IdEntity;
import javax.persistence.Column;
import com.yonde.dex.context.plugin.entities.DxContextHolder;
import com.yonde.dex.context.plugin.entities.DxContextEmbeddable;
import com.yonde.dex.secretcode.plugin.entities.DxSecretHolder;
import com.yonde.dex.dao.entity.base.DxIdEntityEmbeddable;
import com.yonde.dex.secretcode.plugin.entities.DxSecretEmbeddable;
import com.yonde.dex.dao.entity.base.IdOnlyEntity;
import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteHolder;
import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteEmbeddable;
......@@ -33,15 +37,21 @@ import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteEmbeddable;
* @description: ExtExpectPayDetails-PO实体
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:05
* @date: 2024-8-15 10:55:28
**/
@Entity
@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor
@Data
@Table(name = "EXT_EXPECT_PAY_DETAILS")
public class ExtExpectPayDetails extends IdOnlyEntity implements IdEntity ,DxLogicDeleteHolder{
public class ExtExpectPayDetails extends IdOnlyEntity implements DxContextHolder ,IdEntity ,DxLogicDeleteHolder ,DxSecretHolder{
/**
* 扩展PO属性
*/
@DexEmbedded()
@Embedded()
private DxContextEmbeddable dxContextEmbeddable;
/**
* dao扩展对象
*/
......@@ -55,6 +65,12 @@ public class ExtExpectPayDetails extends IdOnlyEntity implements IdEntity ,DxLog
@Embedded()
private DxLogicDeleteEmbeddable dxLogicDeleteEmbeddable;
/**
* 扩展PO属性
*/
@DexEmbedded()
@Embedded()
private DxSecretEmbeddable dxSecretEmbeddable;
/**
* 金额
*/
private BigDecimal amount;
......
dcs-plan-entity/src/main/java/com/yonde/dcs/plan/entity/po/ExtIncomeBillInfo.java
View file @ 1399d312
......@@ -24,22 +24,32 @@ import javax.persistence.Entity;
import javax.persistence.Table;
import com.yonde.dex.dao.entity.base.IdEntity;
import javax.persistence.Column;
import com.yonde.dex.context.plugin.entities.DxContextHolder;
import com.yonde.dex.context.plugin.entities.DxContextEmbeddable;
import com.yonde.dex.secretcode.plugin.entities.DxSecretHolder;
import com.yonde.dex.dao.entity.base.DxIdEntityEmbeddable;
import com.yonde.dex.secretcode.plugin.entities.DxSecretEmbeddable;
import com.yonde.dex.dao.entity.base.IdOnlyEntity;
/**
* @description: ExtIncomeBillInfo-PO实体
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:05
* @date: 2024-8-15 10:55:28
**/
@Entity
@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor
@Data
@Table(name = "EXT_INCOME_BILL_INFO")
public class ExtIncomeBillInfo extends IdOnlyEntity implements IdEntity{
public class ExtIncomeBillInfo extends IdOnlyEntity implements DxContextHolder ,IdEntity ,DxSecretHolder{
/**
* 扩展PO属性
*/
@DexEmbedded()
@Embedded()
private DxContextEmbeddable dxContextEmbeddable;
/**
* dao扩展对象
*/
......@@ -47,13 +57,15 @@ public class ExtIncomeBillInfo extends IdOnlyEntity implements IdEntity{
@Embedded()
private DxIdEntityEmbeddable dxIdEmbeddable;
/**
* 开具金额发票类型
* 扩展PO属性
*/
private String amountInvoiceType;
@DexEmbedded()
@Embedded()
private DxSecretEmbeddable dxSecretEmbeddable;
/**
* 数量
* 票据类型的类型
*/
private Integer amounts;
private String billType;
/**
* 收入明细的id
*/
......@@ -63,33 +75,25 @@ public class ExtIncomeBillInfo extends IdOnlyEntity implements IdEntity{
*/
private String extIncomeDetailIdType;
/**
* 发票内容
*/
private String invoiceContent;
/**
* 发票号码
*/
private String invoiceNumber;
/**
* 开具时间
*/
private LocalDateTime issuingTime;
/**
* 开具单位
* 备注
*/
private String issuingUnit;
/**
* 规格型号
*/
private String specifications;
private String remark;
/**
* 税率
*/
private Float taxRate;
/**
* 单位
* 票据金额
*/
private BigDecimal ticketAmount;
/**
* 票据号码
*/
private String unit;
private String ticketNumber;
}
dcs-plan-entity/src/main/java/com/yonde/dcs/plan/entity/po/ExtIncomeContract.java
View file @ 1399d312
......@@ -24,7 +24,11 @@ import javax.persistence.Entity;
import javax.persistence.Table;
import com.yonde.dex.dao.entity.base.IdEntity;
import javax.persistence.Column;
import com.yonde.dex.context.plugin.entities.DxContextHolder;
import com.yonde.dex.context.plugin.entities.DxContextEmbeddable;
import com.yonde.dex.secretcode.plugin.entities.DxSecretHolder;
import com.yonde.dex.dao.entity.base.DxIdEntityEmbeddable;
import com.yonde.dex.secretcode.plugin.entities.DxSecretEmbeddable;
import com.yonde.dex.dao.entity.base.IdOnlyEntity;
import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteHolder;
import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteEmbeddable;
......@@ -33,15 +37,21 @@ import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteEmbeddable;
* @description: ExtIncomeContract-PO实体
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:06
* @date: 2024-8-15 10:55:29
**/
@Entity
@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor
@Data
@Table(name = "EXT_INCOME_CONTRACT")
public class ExtIncomeContract extends IdOnlyEntity implements IdEntity ,DxLogicDeleteHolder{
public class ExtIncomeContract extends IdOnlyEntity implements DxContextHolder ,IdEntity ,DxLogicDeleteHolder ,DxSecretHolder{
/**
* 扩展PO属性
*/
@DexEmbedded()
@Embedded()
private DxContextEmbeddable dxContextEmbeddable;
/**
* dao扩展对象
*/
......@@ -55,6 +65,12 @@ public class ExtIncomeContract extends IdOnlyEntity implements IdEntity ,DxLogic
@Embedded()
private DxLogicDeleteEmbeddable dxLogicDeleteEmbeddable;
/**
* 扩展PO属性
*/
@DexEmbedded()
@Embedded()
private DxSecretEmbeddable dxSecretEmbeddable;
/**
* 票据金额
*/
private BigDecimal billAmount;
......
dcs-plan-entity/src/main/java/com/yonde/dcs/plan/entity/po/ExtIncomeDetail.java
View file @ 1399d312
......@@ -24,6 +24,8 @@ import javax.persistence.Entity;
import javax.persistence.Table;
import com.yonde.dex.dao.entity.base.IdEntity;
import javax.persistence.Column;
import com.yonde.dex.context.plugin.entities.DxContextHolder;
import com.yonde.dex.context.plugin.entities.DxContextEmbeddable;
import com.yonde.dex.dao.entity.base.DxIdEntityEmbeddable;
import com.yonde.dex.dao.entity.base.IdOnlyEntity;
import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteHolder;
......@@ -33,15 +35,21 @@ import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteEmbeddable;
* @description: ExtIncomeDetail-PO实体
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:05
* @date: 2024-8-15 10:55:28
**/
@Entity
@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor
@Data
@Table(name = "EXT_INCOME_DETAIL")
public class ExtIncomeDetail extends IdOnlyEntity implements IdEntity ,DxLogicDeleteHolder{
public class ExtIncomeDetail extends IdOnlyEntity implements DxContextHolder ,IdEntity ,DxLogicDeleteHolder{
/**
* 扩展PO属性
*/
@DexEmbedded()
@Embedded()
private DxContextEmbeddable dxContextEmbeddable;
/**
* dao扩展对象
*/
......
dcs-plan-entity/src/main/java/com/yonde/dcs/plan/entity/po/ExtOriginObjLink.java
View file @ 1399d312
......@@ -35,7 +35,7 @@ import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteEmbeddable;
* @description: ExtOriginObjLink-PO实体
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:04
* @date: 2024-8-15 10:55:27
**/
@Entity
@EqualsAndHashCode(callSuper = true)
......
dcs-plan-entity/src/main/java/com/yonde/dcs/plan/entity/po/ExtPaymentDetails.java
View file @ 1399d312
......@@ -24,6 +24,8 @@ import javax.persistence.Entity;
import javax.persistence.Table;
import com.yonde.dex.dao.entity.base.IdEntity;
import javax.persistence.Column;
import com.yonde.dex.context.plugin.entities.DxContextHolder;
import com.yonde.dex.context.plugin.entities.DxContextEmbeddable;
import com.yonde.dex.dao.entity.base.DxIdEntityEmbeddable;
import com.yonde.dex.dao.entity.base.IdOnlyEntity;
import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteHolder;
......@@ -33,15 +35,21 @@ import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteEmbeddable;
* @description: ExtPaymentDetails-PO实体
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:06
* @date: 2024-8-15 10:55:28
**/
@Entity
@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor
@Data
@Table(name = "EXT_PAYMENT_DETAILS")
public class ExtPaymentDetails extends IdOnlyEntity implements IdEntity ,DxLogicDeleteHolder{
public class ExtPaymentDetails extends IdOnlyEntity implements DxContextHolder ,IdEntity ,DxLogicDeleteHolder{
/**
* 扩展PO属性
*/
@DexEmbedded()
@Embedded()
private DxContextEmbeddable dxContextEmbeddable;
/**
* dao扩展对象
*/
......
dcs-plan-entity/src/main/java/com/yonde/dcs/plan/entity/po/ExtPlan.java
View file @ 1399d312
......@@ -23,31 +23,41 @@ import javax.persistence.Embedded;
import javax.persistence.Entity;
import javax.persistence.Table;
import com.yonde.dex.lcycle.plugin.entities.DxLifecycleManageBaseEmbeddable;
import com.yonde.dex.dao.entity.base.IdEntity;
import javax.persistence.Column;
import com.yonde.dex.context.plugin.entities.DxContextHolder;
import com.yonde.dex.dfs.objfilelink.plugin.entities.DxObjFileLinkHolder;
import com.yonde.dex.dfs.objfilelink.plugin.entities.DxObjFileLinkEmbeddable;
import com.yonde.dex.lcycle.plugin.entities.DxLifecycleManageBaseHolder;
import com.yonde.dex.dao.entity.base.DxIdEntityEmbeddable;
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.tree.plugin.entities.DxTreeContextEmbeddable;
import com.yonde.dex.tree.plugin.entities.DxTreeContextHolder;
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.version.plugin.entities.DxIterationEmbeddable;
/**
* @description: ExtPlan-PO实体
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:06
* @date: 2024-8-15 10:55:29
**/
@Entity
@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor
@Data
@Table(name = "EXT_PLAN")
public class ExtPlan extends IdOnlyEntity implements DxObjFileLinkHolder ,DxTreeContextHolder ,DxLifecycleManageBaseHolder ,IdEntity ,DxIterationHolder{
public class ExtPlan extends IdOnlyEntity implements DxContextHolder ,DxObjFileLinkHolder ,DxTreeContextHolder ,DxLifecycleManageBaseHolder ,IdEntity ,DxIterationHolder ,DxSecretHolder{
/**
* 扩展PO属性
*/
@DexEmbedded()
@Embedded()
private DxContextEmbeddable dxContextEmbeddable;
/**
* 扩展PO属性
*/
......@@ -79,6 +89,12 @@ public class ExtPlan extends IdOnlyEntity implements DxObjFileLinkHolder ,DxTree
@Embedded()
private DxIterationEmbeddable dxIterationEmbeddable;
/**
* 扩展PO属性
*/
@DexEmbedded()
@Embedded()
private DxSecretEmbeddable dxSecretEmbeddable;
/**
* 实际完成时间
*/
private LocalDateTime actualComplateTime;
......
dcs-plan-entity/src/main/java/com/yonde/dcs/plan/entity/po/ExtPlanDocLink.java
View file @ 1399d312
......@@ -35,7 +35,7 @@ import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteEmbeddable;
* @description: ExtPlanDocLink-PO实体
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:05
* @date: 2024-8-15 10:55:27
**/
@Entity
@EqualsAndHashCode(callSuper = true)
......
dcs-plan-entity/src/main/java/com/yonde/dcs/plan/entity/po/ExtPlanReply.java
View file @ 1399d312
......@@ -25,6 +25,8 @@ import javax.persistence.Table;
import com.yonde.dex.lcycle.plugin.entities.DxLifecycleManageBaseEmbeddable;
import com.yonde.dex.dao.entity.base.IdEntity;
import javax.persistence.Column;
import com.yonde.dex.context.plugin.entities.DxContextHolder;
import com.yonde.dex.context.plugin.entities.DxContextEmbeddable;
import com.yonde.dex.lcycle.plugin.entities.DxLifecycleManageBaseHolder;
import com.yonde.dex.dao.entity.base.DxIdEntityEmbeddable;
import com.yonde.dex.dao.entity.base.IdOnlyEntity;
......@@ -35,15 +37,21 @@ import com.yonde.dex.version.plugin.entities.DxIterationEmbeddable;
* @description: ExtPlanReply-PO实体
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:06
* @date: 2024-8-15 10:55:29
**/
@Entity
@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor
@Data
@Table(name = "EXT_PLAN_REPLY")
public class ExtPlanReply extends IdOnlyEntity implements DxLifecycleManageBaseHolder ,IdEntity ,DxIterationHolder{
public class ExtPlanReply extends IdOnlyEntity implements DxContextHolder ,DxLifecycleManageBaseHolder ,IdEntity ,DxIterationHolder{
/**
* 扩展PO属性
*/
@DexEmbedded()
@Embedded()
private DxContextEmbeddable dxContextEmbeddable;
/**
* 扩展PO属性
*/
......
dcs-plan-entity/src/main/java/com/yonde/dcs/plan/entity/po/ExtPlanReplyLink.java
View file @ 1399d312
......@@ -33,7 +33,7 @@ import com.yonde.dex.linkdata.plugin.entities.DxLinkDataEmbeddable;
* @description: ExtPlanReplyLink-PO实体
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:05
* @date: 2024-8-15 10:55:29
**/
@Entity
@EqualsAndHashCode(callSuper = true)
......
dcs-plan-entity/src/main/java/com/yonde/dcs/plan/entity/po/ExtSpendingBillInfo.java
View file @ 1399d312
......@@ -24,7 +24,11 @@ import javax.persistence.Entity;
import javax.persistence.Table;
import com.yonde.dex.dao.entity.base.IdEntity;
import javax.persistence.Column;
import com.yonde.dex.context.plugin.entities.DxContextHolder;
import com.yonde.dex.context.plugin.entities.DxContextEmbeddable;
import com.yonde.dex.secretcode.plugin.entities.DxSecretHolder;
import com.yonde.dex.dao.entity.base.DxIdEntityEmbeddable;
import com.yonde.dex.secretcode.plugin.entities.DxSecretEmbeddable;
import com.yonde.dex.dao.entity.base.IdOnlyEntity;
import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteHolder;
import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteEmbeddable;
......@@ -33,15 +37,21 @@ import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteEmbeddable;
* @description: ExtSpendingBillInfo-PO实体
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:05
* @date: 2024-8-15 10:55:28
**/
@Entity
@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor
@Data
@Table(name = "EXT_SPENDING_BILL_INFO")
public class ExtSpendingBillInfo extends IdOnlyEntity implements IdEntity ,DxLogicDeleteHolder{
public class ExtSpendingBillInfo extends IdOnlyEntity implements DxContextHolder ,IdEntity ,DxLogicDeleteHolder ,DxSecretHolder{
/**
* 扩展PO属性
*/
@DexEmbedded()
@Embedded()
private DxContextEmbeddable dxContextEmbeddable;
/**
* dao扩展对象
*/
......@@ -55,6 +65,12 @@ public class ExtSpendingBillInfo extends IdOnlyEntity implements IdEntity ,DxLog
@Embedded()
private DxLogicDeleteEmbeddable dxLogicDeleteEmbeddable;
/**
* 扩展PO属性
*/
@DexEmbedded()
@Embedded()
private DxSecretEmbeddable dxSecretEmbeddable;
/**
* 开具金额发票类型
*/
private String amountInvoiceType;
......
dcs-plan-entity/src/main/java/com/yonde/dcs/plan/entity/po/ExtSpendingContract.java
View file @ 1399d312
......@@ -24,7 +24,11 @@ import javax.persistence.Entity;
import javax.persistence.Table;
import com.yonde.dex.dao.entity.base.IdEntity;
import javax.persistence.Column;
import com.yonde.dex.context.plugin.entities.DxContextHolder;
import com.yonde.dex.context.plugin.entities.DxContextEmbeddable;
import com.yonde.dex.secretcode.plugin.entities.DxSecretHolder;
import com.yonde.dex.dao.entity.base.DxIdEntityEmbeddable;
import com.yonde.dex.secretcode.plugin.entities.DxSecretEmbeddable;
import com.yonde.dex.dao.entity.base.IdOnlyEntity;
import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteHolder;
import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteEmbeddable;
......@@ -33,15 +37,21 @@ import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteEmbeddable;
* @description: ExtSpendingContract-PO实体
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:05
* @date: 2024-8-15 10:55:28
**/
@Entity
@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor
@Data
@Table(name = "EXT_SPENDING_CONTRACT")
public class ExtSpendingContract extends IdOnlyEntity implements IdEntity ,DxLogicDeleteHolder{
public class ExtSpendingContract extends IdOnlyEntity implements DxContextHolder ,IdEntity ,DxLogicDeleteHolder ,DxSecretHolder{
/**
* 扩展PO属性
*/
@DexEmbedded()
@Embedded()
private DxContextEmbeddable dxContextEmbeddable;
/**
* dao扩展对象
*/
......@@ -55,6 +65,12 @@ public class ExtSpendingContract extends IdOnlyEntity implements IdEntity ,DxLog
@Embedded()
private DxLogicDeleteEmbeddable dxLogicDeleteEmbeddable;
/**
* 扩展PO属性
*/
@DexEmbedded()
@Embedded()
private DxSecretEmbeddable dxSecretEmbeddable;
/**
* 验收方法
*/
private String acceptMethod;
......
dcs-plan-entity/src/main/java/com/yonde/dcs/plan/entity/po/ExtSpendingDetail.java
View file @ 1399d312
......@@ -24,7 +24,11 @@ import javax.persistence.Entity;
import javax.persistence.Table;
import com.yonde.dex.dao.entity.base.IdEntity;
import javax.persistence.Column;
import com.yonde.dex.context.plugin.entities.DxContextHolder;
import com.yonde.dex.context.plugin.entities.DxContextEmbeddable;
import com.yonde.dex.secretcode.plugin.entities.DxSecretHolder;
import com.yonde.dex.dao.entity.base.DxIdEntityEmbeddable;
import com.yonde.dex.secretcode.plugin.entities.DxSecretEmbeddable;
import com.yonde.dex.dao.entity.base.IdOnlyEntity;
import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteHolder;
import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteEmbeddable;
......@@ -33,15 +37,21 @@ import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteEmbeddable;
* @description: ExtSpendingDetail-PO实体
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:05
* @date: 2024-8-15 10:55:28
**/
@Entity
@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor
@Data
@Table(name = "EXT_SPENDING_DETAIL")
public class ExtSpendingDetail extends IdOnlyEntity implements IdEntity ,DxLogicDeleteHolder{
public class ExtSpendingDetail extends IdOnlyEntity implements DxContextHolder ,IdEntity ,DxLogicDeleteHolder ,DxSecretHolder{
/**
* 扩展PO属性
*/
@DexEmbedded()
@Embedded()
private DxContextEmbeddable dxContextEmbeddable;
/**
* dao扩展对象
*/
......@@ -55,6 +65,12 @@ public class ExtSpendingDetail extends IdOnlyEntity implements IdEntity ,DxLogic
@Embedded()
private DxLogicDeleteEmbeddable dxLogicDeleteEmbeddable;
/**
* 扩展PO属性
*/
@DexEmbedded()
@Embedded()
private DxSecretEmbeddable dxSecretEmbeddable;
/**
* 金额
*/
private BigDecimal amount;
......
dcs-plan-entity/src/main/java/com/yonde/dcs/plan/entity/po/ExtUpgradeObjLink.java
View file @ 1399d312
......@@ -33,7 +33,7 @@ import com.yonde.dex.linkdata.plugin.entities.DxLinkDataEmbeddable;
* @description: ExtUpgradeObjLink-PO实体
* @author: dexadmin
* @version: V
* @date: 2024-7-26 9:34:04
* @date: 2024-8-15 10:55:27
**/
@Entity
@EqualsAndHashCode(callSuper = true)
......
pom.xml
View file @ 1399d312
......@@ -19,7 +19,6 @@
<module>dcs-plan-server</module>
<module>dcs-plan-build-lib</module>
<module>dcs-plan-build-thirdLib</module>
<module>dcs-plan-auto-task</module>
</modules>
<properties>
<java.version>1.8</java.version>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment