模版编制的相关实现

zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/tmpltp/enums/DeleteStatusEnum.java

@@ -5,7 +5,7 @@ import java.util.Set;
 
 public enum DeleteStatusEnum {
 
-    STATUS_DRF(TmplStsEnum.DRAFT.getCode(), new HashSet<>() {{add(TmplStsEnum.STOPPED.getCode());}}),
+    STATUS_DRF(TmplStsEnum.DRAFT.getCode(), new HashSet<>() {{add(TmplStsEnum.DRAFT.getCode());}}),
     STATUS_PUB(TmplStsEnum.PUBLISHED.getCode(), new HashSet<>()),
     STATUS_STOP(TmplStsEnum.STOPPED.getCode(), new HashSet<>());
 

zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/tmpltp/enums/PublishStatusEnum.java

@@ -8,15 +8,9 @@ import java.util.Set;
  */
 public enum PublishStatusEnum {
 
-    STATUS_DRF(TmplStsEnum.DRAFT.getCode(), new HashSet<>() {{
+    STATUS_DRF(TmplStsEnum.DRAFT.getCode(), new HashSet<>() {{add(TmplStsEnum.DRAFT.getCode());}}),
-        add(TmplStsEnum.DRAFT.getCode());
-        add(TmplStsEnum.STOPPED.getCode());
-    }}),
     STATUS_PUB(TmplStsEnum.PUBLISHED.getCode(), new HashSet<>()),
-    STATUS_STOP(TmplStsEnum.STOPPED.getCode(), new HashSet<>() {{
+    STATUS_STOP(TmplStsEnum.STOPPED.getCode(), new HashSet<>() );
-        add(TmplStsEnum.DRAFT.getCode());
-        add(TmplStsEnum.STOPPED.getCode());
-    }});
 
 
     private final String code;

zt-module-base/zt-module-base-api/src/main/java/com/zt/plat/module/tmpltp/enums/UpdateStatusEnum.java

@@ -5,9 +5,15 @@ import java.util.Set;
 
 public enum UpdateStatusEnum {
 
-    STATUS_DRF(TmplStsEnum.DRAFT.getCode(), new HashSet<>() {{add(TmplStsEnum.DRAFT.getCode());}}),
+    STATUS_DRF(TmplStsEnum.DRAFT.getCode(), new HashSet<>() {{
+        add(TmplStsEnum.DRAFT.getCode());
+        add(TmplStsEnum.STOPPED.getCode());
+    }}),
     STATUS_PUB(TmplStsEnum.PUBLISHED.getCode(), new HashSet<>()),
-    STATUS_STOP(TmplStsEnum.STOPPED.getCode(), new HashSet<>());
+    STATUS_STOP(TmplStsEnum.STOPPED.getCode(), new HashSet<>(){{
+        add(TmplStsEnum.DRAFT.getCode());
+        add(TmplStsEnum.STOPPED.getCode());
+    }});
 
 
     private final String code;

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/DisableEnableReqVO.java

@@ -0,0 +1,18 @@
+package com.zt.plat.module.base.controller.admin.templtp.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotEmpty;
+import lombok.Data;
+
+import java.util.List;
+
+@Schema(description = "管理后台 - 实例启用与禁用 Request VO")
+@Data
+public class DisableEnableReqVO {
+    @Schema(description = "实例主键(id)", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotEmpty(message = "实例主键不能为空")
+    private List<String> ids;
+    @Schema(description = "操作类型;操作类型type,type的值启用为enable，禁用为disable", requiredMode = Schema.RequiredMode.REQUIRED, example = "enable")
+    @NotEmpty(message = "实例操作类型不能为空")
+    private String type;
+}

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TemplateInstanceRespVO.java

@@ -56,6 +56,10 @@ public class TemplateInstanceRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
-    @Schema(description = "使用部门编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @Schema(description = "使用部门编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "")
     private List<String> deptIds;
+    @Schema(description = "实例字段;这个是实例字段绑定的字段", requiredMode = Schema.RequiredMode.REQUIRED, example = "")
+    private List<TemplateInstanceDataRespVO> templateInstanceDataRespVOS;
+    @Schema(description = "实例条款；这个是实例条款绑定的条款;", requiredMode = Schema.RequiredMode.REQUIRED, example = "")
+    private List<TemplateInstanceItemRespVO> instanceItemRespVOS;
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/vo/TemplateInstanceSaveReqVO.java

@@ -21,9 +21,9 @@ public class TemplateInstanceSaveReqVO {
     @NotEmpty(message = "模板名称不能为空")
     private String name;
 
-    @Schema(description = "模板编码", requiredMode = Schema.RequiredMode.REQUIRED)
+//    @Schema(description = "模板编码", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "模板编码不能为空")
+//    @NotEmpty(message = "模板编码不能为空")
-    private String cdg;
+//    private String cdg;
 
     @Schema(description = "模板描述")
     private String dsp;

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/tmpltp/TmplTpFldDO.java

@@ -8,7 +8,7 @@ import java.time.LocalDateTime;
 
 /**
  * 字段库 DO
- * 对应数据库表：BIZ_TMPL_TP_FLD
+ * 对应数据库表：BSE_TMPL_TP_FLD
  *
  * @author 后台管理
  */

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/tmpltp/TemplateInstanceMapper.java

@@ -8,6 +8,7 @@ import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
 
 import com.zt.plat.module.base.controller.admin.templtp.vo.TemplateInstancePageReqVO;
 import com.zt.plat.module.base.dal.dataobject.tmpltp.TemplateInstanceDO;
+import com.zt.plat.module.tmpltp.enums.TmplStsEnum;
 import org.apache.ibatis.annotations.Mapper;
 
 
@@ -33,5 +34,20 @@ public interface TemplateInstanceMapper extends BaseMapperX<TemplateInstanceDO>
                 .betweenIfPresent(TemplateInstanceDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(TemplateInstanceDO::getId));
     }
+    default PageResult<TemplateInstanceDO> listExcludingDisabled(TemplateInstancePageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<TemplateInstanceDO>()
+                .eqIfPresent(TemplateInstanceDO::getTpId, reqVO.getTpId())
+                .likeIfPresent(TemplateInstanceDO::getName, reqVO.getName())
+                .eqIfPresent(TemplateInstanceDO::getCdg, reqVO.getCdg())
+                .eqIfPresent(TemplateInstanceDO::getDsp, reqVO.getDsp())
+                .eqIfPresent(TemplateInstanceDO::getCntt, reqVO.getCntt())
+                .eqIfPresent(TemplateInstanceDO::getOrigCntt, reqVO.getOrigCntt())
+                .eqIfPresent(TemplateInstanceDO::getFileTp, reqVO.getFileTp())
+                .eqIfPresent(TemplateInstanceDO::getVer, reqVO.getVer())
+                .eqIfPresent(TemplateInstanceDO::getSts, reqVO.getSts())
+                .betweenIfPresent(TemplateInstanceDO::getCreateTime, reqVO.getCreateTime())
+                .ne(TemplateInstanceDO::getSts, TmplStsEnum.STOPPED.getCode()) // 不包含停用状态（不等于停用状态）
+                .orderByDesc(TemplateInstanceDO::getId));
+    }
 
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/service/tmpltp/TemplateInstanceService.java

@@ -2,10 +2,7 @@ package com.zt.plat.module.base.service.tmpltp;
 
 import java.util.*;
 
-import com.zt.plat.module.base.controller.admin.templtp.vo.PublishTemplateInstanceReqVO;
+import com.zt.plat.module.base.controller.admin.templtp.vo.*;
-import com.zt.plat.module.base.controller.admin.templtp.vo.TemplateInstancePageReqVO;
-import com.zt.plat.module.base.controller.admin.templtp.vo.TemplateInstanceRespVO;
-import com.zt.plat.module.base.controller.admin.templtp.vo.TemplateInstanceSaveReqVO;
 import com.zt.plat.module.base.dal.dataobject.tmpltp.TemplateInstanceDO;
 import jakarta.validation.*;
 
@@ -67,4 +64,15 @@ public interface TemplateInstanceService {
     List<String> getDeptByInstanId(Long instanId);
 
     void publishTemplateInstance(List<PublishTemplateInstanceReqVO> publishReqVOS);
+
+    void getDetailedInfo(TemplateInstanceRespVO templateInstanceRespVO);
+    /**
+     * 获得模板实例分页排除停用状态的
+     *
+     * @param pageReqVO 分页查询
+     * @return 模板实例分页
+     */
+    PageResult<TemplateInstanceDO> listExcludingDisabled(@Valid TemplateInstancePageReqVO pageReqVO);
+
+    void setDisableOrEnable(@Valid DisableEnableReqVO reqVO);
 }