Преглед изворни кода

Merge branch 'test02' into dev02

anderx пре 3 година
родитељ
комит
aaaee4248e
29 измењених фајлова са 913 додато и 923 уклоњено
  1. 9 10
      src/main/java/com/goafanti/admin/controller/AdminOrgBaiscInfoApiController.java
  2. 9 5
      src/main/java/com/goafanti/business/bo/BusinessProjectBo.java
  3. 18 18
      src/main/java/com/goafanti/business/service/BusinessProjectService.java
  4. 1 1
      src/main/java/com/goafanti/business/service/impl/BusinessProjectServiceImpl.java
  5. 2 1
      src/main/java/com/goafanti/common/dao/BusinessProjectMapper.java
  6. 37 91
      src/main/java/com/goafanti/common/dao/TChangeTaskMapper.java
  7. 19 0
      src/main/java/com/goafanti/common/dao/TTaskMemberMapper.java
  8. 6 6
      src/main/java/com/goafanti/common/dao/UserLockReleaseMapper.java
  9. 2 2
      src/main/java/com/goafanti/common/mapper/BusinessProjectMapper.xml
  10. 48 252
      src/main/java/com/goafanti/common/mapper/TChangeTaskMapper.xml
  11. 21 20
      src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml
  12. 125 0
      src/main/java/com/goafanti/common/mapper/TTaskMemberMapper.xml
  13. 3 18
      src/main/java/com/goafanti/common/mapper/UserLockReleaseMapper.xml
  14. 267 393
      src/main/java/com/goafanti/common/model/TChangeTask.java
  15. 90 0
      src/main/java/com/goafanti/common/model/TTaskMember.java
  16. 5 20
      src/main/java/com/goafanti/common/task/ReleaseUserTask.java
  17. 1 2
      src/main/java/com/goafanti/customer/service/CustomerService.java
  18. 5 5
      src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java
  19. 33 0
      src/main/java/com/goafanti/order/bo/InputAddTask.java
  20. 30 0
      src/main/java/com/goafanti/order/bo/OutMemberList.java
  21. 27 0
      src/main/java/com/goafanti/order/bo/TOrderTaskBo.java
  22. 5 5
      src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java
  23. 2 2
      src/main/java/com/goafanti/order/controller/OrderProjectApiController.java
  24. 3 3
      src/main/java/com/goafanti/order/service/OrderNewService.java
  25. 1 1
      src/main/java/com/goafanti/order/service/OrderProjectService.java
  26. 30 1
      src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java
  27. 112 65
      src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java
  28. 1 1
      src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java
  29. 1 1
      src/main/java/com/goafanti/weChat/controller/AdminReleaseApiController.java

+ 9 - 10
src/main/java/com/goafanti/admin/controller/AdminOrgBaiscInfoApiController.java

@@ -38,7 +38,7 @@ import com.goafanti.user.service.OrganizationIdentityService;
 @Controller
 @RequestMapping(value = "/api/admin/basic")
 public class AdminOrgBaiscInfoApiController extends CertifyApiController {
-	
+
 	@Resource
 	private NatureOwnershipService		natureOwnershipService;
 	@Resource
@@ -46,7 +46,7 @@ public class AdminOrgBaiscInfoApiController extends CertifyApiController {
 
 	/**
 	 * 企业基本信息保存
-	 * 
+	 *
 	 * @param info
 	 * @param bindingResult
 	 * @return
@@ -108,7 +108,7 @@ public class AdminOrgBaiscInfoApiController extends CertifyApiController {
 
 	/**
 	 * 企业基本信息入口
-	 * 
+	 *
 	 * @param uid
 	 * @return
 	 */
@@ -124,14 +124,14 @@ public class AdminOrgBaiscInfoApiController extends CertifyApiController {
 		return res;
 	}
 
-	
-	
 
-	
+
+
+
 
 	/**
 	 * 自然人股权列表
-	 * 
+	 *
 	 * @param uid
 	 * @return
 	 */
@@ -149,7 +149,7 @@ public class AdminOrgBaiscInfoApiController extends CertifyApiController {
 
 	/**
 	 * 删除自然人股权
-	 * 
+	 *
 	 * @param ids
 	 * @return
 	 */
@@ -166,7 +166,7 @@ public class AdminOrgBaiscInfoApiController extends CertifyApiController {
 
 	/**
 	 * 自然人股权保存修改
-	 * 
+	 *
 	 * @param data
 	 * @return
 	 */
@@ -198,5 +198,4 @@ public class AdminOrgBaiscInfoApiController extends CertifyApiController {
 		}
 		return res;
 	}
-
 }

+ 9 - 5
src/main/java/com/goafanti/business/bo/BusinessProjectBo.java

@@ -1,18 +1,22 @@
 package com.goafanti.business.bo;
 
-import java.math.BigDecimal;
-import java.util.Date;
 
 import com.goafanti.common.model.BusinessProject;
-import org.apache.commons.lang3.time.DateFormatUtils;
-
-import com.goafanti.common.constant.AFTConstants;
 
 public class BusinessProjectBo  extends BusinessProject {
 	private String createName;
 
 	private String cname;
 
+	private Integer cSort;
+
+	public Integer getcSort() {
+		return cSort;
+	}
+
+	public void setcSort(Integer cSort) {
+		this.cSort = cSort;
+	}
 
 	public String getCreateName() {
 		return createName;

+ 18 - 18
src/main/java/com/goafanti/business/service/BusinessProjectService.java

@@ -15,27 +15,27 @@ import com.goafanti.core.mybatis.page.Pagination;
 
 public interface BusinessProjectService {
 	int insert(String bname,String cid,String country,String province,String city,String district,String boutique);
-	
+
 	Pagination<BusinessProjectBo> listProject(String bname,String cid,String country,String province,String city,String district,String activityFlag,
 										String status,Integer type, Integer pageNo, Integer pageSize );
 	int getBnamecount(String bname);
-	
+
 	int deleteProject(String id);
-	
+
 	int updateStopProject(String id);
-	
+
 	ProjectDetailBo orgProject(String id);
-	
+
 	BusinessProjectBo orgProjects(String id);
-	
+
 	List<Map<String, String>> getAllCnames(Integer flag);
-	
+
 	int updateProject(BusinessProject s);
-	
+
 	int addProjectSize(BusinessProjectModel ps);
-	
+
 	int updateOrgProjectSize(BusinessProjectModel ps);
-	
+
 	Pagination<ProjectSizeBo> listProjectSize(String pid,Integer pNo,Integer pSize);
 
 	ProjectSizeBo getProjectSize(String id);
@@ -45,11 +45,11 @@ public interface BusinessProjectService {
 	int updateSotpProjectSize(String id);
 
 	boolean WhetherRepeat(BusinessProjectModel ps);
-	
+
 	boolean judgeStatus(BusinessProjectModel ps);
-	
+
 	boolean judgeBeing(BusinessProject s);
-	
+
 	Pagination<ProjectBo> getBusinessProject(String id,Integer pNo,Integer pSize);
 
 	Pagination<ProjectBo> recommendProjectList(Integer pNo, Integer pSize);
@@ -61,11 +61,11 @@ public interface BusinessProjectService {
 	Pagination<ProjectBo> portalBusinessProject(String id, Integer pNo, Integer pSize);
 
 	ProjectDetailBo ProjectDetail(String id);
-	
-	List<BusinessProject> selectBusinessProjectByName(String businessName,String cid);
+
+	List<BusinessProjectBo > selectBusinessProjectByName(String businessName,String cid);
 
 	List<BusinessCategory> selectBusinessProjectCatalog();
-	 
-	
-	
+
+
+
 }

+ 1 - 1
src/main/java/com/goafanti/business/service/impl/BusinessProjectServiceImpl.java

@@ -447,7 +447,7 @@ public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMa
 
 
 	@Override
-	public List<BusinessProject> selectBusinessProjectByName(String businessName,String cname) {
+	public List<BusinessProjectBo> selectBusinessProjectByName(String businessName,String cname) {
 		return businessProjectMapper.selectBusinessProjectByName(businessName,cname);
 	}
 

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

@@ -2,6 +2,7 @@ package com.goafanti.common.dao;
 
 import com.goafanti.app.bo.ProjectBo;
 import com.goafanti.app.bo.ProjectDetailBo;
+import com.goafanti.business.bo.BusinessProjectBo;
 import com.goafanti.common.model.BusinessProject;
 import com.goafanti.common.model.BusinessProjectExample;
 import com.goafanti.order.bo.Outproject;
@@ -39,7 +40,7 @@ public interface BusinessProjectMapper {
 
 	int checkProject(String id);
 
-	List<BusinessProject> selectBusinessProjectByName(@Param("businessName")String businessName,@Param("cname")String cname);
+	List<BusinessProjectBo > selectBusinessProjectByName(@Param("businessName")String businessName, @Param("cname")String cname);
 
 
 	 List<BusinessCategory> selectBusinessProjectCatalog();

+ 37 - 91
src/main/java/com/goafanti/common/dao/TChangeTaskMapper.java

@@ -8,96 +8,42 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
 public interface TChangeTaskMapper {
+    int deleteByPrimaryKey(Integer id);
 
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	long countByExample(TChangeTaskExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	int deleteByExample(TChangeTaskExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	int deleteByPrimaryKey(Integer id);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	int insert(TChangeTask record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	int insertSelective(TChangeTask record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	List<TChangeTask> selectByExample(TChangeTaskExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	TChangeTask selectByPrimaryKey(Integer id);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	int updateByExampleSelective(@Param("record") TChangeTask record, @Param("example") TChangeTaskExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	int updateByExample(@Param("record") TChangeTask record, @Param("example") TChangeTaskExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	int updateByPrimaryKeySelective(TChangeTask record);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_task
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	int updateByPrimaryKey(TChangeTask record);
-
-	void insertSelectiveList(@Param("list")List<TChangeTask> list);
-
-	List<TChangeTaskOut> selectByCid(@Param("id")Integer id, @Param("splitStatus")Integer splitStatus);
-
-	/**
-	 *
-	 * @param tid 变更项目id
-	 * @param sid 变更拆分父项目id
-	 * @param type 处理类型
-	 * @return
-	 */
-	int updateByTid(@Param("tid")Integer tid,@Param("sid")Integer sid,@Param("cid")Integer cid,@Param("type")Integer type);
-
-	int deleteByTid(Integer tid);
-
-	/**
-	 *   获取变更子项�???
-	 * @param splitSuper
-	 * @param cid
-	 * @return
-	 */
-	List<TChangeTask> selectBySuper(@Param("splitSuper")Integer splitSuper, @Param("cid")Integer cid);
-
-
-	TChangeTask selectBytid(Integer id);
+    int insert(TChangeTask record);
+
+    int insertSelective(TChangeTask record);
+
+    TChangeTask selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TChangeTask record);
+
+    int updateByPrimaryKey(TChangeTask record);
+
+
+    void insertSelectiveList(@Param("list")List<TChangeTask> list);
+
+    List<TChangeTaskOut> selectByCid(@Param("id")Integer id, @Param("splitStatus")Integer splitStatus);
+
+    /**
+     *
+     * @param tid 变更项目id
+     * @param sid 变更拆分父项目id
+     * @param type 处理类型
+     * @return
+     */
+    int updateByTid(@Param("tid")Integer tid,@Param("sid")Integer sid,@Param("cid")Integer cid,@Param("type")Integer type);
+
+    int deleteByTid(Integer tid);
+
+    /**
+     *   获取变更子项�???
+     * @param splitSuper
+     * @param cid
+     * @return
+     */
+    List<TChangeTask> selectBySuper(@Param("splitSuper")Integer splitSuper, @Param("cid")Integer cid);
+
+
+    TChangeTask selectBytid(Integer id);
 }

+ 19 - 0
src/main/java/com/goafanti/common/dao/TTaskMemberMapper.java

@@ -0,0 +1,19 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.TTaskMember;
+
+public interface TTaskMemberMapper {
+    int deleteByPrimaryKey(Integer id);
+
+    int insert(TTaskMember record);
+
+    int insertSelective(TTaskMember record);
+
+    TTaskMember selectByPrimaryKey(Integer id);
+
+    int updateByPrimaryKeySelective(TTaskMember record);
+
+    int updateByPrimaryKey(TTaskMember record);
+
+    int updateByTid(TTaskMember ttm);
+}

+ 6 - 6
src/main/java/com/goafanti/common/dao/UserLockReleaseMapper.java

@@ -87,15 +87,15 @@ public interface UserLockReleaseMapper {
 	 * @return
 	 */
 	int updateUserLock(@Param("uid")String uid,@Param("aid")String aid,@Param("oldStatus")Integer oldStatus,@Param("newStatus")Integer newStatus);
-	
+
 	int updateUsersLock(@Param("uList")List<String> uList,@Param("aid")String aid,@Param("oldStatus")Integer oldStatus,@Param("newStatus")Integer newStatus);
-	
+
 	int updateUserTypeLock(@Param("uid")String uid,@Param("aid")String aid,@Param("type")Integer type,
 			@Param("newStatus")Integer newStatus,@Param("date") Date date);
 	void updateUserTypeLockList(@Param("list")List<String> list, @Param("aid")String aid,@Param("type")Integer type,
 			@Param("newStatus")Integer newStatus,@Param("date") Date date);
-	
-	List<LockingReleaseBo> selectWaitReleaseCustomer(@Param("aid")String aid, @Param("type")Integer type);
+
+	List<LockingReleaseBo> selectWaitReleaseCustomer(@Param("aid")String aid);
 
 	List<LockingReleaseBo> selectWaitReleaseBusiness(String aid);
 
@@ -113,7 +113,7 @@ public interface UserLockReleaseMapper {
 
 	List<LockingReleaseBo> checkUserProject(@Param("uid")String uid, @Param("pid")String pid, @Param("aid")String aid);
 
-	List<userDaysBo> selectUserDays(@Param("aid")String aid, @Param("x")Integer x, @Param("y")Integer y);
+	List<userDaysBo> selectUserDays(@Param("aid")String aid,  @Param("y")Integer y);
 
 
 
@@ -140,4 +140,4 @@ public interface UserLockReleaseMapper {
 	List<userDaysBo> selectChannelNotFollow(@Param("days")Integer days, @Param("aid")String aid);
 
 
-}
+}

+ 2 - 2
src/main/java/com/goafanti/common/mapper/BusinessProjectMapper.xml

@@ -542,9 +542,9 @@
  where  cid=#{id,jdbcType=VARCHAR}
  </select>
 
- <select id="selectBusinessProjectByName" parameterType="java.lang.String" resultMap="BaseResultMap">
+ <select id="selectBusinessProjectByName" parameterType="java.lang.String" resultType="com.goafanti.business.bo.BusinessProjectBo">
    select  a.id,a.bname,ifnull(a.price,0) as price,ifnull(a.first_payment,0) as firstPayment,
-   a.type ,a.patent_transfer patentTransfer,b.cname
+   a.type ,a.patent_transfer patentTransfer,b.cname,b.sort CSort
    from business_project a  left join business_category b on a.cid=b.id
    where 1=1
  	<if test="cname != null">

+ 48 - 252
src/main/java/com/goafanti/common/mapper/TChangeTaskMapper.xml

@@ -2,11 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.goafanti.common.dao.TChangeTaskMapper">
   <resultMap id="BaseResultMap" type="com.goafanti.common.model.TChangeTask">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 16 15:53:59 CST 2020.
-    -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="tid" jdbcType="INTEGER" property="tid" />
     <result column="cid" jdbcType="INTEGER" property="cid" />
@@ -24,160 +19,42 @@
     <result column="receiver_name" jdbcType="VARCHAR" property="receiverName" />
     <result column="official_cost" jdbcType="INTEGER" property="officialCost" />
     <result column="cost_reduction" jdbcType="INTEGER" property="costReduction" />
+    <result column="service_life" jdbcType="VARCHAR" property="serviceLife" />
+    <result column="service_year" jdbcType="VARCHAR" property="serviceYear" />
+    <result column="year_sum" jdbcType="INTEGER" property="yearSum" />
   </resultMap>
-  <sql id="Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 16 15:53:59 CST 2020.
-    -->
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 16 15:54:00 CST 2020.
-    -->
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
   <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 Oct 16 15:54:00 CST 2020.
-    -->
     id, tid, cid, order_no, main, commodity_id, commodity_name, commodity_quantity, commodity_price,
-    task_comment, type, create_time, split_status, split_super, receiver_name, official_cost,
-    cost_reduction
+    task_comment, `type`, create_time, split_status, split_super, receiver_name, official_cost,
+    cost_reduction, service_life, service_year, year_sum
   </sql>
-  <select id="selectByExample" parameterType="com.goafanti.common.model.TChangeTaskExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 16 15:54:00 CST 2020.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from t_change_task
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
   <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 Oct 16 15:54:00 CST 2020.
-    -->
     select
     <include refid="Base_Column_List" />
     from t_change_task
     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 Oct 16 15:54:00 CST 2020.
-    -->
     delete from t_change_task
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <delete id="deleteByExample" parameterType="com.goafanti.common.model.TChangeTaskExample">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 16 15:54:00 CST 2020.
-    -->
-    delete from t_change_task
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
   <insert id="insert" parameterType="com.goafanti.common.model.TChangeTask">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 16 15:54:00 CST 2020.
-    -->
     insert into t_change_task (id, tid, cid,
       order_no, main, commodity_id,
       commodity_name, commodity_quantity, commodity_price,
-      task_comment, type, create_time,
+      task_comment, `type`, create_time,
       split_status, split_super, receiver_name,
-      official_cost, cost_reduction)
+      official_cost, cost_reduction, service_life,
+      service_year, year_sum)
     values (#{id,jdbcType=INTEGER}, #{tid,jdbcType=INTEGER}, #{cid,jdbcType=INTEGER},
       #{orderNo,jdbcType=VARCHAR}, #{main,jdbcType=INTEGER}, #{commodityId,jdbcType=VARCHAR},
       #{commodityName,jdbcType=VARCHAR}, #{commodityQuantity,jdbcType=INTEGER}, #{commodityPrice,jdbcType=DECIMAL},
       #{taskComment,jdbcType=VARCHAR}, #{type,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
       #{splitStatus,jdbcType=INTEGER}, #{splitSuper,jdbcType=INTEGER}, #{receiverName,jdbcType=VARCHAR},
-      #{officialCost,jdbcType=INTEGER}, #{costReduction,jdbcType=INTEGER})
+      #{officialCost,jdbcType=INTEGER}, #{costReduction,jdbcType=INTEGER}, #{serviceLife,jdbcType=VARCHAR},
+      #{serviceYear,jdbcType=VARCHAR}, #{yearSum,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TChangeTask">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 16 15:54:00 CST 2020.
-    -->
     insert into t_change_task
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -211,7 +88,7 @@
         task_comment,
       </if>
       <if test="type != null">
-        type,
+        `type`,
       </if>
       <if test="createTime != null">
         create_time,
@@ -231,6 +108,15 @@
       <if test="costReduction != null">
         cost_reduction,
       </if>
+      <if test="serviceLife != null">
+        service_life,
+      </if>
+      <if test="serviceYear != null">
+        service_year,
+      </if>
+      <if test="yearSum != null">
+        year_sum,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -284,117 +170,18 @@
       <if test="costReduction != null">
         #{costReduction,jdbcType=INTEGER},
       </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.goafanti.common.model.TChangeTaskExample" resultType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 16 15:54:00 CST 2020.
-    -->
-    select count(*) from t_change_task
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 16 15:54:00 CST 2020.
-    -->
-    update t_change_task
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=INTEGER},
-      </if>
-      <if test="record.tid != null">
-        tid = #{record.tid,jdbcType=INTEGER},
-      </if>
-      <if test="record.cid != null">
-        cid = #{record.cid,jdbcType=INTEGER},
-      </if>
-      <if test="record.orderNo != null">
-        order_no = #{record.orderNo,jdbcType=VARCHAR},
-      </if>
-      <if test="record.main != null">
-        main = #{record.main,jdbcType=INTEGER},
+      <if test="serviceLife != null">
+        #{serviceLife,jdbcType=VARCHAR},
       </if>
-      <if test="record.commodityId != null">
-        commodity_id = #{record.commodityId,jdbcType=VARCHAR},
+      <if test="serviceYear != null">
+        #{serviceYear,jdbcType=VARCHAR},
       </if>
-      <if test="record.commodityName != null">
-        commodity_name = #{record.commodityName,jdbcType=VARCHAR},
+      <if test="yearSum != null">
+        #{yearSum,jdbcType=INTEGER},
       </if>
-      <if test="record.commodityQuantity != null">
-        commodity_quantity = #{record.commodityQuantity,jdbcType=INTEGER},
-      </if>
-      <if test="record.commodityPrice != null">
-        commodity_price = #{record.commodityPrice,jdbcType=DECIMAL},
-      </if>
-      <if test="record.taskComment != null">
-        task_comment = #{record.taskComment,jdbcType=VARCHAR},
-      </if>
-      <if test="record.type != null">
-        type = #{record.type,jdbcType=INTEGER},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.splitStatus != null">
-        split_status = #{record.splitStatus,jdbcType=INTEGER},
-      </if>
-      <if test="record.splitSuper != null">
-        split_super = #{record.splitSuper,jdbcType=INTEGER},
-      </if>
-      <if test="record.receiverName != null">
-        receiver_name = #{record.receiverName,jdbcType=VARCHAR},
-      </if>
-      <if test="record.officialCost != null">
-        official_cost = #{record.officialCost,jdbcType=INTEGER},
-      </if>
-      <if test="record.costReduction != null">
-        cost_reduction = #{record.costReduction,jdbcType=INTEGER},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 16 15:54:00 CST 2020.
-    -->
-    update t_change_task
-    set id = #{record.id,jdbcType=INTEGER},
-      tid = #{record.tid,jdbcType=INTEGER},
-      cid = #{record.cid,jdbcType=INTEGER},
-      order_no = #{record.orderNo,jdbcType=VARCHAR},
-      main = #{record.main,jdbcType=INTEGER},
-      commodity_id = #{record.commodityId,jdbcType=VARCHAR},
-      commodity_name = #{record.commodityName,jdbcType=VARCHAR},
-      commodity_quantity = #{record.commodityQuantity,jdbcType=INTEGER},
-      commodity_price = #{record.commodityPrice,jdbcType=DECIMAL},
-      task_comment = #{record.taskComment,jdbcType=VARCHAR},
-      type = #{record.type,jdbcType=INTEGER},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      split_status = #{record.splitStatus,jdbcType=INTEGER},
-      split_super = #{record.splitSuper,jdbcType=INTEGER},
-      receiver_name = #{record.receiverName,jdbcType=VARCHAR},
-      official_cost = #{record.officialCost,jdbcType=INTEGER},
-      cost_reduction = #{record.costReduction,jdbcType=INTEGER}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
+    </trim>
+  </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TChangeTask">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 16 15:54:00 CST 2020.
-    -->
     update t_change_task
     <set>
       <if test="tid != null">
@@ -425,7 +212,7 @@
         task_comment = #{taskComment,jdbcType=VARCHAR},
       </if>
       <if test="type != null">
-        type = #{type,jdbcType=INTEGER},
+        `type` = #{type,jdbcType=INTEGER},
       </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
@@ -445,15 +232,19 @@
       <if test="costReduction != null">
         cost_reduction = #{costReduction,jdbcType=INTEGER},
       </if>
+      <if test="serviceLife != null">
+        service_life = #{serviceLife,jdbcType=VARCHAR},
+      </if>
+      <if test="serviceYear != null">
+        service_year = #{serviceYear,jdbcType=VARCHAR},
+      </if>
+      <if test="yearSum != null">
+        year_sum = #{yearSum,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.TChangeTask">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Fri Oct 16 15:54:00 CST 2020.
-    -->
     update t_change_task
     set tid = #{tid,jdbcType=INTEGER},
       cid = #{cid,jdbcType=INTEGER},
@@ -464,13 +255,16 @@
       commodity_quantity = #{commodityQuantity,jdbcType=INTEGER},
       commodity_price = #{commodityPrice,jdbcType=DECIMAL},
       task_comment = #{taskComment,jdbcType=VARCHAR},
-      type = #{type,jdbcType=INTEGER},
+      `type` = #{type,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       split_status = #{splitStatus,jdbcType=INTEGER},
       split_super = #{splitSuper,jdbcType=INTEGER},
       receiver_name = #{receiverName,jdbcType=VARCHAR},
       official_cost = #{officialCost,jdbcType=INTEGER},
-      cost_reduction = #{costReduction,jdbcType=INTEGER}
+      cost_reduction = #{costReduction,jdbcType=INTEGER},
+      service_life = #{serviceLife,jdbcType=VARCHAR},
+      service_year = #{serviceYear,jdbcType=VARCHAR},
+      year_sum = #{yearSum,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
 
@@ -478,20 +272,22 @@
     insert into t_change_task ( tid, cid, split_status,
       order_no, commodity_id, commodity_name,
       commodity_quantity, commodity_price, task_comment,
-        split_super , receiver_name, create_time)
+        split_super , receiver_name, create_time,service_life,
+    service_year, year_sum, picture_url)
     values
     <foreach collection="list" index="index" item="item" separator=",">
       ( #{item.tid,jdbcType=INTEGER}, #{item.cid,jdbcType=INTEGER}, #{item.splitStatus,jdbcType=INTEGER},
       #{item.orderNo,jdbcType=VARCHAR}, #{item.commodityId,jdbcType=VARCHAR}, #{item.commodityName,jdbcType=VARCHAR},
       #{item.commodityQuantity,jdbcType=INTEGER}, #{item.commodityPrice,jdbcType=DECIMAL}, #{item.taskComment,jdbcType=VARCHAR},
-       #{item.splitSuper,jdbcType=INTEGER}, #{item.receiverName,jdbcType=VARCHAR}, now())
+       #{item.splitSuper,jdbcType=INTEGER}, #{item.receiverName,jdbcType=VARCHAR}, now(), #{item.serviceLife,jdbcType=VARCHAR},
+      #{item.serviceYear,jdbcType=VARCHAR}, #{item.yearSum,jdbcType=INTEGER}, #{item.pictureUrl,jdbcType=VARCHAR})
     </foreach>
   </insert>
   <select id="selectByCid" resultType="com.goafanti.order.bo.TChangeTaskOut">
     select a.id,a.order_no as orderNo,a.main, c.cname,c.sort cSort,a.commodity_name as commodityName,a.official_cost officialCost,
 	a.official_cost officialCost, a.commodity_quantity as commodityQuantity,i.price,a.commodity_id as commodityId,a.type,a.tid,
 	a.receiver_name receiverName, a.task_comment as taskComment ,a.commodity_price as commodityPrice,a.split_status splitStatus,
-	a.split_super splitSuper
+	a.split_super splitSuper,a.picture_url pictureUrl, a.service_life serviceLife ,a.service_year serviceYear,a.year_sum yearSum
     from t_change_task a left join business_project i on a.commodity_id=i.id
   	left join business_category c on i.cid=c.id
   	where 1=1

+ 21 - 20
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -784,22 +784,19 @@
 
   <select id="selectOrderTask" resultType="com.goafanti.order.bo.TOrderTaskBo">
     select a.id,e.contract_no contractNo,a.order_no as orderNo,h.nickname userName,f.name salesmanName,
-           a.outsource_name outsourceName,a.outsource, a.outsource_price outsourcePrice,g.name depName,
-           e.order_status orderStatus,d.name as contacts,d.contact_mobile as contactsMobile,a.main, c.cname,
-           c.sort cSort,a.commodity_name as commodityName,a.commodity_quantity as commodityQuantity,b.patent_transfer patentTransfer ,
-           i.price,a.certificate_number as certificateNumber, a.commodity_id as commodityId,a.manager_id managerId,
-           a.consultant_id consultantId,a.project_status as projectStatus,a.set_up_amount setUpAmount,
-           a.task_comment as taskComment ,a.commodity_price as commodityPrice, a.task_status as taskStatus,
-           a.task_receiver as taskReceiver ,a.if_certification_fee ifCertificationFee , a.split_status splitStatus,
-           a.cost_reduction costReduction,a.official_cost officialCost,i.`type` ,d.name ,a.declaration_batch declarationBatch,
-           a.patent_type patentType,a.picture_url pictureUrl
-    from t_order_task a left join business_project b on a.commodity_id=b.id
-                        left join t_order_new e on a.order_no=e.order_no
-                        left join admin f on e.salesman_id=f.id left join department g on
-      e.order_dep=g.id left join user h on e.buyer_id=h.id
-                        left join business_project i on a.commodity_id=i.id left join
-         business_category c on b.cid=c.id left join admin d on
-      a.task_receiver=d.id
+    a.outsource_name outsourceName,a.outsource, a.outsource_price outsourcePrice,g.name depName,
+    e.order_status orderStatus,d.name as contacts,d.contact_mobile as contactsMobile,a.main, c.cname,
+    c.sort cSort,a.commodity_name as commodityName,a.commodity_quantity as commodityQuantity,b.patent_transfer patentTransfer ,
+    i.price,a.certificate_number as certificateNumber, a.commodity_id as commodityId,a.manager_id managerId,
+    a.consultant_id consultantId,a.project_status as projectStatus,a.set_up_amount setUpAmount,
+    a.task_comment as taskComment ,a.commodity_price as commodityPrice, a.task_status as taskStatus,
+    a.task_receiver as taskReceiver ,a.if_certification_fee ifCertificationFee , a.split_status splitStatus,
+    a.cost_reduction costReduction,a.official_cost officialCost,i.`type` ,d.name ,a.declaration_batch declarationBatch,
+    a.patent_type patentType,a.picture_url pictureUrl,j.service_life serviceLife ,j.service_year serviceYear,j.year_sum yearSum
+    from t_order_task a left join business_project b on a.commodity_id=b.id left join t_order_new e on a.order_no=e.order_no
+    left join admin f on e.salesman_id=f.id left join department g on e.order_dep=g.id left join user h on e.buyer_id=h.id
+    left join business_project i on a.commodity_id=i.id left join business_category c on b.cid=c.id
+    left join admin d on a.task_receiver=d.id left join t_task_member j on a.id =j.tid
     where a.super_id is null and a.split_status in(0,1)
       <if test="orderNo != null">
       and a.order_no= #{orderNo,jdbcType=VARCHAR}
@@ -816,10 +813,12 @@
            c.sort cSort,a.commodity_name as commodityName,a.commodity_quantity as commodityQuantity,i.price,a.certificate_number as certificateNumber,a.receiver_name receiverName,
            a.commodity_id as commodityId,a.manager_id managerId,a.consultant_id consultantId,a.project_status as projectStatus,a.set_up_amount setUpAmount,
            a.task_comment as taskComment ,a.commodity_price as commodityPrice, a.task_status as taskStatus,  a.task_receiver as taskReceiver ,
-           a.split_status splitStatus,a.split_super splitSuper,a.split_aid splitAid,a.split_time splitTime,a.patent_type patentType
+           a.split_status splitStatus,a.split_super splitSuper,a.split_aid splitAid,a.split_time splitTime,a.patent_type patentType,
+           a.picture_url pictureUrl, ttm.service_life serviceLife ,ttm.service_year serviceYear,ttm.year_sum yearSum
     from t_order_task a left join business_project b on a.commodity_id=b.id left join t_order_new e on a.order_no=e.order_no
-                        left join admin f on e.salesman_id=f.id left join department g on e.order_dep=g.id left join user h on e.buyer_id=h.id
-                        left join business_project i on a.commodity_id=i.id left join business_category c on b.cid=c.id left join admin d on a.task_receiver=d.id
+    left join admin f on e.salesman_id=f.id left join department g on e.order_dep=g.id left join user h on e.buyer_id=h.id
+    left join business_project i on a.commodity_id=i.id left join business_category c on b.cid=c.id left join admin d on a.task_receiver=d.id
+    left join t_task_member ttm on a.id=ttm.tid
     where a.super_id is null  and  a.order_no= #{orderNo,jdbcType=VARCHAR} order by a.id
   </select>
 
@@ -1771,9 +1770,11 @@
     c.salesman_name salesmanName,c.finance_name financeName,a.commodity_name projectName,a.member_type memberType,
     b.delete_sign deleteSign ,b.total_amount totalAmount ,b.sales_type salesType ,b.other,
     a.process_status status,a.commodity_id commodityId,a.commodity_name commodityName,
-    a.commodity_quantity commodityQuantity,a.task_comment taskComment,a.picture_url pictureUrl
+    a.commodity_quantity commodityQuantity,a.task_comment taskComment,a.picture_url pictureUrl,
+    e.service_life serviceLife ,e.service_year serviceYear,e.year_sum yearSum
     from t_order_task a left join t_order_new b on a.order_no =b.order_no
     left join t_order_mid c on a.order_no =c.order_no
+    left join t_task_member e on a.id=e.tid
     <if test="shiroType ==2">
       left join department d on b.order_dep =d.id
     </if>

+ 125 - 0
src/main/java/com/goafanti/common/mapper/TTaskMemberMapper.xml

@@ -0,0 +1,125 @@
+<?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.TTaskMemberMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.TTaskMember">
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="tid" jdbcType="INTEGER" property="tid" />
+    <result column="service_life" jdbcType="VARCHAR" property="serviceLife" />
+    <result column="service_year" jdbcType="VARCHAR" property="serviceYear" />
+    <result column="year_sum" jdbcType="INTEGER" property="yearSum" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+  </resultMap>
+  <sql id="Base_Column_List">
+    id, tid, service_life, service_year, year_sum, create_time
+  </sql>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List" />
+    from t_task_member
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    delete from t_task_member
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.TTaskMember">
+    insert into t_task_member (id, tid, service_life,
+      service_year, year_sum, create_time
+      )
+    values (#{id,jdbcType=INTEGER}, #{tid,jdbcType=INTEGER}, #{serviceLife,jdbcType=VARCHAR},
+      #{serviceYear,jdbcType=VARCHAR}, #{yearSum,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.TTaskMember">
+    insert into t_task_member
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="tid != null">
+        tid,
+      </if>
+      <if test="serviceLife != null">
+        service_life,
+      </if>
+      <if test="serviceYear != null">
+        service_year,
+      </if>
+      <if test="yearSum != null">
+        year_sum,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="tid != null">
+        #{tid,jdbcType=INTEGER},
+      </if>
+      <if test="serviceLife != null">
+        #{serviceLife,jdbcType=VARCHAR},
+      </if>
+      <if test="serviceYear != null">
+        #{serviceYear,jdbcType=VARCHAR},
+      </if>
+      <if test="yearSum != null">
+        #{yearSum,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TTaskMember">
+    update t_task_member
+    <set>
+      <if test="tid != null">
+        tid = #{tid,jdbcType=INTEGER},
+      </if>
+      <if test="serviceLife != null">
+        service_life = #{serviceLife,jdbcType=VARCHAR},
+      </if>
+      <if test="serviceYear != null">
+        service_year = #{serviceYear,jdbcType=VARCHAR},
+      </if>
+      <if test="yearSum != null">
+        year_sum = #{yearSum,jdbcType=INTEGER},
+      </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.TTaskMember">
+    update t_task_member
+    set tid = #{tid,jdbcType=INTEGER},
+      service_life = #{serviceLife,jdbcType=VARCHAR},
+      service_year = #{serviceYear,jdbcType=VARCHAR},
+      year_sum = #{yearSum,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+
+    <update id="updateByTid">
+      update t_task_member
+      <set>
+        <if test="serviceLife != null">
+          service_life = #{serviceLife,jdbcType=VARCHAR},
+        </if>
+        <if test="serviceYear != null">
+          service_year = #{serviceYear,jdbcType=VARCHAR},
+        </if>
+        <if test="yearSum != null">
+          year_sum = #{yearSum,jdbcType=INTEGER},
+        </if>
+        <if test="createTime != null">
+          create_time = #{createTime,jdbcType=TIMESTAMP},
+        </if>
+      </set>
+      where tid = #{tid,jdbcType=INTEGER}
+    </update>
+</mapper>

+ 3 - 18
src/main/java/com/goafanti/common/mapper/UserLockReleaseMapper.xml

@@ -386,13 +386,8 @@
 		(select uid,aid,max(create_time) as last_follow_time from user_follow where aid = #{aid} group by uid)t1
 	on t0.uid = t1.uid
 	left join user u on t0.uid=u.id
-	where u.channel=0
-	<if test="type==0">
+	where u.channel=0 and u.new_channel
 	 and datediff(now(),if(t0.lock_time &lt; t1.last_follow_time,t1.last_follow_time,t0.lock_time))>30
-	</if>
-	<if test="type==1">
-	 and datediff(now(),t0.lock_time)>270
-	</if>
   </select>
 
   <select id="selectWaitReleaseBusiness"  resultType="com.goafanti.customer.bo.LockingReleaseBo">
@@ -448,24 +443,14 @@
   </select>
 
   <select id="selectUserDays" resultType="com.goafanti.common.bo.userDaysBo">
-  select  t0.uid, t0.aid, u.nickname name ,u.channel ,1 type,u.new_channel newChannel
+    select  t0.uid, t0.aid, u.nickname name ,u.channel ,0 type,u.new_channel newChannel
 	from
 		(select id,uid,aid,lock_time from user_lock_release where aid = #{aid} and type = 0 and status = 0)t0
 	left join
 		(select uid,aid,max(create_time) as last_follow_time from user_follow where aid = #{aid} group by uid)t1
 	on t0.uid = t1.uid
 	left join user u on t0.uid=u.id
-	where u.channel=0
-	and  datediff(now(),t0.lock_time)> #{x}
-	UNION
-	select  t0.uid, t0.aid, u.nickname name ,u.channel ,0 type,u.new_channel newChannel
-	from
-		(select id,uid,aid,lock_time from user_lock_release where aid = #{aid} and type = 0 and status = 0)t0
-	left join
-		(select uid,aid,max(create_time) as last_follow_time from user_follow where aid = #{aid} group by uid)t1
-	on t0.uid = t1.uid
-	left join user u on t0.uid=u.id
-	where u.channel=0
+	where u.channel=0 and u.new_channel=0
 	and datediff(now(),if(t0.lock_time &lt; t1.last_follow_time,t1.last_follow_time,t0.lock_time)) &gt; 15
 	UNION
 	  select  t0.uid, t0.aid, u.nickname name ,u.channel ,0 type,u.new_channel newChannel

+ 267 - 393
src/main/java/com/goafanti/common/model/TChangeTask.java

@@ -1,399 +1,273 @@
 package com.goafanti.common.model;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
-public class TChangeTask {
-
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.id
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	private Integer id;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.tid
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	private Integer tid;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.cid
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	private Integer cid;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.order_no
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	private String orderNo;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.main
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	private Integer main;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.commodity_id
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	private String commodityId;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.commodity_name
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	private String commodityName;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.commodity_quantity
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	private Integer commodityQuantity;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.commodity_price
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	private BigDecimal commodityPrice;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.task_comment
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	private String taskComment;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.type
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	private Integer type;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.create_time
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	private Date createTime;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.split_status
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	private Integer splitStatus;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.split_super
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	private Integer splitSuper;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.receiver_name
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	private String receiverName;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.official_cost
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	private Integer officialCost;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_task.cost_reduction
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	private Integer costReduction;
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.id
-	 * @return  the value of t_change_task.id
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	public Integer getId() {
-		return id;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.id
-	 * @param id  the value for t_change_task.id
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.tid
-	 * @return  the value of t_change_task.tid
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	public Integer getTid() {
-		return tid;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.tid
-	 * @param tid  the value for t_change_task.tid
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	public void setTid(Integer tid) {
-		this.tid = tid;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.cid
-	 * @return  the value of t_change_task.cid
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	public Integer getCid() {
-		return cid;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.cid
-	 * @param cid  the value for t_change_task.cid
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	public void setCid(Integer cid) {
-		this.cid = cid;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.order_no
-	 * @return  the value of t_change_task.order_no
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	public String getOrderNo() {
-		return orderNo;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.order_no
-	 * @param orderNo  the value for t_change_task.order_no
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	public void setOrderNo(String orderNo) {
-		this.orderNo = orderNo;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.main
-	 * @return  the value of t_change_task.main
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	public Integer getMain() {
-		return main;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.main
-	 * @param main  the value for t_change_task.main
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	public void setMain(Integer main) {
-		this.main = main;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.commodity_id
-	 * @return  the value of t_change_task.commodity_id
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	public String getCommodityId() {
-		return commodityId;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.commodity_id
-	 * @param commodityId  the value for t_change_task.commodity_id
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	public void setCommodityId(String commodityId) {
-		this.commodityId = commodityId;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.commodity_name
-	 * @return  the value of t_change_task.commodity_name
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	public String getCommodityName() {
-		return commodityName;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.commodity_name
-	 * @param commodityName  the value for t_change_task.commodity_name
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	public void setCommodityName(String commodityName) {
-		this.commodityName = commodityName;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.commodity_quantity
-	 * @return  the value of t_change_task.commodity_quantity
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	public Integer getCommodityQuantity() {
-		return commodityQuantity;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.commodity_quantity
-	 * @param commodityQuantity  the value for t_change_task.commodity_quantity
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	public void setCommodityQuantity(Integer commodityQuantity) {
-		this.commodityQuantity = commodityQuantity;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.commodity_price
-	 * @return  the value of t_change_task.commodity_price
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	public BigDecimal getCommodityPrice() {
-		return commodityPrice;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.commodity_price
-	 * @param commodityPrice  the value for t_change_task.commodity_price
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	public void setCommodityPrice(BigDecimal commodityPrice) {
-		this.commodityPrice = commodityPrice;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.task_comment
-	 * @return  the value of t_change_task.task_comment
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	public String getTaskComment() {
-		return taskComment;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.task_comment
-	 * @param taskComment  the value for t_change_task.task_comment
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	public void setTaskComment(String taskComment) {
-		this.taskComment = taskComment;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.type
-	 * @return  the value of t_change_task.type
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	public Integer getType() {
-		return type;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.type
-	 * @param type  the value for t_change_task.type
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	public void setType(Integer type) {
-		this.type = type;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.create_time
-	 * @return  the value of t_change_task.create_time
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	public Date getCreateTime() {
-		return createTime;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.create_time
-	 * @param createTime  the value for t_change_task.create_time
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.split_status
-	 * @return  the value of t_change_task.split_status
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	public Integer getSplitStatus() {
-		return splitStatus;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.split_status
-	 * @param splitStatus  the value for t_change_task.split_status
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	public void setSplitStatus(Integer splitStatus) {
-		this.splitStatus = splitStatus;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.split_super
-	 * @return  the value of t_change_task.split_super
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	public Integer getSplitSuper() {
-		return splitSuper;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.split_super
-	 * @param splitSuper  the value for t_change_task.split_super
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	public void setSplitSuper(Integer splitSuper) {
-		this.splitSuper = splitSuper;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.receiver_name
-	 * @return  the value of t_change_task.receiver_name
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	public String getReceiverName() {
-		return receiverName;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.receiver_name
-	 * @param receiverName  the value for t_change_task.receiver_name
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	public void setReceiverName(String receiverName) {
-		this.receiverName = receiverName;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.official_cost
-	 * @return  the value of t_change_task.official_cost
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	public Integer getOfficialCost() {
-		return officialCost;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.official_cost
-	 * @param officialCost  the value for t_change_task.official_cost
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	public void setOfficialCost(Integer officialCost) {
-		this.officialCost = officialCost;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_task.cost_reduction
-	 * @return  the value of t_change_task.cost_reduction
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	public Integer getCostReduction() {
-		return costReduction;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_task.cost_reduction
-	 * @param costReduction  the value for t_change_task.cost_reduction
-	 * @mbg.generated  Fri Oct 16 15:53:59 CST 2020
-	 */
-	public void setCostReduction(Integer costReduction) {
-		this.costReduction = costReduction;
-	}
+/**
+ * t_change_task
+ * @author 
+ */
+public class TChangeTask implements Serializable {
+    /**
+     * 任务编号
+     */
+    private Integer id;
+
+    /**
+     * 订单任务编号
+     */
+    private Integer tid;
+
+    /**
+     * 变更编号
+     */
+    private Integer cid;
+
+    /**
+     * 订单编号
+     */
+    private String orderNo;
+
+    /**
+     * 是否为主要任务 0-否,1-是
+     */
+    private Integer main;
+
+    /**
+     * 商品id
+     */
+    private String commodityId;
+
+    /**
+     * 商品名称(冗余)
+     */
+    private String commodityName;
+
+    /**
+     * 商品数量
+     */
+    private Integer commodityQuantity;
+
+    /**
+     * 合同商品价格
+     */
+    private BigDecimal commodityPrice;
+
+    /**
+     * 任务说明
+     */
+    private String taskComment;
+
+    /**
+     * 状态 0正常 1新增 2修改 3删除 
+     */
+    private Integer type;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 0否 1父拆分 2子拆分
+     */
+    private Integer splitStatus;
+
+    /**
+     * 拆分父id
+     */
+    private Integer splitSuper;
+
+    /**
+     * 负责人
+     */
+    private String receiverName;
+
+    /**
+     * 官费 0否 1有
+     */
+    private Integer officialCost;
+
+    /**
+     * 费减 0否 1有 
+     */
+    private Integer costReduction;
+
+    /**
+     * 服务年限
+     */
+    private String serviceLife;
+
+    /**
+     * 本次年份
+     */
+    private String serviceYear;
+
+    /**
+     * 服务年限计数
+     */
+    private Integer yearSum;
+
+    private static final long serialVersionUID = 1L;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getTid() {
+        return tid;
+    }
+
+    public void setTid(Integer tid) {
+        this.tid = tid;
+    }
+
+    public Integer getCid() {
+        return cid;
+    }
+
+    public void setCid(Integer cid) {
+        this.cid = cid;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public Integer getMain() {
+        return main;
+    }
+
+    public void setMain(Integer main) {
+        this.main = main;
+    }
+
+    public String getCommodityId() {
+        return commodityId;
+    }
+
+    public void setCommodityId(String commodityId) {
+        this.commodityId = commodityId;
+    }
+
+    public String getCommodityName() {
+        return commodityName;
+    }
+
+    public void setCommodityName(String commodityName) {
+        this.commodityName = commodityName;
+    }
+
+    public Integer getCommodityQuantity() {
+        return commodityQuantity;
+    }
+
+    public void setCommodityQuantity(Integer commodityQuantity) {
+        this.commodityQuantity = commodityQuantity;
+    }
+
+    public BigDecimal getCommodityPrice() {
+        return commodityPrice;
+    }
+
+    public void setCommodityPrice(BigDecimal commodityPrice) {
+        this.commodityPrice = commodityPrice;
+    }
+
+    public String getTaskComment() {
+        return taskComment;
+    }
+
+    public void setTaskComment(String taskComment) {
+        this.taskComment = taskComment;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Integer getSplitStatus() {
+        return splitStatus;
+    }
+
+    public void setSplitStatus(Integer splitStatus) {
+        this.splitStatus = splitStatus;
+    }
+
+    public Integer getSplitSuper() {
+        return splitSuper;
+    }
+
+    public void setSplitSuper(Integer splitSuper) {
+        this.splitSuper = splitSuper;
+    }
+
+    public String getReceiverName() {
+        return receiverName;
+    }
+
+    public void setReceiverName(String receiverName) {
+        this.receiverName = receiverName;
+    }
+
+    public Integer getOfficialCost() {
+        return officialCost;
+    }
+
+    public void setOfficialCost(Integer officialCost) {
+        this.officialCost = officialCost;
+    }
+
+    public Integer getCostReduction() {
+        return costReduction;
+    }
+
+    public void setCostReduction(Integer costReduction) {
+        this.costReduction = costReduction;
+    }
+
+    public String getServiceLife() {
+        return serviceLife;
+    }
+
+    public void setServiceLife(String serviceLife) {
+        this.serviceLife = serviceLife;
+    }
+
+    public String getServiceYear() {
+        return serviceYear;
+    }
+
+    public void setServiceYear(String serviceYear) {
+        this.serviceYear = serviceYear;
+    }
+
+    public Integer getYearSum() {
+        return yearSum;
+    }
+
+    public void setYearSum(Integer yearSum) {
+        this.yearSum = yearSum;
+    }
 }

+ 90 - 0
src/main/java/com/goafanti/common/model/TTaskMember.java

@@ -0,0 +1,90 @@
+package com.goafanti.common.model;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * t_task_member
+ * @author 
+ */
+public class TTaskMember implements Serializable {
+    /**
+     * 编号
+     */
+    private Integer id;
+
+    /**
+     * 项目id
+     */
+    private Integer tid;
+
+    /**
+     * 服务年限
+     */
+    private String serviceLife;
+
+    /**
+     * 本次年份
+     */
+    private String serviceYear;
+
+    /**
+     * 服务年限计数
+     */
+    private Integer yearSum;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    private static final long serialVersionUID = 1L;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getTid() {
+        return tid;
+    }
+
+    public void setTid(Integer tid) {
+        this.tid = tid;
+    }
+
+    public String getServiceLife() {
+        return serviceLife;
+    }
+
+    public void setServiceLife(String serviceLife) {
+        this.serviceLife = serviceLife;
+    }
+
+    public String getServiceYear() {
+        return serviceYear;
+    }
+
+    public void setServiceYear(String serviceYear) {
+        this.serviceYear = serviceYear;
+    }
+
+    public Integer getYearSum() {
+        return yearSum;
+    }
+
+    public void setYearSum(Integer yearSum) {
+        this.yearSum = yearSum;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}

+ 5 - 20
src/main/java/com/goafanti/common/task/ReleaseUserTask.java

@@ -123,22 +123,14 @@ public class ReleaseUserTask {
 			if (userList != null && !userList.isEmpty()) {
 				for (User u : userList) {
 					List<LockingReleaseBo> userTmpList = new ArrayList<LockingReleaseBo>();
-					List<LockingReleaseBo> userTmpList2 = new ArrayList<LockingReleaseBo>();
+
 					if (StringUtils.isNotBlank(u.getId())) {
 						// 获取30天释放
-						userTmpList = customerService.selectWaitReleaseCustomer(u.getId(), 0);
+						userTmpList = customerService.selectWaitReleaseCustomer(u.getId());
 						customerService.pushReleaseLog(userTmpList, 0);
-						// 获取270天释放
-						if(!u.getId().equals("734092ad-6564-4021-b7ab-aab5af3a1537")){
-							userTmpList2 = customerService.selectWaitReleaseCustomer(u.getId(), 1);
-							customerService.pushReleaseLog(userTmpList2, 1);
-						}
-						addUserNotice(userTmpList,userTmpList2);
-						//
+						addUserNotice(userTmpList);
 						if (userTmpList != null && !userTmpList.isEmpty())
 							lockUserList.addAll(userTmpList);
-						if (userTmpList2 != null && !userTmpList2.isEmpty())
-							lockUserList.addAll(userTmpList2);
 					}
 				}
 			}
@@ -232,7 +224,7 @@ public class ReleaseUserTask {
 	}
 
 
-	private void addUserNotice(List<LockingReleaseBo> userTmpList, List<LockingReleaseBo> userTmpList2) {
+	private void addUserNotice(List<LockingReleaseBo> userTmpList) {
 		List<Notice> nl=new ArrayList<Notice>();
 		if (!userTmpList.isEmpty()) {
 			for (LockingReleaseBo u : userTmpList) {
@@ -245,14 +237,7 @@ public class ReleaseUserTask {
 						u.getUid()));
 			}
 		}
-		if (!userTmpList2.isEmpty()) {
-			for (LockingReleaseBo u : userTmpList2) {
-				nl.add(new Notice(UUID.randomUUID().toString(), new Date(), 0, u.getAid(),
-						NoticeStatus.CUSTOMER_LOSE270.getCode(),
-						String.format("您的%s客户【%s】已经270天未签单,已经自动释放!", "私有", u.getUserName()),
-						u.getUid()));
-			}
-		}
+
 		if(!nl.isEmpty())addNoticeBatch(nl);
 	}
 

+ 1 - 2
src/main/java/com/goafanti/customer/service/CustomerService.java

@@ -429,10 +429,9 @@ public interface CustomerService {
 	/**
 	 * 查询需要释放的客户
 	 * @param uid 客户Id
-	 * @param type   0 未跟进  1未签单
 	 * @return
 	 */
-	List<LockingReleaseBo> selectWaitReleaseCustomer(String uid, Integer type);
+	List<LockingReleaseBo> selectWaitReleaseCustomer(String uid);
 
 	List<LockingReleaseBo> selectWaitReleaseBusiness(String uid);
 

+ 5 - 5
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -1863,8 +1863,8 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 	}
 
 	@Override
-	public List<LockingReleaseBo> selectWaitReleaseCustomer(String uid, Integer type) {
-		return userLockReleaseMapper.selectWaitReleaseCustomer(uid, type);
+	public List<LockingReleaseBo> selectWaitReleaseCustomer(String uid) {
+		return userLockReleaseMapper.selectWaitReleaseCustomer(uid);
 	}
 
 	/**
@@ -2109,10 +2109,10 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 
 	@Override
 	public List<userDaysBo> selectReleaseUserDays(String id) {
-		Integer x = 270, y = USER_CHANNEL_DAYS;
-		x = x - USER_REMIND_DAYS;
+		//渠道
+		Integer y = USER_CHANNEL_DAYS;
 		y = y - USER_REMIND_DAYS;
-		List<userDaysBo> list = userLockReleaseMapper.selectUserDays(id, x, y);
+		List<userDaysBo> list = userLockReleaseMapper.selectUserDays(id,  y);
 		return list;
 	}
 

+ 33 - 0
src/main/java/com/goafanti/order/bo/InputAddTask.java

@@ -0,0 +1,33 @@
+package com.goafanti.order.bo;
+
+import com.goafanti.common.model.TOrderTask;
+
+public class InputAddTask  extends TOrderTask {
+    private String serviceLife;
+    private String serviceYear;
+    private Integer yearSum;
+
+    public String getServiceLife() {
+        return serviceLife;
+    }
+
+    public void setServiceLife(String serviceLife) {
+        this.serviceLife = serviceLife;
+    }
+
+    public String getServiceYear() {
+        return serviceYear;
+    }
+
+    public void setServiceYear(String serviceYear) {
+        this.serviceYear = serviceYear;
+    }
+
+    public Integer getYearSum() {
+        return yearSum;
+    }
+
+    public void setYearSum(Integer yearSum) {
+        this.yearSum = yearSum;
+    }
+}

+ 30 - 0
src/main/java/com/goafanti/order/bo/OutMemberList.java

@@ -46,6 +46,36 @@ public class OutMemberList {
     private String salesTypeName;
 
     private String pictureUrl;
+    @Excel(name = "服务年份",cellType = Excel.ColumnType.STRING)
+    private String serviceLife;
+    @Excel(name = "本次年份")
+    private String serviceYear;
+    @Excel(name = "服务年数",width = MINWIDTH)
+    private Integer yearSum;
+
+    public String getServiceLife() {
+        return serviceLife;
+    }
+
+    public void setServiceLife(String serviceLife) {
+        this.serviceLife = serviceLife;
+    }
+
+    public String getServiceYear() {
+        return serviceYear;
+    }
+
+    public void setServiceYear(String serviceYear) {
+        this.serviceYear = serviceYear;
+    }
+
+    public Integer getYearSum() {
+        return yearSum;
+    }
+
+    public void setYearSum(Integer yearSum) {
+        this.yearSum = yearSum;
+    }
 
     public String getPictureUrl() {
         return pictureUrl;

+ 27 - 0
src/main/java/com/goafanti/order/bo/TOrderTaskBo.java

@@ -44,8 +44,35 @@ public class TOrderTaskBo extends TOrderTask{
 	@Excel(name = "项目状态",sort = 13)
 	private String projectStatusName;
 
+	private String	serviceLife;
+	private String	serviceYear;
+	private Integer	yearSum;
 
 
+	public String getServiceLife() {
+		return serviceLife;
+	}
+
+	public void setServiceLife(String serviceLife) {
+		this.serviceLife = serviceLife;
+	}
+
+	public String getServiceYear() {
+		return serviceYear;
+	}
+
+	public void setServiceYear(String serviceYear) {
+		this.serviceYear = serviceYear;
+	}
+
+	public Integer getYearSum() {
+		return yearSum;
+	}
+
+	public void setYearSum(Integer yearSum) {
+		this.yearSum = yearSum;
+	}
+
 	public String getName() {
 		return name;
 	}

+ 5 - 5
src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java

@@ -96,23 +96,23 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	 * 添加项目
 	 */
 	@RequestMapping(value = "/addOrderTask",method = RequestMethod.POST)
-	public Result addOrderTask(TOrderTask t){
+	public Result addOrderTask(InputAddTask in){
 		Result res = new Result();
-		if(StringUtils.isBlank(t.getOrderNo())){
+		if(StringUtils.isBlank(in.getOrderNo())){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
 			return res;
 		}
-		if (t.getOrderNo()!=null&&orderNewService.checkOrderMain(t)) {
+		if (in.getOrderNo()!=null&&orderNewService.checkOrderMain(in)) {
 			res.getError().add(buildError("订单主要任务已存在","订单主要任务已存在"));
 			return res;
 		}
-		return res.data(orderNewService.addOrderTask(t));
+		return res.data(orderNewService.addOrderTask(in));
 	}
 	/**
 	 * 修改项目(营销员)
 	 */
 	@RequestMapping(value = "/updateOrderTask",method = RequestMethod.POST)
-	public Result updateOrderTask(TOrderTask t){
+	public Result updateOrderTask(InputAddTask t){
 		Result res=new Result();
 		if(null==t.getId()){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","项目编号"));

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

@@ -490,7 +490,7 @@ public class OrderProjectApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/addMemberProject" ,method = RequestMethod.POST)
-	public Result addMemberProject(TOrderTask t){
+	public Result addMemberProject(InputAddTask t){
 		Result res = new Result();
 		if(org.apache.commons.lang3.StringUtils.isBlank(t.getOrderNo())){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
@@ -524,7 +524,7 @@ public class OrderProjectApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/updateMemberProject" ,method = RequestMethod.POST)
-	public Result updateMemberProject(TOrderTask t){
+	public Result updateMemberProject(InputAddTask t){
 		Result res = new Result();
 		if(t.getId()==null){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"项目编号"));

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

@@ -26,14 +26,14 @@ public interface OrderNewService {
 	 * 创建项目
 	 * @param t
 	 */
-	int addOrderTask(TOrderTask t);
+	int addOrderTask(InputAddTask t);
 
-	int addMemberProject(TOrderTask t);
+	int addMemberProject(InputAddTask t);
 	/**
 	 * 修改项目信息
 	 * @param t
 	 */
-	int updateOrderTask(TOrderTask t);
+	int updateOrderTask(InputAddTask t);
 	/**
 	 * 删除项目
 	 * @param id

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

@@ -88,7 +88,7 @@ public interface OrderProjectService {
 
 	Result memberListExport(InputMemberList in);
 
-    int updateMemberProject(TOrderTask t);
+    int updateMemberProject(InputAddTask t);
 
 	int pushExamineMemberProject(InputMenber in);
 

+ 30 - 1
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -76,7 +76,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	@Autowired
 	private OrderRefundInvoiceMapper	orderRefundInvoiceMapper;
 	@Autowired
-	private DepartmentMapper	departmentMapper;
+	private TTaskMemberMapper	tTaskMemberMapper;
 	@Autowired
 	private NewOrderRefundMapper	newOrderRefundMapper;
 	@Autowired
@@ -173,6 +173,11 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 					ck.setReceiverName(tt.getReceiverName());
 					ck.setMain(tt.getMain());
 					ck.setTid(tt.getId());
+					if(tt.getServiceLife()!=null){
+						ck.setServiceLife(tt.getServiceLife());
+						ck.setServiceYear(tt.getServiceYear());
+						ck.setYearSum(tt.getYearSum());
+					}
 					listck.add(ck);
 				}
 				tChangeTaskMapper.insertSelectiveList(listck);
@@ -531,6 +536,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		}else {
 			parameter.put("aid", TokenManager.getAdminId());
 		}
+		parameter.put("deps", orderService.selectMyDeps());
 		Pagination<NewOderCahngeListBo> data = (Pagination<NewOderCahngeListBo>)findPage("selectOrderChangeList", "selectOrderChangeCount", parameter, pageNo, pageSize);
 		return data;
 	}
@@ -766,6 +772,9 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			ot.setMain(cd.getMain());
 			ot.setTaskStatus(0);
 			tOrderTaskMapper.insertSelective(ot);
+			if (cd.getServiceLife()!=null){
+				addTaskMember(ot.getId(),cd.getServiceLife(),cd.getServiceYear(),cd.getYearSum());
+			}
 			cd.setTid(ot.getId());
 			tChangeTaskMapper.updateByPrimaryKeySelective(cd);
 			tChangeDunMapper.updateByCTid(cd.getId(), ot.getId());
@@ -774,6 +783,9 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				ot.setCommodityPrice(cd.getCommodityPrice());
 				ot.setCommodityQuantity(cd.getCommodityQuantity());
 				tOrderTaskMapper.updateByPrimaryKeySelective(ot);
+				if (cd.getServiceLife()!=null){
+					updateTaskMember(ot.getId(),cd.getServiceLife(),cd.getServiceYear(),cd.getYearSum());
+				}
 			}else if(cd.getType()==3) {
 				tOrderTaskMapper.deleteByPrimaryKey(cd.getTid());
 			}
@@ -810,6 +822,23 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		}
 	}
 
+	private void updateTaskMember(Integer id, String serviceLife, String serviceYear, Integer yearSum) {
+		TTaskMember ttm=new TTaskMember();
+		ttm.setTid(id);
+		ttm.setServiceLife(serviceLife);
+		ttm.setServiceYear(serviceYear);
+		ttm.setYearSum(yearSum);
+		tTaskMemberMapper.updateByTid(ttm);
+	}
+
+	private void addTaskMember(Integer id, String serviceLife, String serviceYear, Integer yearSum) {
+		TTaskMember ttm=new TTaskMember();
+		ttm.setTid(id);
+		ttm.setServiceLife(serviceLife);
+		ttm.setServiceYear(serviceYear);
+		ttm.setYearSum(yearSum);
+		tTaskMemberMapper.insertSelective(ttm);
+	}
 
 
 	@Override

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

@@ -28,10 +28,7 @@ import com.goafanti.order.enums.*;
 import com.goafanti.order.service.OrderProjectService;
 import com.goafanti.organization.bo.*;
 import com.goafanti.common.utils.StringUtils;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
 import groovy.transform.Synchronized;
-import org.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -134,6 +131,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	@Autowired
 	private OrderProjectService orderProjectService;
 	@Autowired
+	private TTaskMemberMapper tTaskMemberMapper;
+
+	@Autowired
 	private DepartmentService departmentService;
 	@Value(value = "${upload.path}")
 	private String					uploadPath			= null;
@@ -186,7 +186,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	}
 
 	@Override
-	public int addOrderTask(TOrderTask t) {
+	public int addOrderTask(InputAddTask t) {
 		TOrderNew order=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
 		checkOrder(order,t);
 		t.setTaskStatus(TaskState.WFP.getCode());
@@ -197,6 +197,14 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		String str=tOrderTaskMapper.selectByidGetCname(t.getCommodityId());
 		t.setCname(str);
 		tOrderTaskMapper.insertSelective(t);
+		if (t.getServiceLife()!=null&&t.getServiceYear()!=null){
+			TTaskMember ttm=new TTaskMember();
+			ttm.setTid(t.getId());
+			ttm.setServiceLife(t.getServiceLife());
+			ttm.setServiceYear(t.getServiceYear());
+			ttm.setYearSum(t.getYearSum());
+			tTaskMemberMapper.insertSelective(ttm);
+		}
 		TTaskMid tm=new TTaskMid();
 		tm.setTid(t.getId());
 		//判断这个项目是不是高新复审
@@ -225,9 +233,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	}
 
 	@Override
-	public int addMemberProject(TOrderTask t){
+	public int addMemberProject(InputAddTask t){
 		TOrderNewBo tn = tOrderNewMapper.getSaleIdByOno(t.getOrderNo());
-		addOrderTask( t);
+		addOrderTask(t);
 		orderProjectService.addMemberLog(t.getId(),0,"新增会员项目");
 		addNoticMember(NoticeStatus.MENBER_START.getCode(),tn,null,0);
 		return 1;
@@ -256,7 +264,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	}
 
 	@Override
-	public int updateOrderTask(TOrderTask t) {
+	public int updateOrderTask(InputAddTask t) {
 		TOrderTask use=tOrderTaskMapper.selectByPrimaryKey(t.getId());
 		boolean flag=false;
 		if(use.getCheckStatus()==1) {
@@ -299,6 +307,14 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			projcetCheckLogMapper.insertSelective(log);
 		}
 		int  i=tOrderTaskMapper.updateByPrimaryKeySelective(t);
+		if (t.getServiceLife()!=null&&t.getServiceYear()!=null){
+			TTaskMember ttm=new TTaskMember();
+			ttm.setTid(t.getId());
+			ttm.setServiceLife(t.getServiceLife());
+			ttm.setServiceYear(t.getServiceYear());
+			ttm.setYearSum(t.getYearSum());
+			tTaskMemberMapper.updateByTid(ttm);
+		}
 		if (flag) {
 			patentNewService.updateCostReduction(t.getId());
 		}
@@ -361,15 +377,14 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		if (StringUtils.isBlank(t.getOrderDep())) {
 			t.setOrderDep(adminMapper.selectByPrimaryKey(TokenManager.getAdminId()).getDepartmentId());
 		}
-			//订单提交
-		if (isSubmit==1) {
+		if (isSubmit==1) {//订单提交
 			if(t2.getProcessStatus()<ProcessStatus.YPYXGLY.getCode()) {
 				t.setOrderStatus(OrderNewState.QDDS.getCode());
 				t.setProcessStatus(ProcessStatus.YPYXGLY.getCode());
 			}else {
 				t.setOrderStatus(OrderNewState.QDSHTG.getCode());
 			}
-			if (t2.getApproval().equals(ApprovalNewState.BH.getCode())){
+			if (t2.getApproval()==ApprovalNewState.BH.getCode()){
 				t.setApproval(ApprovalNewState.DSH.getCode());
 			}
 			//生成流转
@@ -603,85 +618,117 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 	@SuppressWarnings("unchecked")
 	@Override
-	public Pagination<TOrderNewBo> orderNewList(InputOrderNewListBo in) {
+	public Pagination<TOrderNewBo> orderNewList(String aid,String name, String orderNo, String starTime, String endTime,Integer specially,Integer approval,
+			Integer distribution,String depId,String contractNo,Integer outsource,Integer liquidationStatus, Integer amountStatus,
+												String contractStart, String contractEnd,String uid,Integer projectType,Integer processStatus,  Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<>();
-		if (in.getSpecially()!=null&&(in.getSpecially()==0||in.getSpecially()==1||in.getSpecially()==2||in.getSpecially()==4||in.getSpecially()==5||in.getSpecially()==7)) {
+		if (specially!=null&&(specially==0||specially==1||specially==2||specially==4||specially==5||specially==7)) {
 			//0 个人 1 营销员管理 2 驳回 3 特批 4 咨询师管理 5部门订单查询
-			if (in.getSpecially()!=3&&in.getSpecially()!=4) {
-				if (in.getAid() ==null){
+			if (specially!=3&&specially!=4) {
+				if (aid ==null){
 					params.put("aid", TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
 				}else{
-					params.put("aid", in.getAid());
+					params.put("aid", aid);
 				}
 			}
 			//(咨询师管理列表 0 未分配 1部分   2全部)
-			if(in.getSpecially()==4) {
-				params.put("distribution",in.getDistribution());
+			if(specially==4) {
+				params.put("distribution",distribution);
 			}
 
-		}else if(in.getSpecially()==8){
-			if (StringUtils.isNotBlank(in.getUid())) {
-				params.put("uid", in.getUid());
+		}else if(specially==8){
+			if (StringUtils.isNotBlank(uid)) {
+				params.put("uid", uid);
 			}
-		}else if (in.getSpecially()==9){
-			if (StringUtils.isNotBlank(in.getAid())) {
-				params.put("aid", in.getAid());
+		}else if (specially==9){
+			if (StringUtils.isNotBlank(aid)) {
+				params.put("aid", aid);
 			}
 		}
-			params.put("specially",in.getSpecially());
-		if (StringUtils.isNotBlank(in.getName())) {
-			params.put("name", in.getName());
+			params.put("specially",specially);
+		if (StringUtils.isNotBlank(name)) {
+			params.put("name", name);
 		}
 		// 计算出所有本部门及所属部门的ID
-		if(in.getSpecially()==1||in.getSpecially()==5) {
-			List<String>departmentList=new ArrayList<>();
-			if (in.getDeps()!=null){
-				departmentList=departmentService.selectSubDeps(in.getDeps());
+		List<Department> deps = new ArrayList<>();
+		if(specially==1||specially==5) {
+			if (depId!=null){
+				deps=departmentService.selectSubDeps(depId,0,1);
+				if(deps.isEmpty()){
+					return new Pagination(1,10,0);
+				}
 			}else {
-				departmentList=departmentService.selectMyDeps();
+				deps=departmentService.selectMyDeps();
 			}
-			params.put("deps",departmentList);
 		}else {
-			if (in.getDeps()!=null) {
-				params.put("deps",departmentService.parseArray(in.getDeps()));
+			if (StringUtils.isNotBlank(depId)) {
+				deps=departmentService.getLowerDep(depId);
 			}
 		}
-
-		if (StringUtils.isNotBlank(in.getContractNo())) {
-			params.put("contractNo", in.getContractNo());
-		}
-		if (null!=in.getLiquidationStatus()) {
-			params.put("liquidationStatus", in.getLiquidationStatus());
+		if (!deps.isEmpty())params.put("deps",deps);
+		if (StringUtils.isNotBlank(contractNo)) {
+			params.put("contractNo", contractNo);
 		}
-			if (null !=in.getApproval()) {
-				params.put("approval", in.getApproval());
+		if (null!=liquidationStatus) {
+			params.put("liquidationStatus", liquidationStatus);
+			if (null !=approval) {
+				params.put("approval", approval);
+			}
+			if(null != amountStatus) {
+				params.put("amountStatus", amountStatus);
+			}
+			if (StringUtils.isNotBlank(orderNo)) {
+				params.put("orderNo", orderNo);
 			}
-			if(null != in.getAmountStatus()) {
-				params.put("amountStatus", in.getAmountStatus());
+			if (StringUtils.isNotBlank(starTime)) {
+				params.put("starTime", starTime);
+			}
+			if (StringUtils.isNotBlank(endTime)) {
+				params.put("endTime", endTime+" 23:59:59");
 			}
-			if (StringUtils.isNotBlank(in.getOrderNo())) {
-				params.put("orderNo", in.getOrderNo());
+			if (StringUtils.isNotBlank(contractStart)) {
+				params.put("contractStart", contractStart);
 			}
-			if (StringUtils.isNotBlank(in.getStarTime())) {
-				params.put("starTime", in.getStarTime());
+			if (StringUtils.isNotBlank(contractEnd)) {
+				params.put("contractEnd", contractEnd+" 23:59:59");
 			}
-			if (StringUtils.isNotBlank(in.getEndTime())) {
-				params.put("endTime", in.getEndTime()+" 23:59:59");
+			if(null != projectType) {
+				params.put("projectType",projectType);
 			}
-			if (StringUtils.isNotBlank(in.getContractStart())) {
-				params.put("contractStart", in.getContractStart());
+			if(null != processStatus) {
+				params.put("processStatus",processStatus);
 			}
-			if (StringUtils.isNotBlank(in.getContractEnd())) {
-				params.put("contractEnd", in.getContractEnd()+" 23:59:59");
+		} else {
+			if (null !=approval) {
+				params.put("approval", approval);
 			}
-			if(null != in.getProjectType()) {
-				params.put("projectType",in.getProjectType());
+			if(null != amountStatus) {
+				params.put("amountStatus", amountStatus);
 			}
-			if(null != in.getProcessStatus()) {
-				params.put("processStatus",in.getProcessStatus());
+			if (StringUtils.isNotBlank(orderNo)) {
+				params.put("orderNo", orderNo);
 			}
-		params.put("outsource", in.getOutsource());
-		Pagination<TOrderNewBo> p = (Pagination<TOrderNewBo>)findPage("selectOrderNewListByPage", "selectOrderNewListCount", params, in.getPageNo(), in.getPageSize());
+			if (StringUtils.isNotBlank(starTime)) {
+				params.put("starTime", starTime);
+			}
+			if (StringUtils.isNotBlank(endTime)) {
+				params.put("endTime", endTime+" 23:59:59");
+			}
+			if (StringUtils.isNotBlank(contractStart)) {
+				params.put("contractStart", contractStart);
+			}
+			if (StringUtils.isNotBlank(contractEnd)) {
+				params.put("contractEnd", contractEnd+" 23:59:59");
+			}
+			if(null != projectType) {
+				params.put("projectType",projectType);
+			}
+			if(null != processStatus) {
+				params.put("processStatus",processStatus);
+			}
+		}
+		params.put("outsource", outsource);
+		Pagination<TOrderNewBo> p = (Pagination<TOrderNewBo>)findPage("selectOrderNewListByPage", "selectOrderNewListCount", params, pageNo, pageSize);
 		return p;
 	}
 
@@ -974,7 +1021,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<outOrderDunListBo> dunOrderNewList(String name, String orderNo,String contractNo, String starTime, String endTime,
-			Integer specially,String  aid, String adminName,String deps,Integer newStatus,Integer approval,Integer amountStatus,Integer memberType,Integer pageNo, Integer pageSize) {
+			Integer specially,String  aid, String adminName,String depId,Integer newStatus,Integer approval,Integer amountStatus,Integer memberType,Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		if(newStatus!=null&&newStatus==0) {
 			params.put("newStatus", 0);
@@ -984,8 +1031,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		if (StringUtils.isNotBlank(name)) {
 			params.put("name", name);
 		}
-		if (StringUtils.isNotBlank(deps)) {
-			params.put("deps", departmentService.parseArray(deps));
+		if (StringUtils.isNotBlank(depId)) {
+			params.put("depId", depId);
 		}
 		if (StringUtils.isNotBlank(adminName)) {
 			params.put("adminName", adminName);
@@ -1725,8 +1772,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		if (StringUtils.isNotBlank(in.getName())) {
 			params.put("name", in.getName());
 		}
-		if (in.getDeps()!=null) {
-			params.put("deps",departmentService.parseArray(in.getDeps()));
+		if (StringUtils.isNotBlank(in.getDepId())) {
+			params.put("deps", departmentService.getLowerDep(in.getDepId()));
 		}
 		if (StringUtils.isNotBlank(in.getAdminName())) {
 			params.put("adminName", in.getAdminName());

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

@@ -1174,7 +1174,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 
 
 	@Override
-	public int updateMemberProject(TOrderTask t) {
+	public int updateMemberProject(InputAddTask t) {
 		TOrderTask task=tOrderTaskMapper.selectByPrimaryKey(t.getId());
 		if(task.getProcessStatus()!=4)throw  new BusinessException("审核状态错误,无法提交。");
 		addMemberLog(t.getId(),0,"修改重新发起");

+ 1 - 1
src/main/java/com/goafanti/weChat/controller/AdminReleaseApiController.java

@@ -147,7 +147,7 @@ public class AdminReleaseApiController extends CertifyApiController{
 			res.getError().add(buildError("备注长度不能超过20个字符。"));
 			return res;
 		}
-		res.setData(publicReleaseService.pushExaminePublicRelease( id , status, remarks));
+		res.setData(publicReleaseService.pushExaminePublicRelease(id,status,remarks));
 		return res;
 	}