anderx лет назад: 3
Родитель
Сommit
7577f8d4dc
19 измененных файлов с 300 добавлено и 614 удалено
  1. 1 1
      src/main/java/com/goafanti/common/bo/EmailBo.java
  2. 2 3
      src/main/java/com/goafanti/common/dao/TOrderTaskMapper.java
  3. 1 0
      src/main/java/com/goafanti/common/enums/NoticeStatus.java
  4. 22 22
      src/main/java/com/goafanti/common/mapper/NewOrderDunMapper.xml
  5. 39 372
      src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml
  6. 21 97
      src/main/java/com/goafanti/common/model/TOrderTask.java
  7. 38 22
      src/main/java/com/goafanti/common/task/OrderDunTask.java
  8. 16 4
      src/main/java/com/goafanti/order/bo/OutNewOrderDunBo.java
  9. 30 10
      src/main/java/com/goafanti/order/bo/TOrderTaskBo.java
  10. 8 4
      src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java
  11. 17 0
      src/main/java/com/goafanti/order/controller/OrderProjectApiController.java
  12. 9 5
      src/main/java/com/goafanti/order/service/OrderNewService.java
  13. 5 4
      src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java
  14. 1 1
      src/main/java/com/goafanti/order/service/impl/LegalAffairsServiceImpl.java
  15. 5 4
      src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java
  16. 42 17
      src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java
  17. 5 6
      src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java
  18. 32 36
      src/main/java/com/goafanti/order/service/impl/OrderReceivablesServiceImpl.java
  19. 6 6
      src/main/resources/props/config_local.properties

+ 1 - 1
src/main/java/com/goafanti/common/bo/EmailBo.java

@@ -75,7 +75,7 @@ public class EmailBo {
 	}
 	}
 
 
 	/**
 	/**
-	 *
+	 *		催款模版
 	 * @param subject	标题
 	 * @param subject	标题
 	 * @param address	收件地址
 	 * @param address	收件地址
 	 * @param deptname		发起人部门
 	 * @param deptname		发起人部门

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

@@ -23,13 +23,13 @@ public interface TOrderTaskMapper {
 
 
     int updateByPrimaryKey(TOrderTask record);
     int updateByPrimaryKey(TOrderTask record);
 
 
-    List<TOrderTaskBo> selectOrderTask(String orderNo);
+    List<TOrderTaskBo> selectOrderTask(@Param("orderNo") String orderNo,@Param("type") Integer type);
 
 
     TOrderTaskDetailBo getOrderTaskDetail(String id);
     TOrderTaskDetailBo getOrderTaskDetail(String id);
 
 
     TOrderTask selectBySuperId(String superId);
     TOrderTask selectBySuperId(String superId);
 
 
-    List<TOrderTask> getReceiverByOid(String oid);
+    List<TOrderTaskBo> getReceiverByOid(String oid);
 
 
     void updateDimissionTransfer(@Param("aid")String aid, @Param("transferId")String transferId, @Param("type")Integer type);
     void updateDimissionTransfer(@Param("aid")String aid, @Param("transferId")String transferId, @Param("type")Integer type);
 
 
@@ -45,7 +45,6 @@ public interface TOrderTaskMapper {
 
 
     void updateByOutsourceToOrderNo(@Param("orderNo")String orderNo, @Param("type")Integer type);
     void updateByOutsourceToOrderNo(@Param("orderNo")String orderNo, @Param("type")Integer type);
 
 
-    int insertSelectiveGetId(TOrderTask tn);
 
 
     List<String> getLockId(@Param("orderNo")String orderNo, @Param("aid")String aid, @Param("uid")String uid);
     List<String> getLockId(@Param("orderNo")String orderNo, @Param("aid")String aid, @Param("uid")String uid);
 
 

+ 1 - 0
src/main/java/com/goafanti/common/enums/NoticeStatus.java

@@ -65,6 +65,7 @@ public enum NoticeStatus {
 	PUBLIC_RELEASE_NO(56,"外出打卡驳回"),
 	PUBLIC_RELEASE_NO(56,"外出打卡驳回"),
 	ITEM_CHECK_START(57,"发起专利核对"),
 	ITEM_CHECK_START(57,"发起专利核对"),
 	ITEM_CHECK_END(58,"完成专利核对"),
 	ITEM_CHECK_END(58,"完成专利核对"),
+	MANBER_DUN(59,"完成专利核对"),
 	OTHER(0, "其他");
 	OTHER(0, "其他");
 
 
 	private NoticeStatus(Integer code, String desc) {
 	private NoticeStatus(Integer code, String desc) {

+ 22 - 22
src/main/java/com/goafanti/common/mapper/NewOrderDunMapper.xml

@@ -97,7 +97,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Fri May 15 09:46:56 CST 2020.
       This element was generated on Fri May 15 09:46:56 CST 2020.
     -->
     -->
-    id, order_no, tid, project_type, dun_type, wait_day, effective_count, aid, status, 
+    id, order_no, tid, project_type, dun_type, wait_day, effective_count, aid, status,
     create_time, start_time, money, appropriation_ratio, customize_name, customize_time
     create_time, start_time, money, appropriation_ratio, customize_name, customize_time
   </sql>
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.NewOrderDunExample" resultMap="BaseResultMap">
   <select id="selectByExample" parameterType="com.goafanti.common.model.NewOrderDunExample" resultMap="BaseResultMap">
@@ -125,7 +125,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Fri May 15 09:46:56 CST 2020.
       This element was generated on Fri May 15 09:46:56 CST 2020.
     -->
     -->
-    select 
+    select
     <include refid="Base_Column_List" />
     <include refid="Base_Column_List" />
     from new_order_dun
     from new_order_dun
     where id = #{id,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
@@ -156,16 +156,16 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Fri May 15 09:46:56 CST 2020.
       This element was generated on Fri May 15 09:46:56 CST 2020.
     -->
     -->
-    insert into new_order_dun (id, order_no, tid, 
-      project_type, dun_type, wait_day, 
-      effective_count, aid, status, 
-      create_time, start_time, money, 
+    insert into new_order_dun (id, order_no, tid,
+      project_type, dun_type, wait_day,
+      effective_count, aid, status,
+      create_time, start_time, money,
       appropriation_ratio, customize_name, customize_time
       appropriation_ratio, customize_name, customize_time
       )
       )
-    values (#{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{tid,jdbcType=INTEGER}, 
-      #{projectType,jdbcType=INTEGER}, #{dunType,jdbcType=INTEGER}, #{waitDay,jdbcType=INTEGER}, 
-      #{effectiveCount,jdbcType=INTEGER}, #{aid,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{startTime,jdbcType=TIMESTAMP}, #{money,jdbcType=DECIMAL}, 
+    values (#{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{tid,jdbcType=INTEGER},
+      #{projectType,jdbcType=INTEGER}, #{dunType,jdbcType=INTEGER}, #{waitDay,jdbcType=INTEGER},
+      #{effectiveCount,jdbcType=INTEGER}, #{aid,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER},
+      #{createTime,jdbcType=TIMESTAMP}, #{startTime,jdbcType=TIMESTAMP}, #{money,jdbcType=DECIMAL},
       #{appropriationRatio,jdbcType=DECIMAL}, #{customizeName,jdbcType=VARCHAR}, #{customizeTime,jdbcType=TIMESTAMP}
       #{appropriationRatio,jdbcType=DECIMAL}, #{customizeName,jdbcType=VARCHAR}, #{customizeTime,jdbcType=TIMESTAMP}
       )
       )
   </insert>
   </insert>
@@ -443,14 +443,14 @@
     where id = #{id,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   </update>
   <delete id="deleteByTid" parameterType="java.lang.Integer">
   <delete id="deleteByTid" parameterType="java.lang.Integer">
-    
+
     delete from new_order_dun
     delete from new_order_dun
     where tid = #{tid,jdbcType=INTEGER}
     where tid = #{tid,jdbcType=INTEGER}
   </delete>
   </delete>
   <select id="selectListNewOrderDun" resultType="com.goafanti.order.bo.OutNewOrderDunBo">
   <select id="selectListNewOrderDun" resultType="com.goafanti.order.bo.OutNewOrderDunBo">
   select a.id,a.order_no orderNo, a.tid, a.project_type projectType, a.dun_type dunType, a.wait_day waitDay, b.set_up_amount setUpAmount,
   select a.id,a.order_no orderNo, a.tid, a.project_type projectType, a.dun_type dunType, a.wait_day waitDay, b.set_up_amount setUpAmount,
   a.effective_count effectiveCount, a.aid, a.create_time createTime ,b.commodity_name commodityName,a.money,a.status,a.customize_time customizeTime,
   a.effective_count effectiveCount, a.aid, a.create_time createTime ,b.commodity_name commodityName,a.money,a.status,a.customize_time customizeTime,
-  a.appropriation_ratio appropriationRatio,date_format(a.customize_time,'%Y-%m-%d') customizeTimes, a.customize_name customizeName 
+  a.appropriation_ratio appropriationRatio,date_format(a.customize_time,'%Y-%m-%d') customizeTimes, a.customize_name customizeName
   from new_order_dun a left join t_order_task b on a.tid=b.id where 1=1
   from new_order_dun a left join t_order_task b on a.tid=b.id where 1=1
   <if test="orderNo != null">
   <if test="orderNo != null">
   and  a.order_no= #{orderNo}
   and  a.order_no= #{orderNo}
@@ -458,18 +458,18 @@
   <if test="status != null">
   <if test="status != null">
   and  a.status= #{status}
   and  a.status= #{status}
   </if>
   </if>
-   order by project_type,dun_type 
+   order by project_type,dun_type
   </select>
   </select>
-  <select id="selectAllOrderDun" resultType="com.goafanti.order.bo.OutNewOrderDunBo"> 
-  select a.id, a.order_no orderNo, a.tid, a.project_type projectType, a.dun_type dunType, a.wait_day waitDay, 
-  a.effective_count effectiveCount, a.aid, a.create_time createTime,b.approval,a.customize_time customizeTime
-  ,date_format(a.customize_time,'%Y-%m-%d') customizeTimes, a.customize_name customizeName,a.money 
-  from new_order_dun a left join  t_order_new b on a.order_no=b.order_no
-  where 1=1 and a.status=0 and b.process_status &gt; 4 and b.delete_sign in (0,2,3)
+  <select id="selectAllOrderDun" resultType="com.goafanti.order.bo.OutNewOrderDunBo">
+    select a.id, a.order_no orderNo, a.tid, a.project_type projectType, a.dun_type dunType, a.wait_day waitDay,
+     a.effective_count effectiveCount, a.aid, a.create_time createTime,b.approval,a.customize_time customizeTime,
+    date_format(a.customize_time,'%Y-%m-%d') customizeTimes, a.customize_name customizeName,a.money ,c.project_type projectType
+    from new_order_dun 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
+    where 1=1 and a.status=0 and b.process_status &gt; 4 and b.delete_sign in (0,2,3)
   </select>
   </select>
   <select id="selectByTid" resultType="com.goafanti.order.bo.OutNewOrderDunBo">
   <select id="selectByTid" resultType="com.goafanti.order.bo.OutNewOrderDunBo">
-    select a.id, a.order_no orderNo, a.tid, a.project_type projectType, a.dun_type dunType, a.wait_day waitDay, 
-  	a.effective_count effectiveCount, a.aid, a.money,a.create_time createTime 
+    select a.id, a.order_no orderNo, a.tid, a.project_type projectType, a.dun_type dunType, a.wait_day waitDay,
+  	a.effective_count effectiveCount, a.aid, a.money,a.create_time createTime
   	,date_format(a.customize_time,'%Y-%m-%d') customizeTimes, a.customize_name customizeName
   	,date_format(a.customize_time,'%Y-%m-%d') customizeTimes, a.customize_name customizeName
   	from new_order_dun a
   	from new_order_dun a
     where tid = #{tid} and status=0
     where tid = #{tid} and status=0
@@ -538,4 +538,4 @@
     <if test="sort==1"> z.money </if>
     <if test="sort==1"> z.money </if>
     desc
     desc
   </select>
   </select>
-</mapper>
+</mapper>

+ 39 - 372
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -62,6 +62,8 @@
     <result column="check_status" jdbcType="INTEGER" property="checkStatus" />
     <result column="check_status" jdbcType="INTEGER" property="checkStatus" />
     <result column="patent_type" jdbcType="INTEGER" property="patentType" />
     <result column="patent_type" jdbcType="INTEGER" property="patentType" />
     <result column="pubicity_url" jdbcType="VARCHAR" property="pubicityUrl" />
     <result column="pubicity_url" jdbcType="VARCHAR" property="pubicityUrl" />
+    <result column="process_status" jdbcType="INTEGER" property="processStatus" />
+    <result column="member_type" jdbcType="INTEGER" property="memberType" />
   </resultMap>
   </resultMap>
   <sql id="Base_Column_List">
   <sql id="Base_Column_List">
     id, order_no, main, super_id, commodity_id, commodity_name, commodity_quantity, commodity_mode,
     id, order_no, main, super_id, commodity_id, commodity_name, commodity_quantity, commodity_mode,
@@ -73,7 +75,8 @@
     split_super, split_status, split_id, split_aid, split_time, cname, receiver_name,
     split_super, split_status, split_id, split_aid, split_time, cname, receiver_name,
     declaration_batch, cost_reduction, official_cost, set_up_status, set_up_time, spot_check_status,
     declaration_batch, cost_reduction, official_cost, set_up_status, set_up_time, spot_check_status,
     high_tech_status, special_comment, if_certification_fee, certification_fee, certification_corporate,
     high_tech_status, special_comment, if_certification_fee, certification_fee, certification_corporate,
-    time_record, if_publicity, check_status, patent_type, pubicity_url
+    time_record, if_publicity, check_status, patent_type, pubicity_url, process_status,
+    member_type
   </sql>
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
     select
@@ -105,8 +108,8 @@
       set_up_time, spot_check_status, high_tech_status,
       set_up_time, spot_check_status, high_tech_status,
       special_comment, if_certification_fee, certification_fee,
       special_comment, if_certification_fee, certification_fee,
       certification_corporate, time_record, if_publicity,
       certification_corporate, time_record, if_publicity,
-      check_status, patent_type, pubicity_url
-      )
+      check_status, patent_type, pubicity_url,
+      process_status, member_type)
     values (#{orderNo,jdbcType=VARCHAR}, #{main,jdbcType=INTEGER}, #{superId,jdbcType=VARCHAR},
     values (#{orderNo,jdbcType=VARCHAR}, #{main,jdbcType=INTEGER}, #{superId,jdbcType=VARCHAR},
       #{commodityId,jdbcType=VARCHAR}, #{commodityName,jdbcType=VARCHAR}, #{commodityQuantity,jdbcType=INTEGER},
       #{commodityId,jdbcType=VARCHAR}, #{commodityName,jdbcType=VARCHAR}, #{commodityQuantity,jdbcType=INTEGER},
       #{commodityMode,jdbcType=VARCHAR}, #{commodityPrice,jdbcType=DECIMAL}, #{taskStatus,jdbcType=INTEGER},
       #{commodityMode,jdbcType=VARCHAR}, #{commodityPrice,jdbcType=DECIMAL}, #{taskStatus,jdbcType=INTEGER},
@@ -126,8 +129,8 @@
       #{setUpTime,jdbcType=TIMESTAMP}, #{spotCheckStatus,jdbcType=INTEGER}, #{highTechStatus,jdbcType=INTEGER},
       #{setUpTime,jdbcType=TIMESTAMP}, #{spotCheckStatus,jdbcType=INTEGER}, #{highTechStatus,jdbcType=INTEGER},
       #{specialComment,jdbcType=VARCHAR}, #{ifCertificationFee,jdbcType=INTEGER}, #{certificationFee,jdbcType=DECIMAL},
       #{specialComment,jdbcType=VARCHAR}, #{ifCertificationFee,jdbcType=INTEGER}, #{certificationFee,jdbcType=DECIMAL},
       #{certificationCorporate,jdbcType=VARCHAR}, #{timeRecord,jdbcType=VARCHAR}, #{ifPublicity,jdbcType=INTEGER},
       #{certificationCorporate,jdbcType=VARCHAR}, #{timeRecord,jdbcType=VARCHAR}, #{ifPublicity,jdbcType=INTEGER},
-      #{checkStatus,jdbcType=INTEGER}, #{patentType,jdbcType=INTEGER}, #{pubicityUrl,jdbcType=VARCHAR}
-      )
+      #{checkStatus,jdbcType=INTEGER}, #{patentType,jdbcType=INTEGER}, #{pubicityUrl,jdbcType=VARCHAR},
+      #{processStatus,jdbcType=INTEGER}, #{memberType,jdbcType=INTEGER})
   </insert>
   </insert>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TOrderTask" useGeneratedKeys="true">
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TOrderTask" useGeneratedKeys="true">
     insert into t_order_task
     insert into t_order_task
@@ -309,6 +312,12 @@
       <if test="pubicityUrl != null">
       <if test="pubicityUrl != null">
         pubicity_url,
         pubicity_url,
       </if>
       </if>
+      <if test="processStatus != null">
+        process_status,
+      </if>
+      <if test="memberType != null">
+        member_type,
+      </if>
     </trim>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="orderNo != null">
       <if test="orderNo != null">
@@ -488,6 +497,12 @@
       <if test="pubicityUrl != null">
       <if test="pubicityUrl != null">
         #{pubicityUrl,jdbcType=VARCHAR},
         #{pubicityUrl,jdbcType=VARCHAR},
       </if>
       </if>
+      <if test="processStatus != null">
+        #{processStatus,jdbcType=INTEGER},
+      </if>
+      <if test="memberType != null">
+        #{memberType,jdbcType=INTEGER},
+      </if>
     </trim>
     </trim>
   </insert>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TOrderTask">
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TOrderTask">
@@ -670,6 +685,12 @@
       <if test="pubicityUrl != null">
       <if test="pubicityUrl != null">
         pubicity_url = #{pubicityUrl,jdbcType=VARCHAR},
         pubicity_url = #{pubicityUrl,jdbcType=VARCHAR},
       </if>
       </if>
+      <if test="processStatus != null">
+        process_status = #{processStatus,jdbcType=INTEGER},
+      </if>
+      <if test="memberType != null">
+        member_type = #{memberType,jdbcType=INTEGER},
+      </if>
     </set>
     </set>
     where id = #{id,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   </update>
@@ -733,374 +754,13 @@
       if_publicity = #{ifPublicity,jdbcType=INTEGER},
       if_publicity = #{ifPublicity,jdbcType=INTEGER},
       check_status = #{checkStatus,jdbcType=INTEGER},
       check_status = #{checkStatus,jdbcType=INTEGER},
       patent_type = #{patentType,jdbcType=INTEGER},
       patent_type = #{patentType,jdbcType=INTEGER},
-      pubicity_url = #{pubicityUrl,jdbcType=VARCHAR}
+      pubicity_url = #{pubicityUrl,jdbcType=VARCHAR},
+      process_status = #{processStatus,jdbcType=INTEGER},
+      member_type = #{memberType,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   </update>
 
 
-  <insert id="insertSelectiveGetId" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TOrderTask" useGeneratedKeys="true">
-    insert into t_order_task
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="orderNo != null">
-        order_no,
-      </if>
-      <if test="main != null">
-        main,
-      </if>
-      <if test="superId != null">
-        super_id,
-      </if>
-      <if test="commodityId != null">
-        commodity_id,
-      </if>
-      <if test="commodityName != null">
-        commodity_name,
-      </if>
-      <if test="commodityQuantity != null">
-        commodity_quantity,
-      </if>
-      <if test="commodityMode != null">
-        commodity_mode,
-      </if>
-      <if test="commodityPrice != null">
-        commodity_price,
-      </if>
-      <if test="taskStatus != null">
-        task_status,
-      </if>
-      <if test="taskDistributionTime != null">
-        task_distribution_time,
-      </if>
-      <if test="taskAllocator != null">
-        task_allocator,
-      </if>
-      <if test="taskReceiver != null">
-        task_receiver,
-      </if>
-      <if test="taskComment != null">
-        task_comment,
-      </if>
-      <if test="taskStartTime != null">
-        task_start_time,
-      </if>
-      <if test="taskEndTime != null">
-        task_end_time,
-      </if>
-      <if test="projectStatus != null">
-        project_status,
-      </if>
-      <if test="acceptTime != null">
-        accept_time,
-      </if>
-      <if test="reviewTime != null">
-        review_time,
-      </if>
-      <if test="publicityTime != null">
-        publicity_time,
-      </if>
-      <if test="licenceTime != null">
-        licence_time,
-      </if>
-      <if test="certificateNumber != null">
-        certificate_number,
-      </if>
-      <if test="status != null">
-        `status`,
-      </if>
-      <if test="formRetrieve != null">
-        form_retrieve,
-      </if>
-      <if test="taskRefund != null">
-        task_refund,
-      </if>
-      <if test="refundContent != null">
-        refund_content,
-      </if>
-      <if test="retrieveContent != null">
-        retrieve_content,
-      </if>
-      <if test="declareUser != null">
-        declare_user,
-      </if>
-      <if test="declarePwd != null">
-        declare_pwd,
-      </if>
-      <if test="setUpAmount != null">
-        set_up_amount,
-      </if>
-      <if test="arrivalMoney != null">
-        arrival_money,
-      </if>
-      <if test="outsourceName != null">
-        outsource_name,
-      </if>
-      <if test="outsourcePrice != null">
-        outsource_price,
-      </if>
-      <if test="consultantId != null">
-        consultant_id,
-      </if>
-      <if test="managerId != null">
-        manager_id,
-      </if>
-      <if test="outsource != null">
-        outsource,
-      </if>
-      <if test="splitSuper != null">
-        split_super,
-      </if>
-      <if test="splitStatus != null">
-        split_status,
-      </if>
-      <if test="splitId != null">
-        split_id,
-      </if>
-      <if test="splitAid != null">
-        split_aid,
-      </if>
-      <if test="splitTime != null">
-        split_time,
-      </if>
-      <if test="cname != null">
-        cname,
-      </if>
-      <if test="receiverName != null">
-        receiver_name,
-      </if>
-      <if test="declarationBatch != null">
-        declaration_batch,
-      </if>
-      <if test="costReduction != null">
-        cost_reduction,
-      </if>
-      <if test="officialCost != null">
-        official_cost,
-      </if>
-      <if test="setUpStatus != null">
-        set_up_status,
-      </if>
-      <if test="setUpTime != null">
-        set_up_time,
-      </if>
-      <if test="spotCheckStatus != null">
-        spot_check_status,
-      </if>
-      <if test="highTechStatus != null">
-        high_tech_status,
-      </if>
-      <if test="specialComment != null">
-        special_comment,
-      </if>
-      <if test="ifCertificationFee != null">
-        if_certification_fee,
-      </if>
-      <if test="certificationFee != null">
-        certification_fee,
-      </if>
-      <if test="certificationCorporate != null">
-        certification_corporate,
-      </if>
-      <if test="ifPublicity != null">
-        if_publicity,
-      </if>
-      <if test="checkStatus != null">
-        check_status,
-      </if>
-      <if test="patentType != null">
-        patent_type,
-      </if>
-      <if test="attachmentUrl != null">
-        attachment_url,
-      </if>
-      <if test="timeRecord != null">
-        time_record,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=INTEGER},
-      </if>
-      <if test="orderNo != null">
-        #{orderNo,jdbcType=VARCHAR},
-      </if>
-      <if test="main != null">
-        #{main,jdbcType=INTEGER},
-      </if>
-      <if test="superId != null">
-        #{superId,jdbcType=VARCHAR},
-      </if>
-      <if test="commodityId != null">
-        #{commodityId,jdbcType=VARCHAR},
-      </if>
-      <if test="commodityName != null">
-        #{commodityName,jdbcType=VARCHAR},
-      </if>
-      <if test="commodityQuantity != null">
-        #{commodityQuantity,jdbcType=INTEGER},
-      </if>
-      <if test="commodityMode != null">
-        #{commodityMode,jdbcType=VARCHAR},
-      </if>
-      <if test="commodityPrice != null">
-        #{commodityPrice,jdbcType=DECIMAL},
-      </if>
-      <if test="taskStatus != null">
-        #{taskStatus,jdbcType=INTEGER},
-      </if>
-      <if test="taskDistributionTime != null">
-        #{taskDistributionTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="taskAllocator != null">
-        #{taskAllocator,jdbcType=VARCHAR},
-      </if>
-      <if test="taskReceiver != null">
-        #{taskReceiver,jdbcType=VARCHAR},
-      </if>
-      <if test="taskComment != null">
-        #{taskComment,jdbcType=VARCHAR},
-      </if>
-      <if test="taskStartTime != null">
-        #{taskStartTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="taskEndTime != null">
-        #{taskEndTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="projectStatus != null">
-        #{projectStatus,jdbcType=INTEGER},
-      </if>
-      <if test="acceptTime != null">
-        #{acceptTime,jdbcType=DATE},
-      </if>
-      <if test="reviewTime != null">
-        #{reviewTime,jdbcType=DATE},
-      </if>
-      <if test="publicityTime != null">
-        #{publicityTime,jdbcType=DATE},
-      </if>
-      <if test="licenceTime != null">
-        #{licenceTime,jdbcType=DATE},
-      </if>
-      <if test="certificateNumber != null">
-        #{certificateNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="status != null">
-        #{status,jdbcType=INTEGER},
-      </if>
-      <if test="formRetrieve != null">
-        #{formRetrieve,jdbcType=INTEGER},
-      </if>
-      <if test="taskRefund != null">
-        #{taskRefund,jdbcType=INTEGER},
-      </if>
-      <if test="refundContent != null">
-        #{refundContent,jdbcType=VARCHAR},
-      </if>
-      <if test="retrieveContent != null">
-        #{retrieveContent,jdbcType=VARCHAR},
-      </if>
-      <if test="declareUser != null">
-        #{declareUser,jdbcType=VARCHAR},
-      </if>
-      <if test="declarePwd != null">
-        #{declarePwd,jdbcType=VARCHAR},
-      </if>
-      <if test="setUpAmount != null">
-        #{setUpAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="arrivalMoney != null">
-        #{arrivalMoney,jdbcType=INTEGER},
-      </if>
-      <if test="outsourceName != null">
-        #{outsourceName,jdbcType=VARCHAR},
-      </if>
-      <if test="outsourcePrice != null">
-        #{outsourcePrice,jdbcType=DECIMAL},
-      </if>
-      <if test="consultantId != null">
-        #{consultantId,jdbcType=VARCHAR},
-      </if>
-      <if test="managerId != null">
-        #{managerId,jdbcType=VARCHAR},
-      </if>
-      <if test="outsource != null">
-        #{outsource,jdbcType=INTEGER},
-      </if>
-      <if test="splitSuper != null">
-        #{splitSuper,jdbcType=INTEGER},
-      </if>
-      <if test="splitStatus != null">
-        #{splitStatus,jdbcType=INTEGER},
-      </if>
-      <if test="splitId != null">
-        #{splitId,jdbcType=INTEGER},
-      </if>
-      <if test="splitAid != null">
-        #{splitAid,jdbcType=VARCHAR},
-      </if>
-      <if test="splitTime != null">
-        #{splitTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="cname != null">
-        #{cname,jdbcType=VARCHAR},
-      </if>
-      <if test="receiverName != null">
-        #{receiverName,jdbcType=VARCHAR},
-      </if>
-      <if test="declarationBatch != null">
-        #{declarationBatch,jdbcType=INTEGER},
-      </if>
-      <if test="costReduction != null">
-        #{costReduction,jdbcType=INTEGER},
-      </if>
-      <if test="officialCost != null">
-        #{officialCost,jdbcType=INTEGER},
-      </if>
-      <if test="setUpStatus != null">
-        #{setUpStatus,jdbcType=INTEGER},
-      </if>
-      <if test="setUpTime != null">
-        #{setUpTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="spotCheckStatus != null">
-        #{spotCheckStatus,jdbcType=INTEGER},
-      </if>
-      <if test="highTechStatus != null">
-        #{highTechStatus,jdbcType=INTEGER},
-      </if>
-      <if test="specialComment != null">
-        #{specialComment,jdbcType=VARCHAR},
-      </if>
-      <if test="ifCertificationFee != null">
-        #{ifCertificationFee,jdbcType=INTEGER},
-      </if>
-      <if test="certificationFee != null">
-        #{certificationFee,jdbcType=DECIMAL},
-      </if>
-      <if test="certificationCorporate != null">
-        #{certificationCorporate,jdbcType=VARCHAR},
-      </if>
-      <if test="ifPublicity != null">
-        #{ifPublicity,jdbcType=INTEGER},
-      </if>
-      <if test="checkStatus != null">
-        #{checkStatus,jdbcType=INTEGER},
-      </if>
-      <if test="patentType != null">
-        #{patentType,jdbcType=INTEGER},
-      </if>
-      <if test="attachmentUrl != null">
-        #{attachmentUrl,jdbcType=LONGVARCHAR},
-      </if>
-      <if test="timeRecord != null">
-        #{timeRecord,jdbcType=LONGVARCHAR},
-      </if>
-    </trim>
-    <selectKey keyProperty="id" order="AFTER" resultType="int">
-      SELECT LAST_INSERT_ID()
-    </selectKey>
-  </insert>
+
   <select id="selectOrderTask" resultType="com.goafanti.order.bo.TOrderTaskBo">
   <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,
     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,
            a.outsource_name outsourceName,a.outsource, a.outsource_price outsourcePrice,g.name depName,
@@ -1119,7 +779,14 @@
                         left join business_project i on a.commodity_id=i.id left join
                         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
          business_category c on b.cid=c.id left join admin d on
       a.task_receiver=d.id
       a.task_receiver=d.id
-    where a.super_id is null and a.split_status in(0,1) and a.order_no= #{orderNo,jdbcType=VARCHAR} order by a.id
+    where a.super_id is null and a.split_status in(0,1)
+      <if test="orderNo != null">
+      and a.order_no= #{orderNo,jdbcType=VARCHAR}
+      </if>
+    <if test="type == 1">
+      and a.process_status= 3
+    </if>
+    order by a.id
   </select>
   </select>
 
 
   <select id="selectOrderTaskAll" resultType="com.goafanti.order.bo.TOrderTaskBo">
   <select id="selectOrderTaskAll" resultType="com.goafanti.order.bo.TOrderTaskBo">
@@ -1457,7 +1124,7 @@
     </if>
     </if>
   </select>
   </select>
   <!-- 根据订单编号获得所有的任务负责人 -->
   <!-- 根据订单编号获得所有的任务负责人 -->
-  <select id="getReceiverByOid" parameterType="java.lang.String" resultMap="BaseResultMap">
+  <select id="getReceiverByOid" resultType="com.goafanti.order.bo.TOrderTaskBo">
     select distinct task_receiver, a.name, a.email, t.id, t.project_status from t_order_task t
     select distinct task_receiver, a.name, a.email, t.id, t.project_status from t_order_task t
                                                                                   inner join admin a on t.task_receiver = a.id
                                                                                   inner join admin a on t.task_receiver = a.id
     where order_no = #{orderNo,jdbcType=VARCHAR} and task_status &gt; 0 and super_id is null
     where order_no = #{orderNo,jdbcType=VARCHAR} and task_status &gt; 0 and super_id is null

+ 21 - 97
src/main/java/com/goafanti/common/model/TOrderTask.java

@@ -1,7 +1,5 @@
 package com.goafanti.common.model;
 package com.goafanti.common.model;
 
 
-import com.goafanti.common.utils.excel.Excel;
-
 import java.io.Serializable;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.Date;
@@ -19,13 +17,11 @@ public class TOrderTask implements Serializable {
     /**
     /**
      * 订单编号
      * 订单编号
      */
      */
-    @Excel(name = "订单编号", sort = 2)
     private String orderNo;
     private String orderNo;
 
 
     /**
     /**
      * 是否为主要任务 0-否,1-是
      * 是否为主要任务 0-否,1-是
      */
      */
-    @Excel(name = "是否主项目", sort = 8, readConverterExp = "0=否,1=是")
     private Integer main;
     private Integer main;
 
 
     /**
     /**
@@ -41,13 +37,11 @@ public class TOrderTask implements Serializable {
     /**
     /**
      * 商品名称(冗余)
      * 商品名称(冗余)
      */
      */
-    @Excel(name = "项目名称", sort = 10)
     private String commodityName;
     private String commodityName;
 
 
     /**
     /**
      * 商品数量
      * 商品数量
      */
      */
-    @Excel(name = "项目数量", sort = 11)
     private Integer commodityQuantity;
     private Integer commodityQuantity;
 
 
     /**
     /**
@@ -58,7 +52,6 @@ public class TOrderTask implements Serializable {
     /**
     /**
      * 合同商品价格
      * 合同商品价格
      */
      */
-    @Excel(name = "服务市价", sort = 11)
     private BigDecimal commodityPrice;
     private BigDecimal commodityPrice;
 
 
     /**
     /**
@@ -84,7 +77,6 @@ public class TOrderTask implements Serializable {
     /**
     /**
      * 任务说明
      * 任务说明
      */
      */
-    @Excel(name = "项目说明", sort = 14)
     private String taskComment;
     private String taskComment;
 
 
     /**
     /**
@@ -130,7 +122,6 @@ public class TOrderTask implements Serializable {
     /**
     /**
      * 证书编号
      * 证书编号
      */
      */
-    @Excel(name = "证书編号", sort = 12)
     private String certificateNumber;
     private String certificateNumber;
 
 
     /**
     /**
@@ -181,13 +172,11 @@ public class TOrderTask implements Serializable {
     /**
     /**
      * 外包公司名称
      * 外包公司名称
      */
      */
-    @Excel(name = "外包(内部)公司", sort = 15)
     private String outsourceName;
     private String outsourceName;
 
 
     /**
     /**
      * 单价
      * 单价
      */
      */
-    @Excel(name = "外包(内部)价格", sort = 16)
     private BigDecimal outsourcePrice;
     private BigDecimal outsourcePrice;
 
 
     /**
     /**
@@ -320,6 +309,16 @@ public class TOrderTask implements Serializable {
      */
      */
     private String pubicityUrl;
     private String pubicityUrl;
 
 
+    /**
+     * 流程状态 0=驳回,1=财务审核,2=特批审核,3=通过
+     */
+    private Integer processStatus;
+
+    /**
+     * 会员付款状态 0=已付会员截点全款,1=已付部分期款,需特批,2=未付款,需特批
+     */
+    private Integer memberType;
+
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     public Integer getId() {
     public Integer getId() {
@@ -802,94 +801,19 @@ public class TOrderTask implements Serializable {
         this.pubicityUrl = pubicityUrl;
         this.pubicityUrl = pubicityUrl;
     }
     }
 
 
+    public Integer getProcessStatus() {
+        return processStatus;
+    }
 
 
+    public void setProcessStatus(Integer processStatus) {
+        this.processStatus = processStatus;
+    }
 
 
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", id=").append(id);
-        sb.append(", orderNo=").append(orderNo);
-        sb.append(", main=").append(main);
-        sb.append(", superId=").append(superId);
-        sb.append(", commodityId=").append(commodityId);
-        sb.append(", commodityName=").append(commodityName);
-        sb.append(", commodityQuantity=").append(commodityQuantity);
-        sb.append(", commodityMode=").append(commodityMode);
-        sb.append(", commodityPrice=").append(commodityPrice);
-        sb.append(", taskStatus=").append(taskStatus);
-        sb.append(", taskDistributionTime=").append(taskDistributionTime);
-        sb.append(", taskAllocator=").append(taskAllocator);
-        sb.append(", taskReceiver=").append(taskReceiver);
-        sb.append(", taskComment=").append(taskComment);
-        sb.append(", taskStartTime=").append(taskStartTime);
-        sb.append(", taskEndTime=").append(taskEndTime);
-        sb.append(", attachmentUrl=").append(attachmentUrl);
-        sb.append(", projectStatus=").append(projectStatus);
-        sb.append(", acceptTime=").append(acceptTime);
-        sb.append(", reviewTime=").append(reviewTime);
-        sb.append(", publicityTime=").append(publicityTime);
-        sb.append(", licenceTime=").append(licenceTime);
-        sb.append(", certificateNumber=").append(certificateNumber);
-        sb.append(", status=").append(status);
-        sb.append(", formRetrieve=").append(formRetrieve);
-        sb.append(", taskRefund=").append(taskRefund);
-        sb.append(", refundContent=").append(refundContent);
-        sb.append(", retrieveContent=").append(retrieveContent);
-        sb.append(", declareUser=").append(declareUser);
-        sb.append(", declarePwd=").append(declarePwd);
-        sb.append(", setUpAmount=").append(setUpAmount);
-        sb.append(", arrivalMoney=").append(arrivalMoney);
-        sb.append(", outsourceName=").append(outsourceName);
-        sb.append(", outsourcePrice=").append(outsourcePrice);
-        sb.append(", consultantId=").append(consultantId);
-        sb.append(", managerId=").append(managerId);
-        sb.append(", outsource=").append(outsource);
-        sb.append(", splitSuper=").append(splitSuper);
-        sb.append(", splitStatus=").append(splitStatus);
-        sb.append(", splitId=").append(splitId);
-        sb.append(", splitAid=").append(splitAid);
-        sb.append(", splitTime=").append(splitTime);
-        sb.append(", cname=").append(cname);
-        sb.append(", receiverName=").append(receiverName);
-        sb.append(", declarationBatch=").append(declarationBatch);
-        sb.append(", costReduction=").append(costReduction);
-        sb.append(", officialCost=").append(officialCost);
-        sb.append(", setUpStatus=").append(setUpStatus);
-        sb.append(", setUpTime=").append(setUpTime);
-        sb.append(", spotCheckStatus=").append(spotCheckStatus);
-        sb.append(", highTechStatus=").append(highTechStatus);
-        sb.append(", specialComment=").append(specialComment);
-        sb.append(", ifCertificationFee=").append(ifCertificationFee);
-        sb.append(", certificationFee=").append(certificationFee);
-        sb.append(", certificationCorporate=").append(certificationCorporate);
-        sb.append(", timeRecord=").append(timeRecord);
-        sb.append(", ifPublicity=").append(ifPublicity);
-        sb.append(", checkStatus=").append(checkStatus);
-        sb.append(", patentType=").append(patentType);
-        sb.append(", pubicityUrl=").append(pubicityUrl);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-    private String name;
-    private String email;
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
+    public Integer getMemberType() {
+        return memberType;
     }
     }
 
 
+    public void setMemberType(Integer memberType) {
+        this.memberType = memberType;
+    }
 }
 }

+ 38 - 22
src/main/java/com/goafanti/common/task/OrderDunTask.java

@@ -123,46 +123,63 @@ public class OrderDunTask {
   			LoggerUtils.debug(logger, "======================新催款任务轮询启动===================");
   			LoggerUtils.debug(logger, "======================新催款任务轮询启动===================");
 			List<OutNewOrderDunBo> list= newOrderDunService.selectAllOrderDun();
 			List<OutNewOrderDunBo> list= newOrderDunService.selectAllOrderDun();
 			Calendar now=Calendar.getInstance();
 			Calendar now=Calendar.getInstance();
-			Calendar now2=Calendar.getInstance();
+			Calendar create=Calendar.getInstance();
 			Date date =new Date();
 			Date date =new Date();
 			for (OutNewOrderDunBo o : list) {
 			for (OutNewOrderDunBo o : list) {
 				now.setTime(date);
 				now.setTime(date);
-				now2.setTime(o.getCreateTime());
+				create.setTime(o.getCreateTime());
 				//计算特批首期款 特批通过 为催款为首期款 催款时间不为空则计算触发
 				//计算特批首期款 特批通过 为催款为首期款 催款时间不为空则计算触发
 				if (o.getApproval()!=null&& o.getApproval()==2&& o.getDunType()==1&&o.getWaitDay()!=null) {
 				if (o.getApproval()!=null&& o.getApproval()==2&& o.getDunType()==1&&o.getWaitDay()!=null) {
-						now2.add(Calendar.DATE, o.getWaitDay());
-					updateOrderDun(o,now,now2);
+					create.add(Calendar.DATE, o.getWaitDay());
+					updateOrderDun(o,now,create);
 				//会员-期限计算
 				//会员-期限计算
 				}else if(o.getProjectType().equals(OrderDunProjectType.HY.getCode())&&o.getDunType()==2) {
 				}else if(o.getProjectType().equals(OrderDunProjectType.HY.getCode())&&o.getDunType()==2) {
-					now2.add(Calendar.DATE, o.getEffectiveCount()*180);
-					CalendarTimeCleared(now2);
-					updateOrderDun(o,now,now2);
+					create.add(Calendar.DATE, o.getEffectiveCount()*180);
+					CalendarTimeCleared(create);
+					updateOrderDun(o,now,create);
 				//财税-期限 计算时间
 				//财税-期限 计算时间
 				} else if(o.getProjectType().equals(OrderDunProjectType.CS.getCode())&&o.getDunType()==2) {
 				} else if(o.getProjectType().equals(OrderDunProjectType.CS.getCode())&&o.getDunType()==2) {
 					//获取年
 					//获取年
-					int year = now2.get(Calendar.YEAR);
+					int year = create.get(Calendar.YEAR);
 					//获取月份,0表示1月份
 					//获取月份,0表示1月份
-					int month = now2.get(Calendar.MONTH) + 1;
+					int month = create.get(Calendar.MONTH) + 1;
 					if(month<10)year=year+1;
 					if(month<10)year=year+1;
 					if(month>9)year=year+2;
 					if(month>9)year=year+2;
-					now2.set(year, 5, 1);
-					CalendarTimeCleared(now2);
-					updateOrderDun(o,now,now2);
+					create.set(year, 5, 1);
+					CalendarTimeCleared(create);
+					updateOrderDun(o,now,create);
 				//自定义 超过设置的时间则触发
 				//自定义 超过设置的时间则触发
 				}else if (o.getDunType()==0) {
 				}else if (o.getDunType()==0) {
-					now2.setTime(o.getCustomizeTime());
-					CalendarTimeCleared(now);
-					updateOrderDun(o,now,now2);
+						CalendarTimeCleared(now);
+						//会员提前2个月多一个催款
+					if (o.getProjectType()==1){
+						pushMamberProject(o,now);
+					}
+					create.setTime(o.getCustomizeTime());
+					updateOrderDun(o,now,create);
+
 				}
 				}
 			}
 			}
+			//校准
 			calibrationDun();
 			calibrationDun();
-  		} catch (Exception e) {
+	} catch (Exception e) {
   			EmailBo emailBo = new EmailBo( "催款处理失败",  AFTConstants.ADMIN_EMAIL,  "超管", "平台",  "系统", devName+"催款处理失败");
   			EmailBo emailBo = new EmailBo( "催款处理失败",  AFTConstants.ADMIN_EMAIL,  "超管", "平台",  "系统", devName+"催款处理失败");
   			asyncUtils.send(emailBo);
   			asyncUtils.send(emailBo);
 			LoggerUtils.error(getClass(), "===================新催款的信息处理失败======================", e);
 			LoggerUtils.error(getClass(), "===================新催款的信息处理失败======================", e);
 		}
 		}
   	}
   	}
 
 
+	private void pushMamberProject(OutNewOrderDunBo o, Calendar now) {
+		Calendar start=Calendar.getInstance();
+		start.setTime(o.getCustomizeTime());
+		start.add(Calendar.MONTH,-2);
+		CalendarTimeCleared(start);
+		if (now.getTimeInMillis()==start.getTimeInMillis()){
+			orderNewService.addTimingTaskNewDunNoticAndSendEmail( o,1);
+		}
+	}
+
+
 	/**
 	/**
 	 * 如果有不对的数据就校准数据
 	 * 如果有不对的数据就校准数据
 	 */
 	 */
@@ -234,7 +251,7 @@ public class OrderDunTask {
 			List<TArrearsDun> list3=tArrearsDunMapper.selectStatusAndAmount(2);
 			List<TArrearsDun> list3=tArrearsDunMapper.selectStatusAndAmount(2);
 			for (TArrearsDun td : list) {
 			for (TArrearsDun td : list) {
 				TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(td.getOrderNo());
 				TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(td.getOrderNo());
-				AdminListBo a = adminMapper.getDeptNameByAid(TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
+
 
 
 				TOrderMid tm=tOrderMidMapper.selectByOrderNo(td.getOrderNo());
 				TOrderMid tm=tOrderMidMapper.selectByOrderNo(td.getOrderNo());
 				//如果欠款大于0则需要触发邮件
 				//如果欠款大于0则需要触发邮件
@@ -243,7 +260,7 @@ public class OrderDunTask {
 					td.setStartTime(date);
 					td.setStartTime(date);
 					td.setOrderArrears(tm.getOrderArrears());
 					td.setOrderArrears(tm.getOrderArrears());
 					td.setOrderReceivables(tm.getOrderReceivables());
 					td.setOrderReceivables(tm.getOrderReceivables());
-					orderNewService.addNotic(NoticeStatus.ORDER_ARREARS_DUN.getCode(),a,b);
+					orderNewService.addNotic(NoticeStatus.ORDER_ARREARS_DUN.getCode(),b);
 					tArrearsDunMapper.updateByPrimaryKeySelective(td);
 					tArrearsDunMapper.updateByPrimaryKeySelective(td);
 				}else if(tm.getOrderArrears().compareTo(new BigDecimal(0))<1) {
 				}else if(tm.getOrderArrears().compareTo(new BigDecimal(0))<1) {
 					td.setDunStatus(2);
 					td.setDunStatus(2);
@@ -256,7 +273,6 @@ public class OrderDunTask {
 			for (TArrearsDun ta : list2) {
 			for (TArrearsDun ta : list2) {
 				TOrderMid tm=tOrderMidMapper.selectByOrderNo(ta.getOrderNo());
 				TOrderMid tm=tOrderMidMapper.selectByOrderNo(ta.getOrderNo());
 				TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(ta.getOrderNo());
 				TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(ta.getOrderNo());
-				AdminListBo a = adminMapper.getDeptNameByAid(TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
 				//如果欠款大于0则需要触发邮件
 				//如果欠款大于0则需要触发邮件
 				if (tm.getOrderArrears().compareTo(new BigDecimal(0))>0) {
 				if (tm.getOrderArrears().compareTo(new BigDecimal(0))>0) {
 					ta.setDunStatus(3);
 					ta.setDunStatus(3);
@@ -267,7 +283,7 @@ public class OrderDunTask {
 					ta.setOrderArrears(tm.getOrderArrears());
 					ta.setOrderArrears(tm.getOrderArrears());
 					ta.setOrderReceivables(tm.getOrderReceivables());
 					ta.setOrderReceivables(tm.getOrderReceivables());
 					tArrearsDunMapper.insertSelective(ta);
 					tArrearsDunMapper.insertSelective(ta);
-					orderNewService.addNotic(NoticeStatus.ORDER_ARREARS_DUN.getCode(),a,b);
+					orderNewService.addNotic(NoticeStatus.ORDER_ARREARS_DUN.getCode(),b);
 				}else if(tm.getOrderArrears().compareTo(new BigDecimal(0))<1) {
 				}else if(tm.getOrderArrears().compareTo(new BigDecimal(0))<1) {
 					ta.setDunStatus(2);
 					ta.setDunStatus(2);
 					ta.setOrderArrears(tm.getOrderArrears());
 					ta.setOrderArrears(tm.getOrderArrears());
@@ -291,7 +307,7 @@ public class OrderDunTask {
 					ta.setOrderArrears(tm.getOrderArrears());
 					ta.setOrderArrears(tm.getOrderArrears());
 					ta.setOrderReceivables(tm.getOrderReceivables());
 					ta.setOrderReceivables(tm.getOrderReceivables());
 					tArrearsDunMapper.insertSelective(ta);
 					tArrearsDunMapper.insertSelective(ta);
-					orderNewService.addNotic(NoticeStatus.ORDER_ARREARS_DUN.getCode(),a,b);
+					orderNewService.addNotic(NoticeStatus.ORDER_ARREARS_DUN.getCode(),b);
 				}else if(tm.getOrderArrears().compareTo(new BigDecimal(0))<1) {
 				}else if(tm.getOrderArrears().compareTo(new BigDecimal(0))<1) {
 					ta.setDunStatus(2);
 					ta.setDunStatus(2);
 					ta.setOrderReceivables(tm.getOrderReceivables());
 					ta.setOrderReceivables(tm.getOrderReceivables());
@@ -383,7 +399,7 @@ public class OrderDunTask {
 				td.setId(i);
 				td.setId(i);
 				tArrearsDunMapper.updateByPrimaryKeySelective(td);
 				tArrearsDunMapper.updateByPrimaryKeySelective(td);
 			}
 			}
-			orderNewService.addTimingTaskNewDunNoticAndSendEmail(orderNew, t);
+			orderNewService.addTimingTaskNewDunNoticAndSendEmail( t,0);
 			try {
 			try {
 				Thread.sleep(2000);
 				Thread.sleep(2000);
 			} catch (InterruptedException e) {
 			} catch (InterruptedException e) {

+ 16 - 4
src/main/java/com/goafanti/order/bo/OutNewOrderDunBo.java

@@ -15,7 +15,19 @@ public class OutNewOrderDunBo extends NewOrderDun {
 	private String startDate;
 	private String startDate;
 	private BigDecimal setUpAmount;
 	private BigDecimal setUpAmount;
 	private String customizeTimes;
 	private String customizeTimes;
-	
+
+	private Integer	projectType;
+
+	@Override
+	public Integer getProjectType() {
+		return projectType;
+	}
+
+	@Override
+	public void setProjectType(Integer projectType) {
+		this.projectType = projectType;
+	}
+
 	public String getDunTypeName() {
 	public String getDunTypeName() {
 		if(super.getDunType()!=null&&super.getProjectType()!=null) {
 		if(super.getDunType()!=null&&super.getProjectType()!=null) {
 			return NewOrderDunType.getValueByCode(Integer.valueOf(""+super.getProjectType()+super.getDunType()));
 			return NewOrderDunType.getValueByCode(Integer.valueOf(""+super.getProjectType()+super.getDunType()));
@@ -46,16 +58,16 @@ public class OutNewOrderDunBo extends NewOrderDun {
 	public String getStartDate() {
 	public String getStartDate() {
 		//会员显示到期时间
 		//会员显示到期时间
 		if(super.getCreateTime()!=null&&super.getEffectiveCount()!=null) {
 		if(super.getCreateTime()!=null&&super.getEffectiveCount()!=null) {
-			Calendar calendar=Calendar.getInstance();   
+			Calendar calendar=Calendar.getInstance();
 	  		calendar.setTime(super.getCreateTime());
 	  		calendar.setTime(super.getCreateTime());
 	  		calendar.add(Calendar.DATE, super.getEffectiveCount()*180);
 	  		calendar.add(Calendar.DATE, super.getEffectiveCount()*180);
 	  		return DateUtils.formatDate(calendar.getTime(), AFTConstants.YYYYMMDD);
 	  		return DateUtils.formatDate(calendar.getTime(), AFTConstants.YYYYMMDD);
 		}
 		}
 		//财税显示催款时间 大于9则年份+2,小于10年份+1
 		//财税显示催款时间 大于9则年份+2,小于10年份+1
 		if (super.getDunType()==2&&super.getProjectType()==5) {
 		if (super.getDunType()==2&&super.getProjectType()==5) {
-			Calendar calendar=Calendar.getInstance();   
+			Calendar calendar=Calendar.getInstance();
 	  		calendar.setTime(super.getCreateTime());
 	  		calendar.setTime(super.getCreateTime());
-	  		int year = calendar.get(Calendar.YEAR);  
+	  		int year = calendar.get(Calendar.YEAR);
 		        //获取月份,0表示1月份
 		        //获取月份,0表示1月份
 		        int month = calendar.get(Calendar.MONTH) + 1;
 		        int month = calendar.get(Calendar.MONTH) + 1;
 		        if(month<10)year=year+1;
 		        if(month<10)year=year+1;

+ 30 - 10
src/main/java/com/goafanti/order/bo/TOrderTaskBo.java

@@ -8,14 +8,14 @@ import com.goafanti.order.enums.NewProjectStatus;
 
 
 public class TOrderTaskBo extends TOrderTask{
 public class TOrderTaskBo extends TOrderTask{
 	/**
 	/**
-	 * 
+	 *
 	 */
 	 */
 	private static final long serialVersionUID = 1L;
 	private static final long serialVersionUID = 1L;
 	private String contactsMobile;
 	private String contactsMobile;
 	@Excel(name = "合同编号",sort = 9)
 	@Excel(name = "合同编号",sort = 9)
 	private String cname;
 	private String cname;
 	private Integer cSort;
 	private Integer cSort;
-	
+
 	@Excel(name = "合同编号",sort = 1)
 	@Excel(name = "合同编号",sort = 1)
 	private String contractNo;
 	private String contractNo;
 	@Excel(name = "订单负责人",sort = 4)
 	@Excel(name = "订单负责人",sort = 4)
@@ -28,20 +28,40 @@ public class TOrderTaskBo extends TOrderTask{
 	private String userName;
 	private String userName;
 	@Excel(name = "订单状态",sort = 6,readConverterExp = "0=待签单,1=签单待审,2=签单审核通过,3=签单审核拒绝,4=已结项,5=已驳回,6=已退单")
 	@Excel(name = "订单状态",sort = 6,readConverterExp = "0=待签单,1=签单待审,2=签单审核通过,3=签单审核拒绝,4=已结项,5=已驳回,6=已退单")
 	private Integer orderStatus;
 	private Integer orderStatus;
-	
+
 	private Integer type;
 	private Integer type;
-	
+
 	private BigDecimal price;
 	private BigDecimal price;
-	
+
 	private BigDecimal appropriationRatio;
 	private BigDecimal appropriationRatio;
-	
+
 	private Integer patentType;
 	private Integer patentType;
 	private String patentTypeName;
 	private String patentTypeName;
 	private Integer patentTransfer;
 	private Integer patentTransfer;
+	private String email;
+	private String name;
 
 
 	@Excel(name = "项目状态",sort = 13)
 	@Excel(name = "项目状态",sort = 13)
 	private String projectStatusName;
 	private String projectStatusName;
 
 
+
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getEmail() {
+		return email;
+	}
+
+	public void setEmail(String email) {
+		this.email = email;
+	}
+
 	public Integer getPatentTransfer() {
 	public Integer getPatentTransfer() {
 		return patentTransfer;
 		return patentTransfer;
 	}
 	}
@@ -70,8 +90,8 @@ public class TOrderTaskBo extends TOrderTask{
 		super.setProjectStatus(projectStatus);
 		super.setProjectStatus(projectStatus);
 		this.projectStatusName=NewProjectStatus.getValueByCode(projectStatus);
 		this.projectStatusName=NewProjectStatus.getValueByCode(projectStatus);
 	}
 	}
-	
-	
+
+
 	public String getContractNo() {
 	public String getContractNo() {
 		return contractNo;
 		return contractNo;
 	}
 	}
@@ -152,6 +172,6 @@ public class TOrderTaskBo extends TOrderTask{
 	public void setPatentTypeName(String patentTypeName) {
 	public void setPatentTypeName(String patentTypeName) {
 		this.patentTypeName = patentTypeName;
 		this.patentTypeName = patentTypeName;
 	}
 	}
-	
-	
+
+
 }
 }

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

@@ -107,6 +107,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 			res.getError().add(buildError("订单主要任务已存在","订单主要任务已存在"));
 			res.getError().add(buildError("订单主要任务已存在","订单主要任务已存在"));
 			return res;
 			return res;
 		}
 		}
+		t.setProcessStatus(3);
 		return res.data(orderNewService.addOrderTask(t));
 		return res.data(orderNewService.addOrderTask(t));
 	}
 	}
 	/**
 	/**
@@ -162,15 +163,18 @@ public class AdminNewOrderApiController extends CertifyApiController {
 
 
 	/**
 	/**
 	 * 获取订单项目信息
 	 * 获取订单项目信息
+	 * @param type   分类 0 所有  1通过审核
+	 * @param orderNo 订单编号
 	 */
 	 */
 	@RequestMapping(value = "/getOrderTask",method = RequestMethod.GET)
 	@RequestMapping(value = "/getOrderTask",method = RequestMethod.GET)
-	public Result getOrderTask(String orderNo){
+	public Result getOrderTask(String orderNo,Integer type){
 		Result res = new Result();
 		Result res = new Result();
 		if(StringUtils.isBlank(orderNo)){
 		if(StringUtils.isBlank(orderNo)){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
 			return res;
 			return res;
 		}
 		}
-		res.setData(orderNewService.selectOrderTask(orderNo));
+		if (type==null)type=1;
+		res.setData(orderNewService.selectOrderTask(orderNo,type));
 
 
 		return res;
 		return res;
 	}
 	}
@@ -609,8 +613,8 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	 * @throws IOException
 	 * @throws IOException
 	 */
 	 */
 	@RequestMapping(value = "/exportOrderTaskData", method = RequestMethod.GET)
 	@RequestMapping(value = "/exportOrderTaskData", method = RequestMethod.GET)
-	public Result exportOrderTaskData(String orderNo,HttpServletResponse response){
-		List<TOrderTaskBo> list=orderNewService.selectOrderTask(orderNo);
+	public Result exportOrderTaskData(String orderNo,Integer type,HttpServletResponse response){
+		List<TOrderTaskBo> list=orderNewService.selectOrderTask(orderNo,type);
 		NewExcelUtil<TOrderTaskBo>excel=new NewExcelUtil<>(TOrderTaskBo.class);
 		NewExcelUtil<TOrderTaskBo>excel=new NewExcelUtil<>(TOrderTaskBo.class);
 		 return  excel.exportExcel(list,"订单项目列表",response);
 		 return  excel.exportExcel(list,"订单项目列表",response);
 	}
 	}

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

@@ -10,7 +10,9 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import javax.validation.Valid;
 
 
+import com.goafanti.common.model.TOrderTask;
 import com.goafanti.order.bo.*;
 import com.goafanti.order.bo.*;
+import com.goafanti.order.service.OrderNewService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.BindingResult;
@@ -35,6 +37,8 @@ public class OrderProjectApiController extends CertifyApiController {
 
 
 	@Autowired
 	@Autowired
 	private OrderProjectService	orderProjectService;
 	private OrderProjectService	orderProjectService;
+	@Autowired
+	private OrderNewService orderNewService;
 	@Value(value = "${upload.path}")
 	@Value(value = "${upload.path}")
 	private String	uploadPath			= null;
 	private String	uploadPath			= null;
 
 
@@ -480,6 +484,19 @@ public class OrderProjectApiController extends CertifyApiController {
 		return newExcelUtil.exportExcel(list,"高新复审详情",uploadPath,str.substring(0,str.toString().length()-1));
 		return newExcelUtil.exportExcel(list,"高新复审详情",uploadPath,str.substring(0,str.toString().length()-1));
 	}
 	}
 
 
+	@RequestMapping(value = "/addMemberProject" ,method = RequestMethod.POST)
+	public Result addMemberProject(TOrderTask t){
+		Result res = new Result();
+		if(org.apache.commons.lang3.StringUtils.isBlank(t.getOrderNo())){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
+			return res;
+		}
+		t.setProcessStatus(1);
+		t.setMain(0);
+		return res.data(orderNewService.addOrderTask(t));
+
+	}
+
 
 
 
 
 
 

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

@@ -42,7 +42,7 @@ public interface OrderNewService {
 	 * 项目详情
 	 * 项目详情
 	 * @param orderNo
 	 * @param orderNo
 	 */
 	 */
-	 List<TOrderTaskBo> selectOrderTask(String orderNo);
+	 List<TOrderTaskBo> selectOrderTask(String orderNo,Integer type);
 	 /**
 	 /**
 	  * 订单提交或保存
 	  * 订单提交或保存
 	  * @param t
 	  * @param t
@@ -154,7 +154,12 @@ public interface OrderNewService {
 
 
 	void addNewDunNoticAndSendEmail(String orderNo, OutNewOrderDunBo o);
 	void addNewDunNoticAndSendEmail(String orderNo, OutNewOrderDunBo o);
 
 
-	void addTimingTaskNewDunNoticAndSendEmail(TOrderNew t2, OutNewOrderDunBo o);
+	/**
+	 *
+	 * @param o
+	 * @param type 0正常催款 1 会员提前2个月催款
+	 */
+	void addTimingTaskNewDunNoticAndSendEmail( OutNewOrderDunBo o,Integer type);
 
 
 	boolean checkORderDun(String orderNo);
 	boolean checkORderDun(String orderNo);
 
 
@@ -202,11 +207,10 @@ public interface OrderNewService {
 	/**
 	/**
 	 *  发送邮件
 	 *  发送邮件
 	 * @param type 消息类型
 	 * @param type 消息类型
-	 * @param a  发送人信息
 	 * @param b 订单信息
 	 * @param b 订单信息
-	 * @param projectType 项目类型 判断是否是会员
+	 *
 	 */
 	 */
-	void addNotic(Integer type, AdminListBo a, TOrderNewBo b);
+	void addNotic(Integer type,  TOrderNewBo b);
 
 
 	Pagination<TOrderNewBo> statisticsOrderList(InputStatisticsOrderList in);
 	Pagination<TOrderNewBo> statisticsOrderList(InputStatisticsOrderList in);
 
 

+ 5 - 4
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -10,6 +10,7 @@ import java.util.Map;
 import java.util.UUID;
 import java.util.UUID;
 
 
 
 
+import com.goafanti.order.bo.TOrderTaskBo;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -248,12 +249,12 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 			bonus.setBonusSubject(BonusSubject.WK.getCode());//12
 			bonus.setBonusSubject(BonusSubject.WK.getCode());//12
 			//发放给技术员如果付完款所有参与这个项目任务的人都会有结算奖
 			//发放给技术员如果付完款所有参与这个项目任务的人都会有结算奖
 			//获得所有的任务负责人
 			//获得所有的任务负责人
-			List<TOrderTask> l = taskMapper.getReceiverByOid(billNew.getOrderNo());
+			List<TOrderTaskBo> l = taskMapper.getReceiverByOid(billNew.getOrderNo());
 //			取消没有技术员不能支付全款
 //			取消没有技术员不能支付全款
 //			if(null == l || l.size() == 0){
 //			if(null == l || l.size() == 0){
 //				return -3;//没有给将任务分给咨询师(技术员)
 //				return -3;//没有给将任务分给咨询师(技术员)
 //			}
 //			}
-			for (TOrderTask tOrderTask : l) {
+			for (TOrderTaskBo tOrderTask : l) {
 				if(null != tOrderTask &&null != tOrderTask.getTaskReceiver()){
 				if(null != tOrderTask &&null != tOrderTask.getTaskReceiver()){
 					bonus.setTaskId(tOrderTask.getId());//任务id
 					bonus.setTaskId(tOrderTask.getId());//任务id
 					bonus.setGrantTarget(tOrderTask.getTaskReceiver());
 					bonus.setGrantTarget(tOrderTask.getTaskReceiver());
@@ -356,8 +357,8 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 			//发送站内消息
 			//发送站内消息
 			//addNotic(o.getOrderNo(),NoticeStatus.ORDER_REFUND.getCode(),o.getSalesmanId());//给营销员
 			//addNotic(o.getOrderNo(),NoticeStatus.ORDER_REFUND.getCode(),o.getSalesmanId());//给营销员
 			//根据订单编号获得所有的技术员
 			//根据订单编号获得所有的技术员
-			List<TOrderTask> l = taskMapper.getReceiverByOid(o.getOrderNo());
-			for (TOrderTask tOrderTask : l) {
+			List<TOrderTaskBo> l = taskMapper.getReceiverByOid(o.getOrderNo());
+			for (TOrderTaskBo tOrderTask : l) {
 				if(null != tOrderTask && null != tOrderTask.getTaskReceiver()){
 				if(null != tOrderTask && null != tOrderTask.getTaskReceiver()){
 					//addNotic(o.getOrderNo(),NoticeStatus.ORDER_REFUND.getCode(),tOrderTask.getTaskReceiver());//给技术员
 					//addNotic(o.getOrderNo(),NoticeStatus.ORDER_REFUND.getCode(),tOrderTask.getTaskReceiver());//给技术员
 					//发邮件给技术员
 					//发邮件给技术员

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

@@ -124,7 +124,7 @@ public class LegalAffairsServiceImpl extends BaseMybatisDao<TOrderMidMapper> imp
 
 
     @Override
     @Override
     public boolean checkTask(String orderNo) {
     public boolean checkTask(String orderNo) {
-        List<TOrderTaskBo> list =tOrderTaskMapper.selectOrderTask(orderNo);
+        List<TOrderTaskBo> list =tOrderTaskMapper.selectOrderTask(orderNo,0);
         for (TOrderTaskBo bo : list) {
         for (TOrderTaskBo bo : list) {
             if (bo.getType()==5&&bo.getProjectStatus()!= NewProjectStatus.YXZ.getCode()){
             if (bo.getType()==5&&bo.getProjectStatus()!= NewProjectStatus.YXZ.getCode()){
                 return true;
                 return true;

+ 5 - 4
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -431,7 +431,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			if(tOrderTaskBo.getSplitStatus()==2) {
 			if(tOrderTaskBo.getSplitStatus()==2) {
 				tOrderTaskBo.setSplitSuper(map.get(tOrderTaskBo.getSplitSuper()));
 				tOrderTaskBo.setSplitSuper(map.get(tOrderTaskBo.getSplitSuper()));
 			}
 			}
-			tOrderTaskMapper.insertSelectiveGetId(tOrderTaskBo);
+			tOrderTaskBo.setProcessStatus(3);
+			tOrderTaskMapper.insertSelective(tOrderTaskBo);
 			int y=tOrderTaskBo.getId();
 			int y=tOrderTaskBo.getId();
 			TTaskMid dtails = tTaskMidMapper.getDtails(tOrderTaskBo.getId());
 			TTaskMid dtails = tTaskMidMapper.getDtails(tOrderTaskBo.getId());
 			TTaskMid tTaskMid = new TTaskMid(y, new BigDecimal(0));
 			TTaskMid tTaskMid = new TTaskMid(y, new BigDecimal(0));
@@ -695,7 +696,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			if (i<1) userLockReleaseMapper.updateReleaseUser(o.getOrderNo());
 			if (i<1) userLockReleaseMapper.updateReleaseUser(o.getOrderNo());
 		}
 		}
 		//
 		//
-		List<TOrderTaskBo> taskBos=tOrderTaskMapper.selectOrderTask(nb.getOrderNo());
+		List<TOrderTaskBo> taskBos=tOrderTaskMapper.selectOrderTask(nb.getOrderNo(),0);
 		int i=0;
 		int i=0;
 		for (TOrderTaskBo to : taskBos) {
 		for (TOrderTaskBo to : taskBos) {
 			if (to.getTaskStatus()>TaskState.UN_DISTRIBUTION.getCode()&&to.getTaskStatus()<TaskState.INVALID.getCode()) {
 			if (to.getTaskStatus()>TaskState.UN_DISTRIBUTION.getCode()&&to.getTaskStatus()<TaskState.INVALID.getCode()) {
@@ -729,7 +730,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			ot.setTaskComment(cd.getTaskComment());
 			ot.setTaskComment(cd.getTaskComment());
 			ot.setMain(cd.getMain());
 			ot.setMain(cd.getMain());
 			ot.setTaskStatus(0);
 			ot.setTaskStatus(0);
-			tOrderTaskMapper.insertSelectiveGetId(ot);
+			tOrderTaskMapper.insertSelective(ot);
 			cd.setTid(ot.getId());
 			cd.setTid(ot.getId());
 			tChangeTaskMapper.updateByPrimaryKeySelective(cd);
 			tChangeTaskMapper.updateByPrimaryKeySelective(cd);
 			tChangeDunMapper.updateByCTid(cd.getId(), ot.getId());
 			tChangeDunMapper.updateByCTid(cd.getId(), ot.getId());
@@ -1001,7 +1002,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				List<TOrderNewBo> list=tOrderNewMapper.selectUsedOrderByOrder(orderNo);
 				List<TOrderNewBo> list=tOrderNewMapper.selectUsedOrderByOrder(orderNo);
 				for (TOrderNewBo t : list) {
 				for (TOrderNewBo t : list) {
 					t.setDunList(newOrderDunService.selectListNewOrderDun(orderNo));
 					t.setDunList(newOrderDunService.selectListNewOrderDun(orderNo));
-					t.setTaskList(orderNewService.selectOrderTask(orderNo));
+					t.setTaskList(orderNewService.selectOrderTask(orderNo,0));
 				}
 				}
 				return list;
 				return list;
 			}
 			}

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

@@ -184,7 +184,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		if(t.getCommodityPrice()!=null)order.setTotalAmount(order.getTotalAmount());
 		if(t.getCommodityPrice()!=null)order.setTotalAmount(order.getTotalAmount());
 		String str=tOrderTaskMapper.selectByidGetCname(t.getCommodityId());
 		String str=tOrderTaskMapper.selectByidGetCname(t.getCommodityId());
 		t.setCname(str);
 		t.setCname(str);
-		tOrderTaskMapper.insertSelectiveGetId(t);
+		tOrderTaskMapper.insertSelective(t);
 		TTaskMid tm=new TTaskMid();
 		TTaskMid tm=new TTaskMid();
 		tm.setTid(t.getId());
 		tm.setTid(t.getId());
 		//判断这个项目是不是高新复审
 		//判断这个项目是不是高新复审
@@ -287,8 +287,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	}
 	}
 
 
 	@Override
 	@Override
-	public List<TOrderTaskBo> selectOrderTask(String orderNo) {
-		List<TOrderTaskBo> list=tOrderTaskMapper.selectOrderTask(orderNo);
+	public List<TOrderTaskBo> selectOrderTask(String orderNo,Integer type) {
+		List<TOrderTaskBo> list=tOrderTaskMapper.selectOrderTask(orderNo,type);
 			for (TOrderTaskBo t : list) {
 			for (TOrderTaskBo t : list) {
 				if (TokenManager.hasRole(AFTConstants.SALESMAN)&&TokenManager.hasRole(AFTConstants.TECH)) {
 				if (TokenManager.hasRole(AFTConstants.SALESMAN)&&TokenManager.hasRole(AFTConstants.TECH)) {
 					//如果是双角色不做处理。
 					//如果是双角色不做处理。
@@ -746,27 +746,39 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 
 	public void addNewDunNoticAndSendEmail(String  orderNo, OutNewOrderDunBo o) {
 	public void addNewDunNoticAndSendEmail(String  orderNo, OutNewOrderDunBo o) {
 		AdminListBo a = adminMapper.getDeptNameByAid(TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
 		AdminListBo a = adminMapper.getDeptNameByAid(TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
-		TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(orderNo);
-		addNotic(NoticeStatus.ORDER_DUN.getCode(),a, b);
+		TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(o.getOrderNo());
+		addNotic(NoticeStatus.ORDER_DUN.getCode(), b);
 		try {
 		try {
-			NewDunsendEmail(orderNo,o.getId(), a, b);
+			NewDunsendEmail(o.getOrderNo(),o.getId(), a, b);
 		} catch (UnsupportedEncodingException | MessagingException e) {
 		} catch (UnsupportedEncodingException | MessagingException e) {
 			throw new BusinessException(new Error("邮件发送错误。"));
 			throw new BusinessException(new Error("邮件发送错误。"));
 		}
 		}
 	}
 	}
 
 
-	public void addTimingTaskNewDunNoticAndSendEmail(TOrderNew t2, OutNewOrderDunBo o) {
+	public void addTimingTaskNewDunNoticAndSendEmail( OutNewOrderDunBo o,Integer type) {
 		AdminListBo a = adminMapper.getDeptNameByAid("1");
 		AdminListBo a = adminMapper.getDeptNameByAid("1");
-		TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(t2.getOrderNo());
-		addNotic(NoticeStatus.ORDER_DUN.getCode(),a, b);
+		TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(o.getOrderNo());
+		StringBuffer sb=new StringBuffer();
+
+		Integer noticType=NoticeStatus.ORDER_DUN.getCode();
+		if (type==1){
+			noticType=NoticeStatus.MANBER_DUN.getCode();
+			sb=sb.append("[").append(b.getUserName()).append("]催款截点将于").append(o.getCustomizeTimes()).append("进行催款,会员项目请提前2个月催款,以免延误会员派单");
+		}else {
+			sb=sb.append("客户名称[").append(b.getUserName()).append("],按时触发应收款欠款,请按时催款,并及时增减项目,以免项目延期等问题。");
+		}
+		addNotic(noticType, b,o,sb.toString());
 		try {
 		try {
-			NewDunsendEmail(t2.getOrderNo(),o.getId(), a, b);
+			NewDunsendEmail(o.getOrderNo(),o.getId(), a, b,noticType,sb.toString());
 		} catch (UnsupportedEncodingException | MessagingException e) {
 		} catch (UnsupportedEncodingException | MessagingException e) {
 			throw new BusinessException(new Error("邮件发送错误。"));
 			throw new BusinessException(new Error("邮件发送错误。"));
 		}
 		}
 	}
 	}
-
 	public void  NewDunsendEmail(String orderNo,Integer dunId,AdminListBo a,TOrderNewBo b) throws UnsupportedEncodingException, MessagingException{
 	public void  NewDunsendEmail(String orderNo,Integer dunId,AdminListBo a,TOrderNewBo b) throws UnsupportedEncodingException, MessagingException{
+		NewDunsendEmail( orderNo, dunId, a, b, NoticeStatus.ORDER_DUN.getCode(),null);
+	}
+
+	public void  NewDunsendEmail(String orderNo,Integer dunId,AdminListBo a,TOrderNewBo b,Integer noticType,String content) throws UnsupportedEncodingException, MessagingException{
 		NewOrderDun ob=newOrderDunMapper.selectByPrimaryKey(dunId);
 		NewOrderDun ob=newOrderDunMapper.selectByPrimaryKey(dunId);
 		AdminListBo a2 = adminMapper.getDeptNameByAid(b.getSalesmanId());
 		AdminListBo a2 = adminMapper.getDeptNameByAid(b.getSalesmanId());
 		String dunTypeName="";
 		String dunTypeName="";
@@ -777,8 +789,14 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		}
 		}
 			//发送驳回邮件
 			//发送驳回邮件
 		if(SendEmailUtil.isEmail(b.getEmail())) {
 		if(SendEmailUtil.isEmail(b.getEmail())) {
-	    	 EmailBo bo = new EmailBo("催收通知", b.getEmail(), a.getDepartmentName(), a.getName(),
+			EmailBo bo =new EmailBo();
+			if (noticType==NoticeStatus.MANBER_DUN.getCode()){
+				bo = new EmailBo("会员提前催收", b.getEmail(), content);
+			}else {
+				bo = new EmailBo("催收通知", b.getEmail(), a.getDepartmentName(), a.getName(),
 						"", orderNo,b.getContractNo(),new SimpleDateFormat("yyyy-MM-dd").format(ob.getCreateTime()),dunTypeName,a2.getName(),b.getUserName(),1,0);
 						"", orderNo,b.getContractNo(),new SimpleDateFormat("yyyy-MM-dd").format(ob.getCreateTime()),dunTypeName,a2.getName(),b.getUserName(),1,0);
+			}
+
 				if(StringUtils.isNotBlank(b.getEmail())) {
 				if(StringUtils.isNotBlank(b.getEmail())) {
 					asyncUtils.patentSend(bo);
 					asyncUtils.patentSend(bo);
 				}
 				}
@@ -931,7 +949,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 
 	@Override
 	@Override
 	public boolean checkOrderMain(TOrderTask t) {
 	public boolean checkOrderMain(TOrderTask t) {
-		List<TOrderTaskBo> list=tOrderTaskMapper.selectOrderTask(t.getOrderNo());
+		List<TOrderTaskBo> list=tOrderTaskMapper.selectOrderTask(t.getOrderNo(),0);
 		int flag=0;
 		int flag=0;
 		if(t.getMain()==1)flag++;
 		if(t.getMain()==1)flag++;
 		for (TOrderTask t2 : list) {
 		for (TOrderTask t2 : list) {
@@ -1037,7 +1055,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 
 	@Override
 	@Override
 	public boolean checkORderTask(String orderNo) {
 	public boolean checkORderTask(String orderNo) {
-		List<TOrderTaskBo> list=tOrderTaskMapper.selectOrderTask(orderNo);
+		List<TOrderTaskBo> list=tOrderTaskMapper.selectOrderTask(orderNo,0);
 		for (TOrderTaskBo t : list) {
 		for (TOrderTaskBo t : list) {
 			if (t.getMain()==1) {
 			if (t.getMain()==1) {
 				return false;
 				return false;
@@ -1137,7 +1155,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				t.getProcessStatus()!=ProcessStatus.YQBFPZXSGLY.getCode()) {
 				t.getProcessStatus()!=ProcessStatus.YQBFPZXSGLY.getCode()) {
 			return -1;
 			return -1;
 		}
 		}
-		List<TOrderTaskBo> list=tOrderTaskMapper.selectOrderTask(orderNo);
+		List<TOrderTaskBo> list=tOrderTaskMapper.selectOrderTask(orderNo,0);
 		for (TOrderTaskBo task : list) {
 		for (TOrderTaskBo task : list) {
 			if (task.getTaskStatus()!=TaskState.CLYWC.getCode()) {
 			if (task.getTaskStatus()!=TaskState.CLYWC.getCode()) {
 				return -1;
 				return -1;
@@ -1185,14 +1203,21 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 
 
 
 	@Override
 	@Override
-	public void addNotic(Integer type, AdminListBo a, TOrderNewBo b) {
+	public void addNotic(Integer type,  TOrderNewBo b) {
 		StringBuffer sb=new StringBuffer();
 		StringBuffer sb=new StringBuffer();
 		sb=sb.append("客户名称[").append(b.getUserName()).append("],按时触发应收款欠款,请按时催款,并及时增减项目,以免项目延期等问题。");
 		sb=sb.append("客户名称[").append(b.getUserName()).append("],按时触发应收款欠款,请按时催款,并及时增减项目,以免项目延期等问题。");
+		addNotic(type,b,null,sb.toString());
+	}
+
+
+
+	public void addNotic(Integer type,  TOrderNewBo b,OutNewOrderDunBo o,String str) {
+
 		Notice n =new Notice();
 		Notice n =new Notice();
 		n.setId(UUID.randomUUID().toString());
 		n.setId(UUID.randomUUID().toString());
 		n.setAid(b.getSalesmanId());
 		n.setAid(b.getSalesmanId());
 		n.setNoticeType(type);
 		n.setNoticeType(type);
-		n.setContent(sb.toString());
+		n.setContent(str);
 		n.setReaded(0);//未读
 		n.setReaded(0);//未读
 		asyncUtils.addNotice(n);
 		asyncUtils.addNotice(n);
 	}
 	}

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

@@ -255,7 +255,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 
 
 	}
 	}
 	public void checkProjiectAllocation(String  orderNo) {
 	public void checkProjiectAllocation(String  orderNo) {
-		List<TOrderTaskBo> taskBos=tOrderTaskMapper.selectOrderTask(orderNo);
+		List<TOrderTaskBo> taskBos=tOrderTaskMapper.selectOrderTask(orderNo,0);
 		TOrderNew tNew=new TOrderNew();
 		TOrderNew tNew=new TOrderNew();
 		tNew.setOrderNo(orderNo);
 		tNew.setOrderNo(orderNo);
 		int i=0;
 		int i=0;
@@ -663,8 +663,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	public void addNoticAndEmail(OutPaymentNode pn,Integer type) {
 	public void addNoticAndEmail(OutPaymentNode pn,Integer type) {
 		paymentNodeEmailBo pnb=paymentNodeMapper.selectBytidGetEmail(pn.getTid());
 		paymentNodeEmailBo pnb=paymentNodeMapper.selectBytidGetEmail(pn.getTid());
 		TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(pnb.getOrderNo());
 		TOrderNewBo b  = tOrderNewMapper.getSaleIdByOno(pnb.getOrderNo());
-		AdminListBo a = adminMapper.getDeptNameByAid(TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
-		orderNewService.addNotic(type,a,b);
+		orderNewService.addNotic(type,b);
 		pn.setDunStatus(1);
 		pn.setDunStatus(1);
 		paymentNodeMapper.updateByPrimaryKeySelective(pn);
 		paymentNodeMapper.updateByPrimaryKeySelective(pn);
 		//营销员名称、邮箱、订单编号、客户名称
 		//营销员名称、邮箱、订单编号、客户名称
@@ -687,8 +686,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 
 
 	private void checkSettlementAward(TOrderNew tn,TOrderTask task) {
 	private void checkSettlementAward(TOrderNew tn,TOrderTask task) {
 		if(task.getTaskStatus()==TaskState.COMPLETE.getCode()&&tn.getTotalAmount().compareTo(tn.getSettlementAmount())==0) {
 		if(task.getTaskStatus()==TaskState.COMPLETE.getCode()&&tn.getTotalAmount().compareTo(tn.getSettlementAmount())==0) {
-			List<TOrderTask> l = tOrderTaskMapper.getReceiverByOid(tn.getOrderNo());
-			for (TOrderTask tOrderTask : l) {
+			List<TOrderTaskBo> l = tOrderTaskMapper.getReceiverByOid(tn.getOrderNo());
+			for (TOrderTaskBo tOrderTask : l) {
 				if(null != tOrderTask &&null != tOrderTask.getTaskReceiver()){
 				if(null != tOrderTask &&null != tOrderTask.getTaskReceiver()){
 					TOrderBonus bonus = new TOrderBonus();
 					TOrderBonus bonus = new TOrderBonus();
 					bonus.setId(UUID.randomUUID().toString());
 					bonus.setId(UUID.randomUUID().toString());
@@ -935,7 +934,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 				newTask.setCommodityQuantity(Integer.parseInt(string));
 				newTask.setCommodityQuantity(Integer.parseInt(string));
 				newTask.setSplitId(i);
 				newTask.setSplitId(i);
 				i++;
 				i++;
-				tOrderTaskMapper.insertSelectiveGetId(newTask);
+				tOrderTaskMapper.insertSelective(newTask);
 				TTaskMid dtails = tTaskMidMapper.getDtails(newTask.getId());
 				TTaskMid dtails = tTaskMidMapper.getDtails(newTask.getId());
 				TTaskMid tTaskMid = new TTaskMid(newTask.getId(), new BigDecimal(0));
 				TTaskMid tTaskMid = new TTaskMid(newTask.getId(), new BigDecimal(0));
 				tTaskMid.setDispatchProvince(dtails.getDispatchProvince());
 				tTaskMid.setDispatchProvince(dtails.getDispatchProvince());

+ 32 - 36
src/main/java/com/goafanti/order/service/impl/OrderReceivablesServiceImpl.java

@@ -10,6 +10,7 @@ import java.util.UUID;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 
 
+import com.goafanti.order.bo.*;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.ss.usermodel.CellType;
@@ -50,11 +51,6 @@ import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.core.shiro.token.TokenManager;
-import com.goafanti.order.bo.OrderListBo;
-import com.goafanti.order.bo.ReceivablesListBo;
-import com.goafanti.order.bo.TOrderInvoiceBo;
-import com.goafanti.order.bo.TOrderNewBo;
-import com.goafanti.order.bo.TemporaryReceivablesBo;
 import com.goafanti.order.enums.ApprovalNewState;
 import com.goafanti.order.enums.ApprovalNewState;
 import com.goafanti.order.enums.BonusSubject;
 import com.goafanti.order.enums.BonusSubject;
 import com.goafanti.order.enums.LiquidationNewState;
 import com.goafanti.order.enums.LiquidationNewState;
@@ -83,15 +79,15 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 	private TOrderTaskMapper tOrderTaskMapper;
 	private TOrderTaskMapper tOrderTaskMapper;
 	@Autowired
 	@Autowired
 	private TOrderMidMapper	tOrderMidMapper;
 	private TOrderMidMapper	tOrderMidMapper;
-	
+
 	@Resource
 	@Resource
 	private FundManageOrderService fundManageOrderService;
 	private FundManageOrderService fundManageOrderService;
 	@Resource
 	@Resource
 	private OrderInvoiceService	orderInvoiceService;
 	private OrderInvoiceService	orderInvoiceService;
-	
+
 	@Resource
 	@Resource
 	private OrderBillService	orderBillService;
 	private OrderBillService	orderBillService;
-	
+
 	@Override
 	@Override
 	public int addReceivables(TemporaryReceivablesBo t) {
 	public int addReceivables(TemporaryReceivablesBo t) {
 		t.setAid(TokenManager.getAdminId());
 		t.setAid(TokenManager.getAdminId());
@@ -130,7 +126,7 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 		if(list.size()>99)throw new BusinessException(new Error("数量过大,建议不超过99。"));
 		if(list.size()>99)throw new BusinessException(new Error("数量过大,建议不超过99。"));
 		List<TOrderBillNew> listBull=new ArrayList<>();
 		List<TOrderBillNew> listBull=new ArrayList<>();
 		for (TemporaryReceivables tr : list) {
 		for (TemporaryReceivables tr : list) {
-			TOrderBillNew tbn=new TOrderBillNew(); 
+			TOrderBillNew tbn=new TOrderBillNew();
 			//获取已收款
 			//获取已收款
 			BigDecimal bill = tOrderBillNewMapper.getAmountByOid(tr.getOrderNo());
 			BigDecimal bill = tOrderBillNewMapper.getAmountByOid(tr.getOrderNo());
 			//获取总金额
 			//获取总金额
@@ -178,8 +174,8 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 				bonus.setBonusSubject(BonusSubject.WK.getCode());//12
 				bonus.setBonusSubject(BonusSubject.WK.getCode());//12
 				//发放给技术员如果付完款所有参与这个项目任务的人都会有结算奖
 				//发放给技术员如果付完款所有参与这个项目任务的人都会有结算奖
 				//获得所有的任务负责人
 				//获得所有的任务负责人
-				List<TOrderTask> l = tOrderTaskMapper.getReceiverByOid(tr.getOrderNo());
-				for (TOrderTask tOrderTask : l) {
+				List<TOrderTaskBo> l = tOrderTaskMapper.getReceiverByOid(tr.getOrderNo());
+				for (TOrderTaskBo tOrderTask : l) {
 					if(null != tOrderTask &&null != tOrderTask.getTaskReceiver()){
 					if(null != tOrderTask &&null != tOrderTask.getTaskReceiver()){
 						bonus.setTaskId(tOrderTask.getId());//任务id
 						bonus.setTaskId(tOrderTask.getId());//任务id
 						bonus.setGrantTarget(tOrderTask.getTaskReceiver());
 						bonus.setGrantTarget(tOrderTask.getTaskReceiver());
@@ -196,7 +192,7 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 					tr.setStatus(0);
 					tr.setStatus(0);
 					temporaryReceivablesMapper.updateByPrimaryKeySelective(tr);
 					temporaryReceivablesMapper.updateByPrimaryKeySelective(tr);
 				}
 				}
-				addOrderLog(tr.getOrderNo(), OrderLogProcess.CWQK.getCode());	
+				addOrderLog(tr.getOrderNo(), OrderLogProcess.CWQK.getCode());
 			}else if (count.compareTo(t.getTotalAmount()) == -1) {//小于总额
 			}else if (count.compareTo(t.getTotalAmount()) == -1) {//小于总额
 				//如果订单流水小于总金额
 				//如果订单流水小于总金额
 				if(bd.compareTo(t.getFirstAmount()) == 0 || bd.compareTo(t.getFirstAmount()) == 1){//首付完成
 				if(bd.compareTo(t.getFirstAmount()) == 0 || bd.compareTo(t.getFirstAmount()) == 1){//首付完成
@@ -212,10 +208,10 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 						bonus.setBonusSubject(BonusSubject.SF.getCode());//11
 						bonus.setBonusSubject(BonusSubject.SF.getCode());//11
 					}
 					}
 					lstaus = 1;
 					lstaus = 1;
-					
+
 					addOrderLog(tr.getOrderNo(), OrderLogProcess.CWSF.getCode());
 					addOrderLog(tr.getOrderNo(), OrderLogProcess.CWSF.getCode());
 				}
 				}
-				
+
 			}
 			}
 			if(tr.getStatus()==2) {
 			if(tr.getStatus()==2) {
 				tr.setStatus(0);
 				tr.setStatus(0);
@@ -255,7 +251,7 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 					bonus.setGrantType(0);
 					bonus.setGrantType(0);
 					tOrderBonusMapper.insertSelective(bonus);
 					tOrderBonusMapper.insertSelective(bonus);
 			}
 			}
-				
+
 				listBull.add(tbn);
 				listBull.add(tbn);
 		}
 		}
 		if(!listBull.isEmpty()) {
 		if(!listBull.isEmpty()) {
@@ -273,7 +269,7 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 		tl.setProcess(code);
 		tl.setProcess(code);
 		tl.setAid(TokenManager.getAdminId());
 		tl.setAid(TokenManager.getAdminId());
 		tOrderLogMapper.insertSelective(tl);
 		tOrderLogMapper.insertSelective(tl);
-		
+
 	}
 	}
 	@SuppressWarnings("unchecked")
 	@SuppressWarnings("unchecked")
 	@Override
 	@Override
@@ -293,7 +289,7 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 		if(StringUtils.isNotBlank(TokenManager.getAdminId()))parameter.put("aid", TokenManager.getAdminId());
 		if(StringUtils.isNotBlank(TokenManager.getAdminId()))parameter.put("aid", TokenManager.getAdminId());
 		Pagination<ReceivablesListBo> p=(Pagination<ReceivablesListBo>) findPage("selectReceivablesList", "selectReceivablesCount", parameter, pageNo, pageSize);
 		Pagination<ReceivablesListBo> p=(Pagination<ReceivablesListBo>) findPage("selectReceivablesList", "selectReceivablesCount", parameter, pageNo, pageSize);
 		List<ReceivablesListBo> list=(List<ReceivablesListBo>) p.getList();
 		List<ReceivablesListBo> list=(List<ReceivablesListBo>) p.getList();
-		
+
 		for (ReceivablesListBo r : list) {
 		for (ReceivablesListBo r : list) {
 			//设置导入信息数据是否有问题判断
 			//设置导入信息数据是否有问题判断
 			// InptStatus 0 正常 1内容不完整 2订单未能匹配 3名称不匹配
 			// InptStatus 0 正常 1内容不完整 2订单未能匹配 3名称不匹配
@@ -310,7 +306,7 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 		}
 		}
 		return p;
 		return p;
 	}
 	}
-	
+
 	@Override
 	@Override
 	public Map<String, Object> getCountlistReceivables(ReceivablesListBo rl, Integer status, String adminName,
 	public Map<String, Object> getCountlistReceivables(ReceivablesListBo rl, Integer status, String adminName,
 			String adminDepId, String orderDepId) {
 			String adminDepId, String orderDepId) {
@@ -330,10 +326,10 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 		map.put("amount",new BigDecimal(temporaryReceivablesMapper.getCountlistReceivablesAmount(parameter)).stripTrailingZeros() );
 		map.put("amount",new BigDecimal(temporaryReceivablesMapper.getCountlistReceivablesAmount(parameter)).stripTrailingZeros() );
 		return map;
 		return map;
 	}
 	}
-	
-	
-	
-	
+
+
+
+
 	@Override
 	@Override
 	public void batchListReceivables(MultipartFile file) {
 	public void batchListReceivables(MultipartFile file) {
 		 //获得Workbook工作薄对象
 		 //获得Workbook工作薄对象
@@ -346,7 +342,7 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
     		if(sheet == null){
     		if(sheet == null){
     			return;
     			return;
     		}
     		}
-    		
+
     		//获得当前sheet的开始行
     		//获得当前sheet的开始行
     		int firstRowNum = sheet.getFirstRowNum();
     		int firstRowNum = sheet.getFirstRowNum();
     		//获得当前sheet的结束行
     		//获得当前sheet的结束行
@@ -429,15 +425,15 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
         	temporaryReceivablesMapper.insertBatch(list);
         	temporaryReceivablesMapper.insertBatch(list);
         	//计算重复的单
         	//计算重复的单
         	temporaryReceivablesMapper.updateRepeatOrderNo(TokenManager.getAdminId());
         	temporaryReceivablesMapper.updateRepeatOrderNo(TokenManager.getAdminId());
-        
+
     }
     }
-      	
-        
-		
-		
-		
+
+
+
+
+
 		/**
 		/**
-		 * 
+		 *
 		 * @param comment
 		 * @param comment
 		 * @param fileName
 		 * @param fileName
 		 * @param list
 		 * @param list
@@ -445,7 +441,7 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 		 * @return
 		 * @return
 		 */
 		 */
 		public static XSSFWorkbook exportTemplateInfoS(String[] comment,String fileName,List<?> list,Integer type){
 		public static XSSFWorkbook exportTemplateInfoS(String[] comment,String fileName,List<?> list,Integer type){
-			 
+
 			//map 数据 ,comment表头 (列名称)
 			//map 数据 ,comment表头 (列名称)
 			//1,创建一个workbook,对应的是一个excel文件
 			//1,创建一个workbook,对应的是一个excel文件
 			XSSFWorkbook wb = new XSSFWorkbook();
 			XSSFWorkbook wb = new XSSFWorkbook();
@@ -481,10 +477,10 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 				addSettlementMyBillList(comment, list, sheet);
 				addSettlementMyBillList(comment, list, sheet);
 				break;
 				break;
 			}
 			}
-			
+
 			return wb;
 			return wb;
 		}
 		}
-		
+
 		@SuppressWarnings("unchecked")
 		@SuppressWarnings("unchecked")
 		private static void addSettlementMyBillList(String[] comment, List<?> list, XSSFSheet sheet) {
 		private static void addSettlementMyBillList(String[] comment, List<?> list, XSSFSheet sheet) {
 			for (TOrderBillNew ob : (List<TOrderBillNew>)list) {
 			for (TOrderBillNew ob : (List<TOrderBillNew>)list) {
@@ -505,7 +501,7 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 					case "付款方": o = ob.getPayerName(); break;
 					case "付款方": o = ob.getPayerName(); break;
 					case "流水科目": o = TransactionSubject.getValueByCode(ob.getTransactionSubject()); break;
 					case "流水科目": o = TransactionSubject.getValueByCode(ob.getTransactionSubject()); break;
 					case "平台流水号": o = ob.getBillNo(); break;
 					case "平台流水号": o = ob.getBillNo(); break;
-					case "收款类型": 
+					case "收款类型":
 						if(ob.getType()==0) {
 						if(ob.getType()==0) {
 							o = "手工收款"; break;
 							o = "手工收款"; break;
 						}else if(ob.getType()==1) {
 						}else if(ob.getType()==1) {
@@ -556,7 +552,7 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 					//当前列的只
 					//当前列的只
 					String o = "";
 					String o = "";
 					switch (comment[i]) {
 					switch (comment[i]) {
-//					"订单编号", "合同编号","客户名称","订单部门","订单负责人","签单日期","下单日期", 
+//					"订单编号", "合同编号","客户名称","订单部门","订单负责人","签单日期","下单日期",
 //					"签单金额(万元)", "已开票金额(万元)", "已收金额(万元)","最近收款(万元)","结算状态","订单流程","是否特批"}
 //					"签单金额(万元)", "已开票金额(万元)", "已收金额(万元)","最近收款(万元)","结算状态","订单流程","是否特批"}
 					case "订单编号": o = ob.getOrderNo().toString(); break;
 					case "订单编号": o = ob.getOrderNo().toString(); break;
 					case "合同编号": o = ob.getContractNo(); break;
 					case "合同编号": o = ob.getContractNo(); break;
@@ -583,6 +579,6 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 			}
 			}
 		}
 		}
 
 
-		
+
 
 
 }
 }

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

@@ -1,12 +1,12 @@
 dev.name=local
 dev.name=local
 jdbc.driverClassName=com.mysql.jdbc.Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
-#jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.url=jdbc\:mysql://localhost:3306/aft20220318?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.url=jdbc\:mysql://localhost:3306/aft20220318?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-#jdbc.username=root
-#jdbc.password=123456
-jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 jdbc.username=root
 jdbc.username=root
-jdbc.password=aftdev
+jdbc.password=123456
+#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.username=root
+#jdbc.password=aftdev
 jdbc.validationQuery=SELECT 'x'
 jdbc.validationQuery=SELECT 'x'
 jdbc.initialSize=3
 jdbc.initialSize=3
 jdbc.maxActive=20
 jdbc.maxActive=20
@@ -46,7 +46,7 @@ user_remind_days=15
 user_channel_days=90
 user_channel_days=90
 
 
 avatar.host=//static.jishutao.com
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.2.17
+static.host=//static.jishutao.com/1.2.18
 #avatar.host=//172.16.0.255:3000
 #avatar.host=//172.16.0.255:3000
 #static.host=//172.16.0.255:3000/1.2.05
 #static.host=//172.16.0.255:3000/1.2.05
 #static.host=http://172.16.1.187/prod/1.2.05
 #static.host=http://172.16.1.187/prod/1.2.05