Pārlūkot izejas kodu

Merge branch 'test' of jishutao/kede-server into prod

anderx 3 gadi atpakaļ
vecāks
revīzija
cb5f60d6e2
39 mainītis faili ar 1095 papildinājumiem un 185 dzēšanām
  1. 7 0
      src/main/java/com/goafanti/common/constant/AFTConstants.java
  2. 6 0
      src/main/java/com/goafanti/common/dao/TOrderMidMapper.java
  3. 4 2
      src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml
  4. 44 8
      src/main/java/com/goafanti/common/mapper/TChangeTaskMapper.xml
  5. 48 6
      src/main/java/com/goafanti/common/mapper/TOrderMidMapper.xml
  6. 5 2
      src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml
  7. 70 30
      src/main/java/com/goafanti/common/mapper/TTaskMidMapper.xml
  8. 4 10
      src/main/java/com/goafanti/common/mapper/UserMapper.xml
  9. 44 4
      src/main/java/com/goafanti/common/model/TChangeTask.java
  10. 26 0
      src/main/java/com/goafanti/common/model/TOrderMid.java
  11. 40 0
      src/main/java/com/goafanti/common/model/TTaskMid.java
  12. 6 12
      src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java
  13. 4 17
      src/main/java/com/goafanti/customer/controller/OrganizationAnnualReportController.java
  14. 0 1
      src/main/java/com/goafanti/customer/service/CustomerService.java
  15. 8 5
      src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java
  16. 20 27
      src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java
  17. 29 0
      src/main/java/com/goafanti/order/bo/InputAddTask.java
  18. 1 6
      src/main/java/com/goafanti/order/bo/InputProjectStatistics.java
  19. 47 0
      src/main/java/com/goafanti/order/bo/OutProjectStatistics.java
  20. 28 0
      src/main/java/com/goafanti/order/bo/TOrderTaskBo.java
  21. 353 0
      src/main/java/com/goafanti/order/bo/outStatistics/OutProjectStatisticsAudit.java
  22. 26 0
      src/main/java/com/goafanti/order/bo/outStatistics/OutProjectStatisticsCommon.java
  23. 23 0
      src/main/java/com/goafanti/order/bo/outStatistics/OutProjectStatisticsDoubleSoft.java
  24. 24 0
      src/main/java/com/goafanti/order/bo/outStatistics/OutProjectStatisticsHighTech.java
  25. 24 0
      src/main/java/com/goafanti/order/bo/outStatistics/OutProjectStatisticsMember.java
  26. 24 0
      src/main/java/com/goafanti/order/bo/outStatistics/OutProjectStatisticsPatent.java
  27. 23 0
      src/main/java/com/goafanti/order/bo/outStatistics/OutProjectStatisticsSoftwareWorks.java
  28. 1 1
      src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java
  29. 1 3
      src/main/java/com/goafanti/order/service/OrderNewService.java
  30. 31 7
      src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java
  31. 51 24
      src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java
  32. 19 0
      src/main/java/com/goafanti/order/service/impl/ProjectStatisticsServiceImpl.java
  33. 22 15
      src/main/java/com/goafanti/order/service/impl/PushOrderService.java
  34. 1 1
      src/main/java/com/goafanti/permission/service/impl/NewRoleServiceImpl.java
  35. 23 0
      src/main/java/com/goafanti/weChat/bo/OutPublicDtails.java
  36. 1 1
      src/main/java/com/goafanti/weChat/controller/AdminReleaseApiController.java
  37. 1 1
      src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java
  38. 1 1
      src/main/resources/props/config_local.properties
  39. 5 1
      src/main/resources/props/config_test.properties

+ 7 - 0
src/main/java/com/goafanti/common/constant/AFTConstants.java

@@ -47,6 +47,7 @@ public class AFTConstants {
 	public static final String  SALESMAN_MANAGER                    = "996";
 	/**	营销员 */
 	public static final String  SALESMAN                      		= "96";
+	public static final String  CUSTOMER_SERVICE_SALESMAN     		= "960";
 	/**	外包审核员 */
 	public static final String  OUTSOURCE_AUDITOR                   = "9991";
 	/** 人事管理员*/
@@ -91,6 +92,12 @@ public class AFTConstants {
 
 	public static final String	CONSULTANT_MANAGER					= "咨询师管理员";
 
+
+
+	public static final String	CAOJIN_AID							= "734092ad-6564-4021-b7ab-aab5af3a1537";
+
+
+
 	public static final int		KEYWORDLENTH						= 16;
 
 	public static final int		IMPORTMAXLENTH						= 1000;					// 科技需求&科技成果批量导入最大数据量

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

@@ -47,4 +47,10 @@ public interface TOrderMidMapper {
     void updateErrorDun();
 
     int judgeProjectType(String orderNo);
+
+    /**
+     * 修改订单中间表的显示的所有名称和所有分类
+     * @param orderNo
+     */
+    void updateCountProjectAndType(String orderNo);
 }

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

@@ -744,9 +744,11 @@
     date_format(a.create_time ,'%Y-%m-%d %H:%i:%S') createTimes,a.audit_info auditInfo,date_format(a.audit_time ,'%Y-%m-%d %H:%i:%S') auditTimes,
     d.name sname, date_format(a.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,date_format(a.release_end ,'%Y-%m-%d %H:%i:%S') releaseEnds,
     a.plan ,a.next_plan nextPlan ,a.expected_effect expectedEffect,a.update_status updateStatus,a.assist_aid_name assistAidName,
-    a.main_name mainName,a.assist,a.assistant_aid assistantAid, a.assistant_name assistantName
+    a.main_name mainName,a.assist,a.assistant_aid assistantAid, a.assistant_name assistantName,e.contract_no contractNo,
+    e.total_amount  totalAmout
     from public_release a left join `user` b on a.uid=b.id left join admin c on a.aid =c.id
-    left join admin d on b.aid=d.id where 1=1
+    left join admin d on b.aid=d.id left join t_order_new e on a.order_no =e.order_no
+    where 1=1
     <if test="publicType != null">
       and a.type= #{publicType}
     </if>

+ 44 - 8
src/main/java/com/goafanti/common/mapper/TChangeTaskMapper.xml

@@ -26,12 +26,15 @@
     <result column="declaration_batch" jdbcType="INTEGER" property="declarationBatch" />
     <result column="patent_type" jdbcType="INTEGER" property="patentType" />
     <result column="change_split_super" jdbcType="INTEGER" property="changeSplitSuper" />
+    <result column="last_year" jdbcType="VARCHAR" property="lastYear" />
+    <result column="last_year_capital" jdbcType="DECIMAL" property="lastYearCapital" />
+    <result column="last_year_income" jdbcType="DECIMAL" property="lastYearIncome" />
   </resultMap>
   <sql id="Base_Column_List">
     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, service_life, service_year, year_sum, contract_term, declaration_batch,
-    patent_type, change_split_super
+    patent_type, change_split_super, last_year, last_year_capital, last_year_income
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
@@ -43,7 +46,6 @@
     delete from t_change_task
     where id = #{id,jdbcType=INTEGER}
   </delete>
-
   <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TChangeTask" useGeneratedKeys="true">
     insert into t_change_task (tid, cid, order_no,
       main, commodity_id, commodity_name,
@@ -52,7 +54,8 @@
       split_super, receiver_name, official_cost,
       cost_reduction, service_life, service_year,
       year_sum, contract_term, declaration_batch,
-      patent_type, change_split_super)
+      patent_type, change_split_super, last_year,
+      last_year_capital, last_year_income)
     values (#{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},
@@ -60,7 +63,8 @@
       #{splitSuper,jdbcType=INTEGER}, #{receiverName,jdbcType=VARCHAR}, #{officialCost,jdbcType=INTEGER},
       #{costReduction,jdbcType=INTEGER}, #{serviceLife,jdbcType=VARCHAR}, #{serviceYear,jdbcType=VARCHAR},
       #{yearSum,jdbcType=INTEGER}, #{contractTerm,jdbcType=VARCHAR}, #{declarationBatch,jdbcType=INTEGER},
-      #{patentType,jdbcType=INTEGER}, #{changeSplitSuper,jdbcType=INTEGER})
+      #{patentType,jdbcType=INTEGER}, #{changeSplitSuper,jdbcType=INTEGER}, #{lastYear,jdbcType=VARCHAR},
+      #{lastYearCapital,jdbcType=DECIMAL}, #{lastYearIncome,jdbcType=DECIMAL})
   </insert>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TChangeTask" useGeneratedKeys="true">
     insert into t_change_task
@@ -134,6 +138,15 @@
       <if test="changeSplitSuper != null">
         change_split_super,
       </if>
+      <if test="lastYear != null">
+        last_year,
+      </if>
+      <if test="lastYearCapital != null">
+        last_year_capital,
+      </if>
+      <if test="lastYearIncome != null">
+        last_year_income,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="tid != null">
@@ -205,6 +218,15 @@
       <if test="changeSplitSuper != null">
         #{changeSplitSuper,jdbcType=INTEGER},
       </if>
+      <if test="lastYear != null">
+        #{lastYear,jdbcType=VARCHAR},
+      </if>
+      <if test="lastYearCapital != null">
+        #{lastYearCapital,jdbcType=DECIMAL},
+      </if>
+      <if test="lastYearIncome != null">
+        #{lastYearIncome,jdbcType=DECIMAL},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TChangeTask">
@@ -279,6 +301,15 @@
       <if test="changeSplitSuper != null">
         change_split_super = #{changeSplitSuper,jdbcType=INTEGER},
       </if>
+      <if test="lastYear != null">
+        last_year = #{lastYear,jdbcType=VARCHAR},
+      </if>
+      <if test="lastYearCapital != null">
+        last_year_capital = #{lastYearCapital,jdbcType=DECIMAL},
+      </if>
+      <if test="lastYearIncome != null">
+        last_year_income = #{lastYearIncome,jdbcType=DECIMAL},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -306,7 +337,10 @@
       contract_term = #{contractTerm,jdbcType=VARCHAR},
       declaration_batch = #{declarationBatch,jdbcType=INTEGER},
       patent_type = #{patentType,jdbcType=INTEGER},
-      change_split_super = #{changeSplitSuper,jdbcType=INTEGER}
+      change_split_super = #{changeSplitSuper,jdbcType=INTEGER},
+      last_year = #{lastYear,jdbcType=VARCHAR},
+      last_year_capital = #{lastYearCapital,jdbcType=DECIMAL},
+      last_year_income = #{lastYearIncome,jdbcType=DECIMAL}
     where id = #{id,jdbcType=INTEGER}
   </update>
 
@@ -315,7 +349,8 @@
       order_no, commodity_id, commodity_name,
       commodity_quantity, commodity_price, task_comment,
         split_super , receiver_name, create_time,service_life,
-    service_year, year_sum, contract_term,declaration_batch,patent_type)
+    service_year, year_sum, contract_term,declaration_batch,patent_type,
+    last_year,last_year_capital,last_year_income)
     values
     <foreach collection="list" index="index" item="item" separator=",">
       ( #{item.tid,jdbcType=INTEGER}, #{item.cid,jdbcType=INTEGER}, #{item.splitStatus,jdbcType=INTEGER},
@@ -323,7 +358,8 @@
       #{item.commodityQuantity,jdbcType=INTEGER}, #{item.commodityPrice,jdbcType=DECIMAL}, #{item.taskComment,jdbcType=VARCHAR},
        #{item.splitSuper,jdbcType=INTEGER}, #{item.receiverName,jdbcType=VARCHAR}, now(), #{item.serviceLife,jdbcType=VARCHAR},
       #{item.serviceYear,jdbcType=VARCHAR}, #{item.yearSum,jdbcType=INTEGER},#{item.contractTerm,jdbcType=VARCHAR},
-      #{item.declarationBatch,jdbcType=INTEGER},#{item.patentType,jdbcType=INTEGER})
+      #{item.declarationBatch,jdbcType=INTEGER},#{item.patentType,jdbcType=INTEGER},
+       #{item.lastYear,jdbcType=VARCHAR}, #{item.lastYearCapital,jdbcType=DECIMAL},#{item.lastYearIncome,jdbcType=DECIMAL})
     </foreach>
   </insert>
   <select id="selectByCid" resultType="com.goafanti.order.bo.TChangeTaskOut">
@@ -332,7 +368,7 @@
 	a.receiver_name receiverName, a.task_comment as taskComment ,a.commodity_price as commodityPrice,a.split_status splitStatus,
 	a.split_super splitSuper, a.service_life serviceLife ,a.service_year serviceYear,a.year_sum yearSum,i.patent_transfer patentTransfer,
     i.type taskType, a.declaration_batch declarationBatch,a.patent_type patentType,a.contract_term contractTerm,
-    a.change_split_super changeSplitSuper
+    a.change_split_super changeSplitSuper,a.last_year lastYear,a.last_year_income lastYearIncome,a.last_year_capital lastYearCapital
     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

+ 48 - 6
src/main/java/com/goafanti/common/mapper/TOrderMidMapper.xml

@@ -25,12 +25,15 @@
     <result column="operation_time" jdbcType="DATE" property="operationTime" />
     <result column="legal_affairs_status" jdbcType="INTEGER" property="legalAffairsStatus" />
     <result column="project_type" jdbcType="INTEGER" property="projectType" />
+    <result column="service_type" jdbcType="VARCHAR" property="serviceType" />
+    <result column="service_project" jdbcType="VARCHAR" property="serviceProject" />
   </resultMap>
   <sql id="Base_Column_List">
     id, order_no, salesman_id, finance_id, salesman_name, finance_name, final_receivables,
     final_Receivables_time, invoice_amount, create_time, buyer_name, order_receivables,
     order_arrears, payment_amount, cost_amount, dep_name, province_name, legal_affairs,
-    dun_start_time, legal_affairs_type, operation_time, legal_affairs_status, project_type
+    dun_start_time, legal_affairs_type, operation_time, legal_affairs_status, project_type,
+    service_type, service_project
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
@@ -50,7 +53,8 @@
       order_arrears, payment_amount, cost_amount,
       dep_name, province_name, legal_affairs,
       dun_start_time, legal_affairs_type, operation_time,
-      legal_affairs_status, project_type)
+      legal_affairs_status, project_type, service_type,
+      service_project)
     values (#{orderNo,jdbcType=VARCHAR}, #{salesmanId,jdbcType=VARCHAR}, #{financeId,jdbcType=VARCHAR},
       #{salesmanName,jdbcType=VARCHAR}, #{financeName,jdbcType=VARCHAR}, #{finalReceivables,jdbcType=DECIMAL},
       #{finalReceivablesTime,jdbcType=TIMESTAMP}, #{invoiceAmount,jdbcType=DECIMAL},
@@ -58,7 +62,8 @@
       #{orderArrears,jdbcType=DECIMAL}, #{paymentAmount,jdbcType=DECIMAL}, #{costAmount,jdbcType=DECIMAL},
       #{depName,jdbcType=VARCHAR}, #{provinceName,jdbcType=VARCHAR}, #{legalAffairs,jdbcType=INTEGER},
       #{dunStartTime,jdbcType=TIMESTAMP}, #{legalAffairsType,jdbcType=INTEGER}, #{operationTime,jdbcType=DATE},
-      #{legalAffairsStatus,jdbcType=INTEGER}, #{projectType,jdbcType=INTEGER})
+      #{legalAffairsStatus,jdbcType=INTEGER}, #{projectType,jdbcType=INTEGER}, #{serviceType,jdbcType=VARCHAR},
+      #{serviceProject,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TOrderMid" useGeneratedKeys="true">
     insert into t_order_mid
@@ -129,6 +134,12 @@
       <if test="projectType != null">
         project_type,
       </if>
+      <if test="serviceType != null">
+        service_type,
+      </if>
+      <if test="serviceProject != null">
+        service_project,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="orderNo != null">
@@ -197,6 +208,12 @@
       <if test="projectType != null">
         #{projectType,jdbcType=INTEGER},
       </if>
+      <if test="serviceType != null">
+        #{serviceType,jdbcType=VARCHAR},
+      </if>
+      <if test="serviceProject != null">
+        #{serviceProject,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TOrderMid">
@@ -268,6 +285,12 @@
       <if test="projectType != null">
         project_type = #{projectType,jdbcType=INTEGER},
       </if>
+      <if test="serviceType != null">
+        service_type = #{serviceType,jdbcType=VARCHAR},
+      </if>
+      <if test="serviceProject != null">
+        service_project = #{serviceProject,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -294,9 +317,12 @@
       legal_affairs_type = #{legalAffairsType,jdbcType=INTEGER},
       operation_time = #{operationTime,jdbcType=DATE},
       legal_affairs_status = #{legalAffairsStatus,jdbcType=INTEGER},
-      project_type = #{projectType,jdbcType=INTEGER}
+      project_type = #{projectType,jdbcType=INTEGER},
+      service_type = #{serviceType,jdbcType=VARCHAR},
+      service_project = #{serviceProject,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
+
   <select id="selectByOrderNo" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
@@ -413,6 +439,12 @@
       <if test="projectType != null">
         project_type = #{projectType,jdbcType=INTEGER},
       </if>
+      <if test="serviceType != null">
+        service_type = #{serviceType,jdbcType=VARCHAR},
+      </if>
+      <if test="serviceProject != null">
+        service_project = #{serviceProject,jdbcType=VARCHAR},
+      </if>
     </set>
     where order_no = #{orderNo,jdbcType=VARCHAR}
   </update>
@@ -423,7 +455,7 @@
     b.order_arrears orderArrears,b.dun_start_time dunStartTime,date_format(b.dun_start_time,'%Y-%m-%d %H:%i:%S')dunStartTimes
     <if test="type==1 or type==2 or type==3">
       ,b.operation_time operationTime,date_format(b.operation_time,'%Y-%m-%d')operationDate,b.legal_affairs_type `type`,
-    b.legal_affairs_status status
+      b.legal_affairs_status status
     </if>
     from t_order_new a left join t_order_mid b on a.order_no =b.order_no
     <if test="shiro == 2">
@@ -540,7 +572,7 @@
   <select id="selectErrorDun" resultType="com.goafanti.common.bo.ErrorDunListBo">
     select a.order_no orderNo,a.order_receivables orderReceivables ,a.order_arrears orderArrears,b.money,a.create_time createTime
     from t_order_mid a left join (select order_no ,ifnull(sum(money),0)money from new_order_dun where status =1 group by order_no)b
-        on a.order_no =b.order_no
+                                 on a.order_no =b.order_no
     where a.order_receivables !=b.money order by a.create_time;
   </select>
   <update id="updateErrorDun">
@@ -549,9 +581,19 @@
     set a.order_receivables=b.money,a.order_arrears =(b.money-c.settlement_amount)
     where a.order_no =b.order_no and a.order_no =c.order_no and a.order_receivables !=b.money;
   </update>
+
   <select id="judgeProjectType" resultType="java.lang.Integer">
     select count(*) from t_order_new a left join t_order_task b on a.order_no =b.order_no
                                        left join business_project c on b.commodity_id =c.id left join business_category d on c.cid =d.id
     where d.sort =6 and a.order_no = #{orderNo}
   </select>
+
+  <update id="updateCountProjectAndType">
+    update t_order_mid a ,(select a.order_no ,GROUP_CONCAT(DISTINCT a.commodity_name )pname, GROUP_CONCAT(DISTINCT c.cname )cname
+                           from t_order_task a left join business_project b on a.commodity_id =b.id
+                                               left join business_category c on b.cid =c.id
+                           group by a.order_no )b
+    set a.service_project =b.pname,a.service_type =b.cname
+    where a.order_no=b.order_no and a.order_no = #{orderNo};
+  </update>
 </mapper>

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

@@ -792,11 +792,13 @@
     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
+    a.patent_type patentType,a.picture_url pictureUrl,j.service_life serviceLife ,j.service_year serviceYear,j.year_sum yearSum,
+    ttm.last_year lastYear,ttm.last_year_capital lastYearCapital,ttm.last_year_income lastYearIncome
     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
+    left join t_task_mid ttm on a.id=ttm.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}
@@ -1254,7 +1256,8 @@
     (a.commodity_price-ttm.cost_amount)profit, a.high_tech_status highTechStatus, tp.patent_name patentName ,tp.patent_no patentNo ,
     date_format(tp.accept_time, '%Y-%m-%d ' ) acceptTime , date_format(tp.authorize_time, '%Y-%m-%d ' )  authorizeTime, ttm.reject_count rejectCount ,
     tm.service_life serviceLife,tm.service_year serviceyear, tm.year_sum yearsum,tm.contract_term contractTerm, a.commodity_price commodityPrice ,
-    a.special_comment specialComment,a.task_comment taskComment
+    a.special_comment specialComment,a.task_comment taskComment,ttm.last_year lastYear,ttm.last_year_capital lastYearCapital,ttm.last_year_income lastYearIncome,
+    e.service_type serviceType,e.service_project serviceProject
     from t_order_task a left join t_order_new b on a.order_no =b.order_no left join department c on b.order_dep =c.id
     left join district_glossory d on c.province=d.id left join task_progress tp  on a.id=tp.task_id left join t_task_member tm on a.id=tm.tid
     left join t_order_mid e on b.order_no =e.order_no left join business_project bp on a.commodity_id =bp.id left join business_category bc on bp.cid =bc.id

+ 70 - 30
src/main/java/com/goafanti/common/mapper/TTaskMidMapper.xml

@@ -25,12 +25,16 @@
     <result column="set_up_count" jdbcType="INTEGER" property="setUpCount" />
     <result column="spot_check_count" jdbcType="INTEGER" property="spotCheckCount" />
     <result column="fail_count" jdbcType="INTEGER" property="failCount" />
+    <result column="last_year" jdbcType="VARCHAR" property="lastYear" />
+    <result column="last_year_capital" jdbcType="DECIMAL" property="lastYearCapital" />
+    <result column="last_year_income" jdbcType="DECIMAL" property="lastYearIncome" />
   </resultMap>
   <sql id="Base_Column_List">
     id, tid, cost_amount, party_amount, create_time, certificates_count, urgent_day,
     if_material, reject_count, accept_count, end_count, authorize_count, apply_count,
     high_new_retrial, dispatch_count, stock_count, complete_count, promulgate_count,
-    dispatch_province, duty_dep, set_up_count, spot_check_count, fail_count
+    dispatch_province, duty_dep, set_up_count, spot_check_count, fail_count, last_year,
+    last_year_capital, last_year_income
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
@@ -42,30 +46,29 @@
     delete from t_task_mid
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.goafanti.common.model.TTaskMid">
-    insert into t_task_mid (id, tid, cost_amount,
-      party_amount, create_time, certificates_count,
-      urgent_day, if_material, reject_count,
-      accept_count, end_count, authorize_count,
-      apply_count, high_new_retrial, dispatch_count,
-      stock_count, complete_count, promulgate_count,
-      dispatch_province, duty_dep, set_up_count,
-      spot_check_count, fail_count)
-    values (#{id,jdbcType=INTEGER}, #{tid,jdbcType=INTEGER}, #{costAmount,jdbcType=DECIMAL},
-      #{partyAmount,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}, #{certificatesCount,jdbcType=INTEGER},
-      #{urgentDay,jdbcType=INTEGER}, #{ifMaterial,jdbcType=INTEGER}, #{rejectCount,jdbcType=INTEGER},
-      #{acceptCount,jdbcType=INTEGER}, #{endCount,jdbcType=INTEGER}, #{authorizeCount,jdbcType=INTEGER},
-      #{applyCount,jdbcType=INTEGER}, #{highNewRetrial,jdbcType=INTEGER}, #{dispatchCount,jdbcType=INTEGER},
-      #{stockCount,jdbcType=INTEGER}, #{completeCount,jdbcType=INTEGER}, #{promulgateCount,jdbcType=INTEGER},
-      #{dispatchProvince,jdbcType=INTEGER}, #{dutyDep,jdbcType=VARCHAR}, #{setUpCount,jdbcType=INTEGER},
-      #{spotCheckCount,jdbcType=INTEGER}, #{failCount,jdbcType=INTEGER})
+  <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TTaskMid" useGeneratedKeys="true">
+    insert into t_task_mid (tid, cost_amount, party_amount,
+      create_time, certificates_count, urgent_day,
+      if_material, reject_count, accept_count,
+      end_count, authorize_count, apply_count,
+      high_new_retrial, dispatch_count, stock_count,
+      complete_count, promulgate_count, dispatch_province,
+      duty_dep, set_up_count, spot_check_count,
+      fail_count, last_year, last_year_capital,
+      last_year_income)
+    values (#{tid,jdbcType=INTEGER}, #{costAmount,jdbcType=DECIMAL}, #{partyAmount,jdbcType=DECIMAL},
+      #{createTime,jdbcType=TIMESTAMP}, #{certificatesCount,jdbcType=INTEGER}, #{urgentDay,jdbcType=INTEGER},
+      #{ifMaterial,jdbcType=INTEGER}, #{rejectCount,jdbcType=INTEGER}, #{acceptCount,jdbcType=INTEGER},
+      #{endCount,jdbcType=INTEGER}, #{authorizeCount,jdbcType=INTEGER}, #{applyCount,jdbcType=INTEGER},
+      #{highNewRetrial,jdbcType=INTEGER}, #{dispatchCount,jdbcType=INTEGER}, #{stockCount,jdbcType=INTEGER},
+      #{completeCount,jdbcType=INTEGER}, #{promulgateCount,jdbcType=INTEGER}, #{dispatchProvince,jdbcType=INTEGER},
+      #{dutyDep,jdbcType=VARCHAR}, #{setUpCount,jdbcType=INTEGER}, #{spotCheckCount,jdbcType=INTEGER},
+      #{failCount,jdbcType=INTEGER}, #{lastYear,jdbcType=VARCHAR}, #{lastYearCapital,jdbcType=DECIMAL},
+      #{lastYearIncome,jdbcType=DECIMAL})
   </insert>
-  <insert id="insertSelective" parameterType="com.goafanti.common.model.TTaskMid">
+  <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TTaskMid" useGeneratedKeys="true">
     insert into t_task_mid
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
       <if test="tid != null">
         tid,
       </if>
@@ -132,11 +135,17 @@
       <if test="failCount != null">
         fail_count,
       </if>
+      <if test="lastYear != null">
+        last_year,
+      </if>
+      <if test="lastYearCapital != null">
+        last_year_capital,
+      </if>
+      <if test="lastYearIncome != null">
+        last_year_income,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=INTEGER},
-      </if>
       <if test="tid != null">
         #{tid,jdbcType=INTEGER},
       </if>
@@ -203,6 +212,15 @@
       <if test="failCount != null">
         #{failCount,jdbcType=INTEGER},
       </if>
+      <if test="lastYear != null">
+        #{lastYear,jdbcType=VARCHAR},
+      </if>
+      <if test="lastYearCapital != null">
+        #{lastYearCapital,jdbcType=DECIMAL},
+      </if>
+      <if test="lastYearIncome != null">
+        #{lastYearIncome,jdbcType=DECIMAL},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TTaskMid">
@@ -274,6 +292,15 @@
       <if test="failCount != null">
         fail_count = #{failCount,jdbcType=INTEGER},
       </if>
+      <if test="lastYear != null">
+        last_year = #{lastYear,jdbcType=VARCHAR},
+      </if>
+      <if test="lastYearCapital != null">
+        last_year_capital = #{lastYearCapital,jdbcType=DECIMAL},
+      </if>
+      <if test="lastYearIncome != null">
+        last_year_income = #{lastYearIncome,jdbcType=DECIMAL},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -300,7 +327,10 @@
       duty_dep = #{dutyDep,jdbcType=VARCHAR},
       set_up_count = #{setUpCount,jdbcType=INTEGER},
       spot_check_count = #{spotCheckCount,jdbcType=INTEGER},
-      fail_count = #{failCount,jdbcType=INTEGER}
+      fail_count = #{failCount,jdbcType=INTEGER},
+      last_year = #{lastYear,jdbcType=VARCHAR},
+      last_year_capital = #{lastYearCapital,jdbcType=DECIMAL},
+      last_year_income = #{lastYearIncome,jdbcType=DECIMAL}
     where id = #{id,jdbcType=INTEGER}
   </update>
 
@@ -308,11 +338,12 @@
 
   <update id="updatePaymentAmount">
     update t_task_mid
+    set party_amount = party_amount
     <if test="type == 0">
-      set party_amount = party_amount + #{paymentAmount,jdbcType=DECIMAL}
+       + #{paymentAmount,jdbcType=DECIMAL}
     </if>
     <if test="type == 1">
-      set party_amount = party_amount - #{paymentAmount,jdbcType=DECIMAL}
+       - #{paymentAmount,jdbcType=DECIMAL}
     </if>
     where tid = #{tid,jdbcType=INTEGER}
   </update>
@@ -403,6 +434,15 @@
       <if test="failCount != null">
         fail_count = #{failCount,jdbcType=INTEGER},
       </if>
+      <if test="lastYear != null">
+        last_year = #{lastYear,jdbcType=VARCHAR},
+      </if>
+      <if test="lastYearCapital != null">
+        last_year_capital = #{lastYearCapital,jdbcType=DECIMAL},
+      </if>
+      <if test="lastYearIncome != null">
+        last_year_income = #{lastYearIncome,jdbcType=DECIMAL},
+      </if>
     </set>
     where tid = #{tid,jdbcType=INTEGER}
   </update>
@@ -439,8 +479,8 @@
   <select id="getDtails" resultType="com.goafanti.common.model.TTaskMid">
     select a.id tid,dg.id dispatchProvince,tr.department_id dutyDep
     from t_order_task a left join t_order_new b on a.order_no =b.order_no
-    left join department c on b.order_dep =c.id  left join admin tr on a.task_receiver =tr.id
-    left join district_glossory dg on c.province =dg.id
+                        left join department c on b.order_dep =c.id  left join admin tr on a.task_receiver =tr.id
+                        left join district_glossory dg on c.province =dg.id
     where a.id= #{id};
   </select>
 

+ 4 - 10
src/main/java/com/goafanti/common/mapper/UserMapper.xml

@@ -1448,11 +1448,8 @@
     <if test="name != null and name != ''">
       and a.nickname like concat('%',#{name},'%')
     </if>
-    <if test="startDate != null and startDate != ''">
-      and a.transfer_time &gt; #{startDate}
-    </if>
-    <if test="endDate != null and endDate != ''">
-      and a.transfer_time &lt; #{endDate}
+    <if test="startDate != null and endDate != null">
+      and a.transfer_time BETWEEN #{startDate} and #{endDate}
     </if>
     <if test="province != null">
       and d.location_province = #{province,jdbcType=INTEGER}
@@ -1508,11 +1505,8 @@
     <if test="name != null and name != ''">
       and a.nickname like concat('%',#{name},'%')
     </if>
-    <if test="startDate != null and startDate != ''">
-      and a.transfer_time &gt; #{startDate}
-    </if>
-    <if test="endDate != null and endDate != ''">
-      and a.transfer_time &lt; #{endDate}
+    <if test="startDate != null and endDate != null">
+      and a.transfer_time BETWEEN #{startDate} and #{endDate}
     </if>
     <if test="province != null">
       and d.location_province = #{province,jdbcType=INTEGER}

+ 44 - 4
src/main/java/com/goafanti/common/model/TChangeTask.java

@@ -6,7 +6,7 @@ import java.util.Date;
 
 /**
  * t_change_task
- * @author
+ * @author 
  */
 public class TChangeTask implements Serializable {
     /**
@@ -60,7 +60,7 @@ public class TChangeTask implements Serializable {
     private String taskComment;
 
     /**
-     * 状态 0正常 1新增 2修改 3删除
+     * 状态 0正常 1新增 2修改 3删除 
      */
     private Integer type;
 
@@ -90,7 +90,7 @@ public class TChangeTask implements Serializable {
     private Integer officialCost;
 
     /**
-     * 费减 0否 1有
+     * 费减 0否 1有 
      */
     private Integer costReduction;
 
@@ -129,6 +129,22 @@ public class TChangeTask implements Serializable {
      */
     private Integer changeSplitSuper;
 
+    /**
+     * 上年度年份
+     */
+    private String lastYear;
+
+    /**
+     * 上年度总资本
+     */
+    private BigDecimal lastYearCapital;
+
+    /**
+     * 上年度总收入
+     */
+    private BigDecimal lastYearIncome;
+
+    private static final long serialVersionUID = 1L;
 
     public Integer getId() {
         return id;
@@ -321,4 +337,28 @@ public class TChangeTask implements Serializable {
     public void setChangeSplitSuper(Integer changeSplitSuper) {
         this.changeSplitSuper = changeSplitSuper;
     }
-}
+
+    public String getLastYear() {
+        return lastYear;
+    }
+
+    public void setLastYear(String lastYear) {
+        this.lastYear = lastYear;
+    }
+
+    public BigDecimal getLastYearCapital() {
+        return lastYearCapital;
+    }
+
+    public void setLastYearCapital(BigDecimal lastYearCapital) {
+        this.lastYearCapital = lastYearCapital;
+    }
+
+    public BigDecimal getLastYearIncome() {
+        return lastYearIncome;
+    }
+
+    public void setLastYearIncome(BigDecimal lastYearIncome) {
+        this.lastYearIncome = lastYearIncome;
+    }
+}

+ 26 - 0
src/main/java/com/goafanti/common/model/TOrderMid.java

@@ -124,6 +124,16 @@ public class TOrderMid implements Serializable {
      */
     private Integer projectType;
 
+    /**
+     * 服务类型
+     */
+    private String serviceType;
+
+    /**
+     * 服务项目
+     */
+    private String serviceProject;
+
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {
@@ -309,4 +319,20 @@ public class TOrderMid implements Serializable {
     public void setProjectType(Integer projectType) {
         this.projectType = projectType;
     }
+
+    public String getServiceType() {
+        return serviceType;
+    }
+
+    public void setServiceType(String serviceType) {
+        this.serviceType = serviceType;
+    }
+
+    public String getServiceProject() {
+        return serviceProject;
+    }
+
+    public void setServiceProject(String serviceProject) {
+        this.serviceProject = serviceProject;
+    }
 }

+ 40 - 0
src/main/java/com/goafanti/common/model/TTaskMid.java

@@ -124,6 +124,21 @@ public class TTaskMid implements Serializable {
      */
     private Integer failCount;
 
+    /**
+     * 上年度年份
+     */
+    private String lastYear;
+
+    /**
+     * 上年度总资本
+     */
+    private BigDecimal lastYearCapital;
+
+    /**
+     * 上年度总收入
+     */
+    private BigDecimal lastYearIncome;
+
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {
@@ -309,6 +324,31 @@ public class TTaskMid implements Serializable {
     public void setFailCount(Integer failCount) {
         this.failCount = failCount;
     }
+
+    public String getLastYear() {
+        return lastYear;
+    }
+
+    public void setLastYear(String lastYear) {
+        this.lastYear = lastYear;
+    }
+
+    public BigDecimal getLastYearCapital() {
+        return lastYearCapital;
+    }
+
+    public void setLastYearCapital(BigDecimal lastYearCapital) {
+        this.lastYearCapital = lastYearCapital;
+    }
+
+    public BigDecimal getLastYearIncome() {
+        return lastYearIncome;
+    }
+
+    public void setLastYearIncome(BigDecimal lastYearIncome) {
+        this.lastYearIncome = lastYearIncome;
+    }
+
     public TTaskMid(Integer tid, BigDecimal costAmount) {
         this.tid = tid;
         this.costAmount = costAmount;

+ 6 - 12
src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java

@@ -3,7 +3,6 @@ package com.goafanti.customer.controller;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Type;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -43,7 +42,6 @@ import com.goafanti.common.model.OrganizationContactBook;
 import com.goafanti.common.model.User;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.customer.service.CustomerService;
-import com.goafanti.customer.service.impl.AdminOrgAnnualReportServiceImpl;
 
 @RestController
 @RequestMapping("/api/admin/customer")
@@ -643,21 +641,17 @@ public class AdminCustomerApiController extends BaseApiController{
 			}else if (check==-2){
 				res.getError().add(buildError(ErrorConstants.CUSTOM_EREXCESS,  USER_RECEIVE_MAX.toString(),USER_RECEIVE_MAX.toString()));
 				return res;
+			}else if (check==-3){
+				res.getError().add(buildError("", "私有客户已达最大限制"));
+				return res;
+			}else if (check==-4){
+				res.getError().add(buildError("", "外联客户丢失后不可再领取"));
+				return res;
 			}else {
 				res.getError().add(buildError("领取参数异常,请联系管理员"));
 				return res;
 			}
 		}
-		if (customerService.checkMax(uid,TokenManager.getAdminId())) {
-			res.getError().add(buildError("", "私有客户已达最大限制"));
-			return res;
-		}
-
-		if (customerService.checkBeforeChannel(uid)) {
-			res.getError().add(buildError("", "外联客户丢失后不可再领取"));
-			return res;
-		}
-
 		customerService.updateByOperatorType(uid, null, oldAid, AFTConstants.USER_RECEIVE, null);
 		return res;
 	}

+ 4 - 17
src/main/java/com/goafanti/customer/controller/OrganizationAnnualReportController.java

@@ -2,12 +2,9 @@ package com.goafanti.customer.controller;
 
 
 import javax.annotation.Resource;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
-import com.goafanti.admin.service.AdminService;
-import com.goafanti.admin.service.AttachmentService;
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.BaseApiController;
@@ -15,25 +12,15 @@ import com.goafanti.common.model.OrganizationAnnualReport;
 import com.goafanti.common.model.OrganizationYearProject;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.customer.service.AdminOrgAnnualReportService;
-import com.goafanti.customer.service.CustomerService;
 
 @RestController
 @RequestMapping("/api/admin/customers")
 public class OrganizationAnnualReportController extends BaseApiController{
-	@Resource
-	private CustomerService customerService;
+
 	@Resource
 	private AdminOrgAnnualReportService adminOrgAnnualReportService;
-	@Resource
-	private AttachmentService aftFileService;
-	@Value(value = "${upload.private.path}")
-	private String	uploadPrivatePath	= null;
-	@Resource
-	private AdminService adminService;
-	
-	@Value(value = "${aesSecretKey}")
-	private String							secretKey	= null;
-	
+
+
 	/**
 	 * 新增客户年报
 	 **/
@@ -129,7 +116,7 @@ public class OrganizationAnnualReportController extends BaseApiController{
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "年份"));
 			return res;
 		}
-		
+
 		res.setData(adminOrgAnnualReportService.addOrgYearProject(o));
 		return res;
 	}

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

@@ -7,7 +7,6 @@ import java.util.Set;
 
 
 import com.goafanti.customer.bo.*;
-import org.apache.poi.hssf.record.BOFRecord;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
 import com.goafanti.common.bo.userDaysBo;

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

@@ -283,7 +283,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		if (StringUtils.isNotBlank(cli.getStartDate()))
 			params.put("startDate", cli.getStartDate());
 		if (StringUtils.isNotBlank(cli.getEndDate()))
-			params.put("endDate", cli.getEndDate());
+			params.put("endDate", cli.getEndDate()+" 23:59:59");
 		if (StringUtils.isNotBlank(cli.getIndustry()))
 			params.put("industry", Integer.parseInt(cli.getIndustry()));
 		if (StringUtils.isNotBlank(cli.getAid()))
@@ -296,10 +296,6 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 			params.put("societyTag", cli.getSocietyTag());
 		if (StringUtils.isNotBlank(cli.getFollow()))
 			params.put("follow", cli.getFollow());
-		if (StringUtils.isNotBlank(cli.getStartDate()))
-			params.put("startDate", cli.getStartDate() + " 00:00:00");
-		if (StringUtils.isNotBlank(cli.getEndDate()))
-			params.put("endDate", cli.getEndDate() + " 23:59:59");
 		if (null != cli.getDataGrade())
 			params.put("dataGrade", cli.getDataGrade());
 		if (null != cli.getLevel())
@@ -1285,8 +1281,11 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 			User u=userMapper.selectByPrimaryKey(uid);
 			if (u.getShareType()!=1)return -1;
 			if (u.getNewChannel()==1)return 0;
+
 		}
 		if (userMapper.UserReceiveCount(TokenManager.getAdminId()) >= USER_RECEIVE_MAX)return  -2;
+		if(checkMax(uid,TokenManager.getAdminId()))return -3;
+		if(checkBeforeChannel(uid)) return -4;
 		return 0;
 	}
 
@@ -2169,6 +2168,9 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 
 	@Override
 	public boolean checkMax(String uid,String aid) {
+		if (TokenManager.hasRole(AFTConstants.CUSTOMER_SERVICE_SALESMAN)){
+			return false;
+		}
 		boolean isUs = false;
 		if (uid !=null &&uid.contains(",")) {
 			isUs = true;
@@ -2190,6 +2192,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 				return false;
 			}
 		}
+
 		List<String > roles=adminMapper.getAdminRoleListByAid(aid);
 		for (String role : roles) {
 			if (role.equals(AFTConstants.SALESMAN_DIRECTOR)){

+ 20 - 27
src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java

@@ -111,11 +111,11 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 	@Autowired
 	private UserInterestMapper	userInterestMapper;
 	@Autowired
-	ProjectInterestMapper	projectInterestMapper; 
+	ProjectInterestMapper	projectInterestMapper;
 	@Autowired
 	AsyncUtils	asyncUtils;
-	
-	
+
+
 	DemandFollowDetailMapper	demandFollowDetailMapper;
 
 	@SuppressWarnings("unchecked")
@@ -142,10 +142,10 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		 * if (TokenManager.hasRole(AFTConstants.SALESMANAGERADMIN) ||
 		 * TokenManager.hasRole(AFTConstants.SALESMANADMIN)) {
 		 * params.put("principal", TokenManager.getAdminId()); }
-		 * 
+		 *
 		 * if (TokenManager.hasRole(AFTConstants.MANAGERADMIN)) {
 		 * params.put("mid", TokenManager.getAdminId()); }
-		 * 
+		 *
 		 * if (TokenManager.hasRole(AFTConstants.TECHBROKER)) {
 		 * params.put("techBroker", TokenManager.getAdminId()); }
 		 */
@@ -177,23 +177,20 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		Map<String, Object> params = disposeParams(auditStatus, province, serialNumber, name, keyword, infoSources,
 				demandType, validityPeriodStartDate, validityPeriodEndDate, username, status, releaseStatus,
 				releaseDateStartDate, releaseDateEndDate, createDateStartDate,  createDateEndDate, boutique, hot);
-		
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
 		}
-
 		if (pSize == null || pSize < 0 || pSize > 10) {
 			pSize = 10;
 		}
-
 		/*if (TokenManager.hasRole(AFTConstants.SALESMANAGERADMIN) || TokenManager.hasRole(AFTConstants.SALESMANADMIN)) {
 			params.put("principal", TokenManager.getAdminId());
 		}
-		
+
 		if (TokenManager.hasRole(AFTConstants.MANAGERADMIN)) {
 			params.put("mid", TokenManager.getAdminId());
 		}
-		
+
 		if (TokenManager.hasRole(AFTConstants.TECHBROKER)) {
 			params.put("techBroker", TokenManager.getAdminId());
 		}*/
@@ -203,19 +200,15 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		if (null!=recordPerson) {
 			params.put("recordPerson",  recordPerson);
 		}
-
 		/*if (!TokenManager.hasRole(AFTConstants.SUPERADMIN) && !TokenManager.hasRole(AFTConstants.AUDITORADMIN)) {
 			params.put("adminId", TokenManager.getAdminId());
 		}*/
-
 		if (StringUtils.isNotBlank(employerName)) {
 			params.put("employerName", employerName);
 		}
-
 		if (StringUtils.isNotBlank(username)) {
 			params.put("unitName", username);
 		}
-
 		return (Pagination<DemandManageListBo>) findPage("findManageOrgDemandListByPage", "findManageOrgDemandCount",
 				params, pNo, pSize);
 	}
@@ -305,7 +298,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 
 	@Override
 	public DemandManageDetailBo selectOrgDemandDetail(String id) {
-		
+
 		return demandMapper.selectOrgDemandDetail(id);
 	}
 
@@ -324,7 +317,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 				releaseDateEndDate, createDateStartDate, createDateEndDate, null, null);
 
 		params.put("employerId", TokenManager.getUserId());
-		
+
 		if (pNo == null || pNo < 0) {
 			pNo = 1;
 		}
@@ -807,7 +800,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 	@Override
 	public DemandListBo selectDemandDetail(String id ) {
 		DemandListBo d=demandMapper.selectAppByPrimaryKey(id);
-		
+
 		if (null!=d.getIndustryCategoryA()) {
 			d.setIndustryCategory1(fieldGlossoryMapper.selectByPrimaryKey(d.getIndustryCategoryA()).getName());
 		}
@@ -868,7 +861,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 
 		if (pSize == null || pSize < 0) {
 			pSize = 10;
-			
+
 		}
 		Pagination<DemandSearchListBo> p=(Pagination<DemandSearchListBo>) findPage("findAppDemandListByPage", "findAppDemandCount", params, pNo, pSize);
 		return p;
@@ -934,7 +927,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 			List<ObjectInterestListBo> l=(List<ObjectInterestListBo>) p.getList();
 			for (ObjectInterestListBo o : l) {
 				int i=projectInterestMapper.countInterest(o.getId());
-				o.setCountInterest(String.valueOf(i));	
+				o.setCountInterest(String.valueOf(i));
 				o.setType(type);
 			}
 			return p;
@@ -988,13 +981,13 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 			if (StringUtils.isNotBlank(u.getId())) {
 				d.setEmployerId(u.getId());
 			}
-			
+
 			if (StringUtils.isNotBlank(u.getMobile())) {
 				d.setEmployerContactsMobile(u.getMobile());
 			}
 		}
 		d.setValidityPeriod(validityPeriod);
-		
+
 		d.setId(UUID.randomUUID().toString());
 		d.setTechBrokerId(TokenManager.getAdminId());
 
@@ -1056,8 +1049,8 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		return (Pagination<DemandManageListBo>) findPage("findMyDemandListByPage", "findMyDemandCount",
 				params, pNo, pSize);
 	}
-	
-	
+
+
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<DemandManageListBo> selectManageDemandManageList(Integer dataCategory,String employerName, Integer auditStatus,
@@ -1078,7 +1071,7 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		}
 		if (null != dataCategory) {
 			params.put("dataCategory", dataCategory);
-		} 
+		}
 		if (null != recordPerson) {
 			params.put("recordPerson", recordPerson);
 		}
@@ -1105,6 +1098,6 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 	public Demand DemandFollowDetails(String id) {
 		return demandMapper.selectDemandFollow(id);
 	}
-		
-	
-}
+
+
+}

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

@@ -2,11 +2,40 @@ package com.goafanti.order.bo;
 
 import com.goafanti.common.model.TOrderTask;
 
+import java.math.BigDecimal;
+
 public class InputAddTask  extends TOrderTask {
     private String serviceLife;
     private String serviceYear;
     private Integer yearSum;
     private String contractTerm;
+    private String lastYear;
+    private BigDecimal lastYearCapital;
+    private BigDecimal lastYearIncome;
+
+    public String getLastYear() {
+        return lastYear;
+    }
+
+    public void setLastYear(String lastYear) {
+        this.lastYear = lastYear;
+    }
+
+    public BigDecimal getLastYearCapital() {
+        return lastYearCapital;
+    }
+
+    public void setLastYearCapital(BigDecimal lastYearCapital) {
+        this.lastYearCapital = lastYearCapital;
+    }
+
+    public BigDecimal getLastYearIncome() {
+        return lastYearIncome;
+    }
+
+    public void setLastYearIncome(BigDecimal lastYearIncome) {
+        this.lastYearIncome = lastYearIncome;
+    }
 
     public String getContractTerm() {
         return contractTerm;

+ 1 - 6
src/main/java/com/goafanti/order/bo/InputProjectStatistics.java

@@ -17,7 +17,7 @@ public class InputProjectStatistics {
 	private Integer pageNo;
 	private Integer pageSize;
 
-	/** 双软=2,软著=3,专利=4,高新=1,其他=0 */
+	// 0通用 1高新 2双软 3软著 4专利 5会员 6审计
 	private Integer status;
 	private String depName;
 	private String thchDepName;
@@ -178,9 +178,4 @@ public class InputProjectStatistics {
 		this.screen = screen;
 	}
 
-
-
-
-
-
 }

+ 47 - 0
src/main/java/com/goafanti/order/bo/OutProjectStatistics.java

@@ -60,6 +60,8 @@ public class OutProjectStatistics {
 	private String	specialComment;
 
 	private String orderRemarks;
+	private String serviceType;
+	private String serviceProject;
 
 	//会员
 	private String serviceLife;
@@ -67,6 +69,51 @@ public class OutProjectStatistics {
 	private Integer yearSum;
 	private String contractTerm;
 
+	//审计
+	private String lastYear;
+	private BigDecimal lastYearCapital;
+	private BigDecimal lastYearIncome;
+
+	public String getServiceType() {
+		return serviceType;
+	}
+
+	public void setServiceType(String serviceType) {
+		this.serviceType = serviceType;
+	}
+
+	public String getServiceProject() {
+		return serviceProject;
+	}
+
+	public void setServiceProject(String serviceProject) {
+		this.serviceProject = serviceProject;
+	}
+
+	public String getLastYear() {
+		return lastYear;
+	}
+
+	public void setLastYear(String lastYear) {
+		this.lastYear = lastYear;
+	}
+
+	public BigDecimal getLastYearCapital() {
+		return lastYearCapital;
+	}
+
+	public void setLastYearCapital(BigDecimal lastYearCapital) {
+		this.lastYearCapital = lastYearCapital;
+	}
+
+	public BigDecimal getLastYearIncome() {
+		return lastYearIncome;
+	}
+
+	public void setLastYearIncome(BigDecimal lastYearIncome) {
+		this.lastYearIncome = lastYearIncome;
+	}
+
 	public String getServiceLife() {
 		return serviceLife;
 	}

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

@@ -50,6 +50,34 @@ public class TOrderTaskBo extends TOrderTask{
 	private String contractTerm;
 	private Integer	yearSum;
 
+	private String lastYear;
+	private BigDecimal lastYearCapital;
+	private BigDecimal lastYearIncome;
+
+	public String getLastYear() {
+		return lastYear;
+	}
+
+	public void setLastYear(String lastYear) {
+		this.lastYear = lastYear;
+	}
+
+	public BigDecimal getLastYearCapital() {
+		return lastYearCapital;
+	}
+
+	public void setLastYearCapital(BigDecimal lastYearCapital) {
+		this.lastYearCapital = lastYearCapital;
+	}
+
+	public BigDecimal getLastYearIncome() {
+		return lastYearIncome;
+	}
+
+	public void setLastYearIncome(BigDecimal lastYearIncome) {
+		this.lastYearIncome = lastYearIncome;
+	}
+
 	private List<TOrderTaskListBo> splitList;
 
 

+ 353 - 0
src/main/java/com/goafanti/order/bo/outStatistics/OutProjectStatisticsAudit.java

@@ -0,0 +1,353 @@
+package com.goafanti.order.bo.outStatistics;
+
+import com.goafanti.common.utils.excel.Excel;
+import com.goafanti.order.bo.OutProjectStatistics;
+
+import java.math.BigDecimal;
+
+public class OutProjectStatisticsAudit extends OutProjectStatistics {
+    private Integer id;
+    @Excel(name = "派单时间")
+    private String distributionTime;
+    @Excel(name = "派单省份")
+    private String province;
+    @Excel(name = "订单部门")
+    private String depName;
+    @Excel(name = "营销员")
+    private String salesmanName;
+    @Excel(name = "合同编号")
+    private String contractNo;
+    @Excel(name = "订单编号")
+    private String orderNo;
+    @Excel(name = "客户名称")
+    private String  userName;
+    @Excel(name = "项目类型")
+    private String cname;
+    @Excel(name = "项目名称")
+    private String  pname;
+    @Excel(name = "数量")
+    private Integer  commodityQuantity;
+    @Excel(name = "服务类型")
+    private String serviceType;
+    @Excel(name = "服务项目")
+    private String serviceProject;
+    @Excel(name = "上年度年份")
+    private String lastYear;
+    @Excel(name = "上年度总资产(万元)")
+    private BigDecimal lastYearCapital;
+    @Excel(name = "上年度总收入(万元)")
+    private BigDecimal lastYearIncome;
+    @Excel(name = "负责部门")
+    private String techDepName;
+    @Excel(name = "咨询师/咨询师经理")
+    private String techName;
+    @Excel(name = "项目状态" ,enumsName = "com.goafanti.order.enums.NewProjectStatus")
+    private Integer projectStatus;
+    @Excel(name = "项目金额",scale = 6)
+    private BigDecimal  commodityPrice;
+    @Excel(name = "特别说明")
+    private String	specialComment;
+    @Excel(name = "项目说明")
+    private String	taskComment;
+    @Excel(name = "订单说明")
+    private String orderRemarks;
+
+    private Integer  setUpStatus;
+    private String setUpTime;
+    private Integer  spotCheckStatus;
+    private String  contactMobile;
+    private String  legalPersonTel;
+    private String  certificateNumber;
+    private String  declarationBatch;
+    private String	licenceTime;
+    private Integer	ifMaterial;
+    private Integer	urgentDay;
+    private BigDecimal	costAmount;
+    private BigDecimal	profit;
+    private Integer  highTechstatus;
+    private Integer	rejectCount;
+    private String	patentNo;
+    private String	patentName;
+    private String	acceptTime;
+
+
+
+    private Integer	certificatesCount;
+
+
+    @Override
+    public String getServiceType() {
+        return serviceType;
+    }
+
+    @Override
+    public void setServiceType(String serviceType) {
+        this.serviceType = serviceType;
+    }
+
+    @Override
+    public String getServiceProject() {
+        return serviceProject;
+    }
+
+    @Override
+    public void setServiceProject(String serviceProject) {
+        this.serviceProject = serviceProject;
+    }
+
+    @Override
+    public String getLastYear() {
+        return lastYear;
+    }
+
+    @Override
+    public void setLastYear(String lastYear) {
+        this.lastYear = lastYear;
+    }
+
+    @Override
+    public BigDecimal getLastYearCapital() {
+        return lastYearCapital;
+    }
+
+    @Override
+    public void setLastYearCapital(BigDecimal lastYearCapital) {
+        this.lastYearCapital = lastYearCapital;
+    }
+
+    @Override
+    public BigDecimal getLastYearIncome() {
+        return lastYearIncome;
+    }
+
+    @Override
+    public void setLastYearIncome(BigDecimal lastYearIncome) {
+        this.lastYearIncome = lastYearIncome;
+    }
+
+    public String getOrderRemarks() {
+        return orderRemarks;
+    }
+
+    public void setOrderRemarks(String orderRemarks) {
+        this.orderRemarks = orderRemarks;
+    }
+
+    public Integer getSetUpStatus() {
+        return setUpStatus;
+    }
+    public void setSetUpStatus(Integer setUpStatus) {
+        this.setUpStatus = setUpStatus;
+    }
+    public String getSetUpTime() {
+        return setUpTime;
+    }
+    public void setSetUpTime(String setUpTime) {
+        this.setUpTime = setUpTime;
+    }
+    public Integer getSpotCheckStatus() {
+        return spotCheckStatus;
+    }
+    public void setSpotCheckStatus(Integer spotCheckStatus) {
+        this.spotCheckStatus = spotCheckStatus;
+    }
+    public String getContactMobile() {
+        return contactMobile;
+    }
+    public void setContactMobile(String contactMobile) {
+        this.contactMobile = contactMobile;
+    }
+    public String getLegalPersonTel() {
+        return legalPersonTel;
+    }
+    public void setLegalPersonTel(String legalPersonTel) {
+        this.legalPersonTel = legalPersonTel;
+    }
+    public String getCertificateNumber() {
+        return certificateNumber;
+    }
+    public void setCertificateNumber(String certificateNumber) {
+        this.certificateNumber = certificateNumber;
+    }
+    public String getDeclarationBatch() {
+        return declarationBatch;
+    }
+    public void setDeclarationBatch(String declarationBatch) {
+        this.declarationBatch = declarationBatch;
+    }
+    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 getDistributionTime() {
+        return distributionTime;
+    }
+    public void setDistributionTime(String distributionTime) {
+        this.distributionTime = distributionTime;
+    }
+    public String getProvince() {
+        return province;
+    }
+    public void setProvince(String province) {
+        this.province = province;
+    }
+    public String getDepName() {
+        return depName;
+    }
+    public void setDepName(String depName) {
+        this.depName = depName;
+    }
+    public String getSalesmanName() {
+        return salesmanName;
+    }
+    public void setSalesmanName(String salesmanName) {
+        this.salesmanName = salesmanName;
+    }
+    public String getContractNo() {
+        return contractNo;
+    }
+    public void setContractNo(String contractNo) {
+        this.contractNo = contractNo;
+    }
+    public String getOrderNo() {
+        return orderNo;
+    }
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+    public String getUserName() {
+        return userName;
+    }
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+    public String getCname() {
+        return cname;
+    }
+    public void setCname(String cname) {
+        this.cname = cname;
+    }
+    public String getPname() {
+        return pname;
+    }
+    public void setPname(String pname) {
+        this.pname = pname;
+    }
+    public String getTechName() {
+        return techName;
+    }
+    public void setTechName(String techName) {
+        this.techName = techName;
+    }
+    public String getTechDepName() {
+        return techDepName;
+    }
+    public void setTechDepName(String techDepName) {
+        this.techDepName = techDepName;
+    }
+    public Integer getProjectStatus() {
+        return projectStatus;
+    }
+    public void setProjectStatus(Integer projectStatus) {
+        this.projectStatus = projectStatus;
+    }
+    public String getLicenceTime() {
+        return licenceTime;
+    }
+    public void setLicenceTime(String licenceTime) {
+        this.licenceTime = licenceTime;
+    }
+    public String getTaskComment() {
+        return taskComment;
+    }
+    public void setTaskComment(String taskComment) {
+        this.taskComment = taskComment;
+    }
+    public Integer getCertificatesCount() {
+        return certificatesCount;
+    }
+    public void setCertificatesCount(Integer certificatesCount) {
+        this.certificatesCount = certificatesCount;
+    }
+    public Integer getUrgentDay() {
+        return urgentDay;
+    }
+    public void setUrgentDay(Integer urgentDay) {
+        this.urgentDay = urgentDay;
+    }
+    public Integer getIfMaterial() {
+        return ifMaterial;
+    }
+    public void setIfMaterial(Integer ifMaterial) {
+        this.ifMaterial = ifMaterial;
+    }
+    public BigDecimal getCostAmount() {
+        return costAmount;
+    }
+    public void setCostAmount(BigDecimal costAmount) {
+        this.costAmount = costAmount;
+    }
+    public BigDecimal getProfit() {
+        if (profit==null&&commodityPrice!=null&&costAmount!=null) {
+            return  commodityPrice.subtract(costAmount);
+        }
+        return profit;
+    }
+    public void setProfit(BigDecimal profit) {
+        this.profit = profit;
+    }
+    public Integer getRejectCount() {
+        return rejectCount;
+    }
+    public void setRejectCount(Integer rejectCount) {
+        this.rejectCount = rejectCount;
+    }
+    public String getPatentName() {
+        return patentName;
+    }
+    public void setPatentName(String patentName) {
+        this.patentName = patentName;
+    }
+    public String getAcceptTime() {
+        return acceptTime;
+    }
+    public void setAcceptTime(String acceptTime) {
+        this.acceptTime = acceptTime;
+    }
+    public Integer getHighTechstatus() {
+        return highTechstatus;
+    }
+    public void setHighTechstatus(Integer highTechstatus) {
+        this.highTechstatus = highTechstatus;
+    }
+    public Integer getId() {
+        return id;
+    }
+    public void setId(Integer id) {
+        this.id = id;
+    }
+    public String getSpecialComment() {
+        return specialComment;
+    }
+    public void setSpecialComment(String specialComment) {
+        this.specialComment = specialComment;
+    }
+    public String getPatentNo() {
+        return patentNo;
+    }
+    public void setPatentNo(String patentNo) {
+        this.patentNo = patentNo;
+    }
+
+}

+ 26 - 0
src/main/java/com/goafanti/order/bo/outStatistics/OutProjectStatisticsCommon.java

@@ -27,6 +27,10 @@ public class OutProjectStatisticsCommon extends OutProjectStatistics {
     private String  pname;
     @Excel(name = "数量")
     private Integer  commodityQuantity;
+    @Excel(name = "服务类型")
+    private String serviceType;
+    @Excel(name = "服务项目")
+    private String serviceProject;
     @Excel(name = "负责部门")
     private String techDepName;
     @Excel(name = "咨询师/咨询师经理")
@@ -65,6 +69,28 @@ public class OutProjectStatisticsCommon extends OutProjectStatistics {
     private Integer	certificatesCount;
 
 
+    @Override
+    public String getServiceType() {
+        return serviceType;
+    }
+
+    @Override
+    public void setServiceType(String serviceType) {
+        this.serviceType = serviceType;
+    }
+
+    @Override
+    public String getServiceProject() {
+        return serviceProject;
+    }
+
+    @Override
+    public void setServiceProject(String serviceProject) {
+        this.serviceProject = serviceProject;
+    }
+
+
+
     public String getOrderRemarks() {
         return orderRemarks;
     }

+ 23 - 0
src/main/java/com/goafanti/order/bo/outStatistics/OutProjectStatisticsDoubleSoft.java

@@ -27,6 +27,10 @@ public class OutProjectStatisticsDoubleSoft extends OutProjectStatistics {
     private String  pname;
     @Excel(name = "数量")
     private Integer  commodityQuantity;
+    @Excel(name = "服务类型")
+    private String serviceType;
+    @Excel(name = "服务项目")
+    private String serviceProject;
     @Excel(name = "负责部门")
     private String techDepName;
     @Excel(name = "咨询师/咨询师经理")
@@ -67,6 +71,25 @@ public class OutProjectStatisticsDoubleSoft extends OutProjectStatistics {
 
     private Integer	certificatesCount;
 
+    @Override
+    public String getServiceType() {
+        return serviceType;
+    }
+
+    @Override
+    public void setServiceType(String serviceType) {
+        this.serviceType = serviceType;
+    }
+
+    @Override
+    public String getServiceProject() {
+        return serviceProject;
+    }
+
+    @Override
+    public void setServiceProject(String serviceProject) {
+        this.serviceProject = serviceProject;
+    }
 
     public String getOrderRemarks() {
         return orderRemarks;

+ 24 - 0
src/main/java/com/goafanti/order/bo/outStatistics/OutProjectStatisticsHighTech.java

@@ -27,6 +27,10 @@ public class OutProjectStatisticsHighTech extends OutProjectStatistics {
     private String  pname;
     @Excel(name = "数量")
     private Integer  commodityQuantity;
+    @Excel(name = "服务类型")
+    private String serviceType;
+    @Excel(name = "服务项目")
+    private String serviceProject;
     @Excel(name = "负责部门")
     private String techDepName;
     @Excel(name = "咨询师/咨询师经理")
@@ -78,6 +82,26 @@ public class OutProjectStatisticsHighTech extends OutProjectStatistics {
     private Integer	certificatesCount;
 
     @Override
+    public String getServiceType() {
+        return serviceType;
+    }
+
+    @Override
+    public void setServiceType(String serviceType) {
+        this.serviceType = serviceType;
+    }
+
+    @Override
+    public String getServiceProject() {
+        return serviceProject;
+    }
+
+    @Override
+    public void setServiceProject(String serviceProject) {
+        this.serviceProject = serviceProject;
+    }
+
+    @Override
     public String getServiceYear() {
         return serviceYear;
     }

+ 24 - 0
src/main/java/com/goafanti/order/bo/outStatistics/OutProjectStatisticsMember.java

@@ -27,6 +27,10 @@ public class OutProjectStatisticsMember extends OutProjectStatistics {
     private String  pname;
     @Excel(name = "数量")
     private Integer  commodityQuantity;
+    @Excel(name = "服务类型")
+    private String serviceType;
+    @Excel(name = "服务项目")
+    private String serviceProject;
     @Excel(name = "负责部门")
     private String techDepName;
     @Excel(name = "咨询师/咨询师经理")
@@ -73,6 +77,26 @@ public class OutProjectStatisticsMember extends OutProjectStatistics {
     private String contractTerm;
 
     @Override
+    public String getServiceType() {
+        return serviceType;
+    }
+
+    @Override
+    public void setServiceType(String serviceType) {
+        this.serviceType = serviceType;
+    }
+
+    @Override
+    public String getServiceProject() {
+        return serviceProject;
+    }
+
+    @Override
+    public void setServiceProject(String serviceProject) {
+        this.serviceProject = serviceProject;
+    }
+
+    @Override
     public String getServiceLife() {
         return serviceLife;
     }

+ 24 - 0
src/main/java/com/goafanti/order/bo/outStatistics/OutProjectStatisticsPatent.java

@@ -27,6 +27,10 @@ public class OutProjectStatisticsPatent extends OutProjectStatistics {
     private String  pname;
     @Excel(name = "数量")
     private Integer  commodityQuantity;
+    @Excel(name = "服务类型")
+    private String serviceType;
+    @Excel(name = "服务项目")
+    private String serviceProject;
     @Excel(name = "负责部门")
     private String techDepName;
     @Excel(name = "咨询师/咨询师经理")
@@ -71,6 +75,26 @@ public class OutProjectStatisticsPatent extends OutProjectStatistics {
     private Integer	urgentDay;
     private Integer	certificatesCount;
 
+    @Override
+    public String getServiceType() {
+        return serviceType;
+    }
+
+    @Override
+    public void setServiceType(String serviceType) {
+        this.serviceType = serviceType;
+    }
+
+    @Override
+    public String getServiceProject() {
+        return serviceProject;
+    }
+
+    @Override
+    public void setServiceProject(String serviceProject) {
+        this.serviceProject = serviceProject;
+    }
+
     public String getQuantityAndcount() {
         return quantityAndcount;
     }

+ 23 - 0
src/main/java/com/goafanti/order/bo/outStatistics/OutProjectStatisticsSoftwareWorks.java

@@ -27,6 +27,10 @@ public class OutProjectStatisticsSoftwareWorks extends OutProjectStatistics {
     private String  pname;
     @Excel(name = "数量")
     private Integer  commodityQuantity;
+    @Excel(name = "服务类型")
+    private String serviceType;
+    @Excel(name = "服务项目")
+    private String serviceProject;
     @Excel(name = "负责部门")
     private String techDepName;
     @Excel(name = "咨询师/咨询师经理")
@@ -69,6 +73,25 @@ public class OutProjectStatisticsSoftwareWorks extends OutProjectStatistics {
     private String	acceptTime;
     private Integer	certificatesCount;
 
+    @Override
+    public String getServiceType() {
+        return serviceType;
+    }
+
+    @Override
+    public void setServiceType(String serviceType) {
+        this.serviceType = serviceType;
+    }
+
+    @Override
+    public String getServiceProject() {
+        return serviceProject;
+    }
+
+    @Override
+    public void setServiceProject(String serviceProject) {
+        this.serviceProject = serviceProject;
+    }
 
     public String getOrderRemarks() {
         return orderRemarks;

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

@@ -93,7 +93,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		return res;
 	}
 	/**
-	 * 添加项目
+	 * 添加项目、新增项目
 	 */
 	@RequestMapping(value = "/addOrderTask",method = RequestMethod.POST)
 	public Result addOrderTask(InputAddTask in){

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

@@ -213,7 +213,5 @@ public interface OrderNewService {
 
 	int updateSalesType(TOrderNew in);
 
-
-	int addTaskMid(Integer id,String commodityId, String orderNo);
-
+	void addTaskMid(Integer id, String commodityId, String orderNo);
 }

+ 31 - 7
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -296,7 +296,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 						nb.setProcessState(nb.getProcessState()+1);
 					}else if (nb.getProcessState()==6){
 						TOrderNew tOrderNew = tOrderNewMapper.selectByPrimaryKey(nb.getOrderNo());
-						if (tOrderNew.getSalesmanId().equals("734092ad-6564-4021-b7ab-aab5af3a1537")){
+						if (tOrderNew.getSalesmanId().equals(AFTConstants.CAOJIN_AID)){
 							nb.setProcessState(8);
 						} else{
 							nb.setProcessState(7);
@@ -762,6 +762,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		//如果合同不是空,则修改合同
 		if (nob.getContractPictureUrl()!=null)o.setContractPictureUrl(nob.getContractPictureUrl());
 		tOrderNewMapper.updateByPrimaryKeySelective(o);
+		tOrderMidMapper.updateCountProjectAndType(o.getOrderNo());
 		return o;
 	}
 
@@ -769,10 +770,9 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 
 	private void pushTaskAndDun(Integer id,TOrderNew o) {
 		List<TChangeTaskOut> listct=tChangeTaskMapper.selectByCid(id,3);
-		HashMap<Integer, Integer> map=changeAddOrderTask(listct,0,null);
+		HashMap<Integer, Integer> map=changeAddOrderTask(listct,null);
 		List<TChangeTaskOut> listct2=tChangeTaskMapper.selectByCid(id,2);
-		changeAddOrderTask(listct2,1 ,map);
-
+		changeAddOrderTask(listct2,map);
 		List<TChangeDunOut> listcd=tChangeDunMapper.selectByCid(id);
 		for (TChangeDunOut cd : listcd) {
 			NewOrderDun nd=new NewOrderDun();
@@ -806,10 +806,10 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 
 	/**
 	 *
-	 * @param listct 数据
-	 * @param type 0普通数据处理 1子集数据处理
+	 * @param listct 变更数据
+	 * @param input  新增数据Id
 	 */
-	private HashMap<Integer, Integer> changeAddOrderTask(List<TChangeTaskOut> listct, Integer type,HashMap<Integer, Integer> input) {
+	private HashMap<Integer, Integer> changeAddOrderTask(List<TChangeTaskOut> listct, HashMap<Integer, Integer> input) {
 		HashMap<Integer, Integer> map = new HashMap<>();
 		for (TChangeTaskOut cd : listct) {
 			TOrderTask ot=new TOrderTask();
@@ -847,6 +847,9 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				if (cd.getServiceLife()!=null){
 					addTaskMember(ot.getId(),cd.getServiceLife(),cd.getServiceYear(),cd.getYearSum(),cd.getContractTerm());
 				}
+				if (cd.getLastYear()!=null){
+					addTaskMid(ot.getId(),cd.getLastYear(),cd.getLastYearCapital(),cd.getLastYearIncome());
+				}
 				cd.setTid(ot.getId());
 				tChangeTaskMapper.updateByPrimaryKeySelective(cd);
 				tChangeDunMapper.updateByCTid(cd.getId(), ot.getId());
@@ -860,6 +863,9 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				if (cd.getServiceLife()!=null){
 					updateTaskMember(ot.getId(),cd.getServiceLife(),cd.getServiceYear(),cd.getYearSum(),cd.getContractTerm());
 				}
+				if (cd.getLastYear()!=null){
+					updateTaskMid(ot.getId(),cd.getLastYear(),cd.getLastYearCapital(),cd.getLastYearIncome());
+				}
 			}else if(cd.getType()==3) {
 				tOrderTaskMapper.deleteByPrimaryKey(cd.getTid());
 			}
@@ -867,6 +873,24 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		return map;
 	}
 
+	private void updateTaskMid(Integer id, String lastYear, BigDecimal lastYearCapital, BigDecimal lastYearIncome) {
+		TTaskMid tTaskMid = new TTaskMid();
+		tTaskMid.setTid(id);
+		tTaskMid.setLastYear(lastYear);
+		tTaskMid.setLastYearCapital(lastYearCapital);
+		tTaskMid.setLastYearIncome(lastYearIncome);
+		tTaskMidMapper.updateByTid(tTaskMid);
+	}
+
+	private void addTaskMid(Integer id, String lastYear, BigDecimal lastYearCapital, BigDecimal lastYearIncome) {
+		TTaskMid tTaskMid = new TTaskMid();
+		tTaskMid.setTid(id);
+		tTaskMid.setLastYear(lastYear);
+		tTaskMid.setLastYearCapital(lastYearCapital);
+		tTaskMid.setLastYearIncome(lastYearIncome);
+		tTaskMidMapper.insertSelective(tTaskMid);
+	}
+
 	private void updateTaskMember(Integer id, String serviceLife, String serviceYear, Integer yearSum,String contractTerm) {
 		TTaskMember ttm=new TTaskMember();
 		ttm.setTid(id);

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

@@ -195,7 +195,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		if(t.getCommodityPrice()!=null) {
 			order.setTotalAmount(order.getTotalAmount());
 		}
-		addTTaskMember(t, order);
+		addTTaskMember(t);
+		addTaskMid(t);
 		//如果是会员添加同性质不同项目
 		BusinessProject bp=businessProjectMapper.selectByPrimaryKey(t.getCommodityId());
 		if (bp.getType()==ProjectType.HY.getCode()){
@@ -218,12 +219,13 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			t2.setMain(0);
 			t2.setCommodityPrice(new BigDecimal(0));
 			t2.setId(null);
-			addTTaskMember(t2, order);
+			addTTaskMember(t2);
+			addTaskMid(t2);
 		}
 		return t;
 	}
 
-	private void addTTaskMember(InputAddTask t, TOrderNew order) {
+	private void addTTaskMember(InputAddTask t) {
 		String str=tOrderTaskMapper.selectByidGetCname(t.getCommodityId());
 		t.setCname(str);
 		tOrderTaskMapper.insertSelective(t);
@@ -236,34 +238,45 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			if(t.getContractTerm()!=null)ttm.setContractTerm(t.getContractTerm());
 			tTaskMemberMapper.insertSelective(ttm);
 		}
-		addTaskMid(t.getId(), t.getCommodityId(), order.getOrderNo());
 	}
 
 	@Override
-	public int addTaskMid(Integer id,String commodityId, String orderNo) {
+	public void addTaskMid(Integer id, String commodityId, String orderNo) {
+		InputAddTask t = new InputAddTask();
+		t.setId(id);
+		t.setCommodityId(commodityId);
+		t.setOrderNo(orderNo);
+		addTaskMid( t);
+	}
+
+
+	public int addTaskMid(InputAddTask t) {
 		TTaskMid tm=new TTaskMid();
-		tm.setTid(id);
+		tm.setTid(t.getId());
 		//判断这个项目是不是高新复审
 		int highNewRetrial=0;
-		BusinessProject b=businessProjectMapper.selectByPrimaryKey(commodityId);
+		BusinessProject b=businessProjectMapper.selectByPrimaryKey(t.getCommodityId());
 		if (b.getType()==5){
-			int i=tOrderTaskMapper.getHighNewRetrial(orderNo);
+			int i=tOrderTaskMapper.getHighNewRetrial(t.getOrderNo());
 			if (i>0) {
 				highNewRetrial =1;
 			}
 			BusinessCategory bc =businessCategoryMapper.selectByPrimaryKey(b.getCid());
 			if (bc !=null && bc.getSort().equals(6)){
 				TOrderMid tom=new TOrderMid();
-				tom.setOrderNo(orderNo);
+				tom.setOrderNo(t.getOrderNo());
 				tom.setProjectType(1);
 				tOrderMidMapper.updateByOrderNo(tom);
 			}
 		}
 		tm.setHighNewRetrial(highNewRetrial);
-		TTaskMid dtails = tTaskMidMapper.getDtails(id);
-		TTaskMid tTaskMid = new TTaskMid(id, new BigDecimal(0));
-		tTaskMid.setDispatchProvince(dtails.getDispatchProvince());
-		tTaskMid.setDutyDep(dtails.getDutyDep());
+		tm.setLastYear(t.getLastYear());
+		tm.setLastYearCapital(t.getLastYearCapital());
+		tm.setLastYearIncome(t.getLastYearIncome());
+		//获取派单省份与部门
+		TTaskMid dtails = tTaskMidMapper.getDtails(t.getId());
+		tm.setDispatchProvince(dtails.getDispatchProvince());
+		tm.setDutyDep(dtails.getDutyDep());
 		return tTaskMidMapper.insertSelective(tm);
 	}
 
@@ -357,6 +370,14 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				tTaskMemberMapper.updateSplitSuper(use.getId(),t.getServiceLife(),t.getServiceYear(),t.getYearSum(),t.getContractTerm());
 			}
 		}
+		if (t.getLastYear()!=null||t.getLastYearIncome()!=null||t.getLastYearCapital()!=null){
+			TTaskMid tTaskMid = new TTaskMid();
+			tTaskMid.setTid(t.getId());
+			tTaskMid.setLastYear(t.getLastYear());
+			tTaskMid.setLastYearIncome(t.getLastYearIncome());
+			tTaskMid.setLastYearCapital(t.getLastYearCapital());
+			tTaskMidMapper.updateByTid(tTaskMid);
+		}
 		if (flag) {
 			patentNewService.updateCostReduction(t.getId());
 		}
@@ -425,7 +446,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		if (StringUtils.isBlank(t.getOrderDep())) {
 			t.setOrderDep(admin.getDepartmentId());
 		}
-		if (isSubmit==1) {//订单提交
+		//订单提交
+		if (isSubmit==1) {
 			t2.setApproval(t.getApproval());
 			if(t2.getProcessStatus()<ProcessStatus.YPYXGLY.getCode()) {
 				t.setOrderStatus(OrderNewState.QDDS.getCode());
@@ -435,7 +457,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			}
 			//特批逻辑处理
 			if (t2.getApproval()==ApprovalNewState.ZCDSH.getCode()){
-				if (admin.getId().equals("734092ad-6564-4021-b7ab-aab5af3a1537")){
+				if (admin.getId().equals(AFTConstants.CAOJIN_AID)){
 					t.setApproval(ApprovalNewState.DSZDSH.getCode());
 				}else {
 					t.setApproval(ApprovalNewState.ZCDSH.getCode());
@@ -501,7 +523,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		Admin admin=adminMapper.selectFinanceAdminByOrderDep(t.getOrderDep());
 		Admin a=adminMapper.selectAllByid(TokenManager.getAdminId());
 		User u=userMapper.selectByPrimaryKey(t.getBuyerId());
-
 		if (tm==null) {
 			tm=new TOrderMid();
 		}
@@ -549,6 +570,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		}else {
 			tOrderMidMapper.insertSelective(tm);
 		}
+		//
+		tOrderMidMapper.updateCountProjectAndType(t.getOrderNo());
 
 	}
 
@@ -631,15 +654,18 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	@Override
 	public TOrderNewBo getOrderNewDetail(String orderNo) {
 		TOrderNewBo tOrder= tOrderNewMapper.getOrderNewDetail(orderNo);
-		String url=pushOrderService.processStatusConstant(tOrder.getContractPictureUrl(),tOrder.getSalesmanId(),tOrder.getProcessStatus());
+		String url=pushOrderService.processStatusConstant(tOrder);
 		tOrder.setContractPictureUrl(url);
-		if (!TokenManager.hasRole(AFTConstants.SUPERADMIN)){
-			if (!tOrder.getSalesmanId().equals(TokenManager.getAdminId())){
-				tOrder.setContacts("***");
-				tOrder.setContactMobile("***");
-				tOrder.setLegalPerson("***");
-				tOrder.setLegalPersonTel("***");
-			}
+		if (TokenManager.hasRole(AFTConstants.SUPERADMIN)||TokenManager.hasRole(AFTConstants.CUSTOMER_SERVICE)||
+				TokenManager.hasRole(AFTConstants.TECH_MANAGER)||TokenManager.hasRole(AFTConstants.TECH)||
+				TokenManager.hasRole(AFTConstants.TECH_ADMIN)||TokenManager.hasRole(AFTConstants.TECH_FINANCE_DIRECTOR)||
+				tOrder.getSalesmanId().equals(TokenManager.getAdminId())) {
+
+		}else {
+			tOrder.setContacts("***");
+			tOrder.setContactMobile("***");
+			tOrder.setLegalPerson("***");
+			tOrder.setLegalPersonTel("***");
 		}
 		return tOrder;
 	}
@@ -861,6 +887,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 
 
+
 	@Override
 	public int updateOrderNew(String orderNo, Integer orderStatus,String reason,Integer outsource, TOrderOutsource o) {
 		TOrderNew t= new TOrderNew();

+ 19 - 0
src/main/java/com/goafanti/order/service/impl/ProjectStatisticsServiceImpl.java

@@ -177,6 +177,25 @@ public class ProjectStatisticsServiceImpl extends BaseMybatisDao<TOrderTaskMappe
 				}
 				NewExcelUtil<OutProjectStatisticsMember> excelUtil=new NewExcelUtil<>(OutProjectStatisticsMember.class);
 				res=excelUtil.exportExcel(tl,"项目汇总表(会员)",downloadPath);
+			}else if (ib.getStatus()==6){//会员
+				List<OutProjectStatisticsAudit> tl=new ArrayList<>();
+				for (OutProjectStatistics o : list) {
+					OutProjectStatisticsAudit audit = new OutProjectStatisticsAudit();
+					BeanUtils.copyProperties(o,audit);
+					if (audit.getServiceLife()!=null){
+						JSONArray jsonArray = JSONArray.parseArray(audit.getServiceLife());
+						Object[] object=jsonArray.stream().toArray();
+						audit.setServiceLife(StringUtils.join(object,","));
+					}
+					if (audit.getContractTerm()!=null){
+						JSONArray jsonArray = JSONArray.parseArray(audit.getContractTerm());
+						Object[] object=jsonArray.stream().toArray();
+						audit.setContractTerm(StringUtils.join(object,"~"));
+					}
+					tl.add(audit);
+				}
+				NewExcelUtil<OutProjectStatisticsAudit> excelUtil=new NewExcelUtil<>(OutProjectStatisticsAudit.class);
+				res=excelUtil.exportExcel(tl,"项目汇总表(审计)",downloadPath);
 			}
 			return  res;
 	}

+ 22 - 15
src/main/java/com/goafanti/order/service/impl/PushOrderService.java

@@ -7,6 +7,8 @@ import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.shiro.token.TokenManager;
 
+import com.goafanti.order.bo.TOrderNewBo;
+import com.goafanti.order.enums.ApprovalNewState;
 import com.goafanti.order.enums.ProcessStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -21,27 +23,32 @@ public class PushOrderService {
 
     /**
      * 根据流程与角色判断是否可以查看订单合同
-     * @param url
-     * @param aid
-     * @param processStatus
      * @return  超级管理员、运营决策者、总裁、外包审核与可以查看;营销员与经理可以查看自己的订单;
      *         营销管理员、财务专员、咨询师管理员可以看到在自己手上的合同;其他只能获取到无权限查看的图片
      *
      */
-    public String processStatusConstant(String url,String aid,Integer processStatus){
+    public String processStatusConstant(TOrderNewBo t){
+        //tOrder.getContractPictureUrl(),tOrder.getSalesmanId(),tOrder.getProcessStatus(),tOrder.getApproval()
         //流程状态 0-已派营销员,1-已派营销员管理员,2-已派财务管理员,3-已派财务专员,4-已派咨询师管理员,5-已部分派咨询师经理,6-已部全部派咨询师经理
-        if (TokenManager.hasRole(AFTConstants.SUPERADMIN) || TokenManager.hasRole(AFTConstants.APPROVAL_DECISION) ||
-                TokenManager.hasRole(AFTConstants.CED) ||TokenManager.hasRole(AFTConstants.OUTSOURCE_AUDITOR)){
-            return url;
+        if (TokenManager.hasRole(AFTConstants.SUPERADMIN) || TokenManager.hasRole(AFTConstants.APPROVAL_DECISION) ){
+            return t.getContractPictureUrl();
+        }else if(TokenManager.hasRole(AFTConstants.CED)){
+            if (t.getApproval()== ApprovalNewState.ZCDSH.getCode()){
+                return  t.getContractPictureUrl();
+            }else  if (t.getSalesmanId().equals(AFTConstants.CAOJIN_AID)){
+                return DEFAULTS_URL;
+            }else {
+                return  t.getContractPictureUrl();
+            }
         }else if (((TokenManager.hasRole(AFTConstants.SALESMAN)||TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER)))&&
-                TokenManager.getAdminId().equals(aid)){
-            return url;
-        }else if (TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)&&processStatus== ProcessStatus.YPYXGLY.getCode()){
-            return url;
-        }else if (TokenManager.hasRole(AFTConstants.FINANCE)&&processStatus== ProcessStatus.YPCWZY.getCode()){
-            return url;
-        }else if (TokenManager.hasRole(AFTConstants.TECH_ADMIN)&&processStatus== ProcessStatus.YPZXSGLY.getCode()){
-            return url;
+                TokenManager.getAdminId().equals(t.getSalesmanId())){
+            return  t.getContractPictureUrl();
+        }else if (TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)&&t.getProcessStatus()== ProcessStatus.YPYXGLY.getCode()){
+            return  t.getContractPictureUrl();
+        }else if (TokenManager.hasRole(AFTConstants.FINANCE)&&t.getProcessStatus()== ProcessStatus.YPCWZY.getCode()){
+            return  t.getContractPictureUrl();
+        }else if (TokenManager.hasRole(AFTConstants.TECH_ADMIN)&&t.getProcessStatus()== ProcessStatus.YPZXSGLY.getCode()){
+            return  t.getContractPictureUrl();
         }else{
             return DEFAULTS_URL;
         }

+ 1 - 1
src/main/java/com/goafanti/permission/service/impl/NewRoleServiceImpl.java

@@ -198,7 +198,7 @@ public class NewRoleServiceImpl extends BaseMybatisDao<RoleMapper> implements Ne
 	@Override
 	public int updatedimission(String aid, String transferId) {
 		List<Integer> list=roleResourcesMapper.selectAdminRoleResources(aid);
-		if (list.size()<1||list.get(0)==null) {
+		if (list.isEmpty()||list.get(0)==null) {
 			throw new BusinessException(new Error("","用户角色资源不存在"));
 		}
 		Date date=new Date();

+ 23 - 0
src/main/java/com/goafanti/weChat/bo/OutPublicDtails.java

@@ -2,6 +2,8 @@ package com.goafanti.weChat.bo;
 
 import com.goafanti.common.utils.excel.Excel;
 
+import java.math.BigDecimal;
+
 public class OutPublicDtails  {
 
 	private Integer id;
@@ -56,6 +58,27 @@ public class OutPublicDtails  {
 	@Excel(name = "协单助手" )
 	private String assistantName;
 	private Integer assist;
+	@Excel(name = "合同编号" )
+	private String contractNo;
+	@Excel(name = "订单总金额" ,scale = 6)
+	private BigDecimal totalAmout;
+
+
+	public String getContractNo() {
+		return contractNo;
+	}
+
+	public void setContractNo(String contractNo) {
+		this.contractNo = contractNo;
+	}
+
+	public BigDecimal getTotalAmout() {
+		return totalAmout;
+	}
+
+	public void setTotalAmout(BigDecimal totalAmout) {
+		this.totalAmout = totalAmout;
+	}
 
 	public String getAuditTimes() {
 		return auditTimes;

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

@@ -127,7 +127,7 @@ public class AdminReleaseApiController extends CertifyApiController{
 	}
 
 	/**
-	 * 外出审核
+	 * 公出审核、外出审核
 	 * @return
 	 */
 	@RequestMapping(value = "/examinePublicRelease", method = RequestMethod.POST)

+ 1 - 1
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -434,7 +434,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 				np.setAid(s);
 				np.setStatus(2);
 				np.setType(3);
-				np.setMainId(use.getMainId());
+				np.setMainId(use.getId());
 				np.setId(null);
 				publicReleaseMapper.insertSelective(np);
 				StringBuffer str = new StringBuffer("[").append(a.getName()).append("]邀请你技术协单").append("[").append(u.getUsername()).append("]。");

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

@@ -50,7 +50,7 @@ yxy_max=100
 yxjl_max=100
 
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.2.43
+static.host=//static.jishutao.com/1.2.44
 #avatar.host=//172.16.0.255:3000
 #static.host=//172.16.0.255:3000/1.2.27
 #static.host=http://172.16.1.187/prod/1.2.25

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

@@ -42,8 +42,12 @@ user.private.max=1000
 user_remind_days=15
 #\u63D0\u524D\u63D0\u9192\u5929\u6570
 user_channel_days=90
+#\u5BA2\u6237\u9650\u5236
+yxzj_max=800
+yxy_max=100
+yxjl_max=100
 
-static.host=//static.jishutao.com/1.2.43
+static.host=//static.jishutao.com/1.2.44
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 avatar.upload.host=//static.jishutao.com/upload