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

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

@@ -15,6 +15,10 @@ public interface ErrorCodeConstants {
     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, "参数为空");
+    ErrorCode DEPARTMENT_INSTANCE_RELATIVITY_NOT_EXISTS = new ErrorCode(1_027_000_511, "部门与实例关联不存在");
+    ErrorCode ILLEGAL_OPERATION_TYPE = new ErrorCode(1_027_000_511, "非法操作类型");
+    ErrorCode OPERATION_FAIL= new ErrorCode(1_027_000_512, "操作失败");
 
+    //Illegal operation type
 }
 

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

@@ -108,4 +108,5 @@ public class TemplateInstanceDataController implements BusinessControllerMarker
                         BeanUtils.toBean(list, TemplateInstanceDataRespVO.class));
     }
 
+
 }

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

@@ -143,4 +143,29 @@ public class TmplTpController extends AbstractFileUploadController implements Bu
         return success(true);
     }
 
+    //表单预览
+//    @GetMapping("/preview")
+//    @Operation(summary = "表单预览",description = "传入模版分类的id")
+//    @PreAuthorize("@ss.hasPermission('bse:tmpl-tp:query')")
+//    public CommonResult< List<TmplFldRespVO>> preview(@Valid @RequestParam("id") Long id) {
+//        List<TmplFldRespVO> field = tmplTpService.getField(id);
+//        return success(field);
+//    }
+
+    // 字段编辑新增或者删除
+    @PostMapping("/field-edit")
+    @Operation(summary = "字段编辑新增或者删除")
+    @PreAuthorize("@ss.hasPermission('bse:tmpl-tp:update')")
+    public CommonResult<Boolean> fieldEdit(@Valid @RequestBody TmplTpEditOrDeleteReqVO reqVO) {
+        tmplTpService.fieldEdit(reqVO);
+        return success(true);
+    }
+
+    @PostMapping("/ltm-edit")
+    @Operation(summary = "条款编辑新增或者删除")
+    @PreAuthorize("@ss.hasPermission('bse:tmpl-tp:update')")
+    public CommonResult<Boolean> ltmEdit(@Valid @RequestBody TmplTpEditOrDeleteReqVO reqVO) {
+        tmplTpService.ltmEdit(reqVO);
+        return success(true);
+    }
 }

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

@@ -0,0 +1,27 @@
+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 DepartmentInstanceRelativityPageReqVO extends PageParam {
+
+    @Schema(description = "部门主键", example = "2450")
+    private String companyDepartmentId;
+
+    @Schema(description = "模板实例主键", example = "17846")
+    private String templateInstanceId;
+
+    @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/DepartmentInstanceRelativityRespVO.java

@@ -0,0 +1,31 @@
+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 DepartmentInstanceRelativityRespVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "4864")
+    @ExcelProperty("主键")
+    private String id;
+
+    @Schema(description = "部门主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "2450")
+    @ExcelProperty("部门主键")
+    private String companyDepartmentId;
+
+    @Schema(description = "模板实例主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "17846")
+    @ExcelProperty("模板实例主键")
+    private String templateInstanceId;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDate createTime;
+
+}

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

@@ -0,0 +1,23 @@
+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 DepartmentInstanceRelativitySaveReqVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "4864")
+    private String id;
+
+    @Schema(description = "部门主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "2450")
+    @NotEmpty(message = "部门主键不能为空")
+    private String companyDepartmentId;
+
+    @Schema(description = "模板实例主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "17846")
+    @NotEmpty(message = "模板实例主键不能为空")
+    private String templateInstanceId;
+
+}

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

@@ -14,13 +14,13 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 public class TemplateInstanceDataPageReqVO extends PageParam {
 
     @Schema(description = "关联实例主键", example = "25824")
-    private String instanceId;
+    private String inscId;
 
     @Schema(description = "字段标识;关联字段库")
-    private String fieldKey;
+    private String fldKy;
 
     @Schema(description = "用户填写的值")
-    private String fieldValue;
+    private String fldVal;
 
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)

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

@@ -18,15 +18,15 @@ public class TemplateInstanceDataRespVO {
 
     @Schema(description = "关联实例主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "25824")
     @ExcelProperty("关联实例主键")
-    private String instanceId;
+    private String inscId;
 
     @Schema(description = "字段标识;关联字段库", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("字段标识;关联字段库")
-    private String fieldKey;
+    private String fldKy;
 
     @Schema(description = "用户填写的值", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("用户填写的值")
-    private String fieldValue;
+    private String fldVal;
 
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")

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

@@ -14,14 +14,14 @@ public class TemplateInstanceDataSaveReqVO {
 
     @Schema(description = "关联实例主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "25824")
     @NotEmpty(message = "关联实例主键不能为空")
-    private String instanceId;
+    private String inscId;
 
     @Schema(description = "字段标识;关联字段库", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotEmpty(message = "字段标识;关联字段库不能为空")
-    private String fieldKey;
+    private String fldKy;
 
     @Schema(description = "用户填写的值", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotEmpty(message = "用户填写的值不能为空")
-    private String fieldValue;
+    private String fldVal;
 
 }