Browse Source

冲突修改

anderx 1 year ago
parent
commit
45f7bae7cf

+ 1 - 1
src/main/java/com/goafanti/common/dao/UserDataLogMapper.java

@@ -4,6 +4,7 @@ import com.goafanti.common.model.UserDataLog;
 import com.goafanti.customer.bo.OutUserDateLogList;
 import org.apache.ibatis.annotations.Param;
 
+import java.awt.print.Pageable;
 import java.util.List;
 
 /**
@@ -22,7 +23,6 @@ public interface UserDataLogMapper {
      */
     UserDataLog queryById(Integer id);
 
-    int insert(UserDataLog record);
 
     /**
      * 查询指定行数据

+ 109 - 53
src/main/java/com/goafanti/common/mapper/UserDataLogMapper.xml

@@ -1,85 +1,141 @@
 <?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.goafanti.common.dao.UserDataLogMapper">
-  <resultMap id="BaseResultMap" type="com.goafanti.common.model.UserDataLog">
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="uid" jdbcType="VARCHAR" property="uid" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
+
+  <resultMap type="com.goafanti.common.model.UserDataLog" id="UserDataLogMap">
+    <result property="id" column="id" jdbcType="INTEGER"/>
+    <result property="uid" column="uid" jdbcType="VARCHAR"/>
+    <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+    <result property="remarks" column="remarks" jdbcType="VARCHAR"/>
+    <result property="type" column="type" jdbcType="INTEGER"/>
   </resultMap>
-  <sql id="Base_Column_List">
-    id, `uid`, create_time, remarks
+
+  <sql id="UserDataLogAllSql">
+    id, uid, create_time, remarks, type
   </sql>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
+
+  <!--查询单个-->
+  <select id="queryById" resultMap="UserDataLogMap">
+    select
+    <include refid="UserDataLogAllSql"/>
     from user_data_log
-    where id = #{id,jdbcType=INTEGER}
+    where id = #{id}
   </select>
 
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    delete from user_data_log
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
-  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.UserDataLog" useGeneratedKeys="true">
-    insert into user_data_log (`uid`, create_time, remarks
-      )
-    values (#{uid,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR}
-      )
-  </insert>
-  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.UserDataLog" useGeneratedKeys="true">
-    insert into user_data_log
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="uid != null">
-        `uid`,
+  <!--查询指定行数据-->
+  <select id="findUserDataLogList" resultMap="UserDataLogMap">
+    select
+    <include refid="UserDataLogAllSql"/>
+
+    from user_data_log
+    <where>
+      <if test="id != null">
+        and id = #{id}
+      </if>
+      <if test="uid != null and uid != ''">
+        and uid = #{uid}
       </if>
       <if test="createTime != null">
-        create_time,
+        and create_time = #{createTime}
       </if>
-      <if test="remarks != null">
-        remarks,
+      <if test="remarks != null and remarks != ''">
+        and remarks = #{remarks}
       </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="uid != null">
-        #{uid,jdbcType=VARCHAR},
+      <if test="type != null">
+        and type = #{type}
+      </if>
+    </where>
+    <if test="page_sql != null">
+      ${page_sql}
+    </if>
+  </select>
+
+  <!--统计总行数-->
+  <select id="findUserDataLogCount" resultType="java.lang.Integer">
+    select count(1)
+    from user_data_log
+    <where>
+      <if test="id != null">
+        and id = #{id}
+      </if>
+      <if test="uid != null and uid != ''">
+        and uid = #{uid}
       </if>
       <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
+        and create_time = #{createTime}
+      </if>
+      <if test="remarks != null and remarks != ''">
+        and remarks = #{remarks}
       </if>
-      <if test="remarks != null">
-        #{remarks,jdbcType=VARCHAR},
+      <if test="type != null">
+        and type = #{type}
       </if>
-    </trim>
+    </where>
+  </select>
+
+  <!--新增所有列-->
+  <insert id="insert" keyProperty="id" useGeneratedKeys="true">
+    insert into user_data_log(uid, create_time, remarks, type)
+    values (#{uid}, #{createTime}, #{remarks}, #{type})
   </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.UserDataLog">
+
+  <insert id="insertBatch">
+    insert into user_data_log(uid, create_time, remarks, type)
+    values
+    <foreach collection="entities" item="entity" separator=",">
+      (#{entity.uid}, #{entity.createTime}, #{entity.remarks}, #{entity.type})
+    </foreach>
+  </insert>
+
+  <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
+    insert into user_data_log(uid, create_time, remarks, type)
+    values
+    <foreach collection="entities" item="entity" separator=",">
+      (#{entity.uid}, #{entity.createTime}, #{entity.remarks}, #{entity.type})
+    </foreach>
+    on duplicate key update
+    uid = values(uid),
+    create_time = values(create_time),
+    remarks = values(remarks),
+    type = values(type)
+  </insert>
+
+  <!--通过主键修改数据-->
+  <update id="update">
     update user_data_log
     <set>
-      <if test="uid != null">
-        `uid` = #{uid,jdbcType=VARCHAR},
+      <if test="uid != null and uid != ''">
+        uid = #{uid},
       </if>
       <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
+        create_time = #{createTime},
+      </if>
+      <if test="remarks != null and remarks != ''">
+        remarks = #{remarks},
       </if>
-      <if test="remarks != null">
-        remarks = #{remarks,jdbcType=VARCHAR},
+      <if test="type != null">
+        type = #{type},
       </if>
     </set>
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.UserDataLog">
-    update user_data_log
-    set `uid` = #{uid,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      remarks = #{remarks,jdbcType=VARCHAR}
-    where id = #{id,jdbcType=INTEGER}
+    where id = #{id}
   </update>
 
+  <!--通过主键删除-->
+  <delete id="deleteById">
+    delete
+    from user_data_log
+    where id = #{id}
+  </delete>
+
+
+
   <select id="userDateLogList" resultType="com.goafanti.customer.bo.OutUserDateLogList">
     select id,uid,remarks ,create_time ,
-    date_format(create_time ,'%Y-%m-%d %H:%i:%s')createTimes
+           date_format(create_time ,'%Y-%m-%d %H:%i:%s')createTimes
     from user_data_log
     where uid= #{uid}
     order by create_time desc
   </select>
-</mapper>
+
+</mapper>
+

+ 7 - 6
src/main/java/com/goafanti/customer/bo/OutSelectUserArchives.java

@@ -1,10 +1,6 @@
 package com.goafanti.customer.bo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.goafanti.common.utils.excel.Excel;
 
 import java.util.Date;
@@ -60,10 +56,15 @@ public class OutSelectUserArchives {
     private String depName;
     @Excel(name = "修改时间",dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
+    private String publicContent;
 
+    public String getPublicContent() {
+        return publicContent;
+    }
 
-
-
+    public void setPublicContent(String publicContent) {
+        this.publicContent = publicContent;
+    }
 
     public Integer getSignBills() {
         return signBills;

+ 3 - 3
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -2653,11 +2653,11 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	@Override
 	public void pushOrderMaxDuration() {
 		List<TOrderNew> tOrderNews = tOrderNewMapper.selectgetAll();
-//		for (TOrderNew e : tOrderNews) {
-		TOrderNew e = tOrderNewMapper.selectByPrimaryKey("1032662365591977984");
+		for (TOrderNew e : tOrderNews) {
+//		TOrderNew e = tOrderNewMapper.selectByPrimaryKey("1032662365591977984");
 		pushOrderPublicReleaseCount(e);
 
-//		}
+		}
 	}