Merge remote-tracking branch 'origin/dev' into dev

pom.xml

@@ -19,7 +19,7 @@
     <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
 
     <properties>
-        <revision>3.0.31</revision>
+        <revision>3.0.34</revision>
         <!-- Maven 相关 -->
         <java.version>17</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>

yudao-module-base/yudao-module-base-api/src/main/java/cn/iocoder/yudao/module/tmpltp/enums/ErrorCodeConstants.java

@@ -12,7 +12,9 @@ public interface ErrorCodeConstants {
     ErrorCode TEMPLATE_INSTANCE_NOT_EXISTS = new ErrorCode(1_027_000_504, "模板实例不存在");
     ErrorCode TMPL_TP_SATUS_ERROR = new ErrorCode(1_027_000_506, "状态变更失败");
     ErrorCode TMPL_TP_DEl_ERROR = new ErrorCode(1_027_000_507, "模版分类删除失败");
-
+    ErrorCode TEMPLATE_INSTANCE_DATA_NOT_EXISTS = new ErrorCode(1_027_000_508, "实例字段值不存在");
+    ErrorCode TEMPLATE_INSTANCE_ITEM_NOT_EXISTS = new ErrorCode(1_027_000_509, "实例条款值不存在");
+    ErrorCode PARAMS_IS_NULL_OR_ERR = new ErrorCode(1_027_000_510, "参数为空");
 
 }
 

yudao-module-base/yudao-module-base-server/src/main/java/cn/iocoder/yudao/module/base/controller/admin/templtp/TmplTpController.java

@@ -26,6 +26,8 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
@@ -33,6 +35,7 @@ import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
 import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
 
+import static cn.iocoder.yudao.module.tmpltp.enums.ErrorCodeConstants.PARAMS_IS_NULL_OR_ERR;
 
 
 @Tag(name = "管理后台 - 模板分类")
@@ -127,16 +130,16 @@ public class TmplTpController extends AbstractFileUploadController implements Bu
 
     //更新类型状态
     @PutMapping("/updateStatus")
-    @Operation(summary = "更新模板字段状态")
+    @Operation(summary = "更新模板类型状态")
     @PreAuthorize("@ss.hasPermission('bse:tmpl-tp:update')")
     public CommonResult<Boolean> updateStatus(@RequestBody Map<String,Object> params) {
         if (params == null){
-         throw new RuntimeException("参数不能为空");
+            throw exception(PARAMS_IS_NULL_OR_ERR);
         }
-        if (!params.containsKey("id") || !params.containsKey("status")){
+        if (!params.containsKey("id") || !params.containsKey("sts")){
-            throw new RuntimeException("参数id或者状态不能为空");
+            throw exception(PARAMS_IS_NULL_OR_ERR);
         }
-        tmplTpService.updateStatus(Long.valueOf(params.get("id").toString()), params.get("status").toString());
+        tmplTpService.updateStatus(Long.valueOf(params.get("id").toString()), params.get("sts").toString());
         return success(true);
     }
 

yudao-module-base/yudao-module-base-server/src/main/java/cn/iocoder/yudao/module/base/controller/admin/templtp/vo/TemplateInstanceDataPageReqVO.java

@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.base.controller.admin.templtp.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 实例字段值分页 Request VO")
+@Data
+public class TemplateInstanceDataPageReqVO extends PageParam {
+
+    @Schema(description = "关联实例主键", example = "25824")
+    private String instanceId;
+
+    @Schema(description = "字段标识;关联字段库")
+    private String fieldKey;
+
+    @Schema(description = "用户填写的值")
+    private String fieldValue;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}

yudao-module-base/yudao-module-base-server/src/main/java/cn/iocoder/yudao/module/base/controller/admin/templtp/vo/TemplateInstanceDataRespVO.java

@@ -0,0 +1,35 @@
+package cn.iocoder.yudao.module.base.controller.admin.templtp.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 实例字段值 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class TemplateInstanceDataRespVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "10920")
+    @ExcelProperty("主键")
+    private Long id;
+
+    @Schema(description = "关联实例主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "25824")
+    @ExcelProperty("关联实例主键")
+    private String instanceId;
+
+    @Schema(description = "字段标识;关联字段库", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("字段标识;关联字段库")
+    private String fieldKey;
+
+    @Schema(description = "用户填写的值", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("用户填写的值")
+    private String fieldValue;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+}

yudao-module-base/yudao-module-base-server/src/main/java/cn/iocoder/yudao/module/base/controller/admin/templtp/vo/TemplateInstanceDataSaveReqVO.java

@@ -0,0 +1,27 @@
+package cn.iocoder.yudao.module.base.controller.admin.templtp.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import jakarta.validation.constraints.*;
+
+@Schema(description = "管理后台 - 实例字段值新增/修改 Request VO")
+@Data
+public class TemplateInstanceDataSaveReqVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "10920")
+    private Long id;
+
+    @Schema(description = "关联实例主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "25824")
+    @NotEmpty(message = "关联实例主键不能为空")
+    private String instanceId;
+
+    @Schema(description = "字段标识;关联字段库", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "字段标识;关联字段库不能为空")
+    private String fieldKey;
+
+    @Schema(description = "用户填写的值", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "用户填写的值不能为空")
+    private String fieldValue;
+
+}

yudao-module-base/yudao-module-base-server/src/main/java/cn/iocoder/yudao/module/base/controller/admin/templtp/vo/TemplateInstanceItemPageReqVO.java

@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.base.controller.admin.templtp.vo;
+
+import lombok.*;
+
+import java.time.LocalDate;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 实例条款值分页 Request VO")
+@Data
+public class TemplateInstanceItemPageReqVO extends PageParam {
+
+    @Schema(description = "关联实例主键", example = "28964")
+    private String inscId;
+
+    @Schema(description = "条款库主键;关联字段库", example = "11278")
+    private String itmId;
+
+    @Schema(description = "用户填写的值")
+    private String val;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDate[] createTime;
+
+}

yudao-module-base/yudao-module-base-server/src/main/java/cn/iocoder/yudao/module/base/controller/admin/templtp/vo/TemplateInstanceItemRespVO.java

@@ -0,0 +1,35 @@
+package cn.iocoder.yudao.module.base.controller.admin.templtp.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+import java.time.LocalDate;
+import java.util.*;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 实例条款值 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class TemplateInstanceItemRespVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "25152")
+    @ExcelProperty("主键")
+    private String id;
+
+    @Schema(description = "关联实例主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "28964")
+    @ExcelProperty("关联实例主键")
+    private String inscId;
+
+    @Schema(description = "条款库主键;关联字段库", requiredMode = Schema.RequiredMode.REQUIRED, example = "11278")
+    @ExcelProperty("条款库主键;关联字段库")
+    private String itmId;
+
+    @Schema(description = "用户填写的值", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("用户填写的值")
+    private String val;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDate createTime;
+
+}