积分分享表添加主键ID 积分类型 积分策略表增加邀请有效期，积分明细表增加操作员工

src/main/java/com/dk/mdm/mapper/mst/IntegralItemMapper.xml

@@ -5,7 +5,7 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        item_id, integral_type, integral, cp_id, cp_id_from, acc_date, flg_valid, user_id, remarks
+        item_id, integral_type, integral, cp_id, cp_id_from, acc_date, flg_valid, user_id, remarks,staff_name
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -19,6 +19,7 @@
                 <result column="flg_valid" property="flgValid"/>
                 <result column="user_id" property="userId" typeHandler="UuidTypeHandler"/>
                 <result column="remarks" property="remarks"/>
+                <result column="staff_name" property="staffName"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -56,7 +57,7 @@
 
     <!-- 通用查询列 -->
     <sql id="Base_Column_List_list">
-        tmii.item_id, tmii.integral_type, tmii.integral, tmii.cp_id, tmii.cp_id_from, tmii.acc_date, tmii.flg_valid, tmii.user_id, tmii.remarks
+        tmii.item_id, tmii.integral_type, tmii.integral, tmii.cp_id, tmii.cp_id_from, tmii.acc_date, tmii.flg_valid, tmii.user_id, tmii.remarks,tmii.staff_name
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -70,6 +71,7 @@
         <result column="flg_valid" property="flgValid"/>
         <result column="user_id" property="userId" typeHandler="UuidTypeHandler"/>
         <result column="remarks" property="remarks"/>
+        <result column="staff_name" property="staffName"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -99,6 +101,9 @@
             <if test="remarks != null and remarks != ''">
                 AND tmii.remarks = #{remarks}
             </if>
+            <if test="staffName != null and staffName != ''">
+                AND tmii.staff_name = #{staffName}
+            </if>
         </where>
     </sql>
 

src/main/java/com/dk/mdm/mapper/mst/IntegralShareMapper.xml

@@ -5,15 +5,17 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        cp_id, tactic_id, share_date, end_date, flg_valid,user_id
+        share_id,cp_id, tactic_id, share_date, end_date,integral_type, flg_valid,user_id
     </sql>
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.dk.mdm.model.pojo.mst.IntegralShare">
-        <id column="cp_id" property="cpId"/>
+        <id column="share_id" property="shareId"/>
+        <result column="cp_id" property="cpId"/>
                 <result column="tactic_id" property="tacticId" typeHandler="UuidTypeHandler"/>
             <result column="share_date" property="shareDate" typeHandler="TimestampTypeHandler"/>
             <result column="end_date" property="endDate" typeHandler="TimestampTypeHandler"/>
+            <result column="integral_type" property="integralType"/>
                 <result column="flg_valid" property="flgValid"/>
                 <result column="user_id" property="userId"/>
     </resultMap>
@@ -43,15 +45,17 @@
 
     <!-- 通用查询列 -->
     <sql id="Base_Column_List_list">
-        cp_id, tactic_id, share_date, end_date, flg_valid,user_id
+        share_id,cp_id, tactic_id, share_date, end_date,integral_type, flg_valid,user_id
     </sql>
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap_list" type="com.dk.mdm.model.response.mst.IntegralShareResponse">
-        <id column="cp_id" property="cpId"/>
+        <id column="share_id" property="shareId"/>
+        <result column="cp_id" property="cpId"/>
         <result column="tactic_id" property="tacticId" typeHandler="UuidTypeHandler"/>
         <result column="share_date" property="shareDate" typeHandler="TimestampTypeHandler"/>
         <result column="end_date" property="endDate" typeHandler="TimestampTypeHandler"/>
+        <result column="integral_type" property="integralType"/>
         <result column="flg_valid" property="flgValid"/>
         <result column="user_id" property="userId"/>
     </resultMap>
@@ -59,6 +63,9 @@
     <!-- 通用条件列 -->
     <sql id="Condition_list">
         <where>
+            <if test="shareId != null and shareId != ''">
+                AND share_id = #{shareId}::uuid
+            </if>
             <if test="cpId != null and cpId != ''">
                 AND cp_id = #{cpId}
             </if>

src/main/java/com/dk/mdm/mapper/mst/IntegralTacticMapper.xml

@@ -50,7 +50,7 @@
 
 
     <sql id="Base_Column_List_list">
-        tactic_id, reg_integral, sign_integral, fifteen_integral, share_integral, share_reg_integral, sign_day_num,share_day_num
+        tactic_id, reg_integral, sign_integral, fifteen_integral, share_integral, share_reg_integral, sign_day_num,share_day_num,share_valid_times
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -63,6 +63,7 @@
         <result column="share_reg_integral" property="shareRegIntegral"/>
         <result column="sign_day_num" property="signDayNum"/>
         <result column="share_day_num" property="shareDayNum"/>
+        <result column="share_valid_times" property="shareValidTimes"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -89,6 +90,9 @@
             <if test="shareDayNum != null">
                 AND share_day_num = #{shareDayNum}
             </if>
+            <if test="shareValidTimes != null">
+                AND share_valid_times = #{shareValidTimes}
+            </if>
         </where>
     </sql>
 

src/main/java/com/dk/mdm/model/pojo/mst/IntegralItem.java

@@ -113,6 +113,13 @@ public class IntegralItem extends PageInfo<IntegralItem> implements Serializable
     @ApiModelProperty(value = "备注")
     private String remarks;
 
+    /**
+     * 员工名称
+     */
+    @Excel(name = "员工名称")
+    @ApiModelProperty(value = "员工名称")
+    private String staffName;
+
 
     /*
      * 相关属性

src/main/java/com/dk/mdm/model/pojo/mst/IntegralShare.java

@@ -38,9 +38,16 @@ public class IntegralShare extends PageInfo<IntegralShare> implements Serializab
      */
 
     /**
+     * 策略ID
+     */
+    @TableId(value = "share_id", type = IdType.AUTO)
+    @ApiModelProperty(value = "分享ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String shareId;
+
+    /**
      * 公司ID
      */
-    @TableId(value = "cp_id", type = IdType.AUTO)
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "公司ID")
     private Integer cpId;
@@ -89,6 +96,8 @@ public class IntegralShare extends PageInfo<IntegralShare> implements Serializab
     @ApiModelProperty(value = "用户ID")
     private Long userId;
 
+    private String integralType;
+
 
     /*
      * 相关属性

src/main/java/com/dk/mdm/model/pojo/mst/IntegralTactic.java

@@ -99,6 +99,7 @@ public class IntegralTactic extends PageInfo<IntegralTactic> implements Serializ
     @ApiModelProperty(value = "每日分享次数")
     private Integer shareDayNum;
 
+    private Integer shareValidTimes;
 
     /*
      * 相关属性

src/main/java/com/dk/mdm/model/query/mst/IntegralItemQuery.java

@@ -60,6 +60,12 @@ public class IntegralItemQuery extends PageInfo<IntegralItemQuery> implements Se
     @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
     private Boolean flgValid;
 
+    /**
+     * 员工名称
+     */
+    @Excel(name = "员工名称")
+    @ApiModelProperty(value = "员工名称")
+    private String staffName;
 
     /*
      * 相关属性

src/main/java/com/dk/mdm/model/query/mst/IntegralShareQuery.java

@@ -38,9 +38,16 @@ public class IntegralShareQuery extends PageInfo<IntegralShareQuery> implements
      */
 
     /**
+     * 策略ID
+     */
+    @TableId(value = "share_id", type = IdType.AUTO)
+    @ApiModelProperty(value = "分享ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String shareId;
+
+    /**
      * 公司ID
      */
-    @TableId(value = "cp_id", type = IdType.AUTO)
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "公司ID")
     private Integer cpId;
@@ -89,6 +96,7 @@ public class IntegralShareQuery extends PageInfo<IntegralShareQuery> implements
     @ApiModelProperty(value = "用户ID")
     private Long userId;
 
+    private String integralType;
 
     /*
      * 相关属性

src/main/java/com/dk/mdm/model/query/mst/IntegralTacticQuery.java

@@ -99,6 +99,8 @@ public class IntegralTacticQuery extends PageInfo<IntegralTacticQuery> implement
     @ApiModelProperty(value = "每日分享次数")
     private Integer shareDayNum;
 
+    private Integer shareValidTimes;
+
 
     /*
      * 相关属性

src/main/java/com/dk/mdm/model/response/mst/IntegralItemResponse.java

@@ -118,6 +118,13 @@ public class IntegralItemResponse extends PageInfo<IntegralItemResponse> impleme
 
     private String userName;
 
+    /**
+     * 员工名称
+     */
+    @Excel(name = "员工名称")
+    @ApiModelProperty(value = "员工名称")
+    private String staffName;
+
 
     /*
      * 相关属性

src/main/java/com/dk/mdm/model/response/mst/IntegralShareResponse.java

@@ -38,9 +38,16 @@ public class IntegralShareResponse extends PageInfo<IntegralShareResponse> imple
      */
 
     /**
+     * 策略ID
+     */
+    @TableId(value = "share_id", type = IdType.AUTO)
+    @ApiModelProperty(value = "分享ID")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String shareId;
+
+    /**
      * 公司ID
      */
-    @TableId(value = "cp_id", type = IdType.AUTO)
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "公司ID")
     private Integer cpId;
@@ -89,6 +96,8 @@ public class IntegralShareResponse extends PageInfo<IntegralShareResponse> imple
     @ApiModelProperty(value = "用户ID")
     private String userId;
 
+    private String integralType;
+
 
     /*
      * 相关属性

src/main/java/com/dk/mdm/model/response/mst/IntegralTacticResponse.java

@@ -99,6 +99,7 @@ public class IntegralTacticResponse extends PageInfo<IntegralTacticResponse> imp
     @ApiModelProperty(value = "每日分享次数")
     private Integer shareDayNum;
 
+    private Integer shareValidTimes;
 
     /*
      * 相关属性

src/main/java/com/dk/mdm/model/vo/mst/IntegralTacticVO.java

@@ -99,6 +99,8 @@ public class IntegralTacticVO extends PageInfo<IntegralTacticVO> implements Seri
     @ApiModelProperty(value = "每日分享次数")
     private Integer shareDayNum;
 
+    private Integer shareValidTimes;
+
 
     /*
      * 相关属性