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

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

@@ -10,7 +10,7 @@ public interface ErrorCodeConstants {
     ErrorCode TMPL_FLD_NOT_EXISTS = new ErrorCode(1_027_000_501, "模板字段不存在");
     ErrorCode TMPL_FLD_CODE_EXISTS = new ErrorCode(1_027_000_502, "字段编码已存在");
     ErrorCode TMPL_ITM_NOT_EXISTS = new ErrorCode(1_027_000_503, "模板条款不存在");
-    ErrorCode TMPL_ITM_NAME_EXISTS = new ErrorCode(1_027_000_503, "模板条款名字已存在");
+    ErrorCode TMPL_ITM_NAME_CODE_EXISTS = new ErrorCode(1_027_000_503, "模板条款名称或编码已存在");
     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, "模版分类删除失败");

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

@@ -124,8 +124,8 @@ public class TmplTpController extends AbstractFileUploadController implements Bu
     //获取分类树
     @GetMapping("/tree")
     @Operation(summary = "获得分类树--上级")
-    public CommonResult<List<TmplTpTreeVO>> getTree() {
+    public CommonResult<List<TmplTpTreeVO>> getTree(@RequestParam(value = "num",required = false) String num,@RequestParam(value = "name",required = false) String name) {
-        List<TmplTpTreeVO> tree = tmplTpService.buildTree();
+        List<TmplTpTreeVO> tree = tmplTpService.buildTree(num,name);
         return success(tree);
     }
 

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

@@ -80,4 +80,8 @@ public class TemplateInstanceRespVO {
     @ExcelProperty("创建人")
     private String creator;
 
+    @Schema(description = "创建人名", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建人名")
+    private String creatorName;
+
 }

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

@@ -42,5 +42,10 @@ public class TmplFldRespVO {
 
     @Schema(description = "字段状态", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("字段状态")
-    private String sts;
+    private Integer sts;
+
+    @Schema(description = "创建人名", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建人名")
+    private String  creatorName;
+
 }

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

@@ -47,6 +47,11 @@ public class TmplItmRespVO {
 
     @Schema(description = "字段状态", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("字段状态")
-    private String sts;
+    private Integer sts;
+
+
+    @Schema(description = "创建人名", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建人名")
+    private String  creatorName;
 
 }

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

@@ -25,5 +25,5 @@ public class TmplItmSaveReqVO {
     private String itmVal;
 
     @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "启用 or 禁用")
-    private String sts;
+    private Integer sts;
 }

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

@@ -22,7 +22,7 @@ public class TmplTpFldSaveReqVO {
     @Schema(description = "是否必填", requiredMode = Schema.RequiredMode.REQUIRED, example = "Y or N")
     private String isMust;
 
-    @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "启用 or 禁用")
+    @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "启用 or 禁用(0或1)")
-    private String sts;
+    private Integer sts;
 
 }

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

@@ -30,6 +30,6 @@ public class TmplItmDO extends BusinessBaseDO {
     private String itmVal;
 
     @TableField("STS")
-    private String sts;
+    private Integer sts;
 
 }

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

@@ -75,5 +75,5 @@ public class TmplTpFldDO extends BusinessBaseDO { // 继承业务基类，自动
     private String orgnTp;
 
     @TableField("STS")
-    private String sts;
+    private Integer sts;
 }

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

@@ -13,7 +13,7 @@ public interface TmplItmMapper extends BaseMapperX<TmplItmDO> {
         return selectPage(reqVO, new LambdaQueryWrapperX<TmplItmDO>()
                 .eqIfPresent(TmplItmDO::getItmVal, reqVO.getItmVal())
                 .likeIfPresent(TmplItmDO::getItmName, reqVO.getItmName())
-                .eqIfPresent(TmplItmDO::getItmNum, reqVO.getItmNum())
+                .likeIfPresent(TmplItmDO::getItmNum, reqVO.getItmNum())
                 .eqIfPresent(TmplItmDO::getRmk, reqVO.getRmk())
                 .betweenIfPresent(TmplItmDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(TmplItmDO::getId));