Commit abffb637 authored by wei's avatar wei 🎱

借阅模型去掉版本

parent b5a750e8
...@@ -36,7 +36,6 @@ import com.yonde.dex.context.plugin.common.entity.DxContextVOEmbeddable; ...@@ -36,7 +36,6 @@ import com.yonde.dex.context.plugin.common.entity.DxContextVOEmbeddable;
import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOHolder; import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOHolder;
import com.yonde.dex.context.plugin.common.entity.DxContextVOHolder; import com.yonde.dex.context.plugin.common.entity.DxContextVOHolder;
import com.yonde.dex.container.folder.plugin.common.entity.DxObjFolderVOEmbeddable; import com.yonde.dex.container.folder.plugin.common.entity.DxObjFolderVOEmbeddable;
import com.yonde.dex.version.plugin.common.entity.DxIterationVOEmbeddable;
import com.yonde.dex.basedata.entity.users.DxUserVO; import com.yonde.dex.basedata.entity.users.DxUserVO;
import com.yonde.dex.lcycle.plugin.common.entity.DxLifecycleManageBaseVOHolder; import com.yonde.dex.lcycle.plugin.common.entity.DxLifecycleManageBaseVOHolder;
import com.yonde.dex.lcycle.plugin.common.entity.DxLifecycleManageBaseVOEmbeddable; import com.yonde.dex.lcycle.plugin.common.entity.DxLifecycleManageBaseVOEmbeddable;
...@@ -48,20 +47,19 @@ import com.yonde.dex.user.common.vo.DxOrganizationVO; ...@@ -48,20 +47,19 @@ import com.yonde.dex.user.common.vo.DxOrganizationVO;
import com.yonde.dex.container.folder.plugin.common.entity.DxObjFolderVOHolder; import com.yonde.dex.container.folder.plugin.common.entity.DxObjFolderVOHolder;
import com.yonde.dex.user.common.vo.DxUserInfoVO; import com.yonde.dex.user.common.vo.DxUserInfoVO;
import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOEmbeddable; import com.yonde.dex.dfs.objfilelink.plugin.common.entity.DxObjFileLinkVOEmbeddable;
import com.yonde.dex.version.plugin.common.entity.DxIterationVOHolder;
import com.inet.dcs.document.common.vo.ExtBorrowingDocLinkVO; import com.inet.dcs.document.common.vo.ExtBorrowingDocLinkVO;
/** /**
* @description: ExtBorrowingForm-VO * @description: ExtBorrowingForm-VO
* @author: dexadmin * @author: dexadmin
* @version: V * @version: V
* @date: 2024-11-8 9:51:42 * @date: 2024-11-12 16:35:50
**/ **/
@JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtBorrowingFormVO.class) @JsonTypeInfo( use = JsonTypeInfo.Id.CLASS, property = "dxClassname", visible = true, defaultImpl = ExtBorrowingFormVO.class)
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Data @Data
@ToString(callSuper = true) @ToString(callSuper = true)
public class ExtBorrowingFormVO extends IdOnlyVO implements IdVO ,DxContextVOHolder ,DxLifecycleManageBaseVOHolder ,DxIterationVOHolder<ExtBorrowingFormVO> ,DxObjFileLinkVOHolder ,DxObjFolderVOHolder ,DxLogicDeleteVOHolder ,DxSecretVOHolder{ public class ExtBorrowingFormVO extends IdOnlyVO implements IdVO ,DxContextVOHolder ,DxLifecycleManageBaseVOHolder ,DxObjFileLinkVOHolder ,DxObjFolderVOHolder ,DxLogicDeleteVOHolder ,DxSecretVOHolder{
public static final String DX_CONTEXT_EMBEDDABLE_PROP_NAME = "dxContextEmbeddable"; 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_OBJ_FILE_LINK_EMBEDDABLE_PROP_NAME = "dxObjFileLinkEmbeddable";
...@@ -69,7 +67,6 @@ public class ExtBorrowingFormVO extends IdOnlyVO implements IdVO ,DxContextVOHol ...@@ -69,7 +67,6 @@ public class ExtBorrowingFormVO extends IdOnlyVO implements IdVO ,DxContextVOHol
public static final String DX_LIFECYCLE_MANAGE_BASE_EMBEDDABLE_PROP_NAME = "dxLifecycleManageBaseEmbeddable"; 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_ID_EMBEDDABLE_PROP_NAME = "dxIdEmbeddable";
public static final String DX_LOGIC_DELETE_EMBEDDABLE_PROP_NAME = "dxLogicDeleteEmbeddable"; public static final String DX_LOGIC_DELETE_EMBEDDABLE_PROP_NAME = "dxLogicDeleteEmbeddable";
public static final String DX_ITERATION_EMBEDDABLE_PROP_NAME = "dxIterationEmbeddable";
public static final String DX_SECRET_EMBEDDABLE_PROP_NAME = "dxSecretEmbeddable"; public static final String DX_SECRET_EMBEDDABLE_PROP_NAME = "dxSecretEmbeddable";
public static final String ACTUAL_RETURN_TIME_PROP_NAME = "actualReturnTime"; public static final String ACTUAL_RETURN_TIME_PROP_NAME = "actualReturnTime";
public static final String BORROWER_PHONE_PROP_NAME = "borrowerPhone"; public static final String BORROWER_PHONE_PROP_NAME = "borrowerPhone";
...@@ -132,13 +129,6 @@ public class ExtBorrowingFormVO extends IdOnlyVO implements IdVO ,DxContextVOHol ...@@ -132,13 +129,6 @@ public class ExtBorrowingFormVO extends IdOnlyVO implements IdVO ,DxContextVOHol
@JsonIgnore @JsonIgnore
private DxLogicDeleteVOEmbeddable dxLogicDeleteEmbeddable; private DxLogicDeleteVOEmbeddable dxLogicDeleteEmbeddable;
/**
* 扩展VO属性
*/
@DexEmbedded()
@JsonIgnore
private DxIterationVOEmbeddable<ExtBorrowingFormVO> dxIterationEmbeddable;
/** /**
* 扩展VO属性 * 扩展VO属性
*/ */
......
...@@ -12,26 +12,19 @@ import com.inet.dcs.document.core.service.ExtBorrowingFormService; ...@@ -12,26 +12,19 @@ import com.inet.dcs.document.core.service.ExtBorrowingFormService;
import com.inet.dcs.document.core.service.impl.ExtBorrowingFormServiceImpl; import com.inet.dcs.document.core.service.impl.ExtBorrowingFormServiceImpl;
import com.yonde.dex.basedata.entity.api.ApiResult; import com.yonde.dex.basedata.entity.api.ApiResult;
import javax.annotation.Resource; import javax.annotation.Resource;
import com.yonde.dex.basedata.auth.annos.PermissionObject;
import com.yonde.dex.version.plugin.core.controller.AbstractVersionBaseController;
import com.yonde.dex.context.plugin.core.controller.DxContextController; import com.yonde.dex.context.plugin.core.controller.DxContextController;
import com.yonde.dex.basedata.auth.annos.SubPermission;
import com.yonde.entity.annotation.SandBoxOpen;
import com.yonde.dex.container.folder.plugin.core.controller.DxObjFolderPluginController; import com.yonde.dex.container.folder.plugin.core.controller.DxObjFolderPluginController;
import org.springframework.web.bind.annotation.*;
import com.yonde.dex.dfs.objfilelink.plugin.core.controller.DxObjFileLinkController; import com.yonde.dex.dfs.objfilelink.plugin.core.controller.DxObjFileLinkController;
import com.yonde.dex.version.plugin.common.entity.DxIterationVOHolder;
import com.yonde.dex.baseweb.AbstractBaseController;
import com.yonde.dex.lcycle.plugin.core.controller.AbstractLifecycleBaseController; import com.yonde.dex.lcycle.plugin.core.controller.AbstractLifecycleBaseController;
import com.yonde.dex.basedata.entity.api.ApiResult; import com.yonde.dex.baseweb.AbstractBaseController;
/** /**
* @description: ExtBorrowingForm-Controller * @description: ExtBorrowingForm-Controller
* @author: dexadmin * @author: dexadmin
* @version: V * @version: V
* @date: 2024-10-31 14:17:35 * @date: 2024-11-12 16:35:50
**/ **/
public class ExtBorrowingFormControllerShadow<V extends ExtBorrowingFormVO, S extends ExtBorrowingFormService<V>> implements DxContextController<V, S> ,AbstractBaseController<V, S> ,AbstractLifecycleBaseController<V, S> ,AbstractVersionBaseController<V, S> ,DxObjFileLinkController<V, S> ,DxObjFolderPluginController<V, S>{ public class ExtBorrowingFormControllerShadow<V extends ExtBorrowingFormVO, S extends ExtBorrowingFormService<V>> implements DxContextController<V, S> ,AbstractBaseController<V, S> ,AbstractLifecycleBaseController<V, S> ,DxObjFileLinkController<V, S> ,DxObjFolderPluginController<V, S>{
public static final String BEAN_NAME = "extBorrowingFormController"; public static final String BEAN_NAME = "extBorrowingFormController";
......
...@@ -7,17 +7,16 @@ import com.yonde.dex.logicdelete.plugin.core.repository.DxLogicDeleteRepository; ...@@ -7,17 +7,16 @@ import com.yonde.dex.logicdelete.plugin.core.repository.DxLogicDeleteRepository;
import com.yonde.dex.dao.business.repository.BaseRepository; import com.yonde.dex.dao.business.repository.BaseRepository;
import com.yonde.dex.container.folder.plugin.core.repository.DxObjFolderPluginRepository; import com.yonde.dex.container.folder.plugin.core.repository.DxObjFolderPluginRepository;
import com.yonde.dex.secretcode.plugin.core.repositroy.DxSecretCodePluginRepository; import com.yonde.dex.secretcode.plugin.core.repositroy.DxSecretCodePluginRepository;
import com.yonde.dex.version.plugin.core.repository.DxIterationRepository;
import com.yonde.dex.lcycle.plugin.core.repository.DxLifecycleManageBaseRepository; import com.yonde.dex.lcycle.plugin.core.repository.DxLifecycleManageBaseRepository;
import com.yonde.dex.dfs.objfilelink.plugin.core.repository.DxObjFileLinkPluginRepository; import com.yonde.dex.dfs.objfilelink.plugin.core.repository.DxObjFileLinkPluginRepository;
/** /**
* @description: ExtBorrowingForm-repository * @description: ExtBorrowingForm-repository
* @author: dexadmin * @author: dexadmin
* @version: V * @version: V
* @date: 2024-10-31 14:17:35 * @date: 2024-11-12 16:35:50
**/ **/
@NoRepositoryBean @NoRepositoryBean
public interface ExtBorrowingFormRepositoryShadow<P extends ExtBorrowingForm> extends DxContextPluginRepository<P> ,DxObjFileLinkPluginRepository<P> ,DxObjFolderPluginRepository<P> ,DxLifecycleManageBaseRepository<P> ,BaseRepository<P> ,DxLogicDeleteRepository<P> ,DxIterationRepository<P> ,DxSecretCodePluginRepository<P> { public interface ExtBorrowingFormRepositoryShadow<P extends ExtBorrowingForm> extends DxContextPluginRepository<P> ,DxObjFileLinkPluginRepository<P> ,DxObjFolderPluginRepository<P> ,DxLifecycleManageBaseRepository<P> ,BaseRepository<P> ,DxLogicDeleteRepository<P> ,DxSecretCodePluginRepository<P> {
String BEAN_NAME = "extBorrowingFormRepository"; String BEAN_NAME = "extBorrowingFormRepository";
} }
...@@ -4,7 +4,6 @@ import com.inet.dcs.document.common.vo.ExtBorrowingFormVO; ...@@ -4,7 +4,6 @@ import com.inet.dcs.document.common.vo.ExtBorrowingFormVO;
import com.inet.dcs.document.feign.ExtBorrowingFormServiceFeign; import com.inet.dcs.document.feign.ExtBorrowingFormServiceFeign;
import com.yonde.dex.dao.service.BaseIdEntityService; import com.yonde.dex.dao.service.BaseIdEntityService;
import com.yonde.dex.secretcode.plugin.core.service.SecretCodePluginService; import com.yonde.dex.secretcode.plugin.core.service.SecretCodePluginService;
import com.yonde.dex.version.plugin.core.service.IterationService;
import com.yonde.dex.context.plugin.core.service.ContextPluginService; import com.yonde.dex.context.plugin.core.service.ContextPluginService;
import com.yonde.dex.lcycle.plugin.core.service.LifecycleBaseService; import com.yonde.dex.lcycle.plugin.core.service.LifecycleBaseService;
import com.yonde.dex.logicdelete.plugin.core.service.LogicDeleteService; import com.yonde.dex.logicdelete.plugin.core.service.LogicDeleteService;
...@@ -14,8 +13,8 @@ import com.yonde.dex.container.folder.plugin.core.service.DxObjFolderPluginServi ...@@ -14,8 +13,8 @@ import com.yonde.dex.container.folder.plugin.core.service.DxObjFolderPluginServi
* @description: ExtBorrowingForm-service * @description: ExtBorrowingForm-service
* @author: dexadmin * @author: dexadmin
* @version: V * @version: V
* @date: 2024-10-31 14:17:35 * @date: 2024-11-12 16:35:50
**/ **/
public interface ExtBorrowingFormServiceShadow<V extends ExtBorrowingFormVO> extends ExtBorrowingFormServiceFeign<V>, ContextPluginService<V> ,ObjFileLinkPluginService<V> ,DxObjFolderPluginService<V> ,LifecycleBaseService<V> ,BaseIdEntityService<V> ,LogicDeleteService<V> ,IterationService<V> ,SecretCodePluginService<V> { public interface ExtBorrowingFormServiceShadow<V extends ExtBorrowingFormVO> extends ExtBorrowingFormServiceFeign<V>, ContextPluginService<V> ,ObjFileLinkPluginService<V> ,DxObjFolderPluginService<V> ,LifecycleBaseService<V> ,BaseIdEntityService<V> ,LogicDeleteService<V> ,SecretCodePluginService<V> {
} }
...@@ -29,7 +29,6 @@ import com.yonde.dex.dfs.objfilelink.plugin.entities.DxObjFileLinkHolder; ...@@ -29,7 +29,6 @@ import com.yonde.dex.dfs.objfilelink.plugin.entities.DxObjFileLinkHolder;
import com.yonde.dex.dfs.objfilelink.plugin.entities.DxObjFileLinkEmbeddable; import com.yonde.dex.dfs.objfilelink.plugin.entities.DxObjFileLinkEmbeddable;
import com.yonde.dex.context.plugin.entities.DxContextEmbeddable; import com.yonde.dex.context.plugin.entities.DxContextEmbeddable;
import com.yonde.dex.dao.entity.base.IdOnlyEntity; import com.yonde.dex.dao.entity.base.IdOnlyEntity;
import com.yonde.dex.version.plugin.entities.DxIterationHolder;
import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteHolder; import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteHolder;
import com.yonde.dex.container.folder.plugin.entities.DxObjFolderHolder; import com.yonde.dex.container.folder.plugin.entities.DxObjFolderHolder;
import com.yonde.dex.dao.entity.base.IdEntity; import com.yonde.dex.dao.entity.base.IdEntity;
...@@ -39,20 +38,19 @@ import com.yonde.dex.lcycle.plugin.entities.DxLifecycleManageBaseHolder; ...@@ -39,20 +38,19 @@ import com.yonde.dex.lcycle.plugin.entities.DxLifecycleManageBaseHolder;
import com.yonde.dex.dao.entity.base.DxIdEntityEmbeddable; import com.yonde.dex.dao.entity.base.DxIdEntityEmbeddable;
import com.yonde.dex.secretcode.plugin.entities.DxSecretEmbeddable; import com.yonde.dex.secretcode.plugin.entities.DxSecretEmbeddable;
import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteEmbeddable; import com.yonde.dex.logicdelete.plugin.entities.DxLogicDeleteEmbeddable;
import com.yonde.dex.version.plugin.entities.DxIterationEmbeddable;
/** /**
* @description: ExtBorrowingForm-PO实体 * @description: ExtBorrowingForm-PO实体
* @author: dexadmin * @author: dexadmin
* @version: V * @version: V
* @date: 2024-11-8 9:51:42 * @date: 2024-11-12 16:35:49
**/ **/
@Entity @Entity
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@NoArgsConstructor @NoArgsConstructor
@Data @Data
@Table(name = "EXT_BORROWING_FORM") @Table(name = "EXT_BORROWING_FORM")
public class ExtBorrowingForm extends IdOnlyEntity implements DxContextHolder ,DxObjFileLinkHolder ,DxObjFolderHolder ,DxLifecycleManageBaseHolder ,IdEntity ,DxLogicDeleteHolder ,DxIterationHolder ,DxSecretHolder{ public class ExtBorrowingForm extends IdOnlyEntity implements DxContextHolder ,DxObjFileLinkHolder ,DxObjFolderHolder ,DxLifecycleManageBaseHolder ,IdEntity ,DxLogicDeleteHolder ,DxSecretHolder{
/** /**
* 扩展PO属性 * 扩展PO属性
...@@ -95,12 +93,6 @@ public class ExtBorrowingForm extends IdOnlyEntity implements DxContextHolder ,D ...@@ -95,12 +93,6 @@ public class ExtBorrowingForm extends IdOnlyEntity implements DxContextHolder ,D
*/ */
@DexEmbedded() @DexEmbedded()
@Embedded() @Embedded()
private DxIterationEmbeddable dxIterationEmbeddable;
/**
* 扩展PO属性
*/
@DexEmbedded()
@Embedded()
private DxSecretEmbeddable dxSecretEmbeddable; private DxSecretEmbeddable dxSecretEmbeddable;
/** /**
* 实际归还日期 * 实际归还日期
......
...@@ -8,9 +8,6 @@ import com.yonde.dex.lcycle.plugin.feign.BaseLifecycleManageFeign; ...@@ -8,9 +8,6 @@ import com.yonde.dex.lcycle.plugin.feign.BaseLifecycleManageFeign;
import com.yonde.dex.dao.service.remotes.BaseFeign; import com.yonde.dex.dao.service.remotes.BaseFeign;
import com.yonde.dex.secretcode.plugin.feign.SecretCodeFeign; import com.yonde.dex.secretcode.plugin.feign.SecretCodeFeign;
import com.yonde.dex.container.folder.plugin.feign.DxObjFolderPluginFeign; import com.yonde.dex.container.folder.plugin.feign.DxObjFolderPluginFeign;
import com.yonde.dex.version.plugin.feign.BaseVersionFeign;
import org.springframework.web.bind.annotation.*;
import com.yonde.dex.version.plugin.common.entity.DxIterationVOHolder;
import com.yonde.dex.context.plugin.feign.ContextPluginFeign; import com.yonde.dex.context.plugin.feign.ContextPluginFeign;
import com.yonde.dex.logicdelete.plugin.feign.LogicDeleteFeign; import com.yonde.dex.logicdelete.plugin.feign.LogicDeleteFeign;
...@@ -18,9 +15,9 @@ import com.yonde.dex.logicdelete.plugin.feign.LogicDeleteFeign; ...@@ -18,9 +15,9 @@ import com.yonde.dex.logicdelete.plugin.feign.LogicDeleteFeign;
* @description: ExtBorrowingForm-Feign * @description: ExtBorrowingForm-Feign
* @author: dexadmin * @author: dexadmin
* @version: V * @version: V
* @date: 2024-10-31 14:17:35 * @date: 2024-11-12 16:35:50
**/ **/
public interface ExtBorrowingFormServiceFeignShadow<V extends ExtBorrowingFormVO> extends ContextPluginFeign<V> ,DxObjFolderPluginFeign<V> ,BaseLifecycleManageFeign<V> ,BaseFeign<V> ,LogicDeleteFeign<V> ,BaseVersionFeign<V> ,SecretCodeFeign<V> { public interface ExtBorrowingFormServiceFeignShadow<V extends ExtBorrowingFormVO> extends ContextPluginFeign<V> ,DxObjFolderPluginFeign<V> ,BaseLifecycleManageFeign<V> ,BaseFeign<V> ,LogicDeleteFeign<V> ,SecretCodeFeign<V> {
String BEAN_NAME = "extBorrowingFormServiceFeign"; String BEAN_NAME = "extBorrowingFormServiceFeign";
......
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