anderx 4 년 전
부모
커밋
3a3aa22bda
20개의 변경된 파일1771개의 추가작업 그리고 14개의 파일을 삭제
  1. 5 9
      GeneratorConfig.xml
  2. 2 0
      src/main/java/com/goafanti/common/dao/TOrderTaskMapper.java
  3. 47 0
      src/main/java/com/goafanti/common/dao/UserServiceFollowMapper.java
  4. 44 0
      src/main/java/com/goafanti/common/dao/UserServiceMapper.java
  5. 5 0
      src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml
  6. 212 0
      src/main/java/com/goafanti/common/mapper/UserServiceFollowMapper.xml
  7. 305 0
      src/main/java/com/goafanti/common/mapper/UserServiceMapper.xml
  8. 316 0
      src/main/java/com/goafanti/common/model/UserService.java
  9. 292 0
      src/main/java/com/goafanti/common/model/UserServiceFollow.java
  10. 3 3
      src/main/java/com/goafanti/order/controller/OrderProjectApiController.java
  11. 3 2
      src/main/java/com/goafanti/order/service/OrderProjectService.java
  12. 7 0
      src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java
  13. 90 0
      src/main/java/com/goafanti/user/bo/InputListOrderUserService.java
  14. 25 0
      src/main/java/com/goafanti/user/bo/InputUserServiceFollow.java
  15. 42 0
      src/main/java/com/goafanti/user/bo/OrderProject.java
  16. 187 0
      src/main/java/com/goafanti/user/bo/OutOrderUserService.java
  17. 29 0
      src/main/java/com/goafanti/user/bo/OutUserServiceFollow.java
  18. 58 0
      src/main/java/com/goafanti/user/controller/UserServiceApiController.java
  19. 23 0
      src/main/java/com/goafanti/user/service/UserServiceService.java
  20. 76 0
      src/main/java/com/goafanti/user/service/impl/UserServiceServiceImpl.java

+ 5 - 9
GeneratorConfig.xml

@@ -43,15 +43,11 @@
     <property name="enableSubPackages" value="false"/>
      <property name="nullCatalogMeansCurrent" value="true"/>
     </javaClientGenerator>
-    <table schema="aft" tableName="task_attribution_log"   enableCountByExample="false"
-               enableUpdateByExample="false"
-               enableDeleteByExample="false"
-               enableSelectByExample="false"
-               selectByExampleQueryId="false"
-               enableSelectByPrimaryKey="true"
-               enableUpdateByPrimaryKey="true"
-               enableDeleteByPrimaryKey="true"
-        >
+    <table schema="aft" tableName="user_service"
+	enableCountByExample="false" enableUpdateByExample="false"
+	enableDeleteByExample="false" enableSelectByExample="false"
+	selectByExampleQueryId="false" enableSelectByPrimaryKey="true"
+	enableUpdateByPrimaryKey="true" enableDeleteByPrimaryKey="true">
          <property name="useActualColumnNames" value="false"/>
         </table>
   </context>

+ 2 - 0
src/main/java/com/goafanti/common/dao/TOrderTaskMapper.java

@@ -78,4 +78,6 @@ public interface TOrderTaskMapper {
 
 	List<String> getLockId(@Param("orderNo")String orderNo, @Param("aid")String aid, @Param("uid")String uid);
 
+	List<TOrderTask> selectUidByproject(String uid);
+
 }

+ 47 - 0
src/main/java/com/goafanti/common/dao/UserServiceFollowMapper.java

@@ -0,0 +1,47 @@
+package com.goafanti.common.dao;
+
+import java.util.List;
+
+import com.goafanti.common.model.UserServiceFollow;
+import com.goafanti.user.bo.OutUserServiceFollow;
+
+public interface UserServiceFollowMapper {
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_service_follow
+	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 */
+	int deleteByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_service_follow
+	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 */
+	int insert(UserServiceFollow record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_service_follow
+	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 */
+	int insertSelective(UserServiceFollow record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_service_follow
+	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 */
+	UserServiceFollow selectByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_service_follow
+	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 */
+	int updateByPrimaryKeySelective(UserServiceFollow record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_service_follow
+	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 */
+	int updateByPrimaryKey(UserServiceFollow record);
+
+	List<OutUserServiceFollow> listUseServiceFollow(String uid);
+}

+ 44 - 0
src/main/java/com/goafanti/common/dao/UserServiceMapper.java

@@ -0,0 +1,44 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.UserService;
+
+public interface UserServiceMapper {
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_service
+	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 */
+	int deleteByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_service
+	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 */
+	int insert(UserService record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_service
+	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 */
+	int insertSelective(UserService record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_service
+	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 */
+	UserService selectByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_service
+	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 */
+	int updateByPrimaryKeySelective(UserService record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_service
+	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 */
+	int updateByPrimaryKey(UserService record);
+
+	Integer selectByUid(String uid);
+}

+ 5 - 0
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -1992,4 +1992,9 @@ left join department de on x.department_id=de.id left join business_category bc
     and a.task_distribution_time between #{startTime} and #{endTime}
      </if>
   </select>
+  <select id="selectUidByproject" resultType="com.goafanti.common.model.TOrderTask">
+  select a.order_no orderNo ,b.id,b.commodity_name commodityName from t_order_new a 
+	left join t_order_task b on a.order_no =b.order_no 
+	where a.buyer_id = #{uid}
+  </select>
 </mapper>

+ 212 - 0
src/main/java/com/goafanti/common/mapper/UserServiceFollowMapper.xml

@@ -0,0 +1,212 @@
+<?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.UserServiceFollowMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.UserServiceFollow">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue May 18 15:33:51 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_id" jdbcType="VARCHAR" property="signProjectId" />
+    <result column="sign_project" jdbcType="VARCHAR" property="signProject" />
+    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+  </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 Tue May 18 15:33:51 CST 2021.
+    -->
+    id, `uid`, aid, add_wechat, wechat, renewal, renewal_time, sign_project_id, sign_project, 
+    remarks, create_time
+  </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 Tue May 18 15:33:51 CST 2021.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from user_service_follow
+    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 Tue May 18 15:33:51 CST 2021.
+    -->
+    delete from user_service_follow
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.UserServiceFollow">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue May 18 15:33:51 CST 2021.
+    -->
+    insert into user_service_follow (id, `uid`, aid, 
+      add_wechat, wechat, renewal, 
+      renewal_time, sign_project_id, sign_project, 
+      remarks, create_time)
+    values (#{id,jdbcType=INTEGER}, #{uid,jdbcType=VARCHAR}, #{aid,jdbcType=VARCHAR}, 
+      #{addWechat,jdbcType=INTEGER}, #{wechat,jdbcType=VARCHAR}, #{renewal,jdbcType=INTEGER}, 
+      #{renewalTime,jdbcType=TIMESTAMP}, #{signProjectId,jdbcType=VARCHAR}, #{signProject,jdbcType=VARCHAR}, 
+      #{remarks,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.UserServiceFollow">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue May 18 15:33:51 CST 2021.
+    -->
+    insert into user_service_follow
+    <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="signProjectId != null">
+        sign_project_id,
+      </if>
+      <if test="signProject != null">
+        sign_project,
+      </if>
+      <if test="remarks != null">
+        remarks,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </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="signProjectId != null">
+        #{signProjectId,jdbcType=VARCHAR},
+      </if>
+      <if test="signProject != null">
+        #{signProject,jdbcType=VARCHAR},
+      </if>
+      <if test="remarks != null">
+        #{remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.UserServiceFollow">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue May 18 15:33:51 CST 2021.
+    -->
+    update user_service_follow
+    <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="signProjectId != null">
+        sign_project_id = #{signProjectId,jdbcType=VARCHAR},
+      </if>
+      <if test="signProject != null">
+        sign_project = #{signProject,jdbcType=VARCHAR},
+      </if>
+      <if test="remarks != null">
+        remarks = #{remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.UserServiceFollow">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue May 18 15:33:51 CST 2021.
+    -->
+    update user_service_follow
+    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_id = #{signProjectId,jdbcType=VARCHAR},
+      sign_project = #{signProject,jdbcType=VARCHAR},
+      remarks = #{remarks,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <select id="listUseServiceFollow" resultType="com.goafanti.user.bo.OutUserServiceFollow">
+	select id, `uid`, aid, add_wechat addWechat, wechat, renewal, renewal_time renewalTime, sign_project_id signProjectId,
+ sign_project signProject,  create_time createTime ,date_format(renewal_time,'%Y-%m-%d') as renewalTimes,
+ date_format(create_time,'%Y-%m-%d %H:%i:%S') as createTimes,remarks
+  from user_service_follow
+    where uid = #{uid}
+    order by create_time desc
+  </select>
+</mapper>

+ 305 - 0
src/main/java/com/goafanti/common/mapper/UserServiceMapper.xml

@@ -0,0 +1,305 @@
+<?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 Tue May 18 15:33:59 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" />
+  </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 Tue May 18 15:33:59 CST 2021.
+    -->
+    id, `uid`, aid, add_wechat, wechat, renewal, renewal_time, sign_project, sign_project_id, 
+    new_time, remarks, create_time
+  </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 Tue May 18 15:33:59 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 Tue May 18 15:33:59 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 Tue May 18 15:33:59 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
+      )
+    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}
+      )
+  </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 Tue May 18 15:33:59 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>
+    </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>
+    </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 Tue May 18 15:33:59 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>
+    </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 Tue May 18 15:33:59 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}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <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 property="orderNo" column="orderNo"/>
+      <result property="contractNo" column="contractNo"/>
+      <result property="depName" column="depName"/>
+      <result property="userName" column="userName"/>
+      <result property="signTimes" column="signTimes"/>
+      <result property="newTimes" column="newTimes"/>
+      <result property="adminName" column="adminName"/>
+      <result property="addWechat" column="addWechat"/>
+      <result property="wechat" column="wechat"/>
+      <result property="renewal" column="renewal"/>
+      <result property="signProject" column="signProject"/>
+      <result property="remarks" column="remarks"/>
+      <result property="renewalTimes" column="renewalTimes"/>
+      <collection property="list" javaType="java.util.ArrayList" ofType="com.goafanti.user.bo.OrderProject">
+        <id property="id" column="id"/>
+        <result property="commodityName" column="commodityName"/>
+        <result property="receiverName" column="receiverName"/>
+        <result property="declarationBatch" column="declarationBatch"/>
+        <result property="certificateNumber" column="certificateNumber"/>
+      </collection>
+    </resultMap>
+  
+  
+  <select id="OrderUseServiceList" resultMap="userService">
+  select a.order_no orderNo,a.contract_no contractNo,b.dep_name depName ,a.create_time ,b.buyer_name userName,c.new_time ,
+date_format(a.create_time,'%Y-%m-%d %H:%i:%S') as signTimes, date_format(c.new_time,'%Y-%m-%d %H:%i:%S') as newTimes,
+date_format(c.renewal_time,'%Y-%m-%d') as renewalTimes,d.name adminName,c.add_wechat addWechat,c.wechat ,c.renewal ,
+c.renewal_time ,c.sign_project signProject ,c.remarks ,e.certificate_number certificateNumber,e.id,
+e.commodity_name commodityName,e.receiver_name receiverName,  e.declaration_batch declarationBatch 
+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  left join t_order_task e on a.order_no=e.order_no
+where 1=1
+<if test="userName != null">
+and b.buyer_name like CONCAT('%', #{userName},'%') 
+</if>
+<if test="depId != null">
+and a.order_dep = #{depId}
+</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 
+  <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 1=1
+<if test="userName != null">
+and b.buyer_name like CONCAT('%', #{userName},'%') 
+</if>
+<if test="depId != null">
+and a.order_dep = #{depId}
+</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>
+</mapper>

+ 316 - 0
src/main/java/com/goafanti/common/model/UserService.java

@@ -0,0 +1,316 @@
+package com.goafanti.common.model;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class UserService implements Serializable {
+
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service.id
+	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 */
+	private Integer id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service.uid
+	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 */
+	private String uid;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service.aid
+	 * @mbg.generated  Tue May 18 15:33:59 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  Tue May 18 15:33:59 CST 2021
+	 */
+	private Integer addWechat;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service.wechat
+	 * @mbg.generated  Tue May 18 15:33:59 CST 2021
+	 */
+	private String wechat;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service.renewal
+	 * @mbg.generated  Tue May 18 15:33:59 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  Tue May 18 15:33:59 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  Tue May 18 15:33:59 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  Tue May 18 15:33:59 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  Tue May 18 15:33:59 CST 2021
+	 */
+	private Date newTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service.remarks
+	 * @mbg.generated  Tue May 18 15:33:59 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  Tue May 18 15:33:59 CST 2021
+	 */
+	private Date createTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table user_service
+	 * @mbg.generated  Tue May 18 15:33:59 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  Tue May 18 15:33:59 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  Tue May 18 15:33:59 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  Tue May 18 15:33:59 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  Tue May 18 15:33:59 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  Tue May 18 15:33:59 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  Tue May 18 15:33:59 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  Tue May 18 15:33:59 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  Tue May 18 15:33:59 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  Tue May 18 15:33:59 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  Tue May 18 15:33:59 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  Tue May 18 15:33:59 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  Tue May 18 15:33:59 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  Tue May 18 15:33:59 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  Tue May 18 15:33:59 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  Tue May 18 15:33:59 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  Tue May 18 15:33:59 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  Tue May 18 15:33:59 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  Tue May 18 15:33:59 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  Tue May 18 15:33:59 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  Tue May 18 15:33:59 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  Tue May 18 15:33:59 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  Tue May 18 15:33:59 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  Tue May 18 15:33:59 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  Tue May 18 15:33:59 CST 2021
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_service
+	 * @mbg.generated  Tue May 18 15:33:59 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(", serialVersionUID=").append(serialVersionUID);
+		sb.append("]");
+		return sb.toString();
+	}
+}

+ 292 - 0
src/main/java/com/goafanti/common/model/UserServiceFollow.java

@@ -0,0 +1,292 @@
+package com.goafanti.common.model;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class UserServiceFollow implements Serializable {
+
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service_follow.id
+	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 */
+	private Integer id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service_follow.uid
+	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 */
+	private String uid;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service_follow.aid
+	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 */
+	private String aid;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service_follow.add_wechat
+	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 */
+	private Integer addWechat;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service_follow.wechat
+	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 */
+	private String wechat;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service_follow.renewal
+	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 */
+	private Integer renewal;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service_follow.renewal_time
+	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 */
+	private Date renewalTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service_follow.sign_project_id
+	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 */
+	private String signProjectId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service_follow.sign_project
+	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 */
+	private String signProject;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service_follow.remarks
+	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 */
+	private String remarks;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column user_service_follow.create_time
+	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 */
+	private Date createTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table user_service_follow
+	 * @mbg.generated  Tue May 18 15:33:51 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_follow.id
+	 * @return  the value of user_service_follow.id
+	 * @mbg.generated  Tue May 18 15:33:51 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_follow.id
+	 * @param id  the value for user_service_follow.id
+	 * @mbg.generated  Tue May 18 15:33:51 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_follow.uid
+	 * @return  the value of user_service_follow.uid
+	 * @mbg.generated  Tue May 18 15:33:51 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_follow.uid
+	 * @param uid  the value for user_service_follow.uid
+	 * @mbg.generated  Tue May 18 15:33:51 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_follow.aid
+	 * @return  the value of user_service_follow.aid
+	 * @mbg.generated  Tue May 18 15:33:51 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_follow.aid
+	 * @param aid  the value for user_service_follow.aid
+	 * @mbg.generated  Tue May 18 15:33:51 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_follow.add_wechat
+	 * @return  the value of user_service_follow.add_wechat
+	 * @mbg.generated  Tue May 18 15:33:51 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_follow.add_wechat
+	 * @param addWechat  the value for user_service_follow.add_wechat
+	 * @mbg.generated  Tue May 18 15:33:51 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_follow.wechat
+	 * @return  the value of user_service_follow.wechat
+	 * @mbg.generated  Tue May 18 15:33:51 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_follow.wechat
+	 * @param wechat  the value for user_service_follow.wechat
+	 * @mbg.generated  Tue May 18 15:33:51 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_follow.renewal
+	 * @return  the value of user_service_follow.renewal
+	 * @mbg.generated  Tue May 18 15:33:51 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_follow.renewal
+	 * @param renewal  the value for user_service_follow.renewal
+	 * @mbg.generated  Tue May 18 15:33:51 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_follow.renewal_time
+	 * @return  the value of user_service_follow.renewal_time
+	 * @mbg.generated  Tue May 18 15:33:51 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_follow.renewal_time
+	 * @param renewalTime  the value for user_service_follow.renewal_time
+	 * @mbg.generated  Tue May 18 15:33:51 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_follow.sign_project_id
+	 * @return  the value of user_service_follow.sign_project_id
+	 * @mbg.generated  Tue May 18 15:33:51 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_follow.sign_project_id
+	 * @param signProjectId  the value for user_service_follow.sign_project_id
+	 * @mbg.generated  Tue May 18 15:33:51 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_follow.sign_project
+	 * @return  the value of user_service_follow.sign_project
+	 * @mbg.generated  Tue May 18 15:33:51 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_follow.sign_project
+	 * @param signProject  the value for user_service_follow.sign_project
+	 * @mbg.generated  Tue May 18 15:33:51 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_follow.remarks
+	 * @return  the value of user_service_follow.remarks
+	 * @mbg.generated  Tue May 18 15:33:51 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_follow.remarks
+	 * @param remarks  the value for user_service_follow.remarks
+	 * @mbg.generated  Tue May 18 15:33:51 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_follow.create_time
+	 * @return  the value of user_service_follow.create_time
+	 * @mbg.generated  Tue May 18 15:33:51 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_follow.create_time
+	 * @param createTime  the value for user_service_follow.create_time
+	 * @mbg.generated  Tue May 18 15:33:51 CST 2021
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table user_service_follow
+	 * @mbg.generated  Tue May 18 15:33:51 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(", signProjectId=").append(signProjectId);
+		sb.append(", signProject=").append(signProject);
+		sb.append(", remarks=").append(remarks);
+		sb.append(", createTime=").append(createTime);
+		sb.append(", serialVersionUID=").append(serialVersionUID);
+		sb.append("]");
+		return sb.toString();
+	}
+}

+ 3 - 3
src/main/java/com/goafanti/order/controller/OrderProjectApiController.java

@@ -366,18 +366,18 @@ public class OrderProjectApiController extends CertifyApiController {
 		return res;
 	}
 	/**
-	 * 	项目日志 (转交日志)
+	 * 	客户项目列表
 	 * @param tid
 	 * @return
 	 */
 	@RequestMapping(value = "/selectUidByproject",method = RequestMethod.GET)
-	public Result selectUidByproject(Integer uid) {
+	public Result selectUidByproject(String uid) {
 		Result res =new Result();
 		if (uid==null) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"客户编号","客户编号"));
 			return res;
 		}
-//		res.data(/* orderProjectService.selectUidByproject(uid) */);
+		res.data( orderProjectService.selectUidByproject(uid) );
 		return res;
 	}
 }

+ 3 - 2
src/main/java/com/goafanti/order/service/OrderProjectService.java

@@ -2,7 +2,7 @@ package com.goafanti.order.service;
 
 import java.util.List;
 
-import com.goafanti.app.bo.ProjectBo;
+import com.goafanti.common.model.TOrderTask;
 import com.goafanti.common.model.TTaskHours;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.order.bo.OutTaskProgressLog;
@@ -76,7 +76,8 @@ public interface OrderProjectService {
 
 	List<taskAttributionLogBo> taskAttributionLog(Integer tid);
 
-//	List<Project> selectUidByproject(Integer uid);
+
+	List<TOrderTask> selectUidByproject(String uid);
 
 
 }

+ 7 - 0
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -979,5 +979,12 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		
 		return taskAttributionLogMapper.selectByTid(tid);
 	}
+
+
+	@Override
+	public List<TOrderTask> selectUidByproject(String uid) {
+		
+		return tOrderTaskMapper.selectUidByproject(uid);
+	}
 	
 }

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

@@ -0,0 +1,90 @@
+package com.goafanti.user.bo;
+
+public class InputListOrderUserService {
+//	a)客户名称/关键字:可根据客户名称或名称关键字搜索客户信息,系统默认显示全部。
+	private String userName;
+//	b)订单部门:可根据订单部门搜索,系统默认显示全部。
+	private String depId;
+//	c)是否已添微信:可根据“是”“否”来搜索
+	private Integer addWechat;
+//	d)续签情况:按续签情况搜索,续签分为以下七个类型,系统默认显示全部。可按不同续签状态搜索。
+	private Integer renewal;
+//	i.是,已续签/复审,续签时间、续签项目
+//	ii.否,客户考虑中,已报价
+//	iii.否,客户考虑中,无报价
+//	iv.否,企业不打算申报/注销
+//	v.否,企业自己申报
+//	vi.否,企业已签其他机构
+//	vii.其他
+//	e)跟进时间:可根据客服跟进时间进行搜索,系统默认显示全部。
+	private String startFollowTimes;
+	private String endFollowTimes;
+//	合同签订时间
+	private String startSignTimes;
+	private String endSignTimes;
+	private Integer pageSize;
+	private Integer pageNo;
+	public String getUserName() {
+		return userName;
+	}
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+	public String getDepId() {
+		return depId;
+	}
+	public void setDepId(String depId) {
+		this.depId = depId;
+	}
+	public Integer getAddWechat() {
+		return addWechat;
+	}
+	public void setAddWechat(Integer addWechat) {
+		this.addWechat = addWechat;
+	}
+	public Integer getRenewal() {
+		return renewal;
+	}
+	public void setRenewal(Integer renewal) {
+		this.renewal = renewal;
+	}
+	public String getStartFollowTimes() {
+		return startFollowTimes;
+	}
+	public void setStartFollowTimes(String startFollowTimes) {
+		this.startFollowTimes = startFollowTimes;
+	}
+	public String getStartSignTimes() {
+		return startSignTimes;
+	}
+	public void setStartSignTimes(String startSignTimes) {
+		this.startSignTimes = startSignTimes;
+	}
+	public String getEndSignTimes() {
+		return endSignTimes;
+	}
+	public void setEndSignTimes(String endSignTimes) {
+		this.endSignTimes = endSignTimes;
+	}
+	public Integer getPageSize() {
+		return pageSize;
+	}
+	public void setPageSize(Integer pageSize) {
+		this.pageSize = pageSize;
+	}
+	public Integer getPageNo() {
+		return pageNo;
+	}
+	public void setPageNo(Integer pageNo) {
+		this.pageNo = pageNo;
+	}
+	public String getEndFollowTimes() {
+		return endFollowTimes;
+	}
+	public void setEndFollowTimes(String endFollowTimes) {
+		this.endFollowTimes = endFollowTimes;
+	}
+	
+	
+	
+}

+ 25 - 0
src/main/java/com/goafanti/user/bo/InputUserServiceFollow.java

@@ -0,0 +1,25 @@
+package com.goafanti.user.bo;
+
+import com.goafanti.common.model.UserServiceFollow;
+
+public class InputUserServiceFollow extends UserServiceFollow{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	
+	
+	private String renewalTimes;
+
+
+	public String getRenewalTimes() {
+		return renewalTimes;
+	}
+
+
+	public void setRenewalTimes(String renewalTimes) {
+		this.renewalTimes = renewalTimes;
+	}
+
+}

+ 42 - 0
src/main/java/com/goafanti/user/bo/OrderProject.java

@@ -0,0 +1,42 @@
+package com.goafanti.user.bo;
+
+public class OrderProject {
+
+	private Integer id;
+	private String commodityName;
+	private String receiverName;
+	private Integer declarationBatch;
+	private String certificateNumber;
+	public Integer getId() {
+		return id;
+	}
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	public String getCommodityName() {
+		return commodityName;
+	}
+	public void setCommodityName(String commodityName) {
+		this.commodityName = commodityName;
+	}
+	public String getReceiverName() {
+		return receiverName;
+	}
+	public void setReceiverName(String receiverName) {
+		this.receiverName = receiverName;
+	}
+	public Integer getDeclarationBatch() {
+		return declarationBatch;
+	}
+	public void setDeclarationBatch(Integer declarationBatch) {
+		this.declarationBatch = declarationBatch;
+	}
+	public String getCertificateNumber() {
+		return certificateNumber;
+	}
+	public void setCertificateNumber(String certificateNumber) {
+		this.certificateNumber = certificateNumber;
+	}
+	
+	
+}

+ 187 - 0
src/main/java/com/goafanti/user/bo/OutOrderUserService.java

@@ -0,0 +1,187 @@
+package com.goafanti.user.bo;
+
+import java.util.List;
+
+
+public class OutOrderUserService {
+	private String orderNo;
+	private String contractNo;
+	private String signTimes;
+	private String depName;
+	private String userName;
+	private String projects;
+	private String consultants;
+	private String declareBatchs;
+	private String certificationNos;
+	private String adminName;
+	private Integer addWechat;
+	private String wechat;
+	private Integer renewal;
+	private String renewalTimes;
+	private String signProject;
+	private String remarks;
+	private String newTimes;
+	private List<OrderProject> list;
+	public String getOrderNo() {
+		return orderNo;
+	}
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+	public String getContractNo() {
+		return contractNo;
+	}
+	public void setContractNo(String contractNo) {
+		this.contractNo = contractNo;
+	}
+	public String getSignTimes() {
+		return signTimes;
+	}
+	public void setSignTimes(String signTimes) {
+		this.signTimes = signTimes;
+	}
+	public String getUserName() {
+		return userName;
+	}
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+	public String getProjects() {
+		StringBuffer s =new StringBuffer();
+		if (!list.isEmpty()) {
+			for (OrderProject p : list) {
+				if (p.getCommodityName()!=null) {
+					s.append(p.getCommodityName());
+				}else {
+					s.append("无");
+				}
+				s.append("/");
+			}
+			return s.substring(0, s.length()-1);
+		}
+		return projects;
+	}
+	public void setProjects(String projects) {
+		this.projects = projects;
+	}
+	public String getConsultants() {
+		StringBuffer s =new StringBuffer();
+		if (!list.isEmpty()) {
+			for (OrderProject p : list) {
+				if (p.getReceiverName()!=null) {
+					s.append(p.getReceiverName());
+				}else {
+					s.append("无");
+				}
+				s.append("/");
+			}
+			return s.substring(0, s.length()-1);
+		}
+		return consultants;
+	}
+	public void setConsultants(String consultants) {
+		this.consultants = consultants;
+	}
+	public String getDeclareBatchs() {
+		StringBuffer s =new StringBuffer();
+		if (!list.isEmpty()) {
+			for (OrderProject p : list) {
+				if (p.getDeclarationBatch()!=null) {
+					s.append(p.getDeclarationBatch());
+				}else {
+					s.append("无");
+				}
+				s.append("/");
+			}
+			return s.substring(0, s.length()-1);
+		}
+		return declareBatchs;
+	}
+	public void setDeclareBatchs(String declareBatchs) {
+		this.declareBatchs = declareBatchs;
+	}
+	public String getCertificationNos() {
+		StringBuffer s =new StringBuffer();
+		if (!list.isEmpty()) {
+			for (OrderProject p : list) {
+				if (p.getCertificateNumber()!=null) {
+					s.append(p.getCertificateNumber());
+				}else {
+					s.append("无");
+				}
+				s.append("/");
+			}
+			return s.substring(0, s.length()-1);
+		}
+		return certificationNos;
+	}
+	public void setCertificationNos(String certificationNos) {
+		this.certificationNos = certificationNos;
+	}
+	public String getAdminName() {
+		return adminName;
+	}
+	public void setAdminName(String adminName) {
+		this.adminName = adminName;
+	}
+	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 String getRenewalTimes() {
+		return renewalTimes;
+	}
+	public void setRenewalTimes(String renewalTimes) {
+		this.renewalTimes = renewalTimes;
+	}
+	
+	public String getRemarks() {
+		return remarks;
+	}
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
+	public String getNewTimes() {
+		return newTimes;
+	}
+	public void setNewTimes(String newTimes) {
+		this.newTimes = newTimes;
+	}
+	public List<OrderProject> getList() {
+		return list;
+	}
+	public void setList(List<OrderProject> list) {
+		this.list = list;
+	}
+	public String getDepName() {
+		return depName;
+	}
+	public void setDepName(String depName) {
+		this.depName = depName;
+	}
+	public String getSignProject() {
+		return signProject;
+	}
+	public void setSignProject(String signProject) {
+		this.signProject = signProject;
+	}
+	
+	
+	
+
+
+}

+ 29 - 0
src/main/java/com/goafanti/user/bo/OutUserServiceFollow.java

@@ -0,0 +1,29 @@
+package com.goafanti.user.bo;
+
+import com.goafanti.common.model.UserServiceFollow;
+
+public class OutUserServiceFollow  extends UserServiceFollow{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	
+	private String renewalTimes;
+	private String createTimes;
+	public String getRenewalTimes() {
+		return renewalTimes;
+	}
+	public void setRenewalTimes(String renewalTimes) {
+		this.renewalTimes = renewalTimes;
+	}
+	public String getCreateTimes() {
+		return createTimes;
+	}
+	public void setCreateTimes(String createTimes) {
+		this.createTimes = createTimes;
+	}
+	
+	
+
+}

+ 58 - 0
src/main/java/com/goafanti/user/controller/UserServiceApiController.java

@@ -0,0 +1,58 @@
+package com.goafanti.user.controller;
+
+import javax.annotation.Resource;
+
+import org.apache.poi.ss.formula.constant.ErrorConstant;
+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;
+import com.goafanti.user.bo.InputListOrderUserService;
+import com.goafanti.user.bo.InputUserServiceFollow;
+import com.goafanti.user.service.UserServiceService;
+
+@RestController
+@RequestMapping(value = "/api/admin")
+public class UserServiceApiController extends BaseApiController {
+	@Resource
+	private UserServiceService						userServiceService;
+
+	@RequestMapping(value = "/addUseService",method = RequestMethod.POST)
+	public Result addUseService(InputUserServiceFollow us) {
+		Result res =new Result();
+		if(us.getUid()==null) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "用户编号"));
+		}
+		if (us.getRenewal()==null||us.getWechat()==null) {
+			res.getError().add(buildError("","续签和微信必须选择"));
+			return res;
+		}
+		res.data(userServiceService.addUseService(us));
+		return res;
+	}
+	
+	
+	@RequestMapping(value = "/listUseServiceFollow",method = RequestMethod.GET)
+	public Result listUseServiceFollow(String uid) {
+		Result res =new Result();
+		if(uid==null) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "用户编号"));
+		}
+		
+		res.data(userServiceService.listUseServiceFollow(uid));
+		return res;
+	}
+	
+	
+	@RequestMapping(value = "/listOrderUseService",method = RequestMethod.GET)
+	public Result listOrderUseService(InputListOrderUserService i) {
+		Result res =new Result();
+		res.data(userServiceService.listOrderUseService(i));
+		return res;
+	}
+	
+
+}

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

@@ -0,0 +1,23 @@
+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;
+
+public interface UserServiceService {
+
+	int addUseService(InputUserServiceFollow us);
+
+
+	List<OutUserServiceFollow> listUseServiceFollow(String uid);
+
+
+	Pagination<OutOrderUserService> listOrderUseService(InputListOrderUserService i);
+
+
+
+}

+ 76 - 0
src/main/java/com/goafanti/user/service/impl/UserServiceServiceImpl.java

@@ -0,0 +1,76 @@
+package com.goafanti.user.service.impl;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.dao.UserServiceFollowMapper;
+import com.goafanti.common.dao.UserServiceMapper;
+import com.goafanti.common.model.UserService;
+import com.goafanti.common.utils.DateUtils;
+import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.mybatis.page.Pagination;
+import com.goafanti.core.shiro.token.TokenManager;
+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 com.goafanti.user.service.UserServiceService;
+
+@Service
+public class  UserServiceServiceImpl extends BaseMybatisDao<UserServiceMapper> implements UserServiceService {
+
+	@Autowired
+	private UserServiceMapper userServiceMapper;
+	@Autowired
+	private UserServiceFollowMapper userServiceFollowMapper;
+	
+	@Override
+	public int addUseService(InputUserServiceFollow us) {
+		us.setAid(TokenManager.getAdminId());
+		if (us.getRenewal()==1) {
+			us.setRenewalTime(DateUtils.StringToDate(us.getRenewalTimes(), AFTConstants.YYYYMMDD));	
+		}
+		Date date=new Date();
+		us.setCreateTime(date);
+		userServiceFollowMapper.insertSelective(us);
+		Integer id=userServiceMapper.selectByUid(us.getUid());
+		UserService u=new UserService();
+		BeanUtils.copyProperties(us, u);
+		u.setNewTime(date);
+		if (id==null) {
+			userServiceMapper.insertSelective(u);
+		}else {
+			u.setId(id);
+			u.setCreateTime(null);
+			userServiceMapper.updateByPrimaryKeySelective(u);
+		}
+		return 1;
+	}
+
+	@Override
+	public List<OutUserServiceFollow> listUseServiceFollow(String uid) {
+		return userServiceFollowMapper.listUseServiceFollow(uid);
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public Pagination<OutOrderUserService> listOrderUseService(InputListOrderUserService i) {
+		Map<String, Object>map =new HashMap<String, Object>();
+		if(i.getUserName()!=null)map.put("userName", i.getUserName());
+		if(i.getDepId()!=null)map.put("depId", i.getDepId());
+		if(i.getStartFollowTimes()!=null)map.put("startFollowTimes", i.getStartFollowTimes());
+		if(i.getEndFollowTimes()!=null)map.put("endFollowTimes", i.getEndFollowTimes());
+		if(i.getStartSignTimes()!=null)map.put("startSignTimes", i.getStartSignTimes());
+		if(i.getEndSignTimes()!=null)map.put("endSignTimes", i.getEndSignTimes());
+		if(i.getRenewal()!=null)map.put("renewal", i.getRenewal());
+		return (Pagination<OutOrderUserService>) findPage("OrderUseServiceList", "OrderUseServiceCount", map, i.getPageNo(), i.getPageSize());
+	}
+
+}