完善

platform-dao/src/main/java/com/platform/dao/dto/customize/CustomFieldTemplateDTO.java

@@ -0,0 +1,90 @@
+package com.platform.dao.dto.customize;
+
+import com.platform.common.bean.BaseDTO;
+import com.platform.common.validation.group.UpdateGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import javax.validation.constraints.*;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.time.LocalDate;
+
+/**
+ * @Description 自定义报表DTO
+ * @Author xc
+ * @Date 2022-04-25 16:02:28
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class CustomFieldTemplateDTO extends BaseDTO implements Serializable {
+
+      /**
+     * 模板id
+     */
+        @NotNull(groups = {UpdateGroup.class}, message = "ID不能为空")
+    private String id;
+          /**
+     * 模板内容
+     */
+          private String content;
+          /**
+     * 类型
+     */
+          private Integer type;
+          /**
+     * 备注
+     */
+          private String remark;
+          /**
+     * 创建日期
+     */
+        private LocalDateTime createdTime;
+      /**
+       * 创建日期开始
+       */
+      private LocalDateTime createdTimeStart;
+      /**
+       * 创建日期结束
+       */
+      private LocalDateTime createdTimeEnd;
+          /**
+     * 更新日期
+     */
+        private LocalDateTime updateTime;
+      /**
+       * 更新日期开始
+       */
+      private LocalDateTime updateTimeStart;
+      /**
+       * 更新日期结束
+       */
+      private LocalDateTime updateTimeEnd;
+          /**
+     * 创建人
+     */
+          private String createdUserId;
+          /**
+     * 创建人名称
+     */
+          private String createdUserName;
+          /**
+     * 更新人
+     */
+          private String updateUserId;
+          /**
+     * 更新人名称
+     */
+          private String updateUserName;
+          /**
+     * 二级类别
+     */
+          private String secondTypeId;
+        /**
+     * 关键字
+     */
+  private String keyword;
+
+}

platform-dao/src/main/java/com/platform/dao/dto/customize/CustomFieldTemplateDataDTO.java

@@ -0,0 +1,90 @@
+package com.platform.dao.dto.customize;
+
+import com.platform.common.bean.BaseDTO;
+import com.platform.common.validation.group.UpdateGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import javax.validation.constraints.*;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.time.LocalDate;
+
+/**
+ * @Description 自定义报表DTO
+ * @Author xc
+ * @Date 2022-04-25 16:02:39
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class CustomFieldTemplateDataDTO extends BaseDTO implements Serializable {
+
+      /**
+     * id
+     */
+        @NotNull(groups = {UpdateGroup.class}, message = "ID不能为空")
+    private String id;
+          /**
+     * 类型
+     */
+          private Integer type;
+          /**
+     * 所属对象id
+     */
+          private String objId;
+          /**
+     * 模板数据
+     */
+          private String data;
+          /**
+     * 备注
+     */
+          private String remark;
+          /**
+     * 创建日期
+     */
+        private LocalDateTime createdTime;
+      /**
+       * 创建日期开始
+       */
+      private LocalDateTime createdTimeStart;
+      /**
+       * 创建日期结束
+       */
+      private LocalDateTime createdTimeEnd;
+          /**
+     * 更新日期
+     */
+        private LocalDateTime updateTime;
+      /**
+       * 更新日期开始
+       */
+      private LocalDateTime updateTimeStart;
+      /**
+       * 更新日期结束
+       */
+      private LocalDateTime updateTimeEnd;
+          /**
+     * 创建人
+     */
+          private String createdUserId;
+          /**
+     * 创建人名称
+     */
+          private String createdUserName;
+          /**
+     * 更新人
+     */
+          private String updateUserId;
+          /**
+     * 更新人名称
+     */
+          private String updateUserName;
+        /**
+     * 关键字
+     */
+  private String keyword;
+
+}

platform-dao/src/main/java/com/platform/dao/entity/customize/CustomFieldTemplate.java

@@ -0,0 +1,77 @@
+package com.platform.dao.entity.customize;
+
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.time.LocalDate;
+import lombok.experimental.Accessors;
+import com.platform.common.bean.DataScope;
+import javax.persistence.Transient;
+
+/**
+ * @Description 自定义报表实体类
+ * @Author xc
+ * @Date 2022-04-25 16:02:28
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Data
+@Accessors(chain = true)
+@Table(name = "t_custom_field_template")
+public class CustomFieldTemplate implements Serializable{
+
+    /**
+     * 模板id
+     */
+        @Id
+    private String id;
+    /**
+     * 模板内容
+     */
+    private String content;
+    /**
+     * 类型
+     */
+    private Integer type;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 创建日期
+     */
+    private LocalDateTime createdTime;
+    /**
+     * 更新日期
+     */
+    private LocalDateTime updateTime;
+    /**
+     * 创建人
+     */
+    private String createdUserId;
+    /**
+     * 创建人名称
+     */
+    private String createdUserName;
+    /**
+     * 更新人
+     */
+    private String updateUserId;
+    /**
+     * 更新人名称
+     */
+    private String updateUserName;
+    /**
+     * 二级类别
+     */
+    private String secondTypeId;
+
+   /**
+    * 数据权限
+    */
+    @Transient
+    private DataScope dataScope;
+
+}

platform-dao/src/main/java/com/platform/dao/entity/customize/CustomFieldTemplateData.java

@@ -0,0 +1,77 @@
+package com.platform.dao.entity.customize;
+
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.time.LocalDate;
+import lombok.experimental.Accessors;
+import com.platform.common.bean.DataScope;
+import javax.persistence.Transient;
+
+/**
+ * @Description 自定义报表实体类
+ * @Author xc
+ * @Date 2022-04-25 16:02:39
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Data
+@Accessors(chain = true)
+@Table(name = "t_custom_field_template_data")
+public class CustomFieldTemplateData implements Serializable{
+
+    /**
+     * id
+     */
+        @Id
+    private String id;
+    /**
+     * 类型
+     */
+    private Integer type;
+    /**
+     * 所属对象id
+     */
+    private String objId;
+    /**
+     * 模板数据
+     */
+    private String data;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 创建日期
+     */
+    private LocalDateTime createdTime;
+    /**
+     * 更新日期
+     */
+    private LocalDateTime updateTime;
+    /**
+     * 创建人
+     */
+    private String createdUserId;
+    /**
+     * 创建人名称
+     */
+    private String createdUserName;
+    /**
+     * 更新人
+     */
+    private String updateUserId;
+    /**
+     * 更新人名称
+     */
+    private String updateUserName;
+
+   /**
+    * 数据权限
+    */
+    @Transient
+    private DataScope dataScope;
+
+}

platform-dao/src/main/java/com/platform/dao/mapper/customize/CustomFieldTemplateDataMapper.java

@@ -0,0 +1,26 @@
+package com.platform.dao.mapper.customize;
+
+import com.platform.dao.dto.customize.CustomFieldTemplateDataDTO;
+import com.platform.dao.config.MyMapper;
+import com.platform.dao.entity.customize.CustomFieldTemplateData;
+import com.platform.dao.vo.query.customize.CustomFieldTemplateDataVO;
+import org.springframework.stereotype.Component;
+import java.util.List;
+
+
+/**
+ * @Description 自定义报表 mapper
+ * @Author xc
+ * @Date 2022-04-25 16:02:39
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Component
+public interface CustomFieldTemplateDataMapper extends MyMapper<CustomFieldTemplateData> {
+    /**
+     * 分页查询
+     * @param dto
+     * @return
+     */
+    List<CustomFieldTemplateDataVO> selectList(CustomFieldTemplateDataDTO dto);
+
+}

platform-dao/src/main/java/com/platform/dao/mapper/customize/CustomFieldTemplateMapper.java

@@ -0,0 +1,26 @@
+package com.platform.dao.mapper.customize;
+
+import com.platform.dao.dto.customize.CustomFieldTemplateDTO;
+import com.platform.dao.config.MyMapper;
+import com.platform.dao.entity.customize.CustomFieldTemplate;
+import com.platform.dao.vo.query.customize.CustomFieldTemplateVO;
+import org.springframework.stereotype.Component;
+import java.util.List;
+
+
+/**
+ * @Description 自定义报表 mapper
+ * @Author xc
+ * @Date 2022-04-25 16:02:28
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Component
+public interface CustomFieldTemplateMapper extends MyMapper<CustomFieldTemplate> {
+    /**
+     * 分页查询
+     * @param dto
+     * @return
+     */
+    List<CustomFieldTemplateVO> selectList(CustomFieldTemplateDTO dto);
+
+}

platform-dao/src/main/java/com/platform/dao/vo/export/customize/ExportCustomFieldTemplateDataVO.java

@@ -0,0 +1,87 @@
+package com.platform.dao.vo.export.customize;
+
+import com.platform.office.annotation.Excel;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.time.LocalDate;
+
+/**
+ * @Description 自定义报表导出VO
+ * @Author xc
+ * @Date 2022-04-25 16:02:39
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Data
+@Accessors(chain = true)
+public class ExportCustomFieldTemplateDataVO implements Serializable {
+
+    /**
+   * id
+   */
+          @Excel(name = "id", orderNum = "1")
+      private String id;
+    
+    /**
+   * 类型
+   */
+          @Excel(name = "类型", orderNum = "2")
+      private Integer type;
+    
+    /**
+   * 所属对象id
+   */
+          @Excel(name = "所属对象id", orderNum = "3")
+      private String objId;
+    
+    /**
+   * 模板数据
+   */
+          @Excel(name = "模板数据", orderNum = "4")
+      private String data;
+    
+    /**
+   * 备注
+   */
+          @Excel(name = "备注", orderNum = "5")
+      private String remark;
+    
+    /**
+   * 创建日期
+   */
+          @Excel(name = "创建日期", orderNum = "6")
+      private LocalDateTime createdTime;
+    
+    /**
+   * 更新日期
+   */
+          @Excel(name = "更新日期", orderNum = "7")
+      private LocalDateTime updateTime;
+    
+    /**
+   * 创建人
+   */
+          @Excel(name = "创建人", orderNum = "8")
+      private String createdUserId;
+    
+    /**
+   * 创建人名称
+   */
+          @Excel(name = "创建人名称", orderNum = "9")
+      private String createdUserName;
+    
+    /**
+   * 更新人
+   */
+          @Excel(name = "更新人", orderNum = "10")
+      private String updateUserId;
+    
+    /**
+   * 更新人名称
+   */
+          @Excel(name = "更新人名称", orderNum = "11")
+      private String updateUserName;
+    
+  
+}

platform-dao/src/main/java/com/platform/dao/vo/export/customize/ExportCustomFieldTemplateVO.java

@@ -0,0 +1,87 @@
+package com.platform.dao.vo.export.customize;
+
+import com.platform.office.annotation.Excel;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.time.LocalDate;
+
+/**
+ * @Description 自定义报表导出VO
+ * @Author xc
+ * @Date 2022-04-25 16:02:28
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Data
+@Accessors(chain = true)
+public class ExportCustomFieldTemplateVO implements Serializable {
+
+    /**
+   * 模板id
+   */
+          @Excel(name = "模板id", orderNum = "1")
+      private String id;
+    
+    /**
+   * 模板内容
+   */
+          @Excel(name = "模板内容", orderNum = "2")
+      private String content;
+    
+    /**
+   * 类型
+   */
+          @Excel(name = "类型", orderNum = "3")
+      private Integer type;
+    
+    /**
+   * 备注
+   */
+          @Excel(name = "备注", orderNum = "4")
+      private String remark;
+    
+    /**
+   * 创建日期
+   */
+          @Excel(name = "创建日期", orderNum = "5")
+      private LocalDateTime createdTime;
+    
+    /**
+   * 更新日期
+   */
+          @Excel(name = "更新日期", orderNum = "6")
+      private LocalDateTime updateTime;
+    
+    /**
+   * 创建人
+   */
+          @Excel(name = "创建人", orderNum = "7")
+      private String createdUserId;
+    
+    /**
+   * 创建人名称
+   */
+          @Excel(name = "创建人名称", orderNum = "8")
+      private String createdUserName;
+    
+    /**
+   * 更新人
+   */
+          @Excel(name = "更新人", orderNum = "9")
+      private String updateUserId;
+    
+    /**
+   * 更新人名称
+   */
+          @Excel(name = "更新人名称", orderNum = "10")
+      private String updateUserName;
+    
+    /**
+   * 二级类别
+   */
+          @Excel(name = "二级类别", orderNum = "11")
+      private String secondTypeId;
+    
+  
+}

platform-dao/src/main/java/com/platform/dao/vo/query/customize/CustomFieldTemplateDataVO.java

@@ -0,0 +1,72 @@
+package com.platform.dao.vo.query.customize;
+
+import lombok.Data;
+import com.platform.common.bean.BaseVO;
+import com.platform.common.bean.BaseDTO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import javax.validation.constraints.*;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.time.LocalDate;
+
+/**
+ * @Description 自定义报表VO结果类
+ * @Author xc
+ * @Date 2022-04-25 16:02:39
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class CustomFieldTemplateDataVO extends BaseVO implements Serializable{
+
+    /**
+     * id
+     */
+        private String id;
+        /**
+     * 类型
+     */
+        private Integer type;
+        /**
+     * 所属对象id
+     */
+        private String objId;
+        /**
+     * 模板数据
+     */
+        private String data;
+        /**
+     * 备注
+     */
+        private String remark;
+        /**
+     * 创建日期
+     */
+        private LocalDateTime createdTime;
+        /**
+     * 更新日期
+     */
+        private LocalDateTime updateTime;
+        /**
+     * 创建人
+     */
+        private String createdUserId;
+        /**
+     * 创建人名称
+     */
+        private String createdUserName;
+        /**
+     * 更新人
+     */
+        private String updateUserId;
+        /**
+     * 更新人名称
+     */
+        private String updateUserName;
+    
+
+
+}

platform-dao/src/main/java/com/platform/dao/vo/query/customize/CustomFieldTemplateVO.java

@@ -0,0 +1,72 @@
+package com.platform.dao.vo.query.customize;
+
+import lombok.Data;
+import com.platform.common.bean.BaseVO;
+import com.platform.common.bean.BaseDTO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import javax.validation.constraints.*;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.time.LocalDate;
+
+/**
+ * @Description 自定义报表VO结果类
+ * @Author xc
+ * @Date 2022-04-25 16:02:28
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class CustomFieldTemplateVO extends BaseVO implements Serializable{
+
+    /**
+     * 模板id
+     */
+        private String id;
+        /**
+     * 模板内容
+     */
+        private String content;
+        /**
+     * 类型
+     */
+        private Integer type;
+        /**
+     * 备注
+     */
+        private String remark;
+        /**
+     * 创建日期
+     */
+        private LocalDateTime createdTime;
+        /**
+     * 更新日期
+     */
+        private LocalDateTime updateTime;
+        /**
+     * 创建人
+     */
+        private String createdUserId;
+        /**
+     * 创建人名称
+     */
+        private String createdUserName;
+        /**
+     * 更新人
+     */
+        private String updateUserId;
+        /**
+     * 更新人名称
+     */
+        private String updateUserName;
+        /**
+     * 二级类别
+     */
+        private String secondTypeId;
+    
+
+
+}

platform-dao/src/main/resources/mapper/customize/CustomFieldTemplateDataMapper.xml

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.platform.dao.mapper.customize.CustomFieldTemplateDataMapper">
+    <sql id="Base_Column_List">
+                             fieldTemplateData.id,
+                                     fieldTemplateData.type,
+                                     fieldTemplateData.obj_id,
+                                     fieldTemplateData.data,
+                                     fieldTemplateData.remark,
+                                     fieldTemplateData.created_time,
+                                     fieldTemplateData.update_time,
+                                     fieldTemplateData.created_user_id,
+                                     fieldTemplateData.created_user_name,
+                                     fieldTemplateData.update_user_id,
+                                     fieldTemplateData.update_user_name
+                        </sql>
+    <sql id="Ref_Column_List">
+                                                                         fieldTemplateData.type,
+                                     fieldTemplateData.obj_id,
+                                     fieldTemplateData.data,
+                                     fieldTemplateData.remark,
+                                                                                                                                                                                                                                                                                                </sql>
+    <sql id="List_Condition">
+                                    <if test="id != null and id != ''">
+                    and fieldTemplateData.id = #{id}
+                </if>
+                                                <if test="type != null">
+                    and fieldTemplateData.type = #{type}
+                </if>
+                                                <if test="objId != null and objId != ''">
+                    and fieldTemplateData.obj_id = #{objId}
+                </if>
+                                                <if test="data != null and data != ''">
+                    and fieldTemplateData.data = #{data}
+                </if>
+                                                <if test="remark != null and remark != ''">
+                    and fieldTemplateData.remark = #{remark}
+                </if>
+                                                <if test="createdTimeStart != null">
+                    and fieldTemplateData.created_time <![CDATA[>=]]>; #{createdTimeStart}
+                </if>
+                <if test="createdTimeEnd != null">
+                    and fieldTemplateData.created_time <![CDATA[<=]]> #{createdTimeEnd}
+                </if>
+                <if test="createdTime != null">
+                    and fieldTemplateData.created_time = #{createdTime}
+                </if>
+                                                <if test="updateTimeStart != null">
+                    and fieldTemplateData.update_time <![CDATA[>=]]>; #{updateTimeStart}
+                </if>
+                <if test="updateTimeEnd != null">
+                    and fieldTemplateData.update_time <![CDATA[<=]]> #{updateTimeEnd}
+                </if>
+                <if test="updateTime != null">
+                    and fieldTemplateData.update_time = #{updateTime}
+                </if>
+                                                <if test="createdUserId != null and createdUserId != ''">
+                    and fieldTemplateData.created_user_id = #{createdUserId}
+                </if>
+                                                <if test="createdUserName != null and createdUserName != ''">
+                    and fieldTemplateData.created_user_name = #{createdUserName}
+                </if>
+                                                <if test="updateUserId != null and updateUserId != ''">
+                    and fieldTemplateData.update_user_id = #{updateUserId}
+                </if>
+                                                <if test="updateUserName != null and updateUserName != ''">
+                    and fieldTemplateData.update_user_name = #{updateUserName}
+                </if>
+                            <if test="keyword != null and keyword != ''">
+            and fieldTemplateData.id like concat(concat('%',#{keyword}),'%')
+        </if>
+    </sql>
+    <select id="selectList" parameterType="com.platform.dao.dto.customize.CustomFieldTemplateDataDTO" resultType="com.platform.dao.vo.query.customize.CustomFieldTemplateDataVO">
+        select fieldTemplateData.*
+                                                                                                                                                                                                                                            from t_custom_field_template_data as fieldTemplateData
+                                                                                                                                                                                                                                            <where>
+            <include refid="List_Condition" />
+        </where>
+    </select>
+</mapper>

platform-dao/src/main/resources/mapper/customize/CustomFieldTemplateMapper.xml

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.platform.dao.mapper.customize.CustomFieldTemplateMapper">
+    <sql id="Base_Column_List">
+                             fieldTemplate.id,
+                                     fieldTemplate.content,
+                                     fieldTemplate.type,
+                                     fieldTemplate.remark,
+                                     fieldTemplate.created_time,
+                                     fieldTemplate.update_time,
+                                     fieldTemplate.created_user_id,
+                                     fieldTemplate.created_user_name,
+                                     fieldTemplate.update_user_id,
+                                     fieldTemplate.update_user_name,
+                                     fieldTemplate.second_type_id
+                        </sql>
+    <sql id="Ref_Column_List">
+                                                                         fieldTemplate.content,
+                                     fieldTemplate.type,
+                                     fieldTemplate.remark,
+                                                                                                                                                                                                                                                                                                             fieldTemplate.second_type_id
+                                </sql>
+    <sql id="List_Condition">
+                                    <if test="id != null and id != ''">
+                    and fieldTemplate.id = #{id}
+                </if>
+                                                <if test="content != null and content != ''">
+                    and fieldTemplate.content = #{content}
+                </if>
+                                                <if test="type != null">
+                    and fieldTemplate.type = #{type}
+                </if>
+                                                <if test="remark != null and remark != ''">
+                    and fieldTemplate.remark = #{remark}
+                </if>
+                                                <if test="createdTimeStart != null">
+                    and fieldTemplate.created_time <![CDATA[>=]]>; #{createdTimeStart}
+                </if>
+                <if test="createdTimeEnd != null">
+                    and fieldTemplate.created_time <![CDATA[<=]]> #{createdTimeEnd}
+                </if>
+                <if test="createdTime != null">
+                    and fieldTemplate.created_time = #{createdTime}
+                </if>
+                                                <if test="updateTimeStart != null">
+                    and fieldTemplate.update_time <![CDATA[>=]]>; #{updateTimeStart}
+                </if>
+                <if test="updateTimeEnd != null">
+                    and fieldTemplate.update_time <![CDATA[<=]]> #{updateTimeEnd}
+                </if>
+                <if test="updateTime != null">
+                    and fieldTemplate.update_time = #{updateTime}
+                </if>
+                                                <if test="createdUserId != null and createdUserId != ''">
+                    and fieldTemplate.created_user_id = #{createdUserId}
+                </if>
+                                                <if test="createdUserName != null and createdUserName != ''">
+                    and fieldTemplate.created_user_name = #{createdUserName}
+                </if>
+                                                <if test="updateUserId != null and updateUserId != ''">
+                    and fieldTemplate.update_user_id = #{updateUserId}
+                </if>
+                                                <if test="updateUserName != null and updateUserName != ''">
+                    and fieldTemplate.update_user_name = #{updateUserName}
+                </if>
+                                                <if test="secondTypeId != null and secondTypeId != ''">
+                    and fieldTemplate.second_type_id = #{secondTypeId}
+                </if>
+                            <if test="keyword != null and keyword != ''">
+            and fieldTemplate.id like concat(concat('%',#{keyword}),'%')
+        </if>
+    </sql>
+    <select id="selectList" parameterType="com.platform.dao.dto.customize.CustomFieldTemplateDTO" resultType="com.platform.dao.vo.query.customize.CustomFieldTemplateVO">
+        select fieldTemplate.*
+                                                                                                                                                                                                                                            from t_custom_field_template as fieldTemplate
+                                                                                                                                                                                                                                            <where>
+            <include refid="List_Condition" />
+        </where>
+    </select>
+</mapper>

platform-rest/src/main/java/com/platform/rest/controller/customize/CustomFieldTemplateController.java

@@ -0,0 +1,180 @@
+package com.platform.rest.controller.customize;
+
+import com.platform.common.util.R;
+import com.platform.dao.dto.customize.CustomFieldTemplateDTO;
+import com.platform.dao.entity.customize.CustomFieldTemplate;
+import com.platform.service.customize.CustomFieldTemplateService;
+import com.platform.dao.util.ExcelUtil;
+import com.platform.dao.vo.export.customize.ExportCustomFieldTemplateVO;
+import com.platform.dao.vo.query.customize.CustomFieldTemplateVO;
+import com.platform.common.util.BeanConverterUtil;
+import com.platform.common.validation.group.AddGroup;
+import com.platform.common.validation.group.UpdateGroup;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import lombok.AllArgsConstructor;
+import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.rest.log.annotation.SysLog;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @Description 自定义报表 控制器
+ * @Author xc
+ * @Date 2022-04-25 16:02:28
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/customize/fieldTemplate")
+public class CustomFieldTemplateController {
+
+  private final  CustomFieldTemplateService customFieldTemplateService;
+
+  /**
+   * 通过id查询单条记录
+   *
+   * content
+   * [
+   *        {
+   * 		"label": "货品名称",
+   * 		"fieldName": "productName",
+   * 		"type": "input",// select picker
+   * 		"required": true,
+   * 		"sort": 1,// 排序
+   * 		"rows": 3,
+   * 		"minLength": 5,
+   * 		"maxLength": 20,
+   * 		"defaultValue": "apple Mac",
+   * 		"readOnly": false,
+   * 		"options": [
+   *            {
+   * 				"value": "1",
+   * 				"name": "看书"
+   *            },
+   *            {
+   * 				"value": "2",
+   * 				"name": "羽毛球"
+   *            }
+   * 		]
+   *    }
+   * ]
+   *
+   * @param id 主键
+   * @return R
+   */
+  @GetMapping("/{id}")
+  public R<CustomFieldTemplate> getById(@PathVariable("id") String id){
+      return new R<>(customFieldTemplateService.getModelById(id));
+  }
+
+  /**
+   * 新增记录
+   *
+   * @param customFieldTemplateDTO 自定义报表DTO
+   * @return R
+   */
+  @SysLog("新增自定义报表")
+  @PostMapping
+  @PreAuthorize("@pms.hasPermission('customize-fieldTemplate-add')")
+  public R save(@Validated({AddGroup.class}) @RequestBody CustomFieldTemplateDTO customFieldTemplateDTO) {
+      return new R<>(customFieldTemplateService.saveModelByDTO(customFieldTemplateDTO));
+  }
+
+  /**
+   * 修改记录
+   *
+   * @param customFieldTemplateDTO 自定义报表DTO
+   * @return R
+   */
+  @SysLog("修改自定义报表")
+  @PutMapping("/{id}")
+  @PreAuthorize("@pms.hasPermission('customize-fieldTemplate-edit')")
+  public R update(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody CustomFieldTemplateDTO customFieldTemplateDTO) {
+      customFieldTemplateService.modModelByDTO(customFieldTemplateDTO);
+      return new R<>();
+  }
+
+
+                        /**
+       * 根据主键 修改select类型值
+       * @param id
+       * @param type
+       * @return R
+       */
+      @SysLog("修改自定义报表")
+      @PutMapping("/type/{id}/{type}")
+      @PreAuthorize("@pms.hasPermission('customize-fieldTemplate-edit')")
+      public R updateTypeById(@PathVariable("id") String id,Integer type) {
+          customFieldTemplateService.updateTypeById(id,type);
+        return new R<>();
+      }
+                                                      
+  /**
+   * 通过id删除一条记录
+   *
+   * @param id 主键
+   * @return R
+   */
+  @SysLog("删除自定义报表")
+  @DeleteMapping("/{id}")
+  @PreAuthorize("@pms.hasPermission('customize-fieldTemplate-del')")
+  public R removeById(@PathVariable String id){
+    customFieldTemplateService.deleteByPrimaryKey(id);
+    return new R<>();
+  }
+
+    /**
+     * 批量记录
+     *
+     * @param ids 主键
+     * @return R
+     */
+    @SysLog("批量删除自定义报表")
+    @DeleteMapping("")
+    @PreAuthorize("@pms.hasPermission('customize-fieldTemplate-del')")
+    public R removeIds(@RequestBody List<String> ids){
+        customFieldTemplateService.batchDelete(ids);
+        return new R<>();
+    }
+
+  /**
+   * 获取分页
+   *
+   * @param pageNum 当前页码
+   * @param pageSize 每页条数
+   * @param customFieldTemplateDTO 自定义报表DTO
+   * @return R
+   */
+  @GetMapping("/page")
+  public R<AbstractPageResultBean<CustomFieldTemplateVO>> query(CustomFieldTemplateDTO customFieldTemplateDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
+      return new R<>(customFieldTemplateService.selectPageList(customFieldTemplateDTO, pageNum, pageSize));
+  }
+
+  /**
+   * 获取列表
+   *
+   * @param customFieldTemplateDTO 自定义报表DTO
+   * @return R
+   */
+  @GetMapping("")
+  public R query(CustomFieldTemplateDTO customFieldTemplateDTO) {
+      return new R<>(customFieldTemplateService.getModelListByDTO(customFieldTemplateDTO));
+  }
+
+  /**
+     * 自定义报表导出
+     *
+     * @param customFieldTemplateDTO 自定义报表DTO
+     * @return R
+     */
+  @GetMapping("/export")
+  @SysLog("自定义报表导出")
+  @PreAuthorize("@pms.hasPermission('customize-fieldTemplate-export')")
+  public void export(HttpServletResponse response, CustomFieldTemplateDTO customFieldTemplateDTO) {
+    List<CustomFieldTemplate> list = customFieldTemplateService.getModelListByDTO(customFieldTemplateDTO);
+    ExcelUtil.exportResponseDict(response, ExportCustomFieldTemplateVO.class, BeanConverterUtil.copyListProperties(list, ExportCustomFieldTemplateVO.class), "自定义报表");
+  }
+
+}

platform-rest/src/main/java/com/platform/rest/controller/customize/CustomFieldTemplateDataController.java

@@ -0,0 +1,154 @@
+package com.platform.rest.controller.customize;
+
+import com.platform.common.util.R;
+import com.platform.dao.dto.customize.CustomFieldTemplateDataDTO;
+import com.platform.dao.entity.customize.CustomFieldTemplateData;
+import com.platform.service.customize.CustomFieldTemplateDataService;
+import com.platform.dao.util.ExcelUtil;
+import com.platform.dao.vo.export.customize.ExportCustomFieldTemplateDataVO;
+import com.platform.dao.vo.query.customize.CustomFieldTemplateDataVO;
+import com.platform.common.util.BeanConverterUtil;
+import com.platform.common.validation.group.AddGroup;
+import com.platform.common.validation.group.UpdateGroup;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import lombok.AllArgsConstructor;
+import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.rest.log.annotation.SysLog;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @Description 自定义报表 控制器
+ * @Author xc
+ * @Date 2022-04-25 16:02:39
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/customize/fieldTemplateData")
+public class CustomFieldTemplateDataController {
+
+  private final  CustomFieldTemplateDataService customFieldTemplateDataService;
+
+  /**
+   * 通过id查询单条记录
+   *
+   * @param id 主键
+   * @return R
+   */
+  @GetMapping("/{id}")
+  public R<CustomFieldTemplateData> getById(@PathVariable("id") String id){
+      return new R<>(customFieldTemplateDataService.getModelById(id));
+  }
+
+  /**
+   * 新增记录
+   *
+   * @param customFieldTemplateDataDTO 自定义报表DTO
+   * @return R
+   */
+  @SysLog("新增自定义报表")
+  @PostMapping
+  @PreAuthorize("@pms.hasPermission('customize-fieldTemplateData-add')")
+  public R save(@Validated({AddGroup.class}) @RequestBody CustomFieldTemplateDataDTO customFieldTemplateDataDTO) {
+      return new R<>(customFieldTemplateDataService.saveModelByDTO(customFieldTemplateDataDTO));
+  }
+
+  /**
+   * 修改记录
+   *
+   * @param customFieldTemplateDataDTO 自定义报表DTO
+   * @return R
+   */
+  @SysLog("修改自定义报表")
+  @PutMapping("/{id}")
+  @PreAuthorize("@pms.hasPermission('customize-fieldTemplateData-edit')")
+  public R update(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody CustomFieldTemplateDataDTO customFieldTemplateDataDTO) {
+      customFieldTemplateDataService.modModelByDTO(customFieldTemplateDataDTO);
+      return new R<>();
+  }
+
+
+                  /**
+       * 根据主键 修改select类型值
+       * @param id
+       * @param type
+       * @return R
+       */
+      @SysLog("修改自定义报表")
+      @PutMapping("/Type/{id}")
+      @PreAuthorize("@pms.hasPermission('customize-fieldTemplateData-edit')")
+      public R updateTypeById(@PathVariable("id") String id,Integer type) {
+          customFieldTemplateDataService.updateTypeById(id,type);
+        return new R<>();
+      }
+                                                            
+  /**
+   * 通过id删除一条记录
+   *
+   * @param id 主键
+   * @return R
+   */
+  @SysLog("删除自定义报表")
+  @DeleteMapping("/{id}")
+  @PreAuthorize("@pms.hasPermission('customize-fieldTemplateData-del')")
+  public R removeById(@PathVariable String id){
+    customFieldTemplateDataService.deleteByPrimaryKey(id);
+    return new R<>();
+  }
+
+    /**
+     * 批量记录
+     *
+     * @param ids 主键
+     * @return R
+     */
+    @SysLog("批量删除自定义报表")
+    @DeleteMapping("")
+    @PreAuthorize("@pms.hasPermission('customize-fieldTemplateData-del')")
+    public R removeIds(@RequestBody List<String> ids){
+        customFieldTemplateDataService.batchDelete(ids);
+        return new R<>();
+    }
+
+  /**
+   * 获取分页
+   *
+   * @param pageNum 当前页码
+   * @param pageSize 每页条数
+   * @param customFieldTemplateDataDTO 自定义报表DTO
+   * @return R
+   */
+  @GetMapping("/page")
+  public R<AbstractPageResultBean<CustomFieldTemplateDataVO>> query(CustomFieldTemplateDataDTO customFieldTemplateDataDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
+      return new R<>(customFieldTemplateDataService.selectPageList(customFieldTemplateDataDTO, pageNum, pageSize));
+  }
+
+  /**
+   * 获取列表
+   *
+   * @param customFieldTemplateDataDTO 自定义报表DTO
+   * @return R
+   */
+  @GetMapping("")
+  public R query(CustomFieldTemplateDataDTO customFieldTemplateDataDTO) {
+      return new R<>(customFieldTemplateDataService.getModelListByDTO(customFieldTemplateDataDTO));
+  }
+
+  /**
+     * 自定义报表导出
+     *
+     * @param customFieldTemplateDataDTO 自定义报表DTO
+     * @return R
+     */
+  @GetMapping("/export")
+  @SysLog("自定义报表导出")
+  @PreAuthorize("@pms.hasPermission('customize-fieldTemplateData-export')")
+  public void export(HttpServletResponse response, CustomFieldTemplateDataDTO customFieldTemplateDataDTO) {
+    List<CustomFieldTemplateData> list = customFieldTemplateDataService.getModelListByDTO(customFieldTemplateDataDTO);
+    ExcelUtil.exportResponseDict(response, ExportCustomFieldTemplateDataVO.class, BeanConverterUtil.copyListProperties(list, ExportCustomFieldTemplateDataVO.class), "自定义报表");
+  }
+
+}

platform-rest/src/main/java/com/platform/rest/controller/sb/SbInfoStopDetailController.java

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.*;
 import lombok.AllArgsConstructor;
 import com.platform.common.bean.AbstractPageResultBean;
 import com.platform.rest.log.annotation.SysLog;
+
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
@@ -30,87 +31,90 @@ import javax.servlet.http.HttpServletResponse;
 @RequestMapping("/sb/stop-details")
 public class SbInfoStopDetailController {
 
-  private final  SbInfoStopDetailService sbInfoStopDetailService;
-
-  /**
-   * 通过id查询单条记录
-   *
-   * @param id 主键
-   * @return R
-   */
-  @GetMapping("/{id}")
-  public R<SbInfoStopDetail> getById(@PathVariable("id") String id){
-      return new R<>(sbInfoStopDetailService.getModelById(id));
-  }
-
-  /**
-   * 新增记录
-   *
-   * @param sbInfoStopDetailDTO 设备停用记录表DTO
-   * @return R
-   */
-  @SysLog("新增设备停用记录表")
-  @PostMapping
-  @PreAuthorize("@pms.hasPermission('sb-stop-details-add')")
-  public R save(@Validated({AddGroup.class}) @RequestBody SbInfoStopDetailDTO sbInfoStopDetailDTO) {
-      return new R<>(sbInfoStopDetailService.saveModelByDTO(sbInfoStopDetailDTO));
-  }
-
-  /**
-   * 修改记录
-   *
-   * @param sbInfoStopDetailDTO 设备停用记录表DTO
-   * @return R
-   */
-  @SysLog("修改设备停用记录表")
-  @PutMapping("/{id}")
-  @PreAuthorize("@pms.hasPermission('sb-stop-details-edit')")
-  public R update(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody SbInfoStopDetailDTO sbInfoStopDetailDTO) {
-      sbInfoStopDetailService.modModelByDTO(sbInfoStopDetailDTO);
-      return new R<>();
-  }
-
-
-                                          /**
-       * 根据主键 修改select类型值
-       * @param id
-       * @param type
-       * @return R
-       */
-      @SysLog("修改设备停用记录表")
-      @PutMapping("/Type/{id}")
-      @PreAuthorize("@pms.hasPermission('sb-stop-details-edit')")
-      public R updateTypeById(@PathVariable("id") String id,Integer type) {
-          sbInfoStopDetailService.updateTypeById(id,type);
+    private final SbInfoStopDetailService sbInfoStopDetailService;
+
+    /**
+     * 通过id查询单条记录
+     *
+     * @param id 主键
+     * @return R
+     */
+    @GetMapping("/{id}")
+    public R<SbInfoStopDetail> getById(@PathVariable("id") String id) {
+        return new R<>(sbInfoStopDetailService.getModelById(id));
+    }
+
+    /**
+     * 新增记录
+     *
+     * @param sbInfoStopDetailDTO 设备停用记录表DTO
+     * @return R
+     */
+    @SysLog("新增设备停用记录表")
+    @PostMapping
+    @PreAuthorize("@pms.hasPermission('sb-stop-details-add')")
+    public R save(@Validated({AddGroup.class}) @RequestBody SbInfoStopDetailDTO sbInfoStopDetailDTO) {
+        return new R<>(sbInfoStopDetailService.saveModelByDTO(sbInfoStopDetailDTO));
+    }
+
+    /**
+     * 修改记录
+     *
+     * @param sbInfoStopDetailDTO 设备停用记录表DTO
+     * @return R
+     */
+    @SysLog("修改设备停用记录表")
+    @PutMapping("/{id}")
+    @PreAuthorize("@pms.hasPermission('sb-stop-details-edit')")
+    public R update(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody SbInfoStopDetailDTO sbInfoStopDetailDTO) {
+        sbInfoStopDetailService.modModelByDTO(sbInfoStopDetailDTO);
         return new R<>();
-      }
-                                        /**
-       * 根据主键 修改select类型值
-       * @param id
-       * @param status
-       * @return R
-       */
-      @SysLog("修改设备停用记录表")
-      @PutMapping("/Status/{id}")
-      @PreAuthorize("@pms.hasPermission('sb-stop-details-edit')")
-      public R updateStatusById(@PathVariable("id") String id,Integer status) {
-          sbInfoStopDetailService.updateStatusById(id,status);
+    }
+
+
+    /**
+     * 根据主键 修改select类型值
+     *
+     * @param id
+     * @param type
+     * @return R
+     */
+    @SysLog("修改设备停用记录表")
+    @PutMapping("/type/{id}")
+    @PreAuthorize("@pms.hasPermission('sb-stop-details-edit')")
+    public R updateTypeById(@PathVariable("id") String id, Integer type) {
+        sbInfoStopDetailService.updateTypeById(id, type);
         return new R<>();
-      }
-                                                
-  /**
-   * 通过id删除一条记录
-   *
-   * @param id 主键
-   * @return R
-   */
-  @SysLog("删除设备停用记录表")
-  @DeleteMapping("/{id}")
-  @PreAuthorize("@pms.hasPermission('sb-stop-details-del')")
-  public R removeById(@PathVariable String id){
-    sbInfoStopDetailService.deleteByPrimaryKey(id);
-    return new R<>();
-  }
+    }
+
+    /**
+     * 根据主键 修改select类型值
+     *
+     * @param id
+     * @param status
+     * @return R
+     */
+    @SysLog("修改设备停用记录表")
+    @PutMapping("/status/{id}")
+    @PreAuthorize("@pms.hasPermission('sb-stop-details-edit')")
+    public R updateStatusById(@PathVariable("id") String id, Integer status) {
+        sbInfoStopDetailService.updateStatusById(id, status);
+        return new R<>();
+    }
+
+    /**
+     * 通过id删除一条记录
+     *
+     * @param id 主键
+     * @return R
+     */
+    @SysLog("删除设备停用记录表")
+    @DeleteMapping("/{id}")
+    @PreAuthorize("@pms.hasPermission('sb-stop-details-del')")
+    public R removeById(@PathVariable String id) {
+        sbInfoStopDetailService.deleteByPrimaryKey(id);
+        return new R<>();
+    }
 
     /**
      * 批量记录
@@ -121,47 +125,47 @@ public class SbInfoStopDetailController {
     @SysLog("批量删除设备停用记录表")
     @DeleteMapping("")
     @PreAuthorize("@pms.hasPermission('sb-stop-details-del')")
-    public R removeIds(@RequestBody List<String> ids){
+    public R removeIds(@RequestBody List<String> ids) {
         sbInfoStopDetailService.batchDelete(ids);
         return new R<>();
     }
 
-  /**
-   * 获取分页
-   *
-   * @param pageNum 当前页码
-   * @param pageSize 每页条数
-   * @param sbInfoStopDetailDTO 设备停用记录表DTO
-   * @return R
-   */
-  @GetMapping("/page")
-  public R<AbstractPageResultBean<SbInfoStopDetailVO>> query(SbInfoStopDetailDTO sbInfoStopDetailDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
-      return new R<>(sbInfoStopDetailService.selectPageList(sbInfoStopDetailDTO, pageNum, pageSize));
-  }
-
-  /**
-   * 获取列表
-   *
-   * @param sbInfoStopDetailDTO 设备停用记录表DTO
-   * @return R
-   */
-  @GetMapping("")
-  public R query(SbInfoStopDetailDTO sbInfoStopDetailDTO) {
-      return new R<>(sbInfoStopDetailService.getModelListByDTO(sbInfoStopDetailDTO));
-  }
-
-  /**
+    /**
+     * 获取分页
+     *
+     * @param pageNum             当前页码
+     * @param pageSize            每页条数
+     * @param sbInfoStopDetailDTO 设备停用记录表DTO
+     * @return R
+     */
+    @GetMapping("/page")
+    public R<AbstractPageResultBean<SbInfoStopDetailVO>> query(SbInfoStopDetailDTO sbInfoStopDetailDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
+        return new R<>(sbInfoStopDetailService.selectPageList(sbInfoStopDetailDTO, pageNum, pageSize));
+    }
+
+    /**
+     * 获取列表
+     *
+     * @param sbInfoStopDetailDTO 设备停用记录表DTO
+     * @return R
+     */
+    @GetMapping("")
+    public R query(SbInfoStopDetailDTO sbInfoStopDetailDTO) {
+        return new R<>(sbInfoStopDetailService.getModelListByDTO(sbInfoStopDetailDTO));
+    }
+
+    /**
      * 设备停用记录表导出
      *
      * @param sbInfoStopDetailDTO 设备停用记录表DTO
      * @return R
      */
-  @GetMapping("/export")
-  @SysLog("设备停用记录表导出")
-  @PreAuthorize("@pms.hasPermission('sb-stop-details-export')")
-  public void export(HttpServletResponse response, SbInfoStopDetailDTO sbInfoStopDetailDTO) {
-    List<SbInfoStopDetail> list = sbInfoStopDetailService.getModelListByDTO(sbInfoStopDetailDTO);
-    ExcelUtil.exportResponseDict(response, ExportSbInfoStopDetailVO.class, BeanConverterUtil.copyListProperties(list, ExportSbInfoStopDetailVO.class), "设备停用记录表");
-  }
+    @GetMapping("/export")
+    @SysLog("设备停用记录表导出")
+    @PreAuthorize("@pms.hasPermission('sb-stop-details-export')")
+    public void export(HttpServletResponse response, SbInfoStopDetailDTO sbInfoStopDetailDTO) {
+        List<SbInfoStopDetail> list = sbInfoStopDetailService.getModelListByDTO(sbInfoStopDetailDTO);
+        ExcelUtil.exportResponseDict(response, ExportSbInfoStopDetailVO.class, BeanConverterUtil.copyListProperties(list, ExportSbInfoStopDetailVO.class), "设备停用记录表");
+    }
 
 }

platform-service/src/main/java/com/platform/service/customize/CustomFieldTemplateDataService.java

@@ -0,0 +1,36 @@
+package com.platform.service.customize;
+
+import com.platform.dao.vo.query.customize.CustomFieldTemplateDataVO;
+import com.platform.dao.dto.customize.CustomFieldTemplateDataDTO;
+import com.platform.dao.entity.customize.CustomFieldTemplateData;
+import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.service.base.IBaseService;
+import java.util.List;
+
+/**
+ * @Description 自定义报表 service
+ * @Author xc
+ * @Date 2022-04-25 16:02:39
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+public interface CustomFieldTemplateDataService extends IBaseService<CustomFieldTemplateData, CustomFieldTemplateDataDTO> {
+
+   /**
+    * 批量删除
+    *
+    * @param ids ：
+    * @return ：
+    */
+    int batchDelete(List<String> ids);
+
+    /**
+     * 分页查询
+     * @param record
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    AbstractPageResultBean<CustomFieldTemplateDataVO> selectPageList(CustomFieldTemplateDataDTO record, int pageNum, int pageSize);
+
+                        void updateTypeById(String id,Integer type);
+                                                                                                                        }

platform-service/src/main/java/com/platform/service/customize/CustomFieldTemplateService.java

@@ -0,0 +1,36 @@
+package com.platform.service.customize;
+
+import com.platform.dao.vo.query.customize.CustomFieldTemplateVO;
+import com.platform.dao.dto.customize.CustomFieldTemplateDTO;
+import com.platform.dao.entity.customize.CustomFieldTemplate;
+import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.service.base.IBaseService;
+import java.util.List;
+
+/**
+ * @Description 自定义报表 service
+ * @Author xc
+ * @Date 2022-04-25 16:02:28
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+public interface CustomFieldTemplateService extends IBaseService<CustomFieldTemplate, CustomFieldTemplateDTO> {
+
+   /**
+    * 批量删除
+    *
+    * @param ids ：
+    * @return ：
+    */
+    int batchDelete(List<String> ids);
+
+    /**
+     * 分页查询
+     * @param record
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    AbstractPageResultBean<CustomFieldTemplateVO> selectPageList(CustomFieldTemplateDTO record, int pageNum, int pageSize);
+
+                                    void updateTypeById(String id,Integer type);
+                                                                                                            }

platform-service/src/main/java/com/platform/service/customize/impl/CustomFieldTemplateDataServiceImpl.java

@@ -0,0 +1,58 @@
+package com.platform.service.customize.impl;
+import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.dao.bean.MyPage;
+import com.github.pagehelper.PageHelper;
+import com.platform.dao.vo.query.customize.CustomFieldTemplateDataVO;
+import com.platform.dao.dto.customize.CustomFieldTemplateDataDTO;
+import com.platform.dao.entity.customize.CustomFieldTemplateData;
+import com.platform.dao.mapper.customize.CustomFieldTemplateDataMapper;
+import com.platform.service.customize.CustomFieldTemplateDataService;
+import org.springframework.stereotype.Service;
+import com.platform.service.base.impl.BaseServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+import tk.mybatis.mapper.weekend.Weekend;
+import tk.mybatis.mapper.weekend.WeekendCriteria;
+import lombok.AllArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @Description 自定义报表 service 实现类
+ * @Author xc
+ * @Date 2022-04-25 16:02:39
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@AllArgsConstructor
+@Service("customFieldTemplateDataService")
+public class CustomFieldTemplateDataServiceImpl extends BaseServiceImpl<CustomFieldTemplateDataMapper, CustomFieldTemplateData, CustomFieldTemplateDataDTO> implements CustomFieldTemplateDataService {
+
+    @Override
+    public int batchDelete(List<String> ids) {
+        Weekend<CustomFieldTemplateData> weekend = new Weekend<>(CustomFieldTemplateData.class);
+        WeekendCriteria<CustomFieldTemplateData, Object> weekendCriteria = weekend.weekendCriteria();
+        weekendCriteria.andIn(CustomFieldTemplateData::getId, ids);
+        mapper.deleteByExample(weekend);
+        return 1;
+    }
+
+    @Override
+    public AbstractPageResultBean<CustomFieldTemplateDataVO> selectPageList(CustomFieldTemplateDataDTO record, int pageNum, int pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        return new MyPage(mapper.selectList(record));
+    }
+
+    @Override
+    public AbstractPageResultBean<CustomFieldTemplateData> selectPageInfo(CustomFieldTemplateDataDTO record, int pageNum, int pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        return new MyPage(mapper.selectList(record));
+    }
+
+                                    @Override
+            @Transactional(rollbackFor = Exception.class)
+            public void updateTypeById(String id,Integer type) {
+                CustomFieldTemplateData updInfo = new CustomFieldTemplateData();
+                updInfo.setId(id);
+                updInfo.setType(type);
+                mapper.updateByPrimaryKeySelective(updInfo);
+            }
+                                                                                                                        }

platform-service/src/main/java/com/platform/service/customize/impl/CustomFieldTemplateServiceImpl.java

@@ -0,0 +1,58 @@
+package com.platform.service.customize.impl;
+import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.dao.bean.MyPage;
+import com.github.pagehelper.PageHelper;
+import com.platform.dao.vo.query.customize.CustomFieldTemplateVO;
+import com.platform.dao.dto.customize.CustomFieldTemplateDTO;
+import com.platform.dao.entity.customize.CustomFieldTemplate;
+import com.platform.dao.mapper.customize.CustomFieldTemplateMapper;
+import com.platform.service.customize.CustomFieldTemplateService;
+import org.springframework.stereotype.Service;
+import com.platform.service.base.impl.BaseServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+import tk.mybatis.mapper.weekend.Weekend;
+import tk.mybatis.mapper.weekend.WeekendCriteria;
+import lombok.AllArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @Description 自定义报表 service 实现类
+ * @Author xc
+ * @Date 2022-04-25 16:02:28
+ * @Version Copyright (c) 2020,北京乾元坤和科技有限公司 All rights reserved.
+ */
+@AllArgsConstructor
+@Service("customFieldTemplateService")
+public class CustomFieldTemplateServiceImpl extends BaseServiceImpl<CustomFieldTemplateMapper, CustomFieldTemplate, CustomFieldTemplateDTO> implements CustomFieldTemplateService {
+
+    @Override
+    public int batchDelete(List<String> ids) {
+        Weekend<CustomFieldTemplate> weekend = new Weekend<>(CustomFieldTemplate.class);
+        WeekendCriteria<CustomFieldTemplate, Object> weekendCriteria = weekend.weekendCriteria();
+        weekendCriteria.andIn(CustomFieldTemplate::getId, ids);
+        mapper.deleteByExample(weekend);
+        return 1;
+    }
+
+    @Override
+    public AbstractPageResultBean<CustomFieldTemplateVO> selectPageList(CustomFieldTemplateDTO record, int pageNum, int pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        return new MyPage(mapper.selectList(record));
+    }
+
+    @Override
+    public AbstractPageResultBean<CustomFieldTemplate> selectPageInfo(CustomFieldTemplateDTO record, int pageNum, int pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        return new MyPage(mapper.selectList(record));
+    }
+
+                                                @Override
+            @Transactional(rollbackFor = Exception.class)
+            public void updateTypeById(String id,Integer type) {
+                CustomFieldTemplate updInfo = new CustomFieldTemplate();
+                updInfo.setId(id);
+                updInfo.setType(type);
+                mapper.updateByPrimaryKeySelective(updInfo);
+            }
+                                                                                                            }