Merge branch 'dev-xym-new-delete' of Server/growth-manager into master

api-module/src/main/resources/mybatis-generator-config.xml

@@ -58,7 +58,9 @@
 <!--        <table tableName="we_com_special_pre_send_message" domainObjectName="PreSpecialSendMessage" alias=""/>-->
 <!--        <table tableName="we_com_send_msg_result" domainObjectName="SendMsgResult" alias=""/>-->
 <!--        <table tableName="we_com_corp" domainObjectName="Corp" alias=""/>-->
-        <table tableName="we_com_moment_send_message" domainObjectName="MomentSendMessage" alias=""/>
+<!--        <table tableName="we_com_moment_send_message" domainObjectName="MomentSendMessage" alias=""/>-->
+        <table tableName="we_com_staff_with_user" domainObjectName="StaffWithUser" alias=""/>
+
 
 
     </context>

common-module/src/main/java/com/tzld/piaoquan/growth/common/model/po/StaffWithUser.java

@@ -13,6 +13,10 @@ public class StaffWithUser {
 
     private Date deleteTime;
 
+    private Integer newIsDelete;
+
+    private Date newDeleteTime;
+
     private Date createTime;
 
     private Date updateTime;
@@ -57,6 +61,22 @@ public class StaffWithUser {
         this.deleteTime = deleteTime;
     }
 
+    public Integer getNewIsDelete() {
+        return newIsDelete;
+    }
+
+    public void setNewIsDelete(Integer newIsDelete) {
+        this.newIsDelete = newIsDelete;
+    }
+
+    public Date getNewDeleteTime() {
+        return newDeleteTime;
+    }
+
+    public void setNewDeleteTime(Date newDeleteTime) {
+        this.newDeleteTime = newDeleteTime;
+    }
+
     public Date getCreateTime() {
         return createTime;
     }
@@ -84,6 +104,8 @@ public class StaffWithUser {
         sb.append(", userId=").append(userId);
         sb.append(", isDelete=").append(isDelete);
         sb.append(", deleteTime=").append(deleteTime);
+        sb.append(", newIsDelete=").append(newIsDelete);
+        sb.append(", newDeleteTime=").append(newDeleteTime);
         sb.append(", createTime=").append(createTime);
         sb.append(", updateTime=").append(updateTime);
         sb.append("]");

common-module/src/main/java/com/tzld/piaoquan/growth/common/model/po/StaffWithUserExample.java

@@ -417,6 +417,126 @@ public class StaffWithUserExample {
             return (Criteria) this;
         }
 
+        public Criteria andNewIsDeleteIsNull() {
+            addCriterion("new_is_delete is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewIsDeleteIsNotNull() {
+            addCriterion("new_is_delete is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewIsDeleteEqualTo(Integer value) {
+            addCriterion("new_is_delete =", value, "newIsDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewIsDeleteNotEqualTo(Integer value) {
+            addCriterion("new_is_delete <>", value, "newIsDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewIsDeleteGreaterThan(Integer value) {
+            addCriterion("new_is_delete >", value, "newIsDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewIsDeleteGreaterThanOrEqualTo(Integer value) {
+            addCriterion("new_is_delete >=", value, "newIsDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewIsDeleteLessThan(Integer value) {
+            addCriterion("new_is_delete <", value, "newIsDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewIsDeleteLessThanOrEqualTo(Integer value) {
+            addCriterion("new_is_delete <=", value, "newIsDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewIsDeleteIn(List<Integer> values) {
+            addCriterion("new_is_delete in", values, "newIsDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewIsDeleteNotIn(List<Integer> values) {
+            addCriterion("new_is_delete not in", values, "newIsDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewIsDeleteBetween(Integer value1, Integer value2) {
+            addCriterion("new_is_delete between", value1, value2, "newIsDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewIsDeleteNotBetween(Integer value1, Integer value2) {
+            addCriterion("new_is_delete not between", value1, value2, "newIsDelete");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewDeleteTimeIsNull() {
+            addCriterion("new_delete_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewDeleteTimeIsNotNull() {
+            addCriterion("new_delete_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewDeleteTimeEqualTo(Date value) {
+            addCriterion("new_delete_time =", value, "newDeleteTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewDeleteTimeNotEqualTo(Date value) {
+            addCriterion("new_delete_time <>", value, "newDeleteTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewDeleteTimeGreaterThan(Date value) {
+            addCriterion("new_delete_time >", value, "newDeleteTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewDeleteTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("new_delete_time >=", value, "newDeleteTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewDeleteTimeLessThan(Date value) {
+            addCriterion("new_delete_time <", value, "newDeleteTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewDeleteTimeLessThanOrEqualTo(Date value) {
+            addCriterion("new_delete_time <=", value, "newDeleteTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewDeleteTimeIn(List<Date> values) {
+            addCriterion("new_delete_time in", values, "newDeleteTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewDeleteTimeNotIn(List<Date> values) {
+            addCriterion("new_delete_time not in", values, "newDeleteTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewDeleteTimeBetween(Date value1, Date value2) {
+            addCriterion("new_delete_time between", value1, value2, "newDeleteTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andNewDeleteTimeNotBetween(Date value1, Date value2) {
+            addCriterion("new_delete_time not between", value1, value2, "newDeleteTime");
+            return (Criteria) this;
+        }
+
         public Criteria andCreateTimeIsNull() {
             addCriterion("create_time is null");
             return (Criteria) this;

common-module/src/main/java/com/tzld/piaoquan/growth/common/service/Impl/WeComUserServiceImpl.java

@@ -159,6 +159,7 @@ public class WeComUserServiceImpl implements WeComUserService {
                     StaffWithUser staffWithUser = staffWithUserList.get(0);
                     if (staffWithUser.getIsDelete() == 1) {
                         staffWithUser.setIsDelete(0);
+                        staffWithUser.setNewIsDelete(0);
                         staffWithUserMapper.updateByPrimaryKeySelective(staffWithUser);
                     }
                 }
@@ -208,8 +209,12 @@ public class WeComUserServiceImpl implements WeComUserService {
         StaffWithUser staffWithUser = staffWithUserList.get(0);
         if (deleteTime != null) {
             staffWithUser.setDeleteTime(new Date(deleteTime));
+            staffWithUser.setNewDeleteTime(new Date(deleteTime));
+        }else {
+            staffWithUser.setNewDeleteTime(new Date());
         }
         staffWithUser.setIsDelete(1);
+        staffWithUser.setNewIsDelete(1);
         staffWithUserMapper.updateByPrimaryKeySelective(staffWithUser);
     }
 

common-module/src/main/resources/mapper/StaffWithUserMapper.xml

@@ -7,6 +7,8 @@
     <result column="user_id" jdbcType="BIGINT" property="userId" />
     <result column="is_delete" jdbcType="INTEGER" property="isDelete" />
     <result column="delete_time" jdbcType="TIMESTAMP" property="deleteTime" />
+    <result column="new_is_delete" jdbcType="INTEGER" property="newIsDelete" />
+    <result column="new_delete_time" jdbcType="TIMESTAMP" property="newDeleteTime" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
@@ -69,7 +71,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, staff_id, user_id, is_delete, delete_time, create_time, update_time
+    id, staff_id, user_id, is_delete, delete_time, new_is_delete, new_delete_time, create_time, 
+    update_time
   </sql>
   <select id="selectByExample" parameterType="com.tzld.piaoquan.growth.common.model.po.StaffWithUserExample" resultMap="BaseResultMap">
     select
@@ -89,7 +92,7 @@
     </if>
   </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select
+    select 
     <include refid="Base_Column_List" />
     from we_com_staff_with_user
     where id = #{id,jdbcType=BIGINT}
@@ -105,11 +108,14 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.tzld.piaoquan.growth.common.model.po.StaffWithUser">
-    insert into we_com_staff_with_user (id, staff_id, user_id, delete_time, create_time,
-      update_time)
-    values (#{id,jdbcType=BIGINT}, #{staffId,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT},
-      #{deleteTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP},
-      #{updateTime,jdbcType=TIMESTAMP})
+    insert into we_com_staff_with_user (id, staff_id, user_id, 
+      is_delete, delete_time, new_is_delete, 
+      new_delete_time, create_time, update_time
+      )
+    values (#{id,jdbcType=BIGINT}, #{staffId,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, 
+      #{isDelete,jdbcType=INTEGER}, #{deleteTime,jdbcType=TIMESTAMP}, #{newIsDelete,jdbcType=INTEGER}, 
+      #{newDeleteTime,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.tzld.piaoquan.growth.common.model.po.StaffWithUser">
     insert into we_com_staff_with_user
@@ -129,6 +135,12 @@
       <if test="deleteTime != null">
         delete_time,
       </if>
+      <if test="newIsDelete != null">
+        new_is_delete,
+      </if>
+      <if test="newDeleteTime != null">
+        new_delete_time,
+      </if>
       <if test="createTime != null">
         create_time,
       </if>
@@ -152,6 +164,12 @@
       <if test="deleteTime != null">
         #{deleteTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="newIsDelete != null">
+        #{newIsDelete,jdbcType=INTEGER},
+      </if>
+      <if test="newDeleteTime != null">
+        #{newDeleteTime,jdbcType=TIMESTAMP},
+      </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -184,6 +202,12 @@
       <if test="record.deleteTime != null">
         delete_time = #{record.deleteTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.newIsDelete != null">
+        new_is_delete = #{record.newIsDelete,jdbcType=INTEGER},
+      </if>
+      <if test="record.newDeleteTime != null">
+        new_delete_time = #{record.newDeleteTime,jdbcType=TIMESTAMP},
+      </if>
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
@@ -202,6 +226,8 @@
       user_id = #{record.userId,jdbcType=BIGINT},
       is_delete = #{record.isDelete,jdbcType=INTEGER},
       delete_time = #{record.deleteTime,jdbcType=TIMESTAMP},
+      new_is_delete = #{record.newIsDelete,jdbcType=INTEGER},
+      new_delete_time = #{record.newDeleteTime,jdbcType=TIMESTAMP},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP}
     <if test="_parameter != null">
@@ -223,6 +249,12 @@
       <if test="deleteTime != null">
         delete_time = #{deleteTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="newIsDelete != null">
+        new_is_delete = #{newIsDelete,jdbcType=INTEGER},
+      </if>
+      <if test="newDeleteTime != null">
+        new_delete_time = #{newDeleteTime,jdbcType=TIMESTAMP},
+      </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -238,6 +270,8 @@
       user_id = #{userId,jdbcType=BIGINT},
       is_delete = #{isDelete,jdbcType=INTEGER},
       delete_time = #{deleteTime,jdbcType=TIMESTAMP},
+      new_is_delete = #{newIsDelete,jdbcType=INTEGER},
+      new_delete_time = #{newDeleteTime,jdbcType=TIMESTAMP},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=BIGINT}
@@ -250,6 +284,8 @@
     user_id,
     is_delete,
     delete_time,
+    new_is_delete,
+    new_delete_time,
     create_time,
     update_time
     )
@@ -260,6 +296,8 @@
       #{item.userId,jdbcType=BIGINT},
       #{item.isDelete,jdbcType=INTEGER},
       #{item.deleteTime,jdbcType=TIMESTAMP},
+      #{newIsDelete,jdbcType=INTEGER},
+      #{newDeleteTime,jdbcType=TIMESTAMP},
       #{item.createTime,jdbcType=TIMESTAMP},
       #{item.updateTime,jdbcType=TIMESTAMP}
       )