Browse Source

Merge branch 'test2' into test

anderx 1 year ago
parent
commit
871a488300

+ 85 - 38
src/main/java/com/goafanti/common/dao/UserServiceMapper.java

@@ -1,44 +1,91 @@
 package com.goafanti.common.dao;
 
 import com.goafanti.common.model.UserService;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.data.domain.Pageable;
 
+import java.util.List;
+
+/**
+ * 客服信息表(UserService)表数据库访问层
+ *
+ * @author makejava
+ * @since 2024-11-06 09:00:41
+ */
 public interface UserServiceMapper {
 
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_service
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	int deleteByPrimaryKey(Integer id);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_service
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	int insert(UserService record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_service
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	int insertSelective(UserService record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_service
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	UserService selectByPrimaryKey(Integer id);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_service
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	int updateByPrimaryKeySelective(UserService record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_service
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	int updateByPrimaryKey(UserService record);
-
-	Integer selectByUid(String uid);
-}
+    /**
+     * 通过ID查询单条数据
+     *
+     * @param id 主键
+     * @return 实例对象
+     */
+    UserService queryById(Integer id);
+
+
+    /**
+     * 查询指定行数据
+     *
+     * @param userService 查询条件
+     * @param pageable    分页对象
+     * @return 对象列表
+     */
+    List<UserService> findUserServiceList(UserService userService, @Param("pageable") Pageable pageable);
+
+    /**
+     * 统计总行数
+     *
+     * @param userService 查询条件
+     * @return 总行数
+     */
+    int findUserServiceCount(UserService userService);
+
+    /**
+     * 新增数据
+     *
+     * @param userService 实例对象
+     * @return 影响行数
+     */
+    int insert(UserService userService);
+
+    int insertSelective(UserService userService);
+
+
+    /**
+     * 批量新增数据(MyBatis原生foreach方法)
+     *
+     * @param entities List<UserService> 实例对象列表
+     * @return 影响行数
+     */
+    int insertBatch(@Param("entities") List<UserService> entities);
+
+    /**
+     * 批量新增或按主键更新数据(MyBatis原生foreach方法)
+     *
+     * @param entities List<UserService> 实例对象列表
+     * @return 影响行数
+     * @throws org.springframework.jdbc.BadSqlGrammarException 入参是空List的时候会抛SQL语句错误的异常,请自行校验入参
+     */
+    int insertOrUpdateBatch(@Param("entities") List<UserService> entities);
+
+    /**
+     * 修改数据
+     *
+     * @param userService 实例对象
+     * @return 影响行数
+     */
+    int update(UserService userService);
+
+    /**
+     * 通过主键删除数据
+     *
+     * @param id 主键
+     * @return 影响行数
+     */
+    int deleteById(Integer id);
+
+
+    Integer selectByUid(String uid);
+
+}
+

+ 454 - 331
src/main/java/com/goafanti/common/mapper/UserServiceMapper.xml

@@ -1,343 +1,466 @@
 <?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.UserServiceMapper">
-  <resultMap id="BaseResultMap" type="com.goafanti.common.model.UserService">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri May 28 13:36:56 CST 2021.
-    -->
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="uid" jdbcType="VARCHAR" property="uid" />
-    <result column="aid" jdbcType="VARCHAR" property="aid" />
-    <result column="add_wechat" jdbcType="INTEGER" property="addWechat" />
-    <result column="wechat" jdbcType="VARCHAR" property="wechat" />
-    <result column="renewal" jdbcType="INTEGER" property="renewal" />
-    <result column="renewal_time" jdbcType="TIMESTAMP" property="renewalTime" />
-    <result column="sign_project" jdbcType="VARCHAR" property="signProject" />
-    <result column="sign_project_id" jdbcType="VARCHAR" property="signProjectId" />
-    <result column="new_time" jdbcType="TIMESTAMP" property="newTime" />
-    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="tech_satisfaction" jdbcType="INTEGER" property="techSatisfaction" />
-    <result column="business_satisfaction" jdbcType="INTEGER" property="businessSatisfaction" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri May 28 13:36:56 CST 2021.
-    -->
-    id, `uid`, aid, add_wechat, wechat, renewal, renewal_time, sign_project, sign_project_id,
-    new_time, remarks, create_time, tech_satisfaction, business_satisfaction
-  </sql>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri May 28 13:36:56 CST 2021.
-    -->
-    select
-    <include refid="Base_Column_List" />
-    from user_service
-    where id = #{id,jdbcType=INTEGER}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri May 28 13:36:56 CST 2021.
-    -->
-    delete from user_service
-    where id = #{id,jdbcType=INTEGER}
-  </delete>
-  <insert id="insert" parameterType="com.goafanti.common.model.UserService">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri May 28 13:36:56 CST 2021.
-    -->
-    insert into user_service (id, `uid`, aid,
-      add_wechat, wechat, renewal,
-      renewal_time, sign_project, sign_project_id,
-      new_time, remarks, create_time,
-      tech_satisfaction, business_satisfaction)
-    values (#{id,jdbcType=INTEGER}, #{uid,jdbcType=VARCHAR}, #{aid,jdbcType=VARCHAR},
-      #{addWechat,jdbcType=INTEGER}, #{wechat,jdbcType=VARCHAR}, #{renewal,jdbcType=INTEGER},
-      #{renewalTime,jdbcType=TIMESTAMP}, #{signProject,jdbcType=VARCHAR}, #{signProjectId,jdbcType=VARCHAR},
-      #{newTime,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
-      #{techSatisfaction,jdbcType=INTEGER}, #{businessSatisfaction,jdbcType=INTEGER})
-  </insert>
-  <insert id="insertSelective" parameterType="com.goafanti.common.model.UserService">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri May 28 13:36:56 CST 2021.
-    -->
-    insert into user_service
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="uid != null">
-        `uid`,
-      </if>
-      <if test="aid != null">
-        aid,
-      </if>
-      <if test="addWechat != null">
-        add_wechat,
-      </if>
-      <if test="wechat != null">
-        wechat,
-      </if>
-      <if test="renewal != null">
-        renewal,
-      </if>
-      <if test="renewalTime != null">
-        renewal_time,
-      </if>
-      <if test="signProject != null">
-        sign_project,
-      </if>
-      <if test="signProjectId != null">
-        sign_project_id,
-      </if>
-      <if test="newTime != null">
-        new_time,
-      </if>
-      <if test="remarks != null">
-        remarks,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="techSatisfaction != null">
-        tech_satisfaction,
-      </if>
-      <if test="businessSatisfaction != null">
-        business_satisfaction,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=INTEGER},
-      </if>
-      <if test="uid != null">
-        #{uid,jdbcType=VARCHAR},
-      </if>
-      <if test="aid != null">
-        #{aid,jdbcType=VARCHAR},
-      </if>
-      <if test="addWechat != null">
-        #{addWechat,jdbcType=INTEGER},
-      </if>
-      <if test="wechat != null">
-        #{wechat,jdbcType=VARCHAR},
-      </if>
-      <if test="renewal != null">
-        #{renewal,jdbcType=INTEGER},
-      </if>
-      <if test="renewalTime != null">
-        #{renewalTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="signProject != null">
-        #{signProject,jdbcType=VARCHAR},
-      </if>
-      <if test="signProjectId != null">
-        #{signProjectId,jdbcType=VARCHAR},
-      </if>
-      <if test="newTime != null">
-        #{newTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="remarks != null">
-        #{remarks,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="techSatisfaction != null">
-        #{techSatisfaction,jdbcType=INTEGER},
-      </if>
-      <if test="businessSatisfaction != null">
-        #{businessSatisfaction,jdbcType=INTEGER},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.UserService">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri May 28 13:36:56 CST 2021.
-    -->
-    update user_service
-    <set>
-      <if test="uid != null">
-        `uid` = #{uid,jdbcType=VARCHAR},
-      </if>
-      <if test="aid != null">
-        aid = #{aid,jdbcType=VARCHAR},
-      </if>
-      <if test="addWechat != null">
-        add_wechat = #{addWechat,jdbcType=INTEGER},
-      </if>
-      <if test="wechat != null">
-        wechat = #{wechat,jdbcType=VARCHAR},
-      </if>
-      <if test="renewal != null">
-        renewal = #{renewal,jdbcType=INTEGER},
-      </if>
-      <if test="renewalTime != null">
-        renewal_time = #{renewalTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="signProject != null">
-        sign_project = #{signProject,jdbcType=VARCHAR},
-      </if>
-      <if test="signProjectId != null">
-        sign_project_id = #{signProjectId,jdbcType=VARCHAR},
-      </if>
-      <if test="newTime != null">
-        new_time = #{newTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="remarks != null">
-        remarks = #{remarks,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="techSatisfaction != null">
-        tech_satisfaction = #{techSatisfaction,jdbcType=INTEGER},
-      </if>
-      <if test="businessSatisfaction != null">
-        business_satisfaction = #{businessSatisfaction,jdbcType=INTEGER},
-      </if>
-    </set>
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.UserService">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri May 28 13:36:56 CST 2021.
-    -->
-    update user_service
-    set `uid` = #{uid,jdbcType=VARCHAR},
-      aid = #{aid,jdbcType=VARCHAR},
-      add_wechat = #{addWechat,jdbcType=INTEGER},
-      wechat = #{wechat,jdbcType=VARCHAR},
-      renewal = #{renewal,jdbcType=INTEGER},
-      renewal_time = #{renewalTime,jdbcType=TIMESTAMP},
-      sign_project = #{signProject,jdbcType=VARCHAR},
-      sign_project_id = #{signProjectId,jdbcType=VARCHAR},
-      new_time = #{newTime,jdbcType=TIMESTAMP},
-      remarks = #{remarks,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
-      tech_satisfaction = #{techSatisfaction,jdbcType=INTEGER},
-      business_satisfaction = #{businessSatisfaction,jdbcType=INTEGER}
-    where id = #{id,jdbcType=INTEGER}
-  </update>
-  <select id="selectByUid" resultType="java.lang.Integer">
-  select id from user_service where uid= #{uid}
-  </select>
 
+    <resultMap type="com.goafanti.common.model.UserService" id="UserServiceMap">
+        <result property="id" column="id" jdbcType="INTEGER"/>
+        <result property="uid" column="uid" jdbcType="VARCHAR"/>
+        <result property="aid" column="aid" jdbcType="VARCHAR"/>
+        <result property="addWechat" column="add_wechat" jdbcType="INTEGER"/>
+        <result property="wechat" column="wechat" jdbcType="VARCHAR"/>
+        <result property="renewal" column="renewal" jdbcType="INTEGER"/>
+        <result property="renewalTime" column="renewal_time" jdbcType="TIMESTAMP"/>
+        <result property="signProject" column="sign_project" jdbcType="VARCHAR"/>
+        <result property="signProjectId" column="sign_project_id" jdbcType="VARCHAR"/>
+        <result property="newTime" column="new_time" jdbcType="TIMESTAMP"/>
+        <result property="remarks" column="remarks" jdbcType="VARCHAR"/>
+        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+        <result property="techSatisfaction" column="tech_satisfaction" jdbcType="INTEGER"/>
+        <result property="businessSatisfaction" column="business_satisfaction" jdbcType="INTEGER"/>
+        <result property="addGroupChat" column="add_group_chat" jdbcType="INTEGER"/>
+    </resultMap>
+
+    <sql id="UserServiceAllSql">
+        id, uid, aid, add_wechat, wechat, renewal, renewal_time, sign_project, sign_project_id, new_time, remarks, create_time, tech_satisfaction, business_satisfaction, add_group_chat
+    </sql>
+
+    <!--查询单个-->
+    <select id="queryById" resultMap="UserServiceMap">
+        select
+        <include refid="UserServiceAllSql"/>
+        from user_service
+        where id = #{id}
+    </select>
+
+    <!--查询指定行数据-->
+    <select id="findUserServiceList" resultMap="UserServiceMap">
+        select
+        <include refid="UserServiceAllSql"/>
+
+        from user_service
+        <where>
+            <if test="id != null">
+                and id = #{id}
+            </if>
+            <if test="uid != null and uid != ''">
+                and uid = #{uid}
+            </if>
+            <if test="aid != null and aid != ''">
+                and aid = #{aid}
+            </if>
+            <if test="addWechat != null">
+                and add_wechat = #{addWechat}
+            </if>
+            <if test="wechat != null and wechat != ''">
+                and wechat = #{wechat}
+            </if>
+            <if test="renewal != null">
+                and renewal = #{renewal}
+            </if>
+            <if test="renewalTime != null">
+                and renewal_time = #{renewalTime}
+            </if>
+            <if test="signProject != null and signProject != ''">
+                and sign_project = #{signProject}
+            </if>
+            <if test="signProjectId != null and signProjectId != ''">
+                and sign_project_id = #{signProjectId}
+            </if>
+            <if test="newTime != null">
+                and new_time = #{newTime}
+            </if>
+            <if test="remarks != null and remarks != ''">
+                and remarks = #{remarks}
+            </if>
+            <if test="createTime != null">
+                and create_time = #{createTime}
+            </if>
+            <if test="techSatisfaction != null">
+                and tech_satisfaction = #{techSatisfaction}
+            </if>
+            <if test="businessSatisfaction != null">
+                and business_satisfaction = #{businessSatisfaction}
+            </if>
+            <if test="addGroupChat != null">
+                and add_group_chat = #{addGroupChat}
+            </if>
+        </where>
+        <if test="page_sql != null">
+            ${page_sql}
+        </if>
+    </select>
+
+    <!--统计总行数-->
+    <select id="findUserServiceCount" resultType="java.lang.Integer">
+        select count(1)
+        from user_service
+        <where>
+            <if test="id != null">
+                and id = #{id}
+            </if>
+            <if test="uid != null and uid != ''">
+                and uid = #{uid}
+            </if>
+            <if test="aid != null and aid != ''">
+                and aid = #{aid}
+            </if>
+            <if test="addWechat != null">
+                and add_wechat = #{addWechat}
+            </if>
+            <if test="wechat != null and wechat != ''">
+                and wechat = #{wechat}
+            </if>
+            <if test="renewal != null">
+                and renewal = #{renewal}
+            </if>
+            <if test="renewalTime != null">
+                and renewal_time = #{renewalTime}
+            </if>
+            <if test="signProject != null and signProject != ''">
+                and sign_project = #{signProject}
+            </if>
+            <if test="signProjectId != null and signProjectId != ''">
+                and sign_project_id = #{signProjectId}
+            </if>
+            <if test="newTime != null">
+                and new_time = #{newTime}
+            </if>
+            <if test="remarks != null and remarks != ''">
+                and remarks = #{remarks}
+            </if>
+            <if test="createTime != null">
+                and create_time = #{createTime}
+            </if>
+            <if test="techSatisfaction != null">
+                and tech_satisfaction = #{techSatisfaction}
+            </if>
+            <if test="businessSatisfaction != null">
+                and business_satisfaction = #{businessSatisfaction}
+            </if>
+            <if test="addGroupChat != null">
+                and add_group_chat = #{addGroupChat}
+            </if>
+        </where>
+    </select>
+
+    <!--新增所有列-->
+    <insert id="insert" keyProperty="id" useGeneratedKeys="true">
+        insert into user_service(uid, aid, add_wechat, wechat, renewal, renewal_time, sign_project, sign_project_id,
+                                 new_time, remarks, create_time, tech_satisfaction, business_satisfaction,
+                                 add_group_chat)
+        values (#{uid}, #{aid}, #{addWechat}, #{wechat}, #{renewal}, #{renewalTime}, #{signProject}, #{signProjectId},
+                #{newTime}, #{remarks}, #{createTime}, #{techSatisfaction}, #{businessSatisfaction}, #{addGroupChat})
+    </insert>
+
+    <insert id="insertSelective" parameterType="com.goafanti.common.model.UserService">
+        <!--
+          WARNING - @mbg.generated
+          This element is automatically generated by MyBatis Generator, do not modify.
+          This element was generated on Fri May 28 13:36:56 CST 2021.
+        -->
+        insert into user_service
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                id,
+            </if>
+            <if test="uid != null">
+                `uid`,
+            </if>
+            <if test="aid != null">
+                aid,
+            </if>
+            <if test="addWechat != null">
+                add_wechat,
+            </if>
+            <if test="wechat != null">
+                wechat,
+            </if>
+            <if test="renewal != null">
+                renewal,
+            </if>
+            <if test="renewalTime != null">
+                renewal_time,
+            </if>
+            <if test="signProject != null">
+                sign_project,
+            </if>
+            <if test="signProjectId != null">
+                sign_project_id,
+            </if>
+            <if test="newTime != null">
+                new_time,
+            </if>
+            <if test="remarks != null">
+                remarks,
+            </if>
+            <if test="createTime != null">
+                create_time,
+            </if>
+            <if test="techSatisfaction != null">
+                tech_satisfaction,
+            </if>
+            <if test="businessSatisfaction != null">
+                business_satisfaction,
+            </if>
+            <if test="addGroupChat != null">
+                add_group_chat,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">
+                #{id,jdbcType=INTEGER},
+            </if>
+            <if test="uid != null">
+                #{uid,jdbcType=VARCHAR},
+            </if>
+            <if test="aid != null">
+                #{aid,jdbcType=VARCHAR},
+            </if>
+            <if test="addWechat != null">
+                #{addWechat,jdbcType=INTEGER},
+            </if>
+            <if test="wechat != null">
+                #{wechat,jdbcType=VARCHAR},
+            </if>
+            <if test="renewal != null">
+                #{renewal,jdbcType=INTEGER},
+            </if>
+            <if test="renewalTime != null">
+                #{renewalTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="signProject != null">
+                #{signProject,jdbcType=VARCHAR},
+            </if>
+            <if test="signProjectId != null">
+                #{signProjectId,jdbcType=VARCHAR},
+            </if>
+            <if test="newTime != null">
+                #{newTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="remarks != null">
+                #{remarks,jdbcType=VARCHAR},
+            </if>
+            <if test="createTime != null">
+                #{createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="techSatisfaction != null">
+                #{techSatisfaction,jdbcType=INTEGER},
+            </if>
+            <if test="businessSatisfaction != null">
+                #{businessSatisfaction,jdbcType=INTEGER},
+            </if>
+            <if test="addGroupChat != null">
+                #{addGroupChat,jdbcType=INTEGER},
+            </if>
+        </trim>
+    </insert>
+
+    <insert id="insertBatch">
+        insert into user_service(uid, aid, add_wechat, wechat, renewal, renewal_time, sign_project, sign_project_id,
+        new_time, remarks, create_time, tech_satisfaction, business_satisfaction, add_group_chat)
+        values
+        <foreach collection="entities" item="entity" separator=",">
+            (#{entity.uid}, #{entity.aid}, #{entity.addWechat}, #{entity.wechat}, #{entity.renewal},
+            #{entity.renewalTime}, #{entity.signProject}, #{entity.signProjectId}, #{entity.newTime}, #{entity.remarks},
+            #{entity.createTime}, #{entity.techSatisfaction}, #{entity.businessSatisfaction}, #{entity.addGroupChat})
+        </foreach>
+    </insert>
 
-   <resultMap id="userService" type="com.goafanti.user.bo.OutOrderUserService">
-      <result column="orderNo" property="orderNo" />
-      <result column="contractNo" property="contractNo" />
-      <result column="depName" property="depName" />
-      <result column="userName" property="userName" />
-      <result column="uid" property="uid" />
-      <result column="signTimes" property="signTimes" />
-      <result column="orderTimes" property="orderTimes" />
-      <result column="newTimes" property="newTimes" />
-      <result column="adminName" property="adminName" />
-      <result column="addWechat" property="addWechat" />
-      <result column="wechat" property="wechat" />
-      <result column="deleteSign" property="deleteSign" />
-      <result column="renewal" property="renewal" />
-      <result column="signProject" property="signProject" />
-      <result column="remarks" property="remarks" />
-      <result column="renewalTimes" property="renewalTimes" />
-      <result column="techSatisfaction" property="techSatisfaction" />
-      <result column="businessSatisfaction" property="businessSatisfaction" />
-      <association column="orderNo" javaType="java.util.ArrayList" property="list" select="getTask" />
+    <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
+        insert into user_service(uid, aid, add_wechat, wechat, renewal, renewal_time, sign_project, sign_project_id,
+        new_time, remarks, create_time, tech_satisfaction, business_satisfaction, add_group_chat)
+        values
+        <foreach collection="entities" item="entity" separator=",">
+            (#{entity.uid}, #{entity.aid}, #{entity.addWechat}, #{entity.wechat}, #{entity.renewal},
+            #{entity.renewalTime}, #{entity.signProject}, #{entity.signProjectId}, #{entity.newTime}, #{entity.remarks},
+            #{entity.createTime}, #{entity.techSatisfaction}, #{entity.businessSatisfaction}, #{entity.addGroupChat})
+        </foreach>
+        on duplicate key update
+        uid = values(uid),
+        aid = values(aid),
+        add_wechat = values(add_wechat),
+        wechat = values(wechat),
+        renewal = values(renewal),
+        renewal_time = values(renewal_time),
+        sign_project = values(sign_project),
+        sign_project_id = values(sign_project_id),
+        new_time = values(new_time),
+        remarks = values(remarks),
+        create_time = values(create_time),
+        tech_satisfaction = values(tech_satisfaction),
+        business_satisfaction = values(business_satisfaction),
+        add_group_chat = values(add_group_chat)
+    </insert>
+
+    <!--通过主键修改数据-->
+    <update id="update">
+        update user_service
+        <set>
+            <if test="uid != null and uid != ''">
+                uid = #{uid},
+            </if>
+            <if test="aid != null and aid != ''">
+                aid = #{aid},
+            </if>
+            <if test="addWechat != null">
+                add_wechat = #{addWechat},
+            </if>
+            <if test="wechat != null and wechat != ''">
+                wechat = #{wechat},
+            </if>
+            <if test="renewal != null">
+                renewal = #{renewal},
+            </if>
+            <if test="renewalTime != null">
+                renewal_time = #{renewalTime},
+            </if>
+            <if test="signProject != null and signProject != ''">
+                sign_project = #{signProject},
+            </if>
+            <if test="signProjectId != null and signProjectId != ''">
+                sign_project_id = #{signProjectId},
+            </if>
+            <if test="newTime != null">
+                new_time = #{newTime},
+            </if>
+            <if test="remarks != null and remarks != ''">
+                remarks = #{remarks},
+            </if>
+            <if test="createTime != null">
+                create_time = #{createTime},
+            </if>
+            <if test="techSatisfaction != null">
+                tech_satisfaction = #{techSatisfaction},
+            </if>
+            <if test="businessSatisfaction != null">
+                business_satisfaction = #{businessSatisfaction},
+            </if>
+            <if test="addGroupChat != null">
+                add_group_chat = #{addGroupChat},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <!--通过主键删除-->
+    <delete id="deleteById">
+        delete
+        from user_service
+        where id = #{id}
+    </delete>
+
+    <select id="selectByUid" resultType="java.lang.Integer">
+        select id from user_service where uid= #{uid}
+    </select>
+
+
+
+    <resultMap id="userService" type="com.goafanti.user.bo.OutOrderUserService">
+        <result column="orderNo" property="orderNo" />
+        <result column="contractNo" property="contractNo" />
+        <result column="depName" property="depName" />
+        <result column="userName" property="userName" />
+        <result column="uid" property="uid" />
+        <result column="signTimes" property="signTimes" />
+        <result column="orderTimes" property="orderTimes" />
+        <result column="newTimes" property="newTimes" />
+        <result column="adminName" property="adminName" />
+        <result column="addWechat" property="addWechat" />
+        <result column="wechat" property="wechat" />
+        <result column="deleteSign" property="deleteSign" />
+        <result column="renewal" property="renewal" />
+        <result column="signProject" property="signProject" />
+        <result column="remarks" property="remarks" />
+        <result column="renewalTimes" property="renewalTimes" />
+        <result column="techSatisfaction" property="techSatisfaction" />
+        <result column="businessSatisfaction" property="businessSatisfaction" />
+        <result column="add_group_chat" property="addGroupChat" />
+        <association column="orderNo" javaType="java.util.ArrayList" property="list" select="getTask" />
     </resultMap>
+
     <select id="getTask" resultType="com.goafanti.user.bo.OrderProject">
-    	select id,commodity_name commodityName ,declaration_batch declarationBatch ,
-		receiver_name receiverName ,certificate_number  certificateNumber
-		from t_order_task where split_status in (0,1) and order_no = #{orderNo}
+        select id,commodity_name commodityName ,declaration_batch declarationBatch ,
+               receiver_name receiverName ,certificate_number  certificateNumber
+        from t_order_task where split_status in (0,1) and order_no = #{orderNo}
     </select>
 
 
-  <select id="OrderUseServiceList" resultMap="userService">
-select a.order_no orderNo,a.contract_no contractNo,b.dep_name depName ,a.buyer_id uid,a.create_time ,b.buyer_name userName,c.new_time ,
-date_format(a.create_time,'%Y-%m-%d %H:%i:%S') as orderTimes, date_format(c.new_time,'%Y-%m-%d %H:%i:%S') as newTimes,
-date_format(c.renewal_time,'%Y-%m-%d') as renewalTimes, date_format(a.sign_time,'%Y-%m-%d') as signTimes,a.delete_sign deleteSign ,
-d.name adminName,c.add_wechat addWechat,c.wechat ,c.renewal ,c.renewal_time ,c.sign_project signProject ,c.remarks,
-c.tech_satisfaction techSatisfaction, c.business_satisfaction businessSatisfaction
-from t_order_new a
-left join t_order_mid b on a.order_no =b.order_no  left join user_service c on a.buyer_id =c.uid
-left join admin d on c.aid =d.id
-where a.delete_sign in(0,2,3)
-    <if test="contractNo!=null">
-  and  a.contract_no like CONCAT('%', #{contractNo},'%')
-    </if>
-  <if test="userName != null">
-  and b.buyer_name like CONCAT('%', #{userName},'%')
-  </if>
-  <if test="deps != null">
-  and a.order_dep in
-    <foreach close=")" collection="deps" item="depId" open="(" separator=",">
-      #{depId}
-    </foreach>
-  </if>
-  <if test="addWechat != null">
-  and c.add_wechat = #{addWechat}
-  </if>
-  <if test="renewal != null">
-  and c.renewal = #{renewal}
-  </if>
-  <if test="startFollowTimes != null">
-  and c.new_time  BETWEEN #{startFollowTimes} and #{endFollowTimes}
-  </if>
-  <if test="startSignTimes != null">
-  and a.create_time BETWEEN #{startSignTimes} and #{endSignTimes}
-  </if>
-order by c.new_time,a.create_time
-  <if test="page_sql != null">
-    		${page_sql}
-   </if>
- </select>
+    <select id="OrderUseServiceList" resultMap="userService">
+        select a.order_no orderNo,a.contract_no contractNo,b.dep_name depName ,a.buyer_id uid,a.create_time ,b.buyer_name userName,c.new_time ,
+        date_format(a.create_time,'%Y-%m-%d %H:%i:%S') as orderTimes, date_format(c.new_time,'%Y-%m-%d %H:%i:%S') as newTimes,c.add_group_chat,
+        date_format(c.renewal_time,'%Y-%m-%d') as renewalTimes, date_format(a.sign_time,'%Y-%m-%d') as signTimes,a.delete_sign deleteSign ,
+        d.name adminName,c.add_wechat addWechat,c.wechat ,c.renewal ,c.renewal_time ,c.sign_project signProject ,c.remarks,
+        c.tech_satisfaction techSatisfaction, c.business_satisfaction businessSatisfaction
+        from t_order_new a
+        left join t_order_mid b on a.order_no =b.order_no  left join user_service c on a.buyer_id =c.uid
+        left join admin d on c.aid =d.id
+        where a.delete_sign in(0,2,3)
+        <if test="contractNo!=null">
+            and  a.contract_no like CONCAT('%', #{contractNo},'%')
+        </if>
+        <if test="userName != null">
+            and b.buyer_name like CONCAT('%', #{userName},'%')
+        </if>
+        <if test="deps != null">
+            and a.order_dep in
+            <foreach close=")" collection="deps" item="depId" open="(" separator=",">
+                #{depId}
+            </foreach>
+        </if>
+        <if test="addWechat != null">
+            and c.add_wechat = #{addWechat}
+        </if>
+        <if test="renewal != null">
+            and c.renewal = #{renewal}
+        </if>
+        <if test="startFollowTimes != null">
+            and c.new_time  BETWEEN #{startFollowTimes} and #{endFollowTimes}
+        </if>
+        <if test="startSignTimes != null">
+            and a.create_time BETWEEN #{startSignTimes} and #{endSignTimes}
+        </if>
+        <if test="addGroupChat != null">
+            and c.add_group_chat = #{addGroupChat}
+        </if>
+        order by c.new_time,a.create_time
+        <if test="page_sql != null">
+            ${page_sql}
+        </if>
+    </select>
 
- <select id="OrderUseServiceCount" resultType="java.lang.Integer">
-  select count(*)
-from t_order_new a
-left join t_order_mid b on a.order_no =b.order_no  left join user_service c on a.buyer_id =c.uid
-left join admin d on c.aid =d.id
-where a.delete_sign in(0,2,3)
-   <if test="contractNo!=null">
-     and a.contract_no like CONCAT('%', #{contractNo},'%')
-   </if>
-    <if test="userName != null">
-    and b.buyer_name like CONCAT('%', #{userName},'%')
-    </if>
-   <if test="deps != null">
-     and a.order_dep in
-     <foreach close=")" collection="deps" item="depId" open="(" separator=",">
-       #{depId}
-     </foreach>
-   </if>
-    <if test="addWechat != null">
-    and c.add_wechat = #{addWechat}
-    </if>
-    <if test="renewal != null">
-    and c.renewal = #{renewal}
-    </if>
-    <if test="startFollowTimes != null">
-    and c.new_time  BETWEEN #{startFollowTimes} and #{endFollowTimes}
-    </if>
-    <if test="startSignTimes != null">
-    and a.create_time BETWEEN #{startSignTimes} and #{endSignTimes}
-    </if>
- </select>
+    <select id="OrderUseServiceCount" resultType="java.lang.Integer">
+        select count(*)
+        from t_order_new a
+        left join t_order_mid b on a.order_no =b.order_no  left join user_service c on a.buyer_id =c.uid
+        left join admin d on c.aid =d.id
+        where a.delete_sign in(0,2,3)
+        <if test="contractNo!=null">
+            and a.contract_no like CONCAT('%', #{contractNo},'%')
+        </if>
+        <if test="userName != null">
+            and b.buyer_name like CONCAT('%', #{userName},'%')
+        </if>
+        <if test="deps != null">
+            and a.order_dep in
+            <foreach close=")" collection="deps" item="depId" open="(" separator=",">
+                #{depId}
+            </foreach>
+        </if>
+        <if test="addWechat != null">
+            and c.add_wechat = #{addWechat}
+        </if>
+        <if test="renewal != null">
+            and c.renewal = #{renewal}
+        </if>
+        <if test="startFollowTimes != null">
+            and c.new_time  BETWEEN #{startFollowTimes} and #{endFollowTimes}
+        </if>
+        <if test="startSignTimes != null">
+            and a.create_time BETWEEN #{startSignTimes} and #{endSignTimes}
+        </if>
+        <if test="addGroupChat != null">
+            and c.add_group_chat = #{addGroupChat}
+        </if>
+    </select>
 </mapper>
+

+ 187 - 357
src/main/java/com/goafanti/common/model/UserService.java

@@ -3,362 +3,192 @@ package com.goafanti.common.model;
 import java.io.Serializable;
 import java.util.Date;
 
+
+/**
+ * 客服信息表(UserService)实体类
+ *
+ * @author makejava
+ * @since 2024-11-06 09:00:41
+ */
 public class UserService implements Serializable {
+    private static final long serialVersionUID = 215446055667637479L;
+
+    private Integer id;
+
+    private String uid;
+    /**
+     * 操作人
+     */
+    private String aid;
+    /**
+     * 添加微信 0否 1是
+     */
+    private Integer addWechat;
+    /**
+     * 微信
+     */
+    private String wechat;
+    /**
+     * 续签状态 0=未联系上当前联系人,1=企业已签其他机构,2=企业自己申报,3=企业不打算申报/注销,4=得续签,未报价,5=待续签,已报价,6已续签/复审、续签时间、续签项目
+     */
+    private Integer renewal;
+    /**
+     * 续签时间
+     */
+    private Date renewalTime;
+    /**
+     * 已签项目
+     */
+    private String signProject;
+    /**
+     * 已签项目编号
+     */
+    private String signProjectId;
+    /**
+     * 最新更新时间
+     */
+    private Date newTime;
+    /**
+     * 备注
+     */
+    private String remarks;
+    /**
+     * 操作时间
+     */
+    private Date createTime;
+    /**
+     * 技术端满意度
+     */
+    private Integer techSatisfaction;
+    /**
+     * 业务端满意度
+     */
+    private Integer businessSatisfaction;
+    /**
+     * 入群 0=否,1=是
+     */
+    private Integer addGroupChat;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getUid() {
+        return uid;
+    }
+
+    public void setUid(String uid) {
+        this.uid = uid;
+    }
+
+    public String getAid() {
+        return aid;
+    }
+
+    public void setAid(String aid) {
+        this.aid = aid;
+    }
+
+    public Integer getAddWechat() {
+        return addWechat;
+    }
+
+    public void setAddWechat(Integer addWechat) {
+        this.addWechat = addWechat;
+    }
+
+    public String getWechat() {
+        return wechat;
+    }
+
+    public void setWechat(String wechat) {
+        this.wechat = wechat;
+    }
+
+    public Integer getRenewal() {
+        return renewal;
+    }
+
+    public void setRenewal(Integer renewal) {
+        this.renewal = renewal;
+    }
+
+    public Date getRenewalTime() {
+        return renewalTime;
+    }
+
+    public void setRenewalTime(Date renewalTime) {
+        this.renewalTime = renewalTime;
+    }
+
+    public String getSignProject() {
+        return signProject;
+    }
+
+    public void setSignProject(String signProject) {
+        this.signProject = signProject;
+    }
+
+    public String getSignProjectId() {
+        return signProjectId;
+    }
+
+    public void setSignProjectId(String signProjectId) {
+        this.signProjectId = signProjectId;
+    }
+
+    public Date getNewTime() {
+        return newTime;
+    }
+
+    public void setNewTime(Date newTime) {
+        this.newTime = newTime;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks == null ? null : remarks.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Integer getTechSatisfaction() {
+        return techSatisfaction;
+    }
+
+    public void setTechSatisfaction(Integer techSatisfaction) {
+        this.techSatisfaction = techSatisfaction;
+    }
+
+    public Integer getBusinessSatisfaction() {
+        return businessSatisfaction;
+    }
+
+    public void setBusinessSatisfaction(Integer businessSatisfaction) {
+        this.businessSatisfaction = businessSatisfaction;
+    }
+
+    public Integer getAddGroupChat() {
+        return addGroupChat;
+    }
+
+    public void setAddGroupChat(Integer addGroupChat) {
+        this.addGroupChat = addGroupChat;
+    }
+
+}
 
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service.id
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	private Integer id;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service.uid
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	private String uid;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service.aid
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	private String aid;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service.add_wechat
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	private Integer addWechat;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service.wechat
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	private String wechat;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service.renewal
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	private Integer renewal;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service.renewal_time
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	private Date renewalTime;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service.sign_project
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	private String signProject;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service.sign_project_id
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	private String signProjectId;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service.new_time
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	private Date newTime;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service.remarks
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	private String remarks;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service.create_time
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	private Date createTime;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service.tech_satisfaction
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	private Integer techSatisfaction;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service.business_satisfaction
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	private Integer businessSatisfaction;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database table user_service
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_service.id
-	 * @return  the value of user_service.id
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	public Integer getId() {
-		return id;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_service.id
-	 * @param id  the value for user_service.id
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_service.uid
-	 * @return  the value of user_service.uid
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	public String getUid() {
-		return uid;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_service.uid
-	 * @param uid  the value for user_service.uid
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	public void setUid(String uid) {
-		this.uid = uid == null ? null : uid.trim();
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_service.aid
-	 * @return  the value of user_service.aid
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	public String getAid() {
-		return aid;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_service.aid
-	 * @param aid  the value for user_service.aid
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	public void setAid(String aid) {
-		this.aid = aid == null ? null : aid.trim();
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_service.add_wechat
-	 * @return  the value of user_service.add_wechat
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	public Integer getAddWechat() {
-		return addWechat;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_service.add_wechat
-	 * @param addWechat  the value for user_service.add_wechat
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	public void setAddWechat(Integer addWechat) {
-		this.addWechat = addWechat;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_service.wechat
-	 * @return  the value of user_service.wechat
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	public String getWechat() {
-		return wechat;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_service.wechat
-	 * @param wechat  the value for user_service.wechat
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	public void setWechat(String wechat) {
-		this.wechat = wechat == null ? null : wechat.trim();
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_service.renewal
-	 * @return  the value of user_service.renewal
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	public Integer getRenewal() {
-		return renewal;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_service.renewal
-	 * @param renewal  the value for user_service.renewal
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	public void setRenewal(Integer renewal) {
-		this.renewal = renewal;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_service.renewal_time
-	 * @return  the value of user_service.renewal_time
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	public Date getRenewalTime() {
-		return renewalTime;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_service.renewal_time
-	 * @param renewalTime  the value for user_service.renewal_time
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	public void setRenewalTime(Date renewalTime) {
-		this.renewalTime = renewalTime;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_service.sign_project
-	 * @return  the value of user_service.sign_project
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	public String getSignProject() {
-		return signProject;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_service.sign_project
-	 * @param signProject  the value for user_service.sign_project
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	public void setSignProject(String signProject) {
-		this.signProject = signProject == null ? null : signProject.trim();
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_service.sign_project_id
-	 * @return  the value of user_service.sign_project_id
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	public String getSignProjectId() {
-		return signProjectId;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_service.sign_project_id
-	 * @param signProjectId  the value for user_service.sign_project_id
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	public void setSignProjectId(String signProjectId) {
-		this.signProjectId = signProjectId == null ? null : signProjectId.trim();
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_service.new_time
-	 * @return  the value of user_service.new_time
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	public Date getNewTime() {
-		return newTime;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_service.new_time
-	 * @param newTime  the value for user_service.new_time
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	public void setNewTime(Date newTime) {
-		this.newTime = newTime;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_service.remarks
-	 * @return  the value of user_service.remarks
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	public String getRemarks() {
-		return remarks;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_service.remarks
-	 * @param remarks  the value for user_service.remarks
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	public void setRemarks(String remarks) {
-		this.remarks = remarks == null ? null : remarks.trim();
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_service.create_time
-	 * @return  the value of user_service.create_time
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	public Date getCreateTime() {
-		return createTime;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_service.create_time
-	 * @param createTime  the value for user_service.create_time
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_service.tech_satisfaction
-	 * @return  the value of user_service.tech_satisfaction
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	public Integer getTechSatisfaction() {
-		return techSatisfaction;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_service.tech_satisfaction
-	 * @param techSatisfaction  the value for user_service.tech_satisfaction
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	public void setTechSatisfaction(Integer techSatisfaction) {
-		this.techSatisfaction = techSatisfaction;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column user_service.business_satisfaction
-	 * @return  the value of user_service.business_satisfaction
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	public Integer getBusinessSatisfaction() {
-		return businessSatisfaction;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column user_service.business_satisfaction
-	 * @param businessSatisfaction  the value for user_service.business_satisfaction
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	public void setBusinessSatisfaction(Integer businessSatisfaction) {
-		this.businessSatisfaction = businessSatisfaction;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_service
-	 * @mbg.generated  Fri May 28 13:36:56 CST 2021
-	 */
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append(getClass().getSimpleName());
-		sb.append(" [");
-		sb.append("Hash = ").append(hashCode());
-		sb.append(", id=").append(id);
-		sb.append(", uid=").append(uid);
-		sb.append(", aid=").append(aid);
-		sb.append(", addWechat=").append(addWechat);
-		sb.append(", wechat=").append(wechat);
-		sb.append(", renewal=").append(renewal);
-		sb.append(", renewalTime=").append(renewalTime);
-		sb.append(", signProject=").append(signProject);
-		sb.append(", signProjectId=").append(signProjectId);
-		sb.append(", newTime=").append(newTime);
-		sb.append(", remarks=").append(remarks);
-		sb.append(", createTime=").append(createTime);
-		sb.append(", techSatisfaction=").append(techSatisfaction);
-		sb.append(", businessSatisfaction=").append(businessSatisfaction);
-		sb.append(", serialVersionUID=").append(serialVersionUID);
-		sb.append("]");
-		return sb.toString();
-	}
-}

+ 110 - 3
src/main/java/com/goafanti/common/utils/HttpUtils.java

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
 import org.apache.http.ParseException;
-import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
@@ -13,15 +12,122 @@ import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.util.EntityUtils;
 
-import java.io.IOException;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
+import java.io.*;
+import java.net.URL;
 import java.net.UnknownHostException;
 import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
 import java.util.Map;
 import java.util.Set;
 
 public class HttpUtils {
 
+	/**
+	 * 发送https请求
+	 *
+	 * @param url           url
+	 * @param requestMethod 请求方式
+	 * @param param         请求参数
+	 * @return 返回值
+	 */
+	public String sendHttpsRequest(String url, String requestMethod, Map<String,Object> param) {
+		StringBuilder result = new StringBuilder();
+		try {
+			SSLContext sc = SSLContext.getInstance("SSL");
+			sc.init(null, new TrustManager[]{
+					new X509TrustManager() {
+						@Override
+						public void checkClientTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException {
+						}
+
+						@Override
+						public void checkServerTrusted(X509Certificate[] x509Certificates, String s) throws CertificateException {
+						}
+
+						@Override
+						public X509Certificate[] getAcceptedIssuers() {
+							return new X509Certificate[0];
+						}
+					}
+			}, new SecureRandom());
+			URL console = new URL(url);
+			HttpsURLConnection conn = (HttpsURLConnection) console.openConnection();
+			// GET/POST
+			conn.setRequestMethod(requestMethod);
+			conn.setRequestProperty("Content-Type", "application/json");
+			conn.setDoOutput(true);
+			conn.setDoInput(true);
+			// 设置证书忽略相关操作
+			conn.setSSLSocketFactory(sc.getSocketFactory());
+			if (null != param) {
+				OutputStream outputStream = conn.getOutputStream();
+				// 注意编码格式
+				outputStream.write(JSON.toJSONString(param).getBytes(StandardCharsets.UTF_8));
+				outputStream.close();
+			}
+
+
+			conn.setHostnameVerifier((s, sslSession) -> true);
+			conn.connect();
+			InputStream is = conn.getInputStream();
+			BufferedReader br = new BufferedReader(new InputStreamReader(is,StandardCharsets.UTF_8));
+			String ret = "";
+			while ((ret = br.readLine()) != null) {
+				if (!ret.trim().isEmpty()) {
+					result.append(ret);
+				}
+			}
+			conn.disconnect();
+			br.close();
+		} catch (NoSuchAlgorithmException | KeyManagementException | IOException e) {
+			e.printStackTrace();
+		}
+        return result.toString();
+	}
+
+	// http协议访问方法
+//	public String sendHttpRequest(String url, String requestMethod, String param) {
+//		StringBuilder result = new StringBuilder();
+//		try {
+//			URL console = new URL(url);
+//			HttpURLConnection conn = (HttpURLConnection) console.openConnection();
+//			// GET/POST
+//			conn.setRequestMethod(requestMethod);
+//			conn.setRequestProperty("Content-Type", "application/json");
+//			conn.setDoOutput(true);
+//			conn.setDoInput(true);
+//			if (null != param) {
+//				OutputStream outputStream = conn.getOutputStream();
+//				// 注意编码格式
+//				outputStream.write(param.getBytes("UTF-8"));
+//				outputStream.close();
+//			}
+//
+//			conn.connect();
+//			InputStream is = conn.getInputStream();
+//			BufferedReader br = new BufferedReader(new InputStreamReader(is));
+//			String ret = "";
+//			while ((ret = br.readLine()) != null) {
+//				if (ret != null && !ret.trim().equals("")) {
+//					result.append(new String(ret.getBytes("utf-8"), "utf-8"));
+//				}
+//			}
+//			conn.disconnect();
+//			br.close();
+//		} catch (IOException ioException) {
+//			ioException.printStackTrace();
+//		}
+//		return result.toString();
+//	}
+
 
 
 	 public static JSONObject httpGet(String url) {
@@ -102,4 +208,5 @@ public class HttpUtils {
 	}
 
 
+
 }

+ 27 - 0
src/main/java/com/goafanti/customer/controller/UserOutboundApiController.java

@@ -0,0 +1,27 @@
+package com.goafanti.customer.controller;
+
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.controller.BaseApiController;
+import com.goafanti.customer.service.UserOutboundService;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+
+@RestController
+@RequestMapping("/api/admin/userOutbound")
+public class UserOutboundApiController  extends BaseApiController {
+
+    @Resource
+    private UserOutboundService userOutboundService;
+    /**
+     * 客户外呼查询
+     *
+     */
+    @PostMapping("/checkUser")
+    public Result checkUser(Integer type) {
+        return new Result<>().data(this.userOutboundService.checkUser(type));
+    }
+}

+ 5 - 0
src/main/java/com/goafanti/customer/service/UserOutboundService.java

@@ -0,0 +1,5 @@
+package com.goafanti.customer.service;
+
+public interface UserOutboundService {
+    Object checkUser(Integer type);
+}

+ 44 - 0
src/main/java/com/goafanti/customer/service/impl/UserOutboundServiceImpl.java

@@ -0,0 +1,44 @@
+package com.goafanti.customer.service.impl;
+
+import com.goafanti.common.dao.UserArchivesMapper;
+import com.goafanti.common.utils.HttpUtils;
+import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.customer.service.UserOutboundService;
+import org.apache.shiro.crypto.hash.SimpleHash;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Service("userOutboundService")
+public class UserOutboundServiceImpl extends BaseMybatisDao<UserArchivesMapper> implements UserOutboundService {
+    static final String customer="C322";
+    static final String seq="20241101";
+    static final String pwd="084332D02CCF7B42461F34155AC8754F";
+    static final String version= "2.0.6";
+    static final String default_url ="https://webmc.zb-sx.cn:1443";
+
+    @Override
+    public Object checkUser(Integer type) {
+        String url= default_url +"/openapi/"+version+"/getClientInfo";
+        Map<String,Object> param=new HashMap<>();
+        Map<String,Object> authentication=new HashMap<>();
+        authentication.put("customer","C322");
+        long timeMillis = System.currentTimeMillis();
+        authentication.put("timestamp",timeMillis);
+        authentication.put("seq",seq);
+        String digestSource=customer+"@"+timeMillis+"@"+seq+"@"+pwd;
+//        System.out.println("digestSource="+digestSource);
+        String md5 = new SimpleHash("MD5", digestSource).toHex();
+//        System.out.println("md5="+md5);
+        authentication.put("digest",md5);
+        param.put("authentication",authentication);
+        Map<String,Object> request=new HashMap<>();
+        request.put("type",type);
+        param.put("request",request);
+        HttpUtils httpUtils=new HttpUtils();
+        String s = httpUtils.sendHttpsRequest(url, "POST", param);
+        System.out.println(s);
+        return null;
+    }
+}

+ 0 - 1
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -1805,7 +1805,6 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
                 if(StringUtils.isNotBlank(in.getAid()))param.put("aid",in.getAid());
             }else if (TokenManager.hasRole(AFTConstants.FINANCE)){
                 //0 设置为财务查看
-
                 param.put("auditor",TokenManager.getAdminId());
                 //如果是空设置为
                 if (in.getProcessStatus()==null)in.setProcessStatus(2);

+ 1 - 5
src/main/java/com/goafanti/organization/service/impl/OrganizationServiceImpl.java

@@ -441,12 +441,8 @@ public class OrganizationServiceImpl extends BaseMybatisDao<DepartmentMapper> im
 		//切换财务审核与财务复审
 		if (in.getExpenseFinanceId()!=null&&!in.getExpenseFinanceId().equals(useDep.getExpenseFinanceId())){
 			//如果新的财务审核人与旧财务审核人不一致,切换审核人
-			adminMapper.updateDepExpenseFinance(in.getId(),in.getExpenseFinanceId());
-		}
-
-		if (in.getExpenseFinanceId()!=null&&!in.getExpenseFinanceId().equals(useDep.getExpenseFinanceId())){
 			dep.setExpenseFinanceId(in.getExpenseFinanceId());
-			departmentMapper.updateExpenseFinanceNotExamine(in.getExpenseFinanceId(), useDep.getExpenseFinanceId());
+			adminMapper.updateDepExpenseFinance(in.getId(),in.getExpenseFinanceId());
 		}
 		if (updateFinance){
 			aids.add(in.getFinanceId());

+ 9 - 0
src/main/java/com/goafanti/user/bo/InputListOrderUserService.java

@@ -23,9 +23,18 @@ public class InputListOrderUserService {
 	private String startSignTimes;
 	private String endSignTimes;
 	private String contractNo;
+	private Integer addGroupChat;
 	private Integer pageSize;
 	private Integer pageNo;
 
+	public Integer getAddGroupChat() {
+		return addGroupChat;
+	}
+
+	public void setAddGroupChat(Integer addGroupChat) {
+		this.addGroupChat = addGroupChat;
+	}
+
 	public String getContractNo() {
 		return contractNo;
 	}

+ 12 - 1
src/main/java/com/goafanti/user/bo/InputUserServiceFollow.java

@@ -8,10 +8,21 @@ public class InputUserServiceFollow extends UserServiceFollow{
 	 * 
 	 */
 	private static final long serialVersionUID = 1L;
-	
+
+	/**
+	 * 是否加群 0=否,1=是
+	 */
+	private Integer addGroupChat;
 	
 	private String renewalTimes;
 
+	public Integer getAddGroupChat() {
+		return addGroupChat;
+	}
+
+	public void setAddGroupChat(Integer addGroupChat) {
+		this.addGroupChat = addGroupChat;
+	}
 
 	public String getRenewalTimes() {
 		return renewalTimes;

+ 14 - 5
src/main/java/com/goafanti/user/bo/OutOrderUserService.java

@@ -1,9 +1,9 @@
 package com.goafanti.user.bo;
 
-import java.util.List;
-
 import com.goafanti.common.utils.excel.Excel;
 
+import java.util.List;
+
 
 public class OutOrderUserService {
 	@Excel(name = "订单编号")
@@ -49,11 +49,20 @@ public class OutOrderUserService {
 	private Integer techSatisfaction;
 	@Excel(name = "业务端满意度",readConverterExp = "0=已投诉,1=不满意,2=一般满意,3=非常满意")
 	private Integer businessSatisfaction;
+	@Excel(name = "是否入群",readConverterExp = "0=否,1=是")
+	private Integer addGroupChat;
 	private String uid;
 	private List<OrderProject> list;
-	
-	
-	
+
+	public Integer getAddGroupChat() {
+		if (addGroupChat==null)return 0;
+		return addGroupChat;
+	}
+
+	public void setAddGroupChat(Integer addGroupChat) {
+		this.addGroupChat = addGroupChat;
+	}
+
 	public Integer getTechSatisfaction() {
 		return techSatisfaction;
 	}

+ 22 - 10
src/main/java/com/goafanti/user/controller/UserServiceApiController.java

@@ -1,15 +1,5 @@
 package com.goafanti.user.controller;
 
-import java.util.List;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
@@ -18,6 +8,13 @@ import com.goafanti.user.bo.InputListOrderUserService;
 import com.goafanti.user.bo.InputUserServiceFollow;
 import com.goafanti.user.bo.OutOrderUserService;
 import com.goafanti.user.service.UserServiceService;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
 
 @RestController
 @RequestMapping(value = "/api/admin")
@@ -41,6 +38,21 @@ public class UserServiceApiController extends BaseApiController {
 		return res;
 	}
 
+	/**
+	 * 修改用户是否入群
+	 * @param us
+	 * @return
+	 */
+	@RequestMapping(value = "/updateUseService",method = RequestMethod.POST)
+	public Result updateUseService(InputUserServiceFollow us) {
+		Result res =new Result();
+		if(us.getUid()==null) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "用户编号"));
+		}
+		res.data(userServiceService.updateUseService(us));
+		return res;
+	}
+
 
 	@RequestMapping(value = "/listUseServiceFollow",method = RequestMethod.GET)
 	public Result listUseServiceFollow(String uid) {

+ 3 - 3
src/main/java/com/goafanti/user/service/UserServiceService.java

@@ -1,13 +1,13 @@
 package com.goafanti.user.service;
 
-import java.util.List;
-
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.user.bo.InputListOrderUserService;
 import com.goafanti.user.bo.InputUserServiceFollow;
 import com.goafanti.user.bo.OutOrderUserService;
 import com.goafanti.user.bo.OutUserServiceFollow;
 
+import java.util.List;
+
 public interface UserServiceService {
 
 	int addUseService(InputUserServiceFollow us);
@@ -22,5 +22,5 @@ public interface UserServiceService {
 	List<OutOrderUserService> listOrderUseServiceGetList(InputListOrderUserService i);
 
 
-
+	int updateUseService(InputUserServiceFollow us);
 }

+ 24 - 5
src/main/java/com/goafanti/user/service/impl/UserServiceServiceImpl.java

@@ -49,7 +49,7 @@ public class  UserServiceServiceImpl extends BaseMybatisDao<UserServiceMapper> i
 		}else {
 			u.setId(id);
 			u.setCreateTime(null);
-			userServiceMapper.updateByPrimaryKeySelective(u);
+			userServiceMapper.update(u);
 		}
 		return 1;
 	}
@@ -80,6 +80,7 @@ public class  UserServiceServiceImpl extends BaseMybatisDao<UserServiceMapper> i
 		if(i.getAddWechat()!=null)map.put("addWechat", i.getAddWechat());
 		if(i.getRenewal()!=null)map.put("renewal", i.getRenewal());
 		if (i.getContractNo()!=null)map.put("contractNo", i.getContractNo());
+		if (i.getAddGroupChat()!=null)map.put("addGroupChat", i.getAddGroupChat());
 		return map;
 	}
 
@@ -93,12 +94,30 @@ public class  UserServiceServiceImpl extends BaseMybatisDao<UserServiceMapper> i
 		return list;
 	}
 
+	@Override
+	public int updateUseService(InputUserServiceFollow us) {
+		UserService update =new UserService();
+		Integer id=userServiceMapper.selectByUid(us.getUid());
+		update.setUid(us.getUid());
+		update.setAddGroupChat(us.getAddGroupChat());
+		Date date = new Date();
+		if (id==null) {
+			update.setCreateTime(date);
+			update.setNewTime(date);
+			userServiceMapper.insertSelective(update);
+		}else {
+			update.setId(id);
+			userServiceMapper.update(update);
+		}
+		return 1;
+	}
+
 	private void setOrderUserService(List<OutOrderUserService> list) {
 		for (OutOrderUserService ou: list) {
-			StringBuffer projects=new StringBuffer();
-			StringBuffer consultants=new StringBuffer();
-			StringBuffer declareBatchs=new StringBuffer();
-			StringBuffer certificationNos=new StringBuffer();
+			StringBuilder projects=new StringBuilder();
+			StringBuilder consultants=new StringBuilder();
+			StringBuilder declareBatchs=new StringBuilder();
+			StringBuilder certificationNos=new StringBuilder();
 			for (OrderProject o : ou.getList()) {
 				if (StringUtils.isNotBlank(o.getCommodityName())) {
 					projects.append(o.getCommodityName());

+ 2 - 2
src/main/resources/props/config_local.properties

@@ -1,8 +1,8 @@
 dev.name=local
 jdbc.driverClassName=com.mysql.jdbc.Driver
 
-static.host=//static.jishutao.com/1.3.26
-#static.host=//172.16.1.187/1.3.26
+#static.host=//static.jishutao.com/1.3.27
+static.host=//172.16.1.187/1.3.27
 
 #jdbc.url=jdbc\:mysql://localhost:3306/aft20240430?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -1,5 +1,5 @@
 dev.name=test
-static.host=//static.jishutao.com/1.3.26
+static.host=//static.jishutao.com/1.3.27
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 jdbc.url=jdbc:mysql://127.0.0.1:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false