anderx před 4 roky
rodič
revize
ac97d07feb

+ 1 - 1
GeneratorConfig.xml

@@ -43,7 +43,7 @@
     <property name="enableSubPackages" value="false"/>
      <property name="nullCatalogMeansCurrent" value="true"/>
     </javaClientGenerator>
-    <table schema="aft" tableName="organization_identity"   enableCountByExample="false"
+    <table schema="aft" tableName="t_order_task"   enableCountByExample="false"
                enableUpdateByExample="false"
                enableDeleteByExample="false"
                enableSelectByExample="false"

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

@@ -78,7 +78,7 @@ public interface NewOrderDunMapper {
 
 	List<OutNewOrderDunBo> selectAllOrderDun();
 
-	List<OutNewOrderDunBo> selectByTid(String id);
+	List<OutNewOrderDunBo> selectByTid(Integer id);
 
 	void deleteByTid(Integer tid);
 

+ 7 - 49
src/main/java/com/goafanti/common/dao/TOrderTaskMapper.java

@@ -12,85 +12,43 @@ import org.apache.ibatis.annotations.Param;
 public interface TOrderTaskMapper {
     /**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 11 09:59:01 CST 2020
-	 */
-	long countByExample(TOrderTaskExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 11 09:59:01 CST 2020
-	 */
-	int deleteByExample(TOrderTaskExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 11 09:59:01 CST 2020
+	 * @mbg.generated  Tue Jan 26 11:11:55 CST 2021
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 11 09:59:01 CST 2020
+	 * @mbg.generated  Tue Jan 26 11:11:55 CST 2021
 	 */
 	int insert(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 11 09:59:01 CST 2020
+	 * @mbg.generated  Tue Jan 26 11:11:55 CST 2021
 	 */
 	int insertSelective(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 11 09:59:01 CST 2020
-	 */
-	List<TOrderTask> selectByExampleWithBLOBs(TOrderTaskExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 11 09:59:01 CST 2020
-	 */
-	List<TOrderTask> selectByExample(TOrderTaskExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 11 09:59:01 CST 2020
+	 * @mbg.generated  Tue Jan 26 11:11:55 CST 2021
 	 */
 	TOrderTask selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 11 09:59:01 CST 2020
-	 */
-	int updateByExampleSelective(@Param("record") TOrderTask record, @Param("example") TOrderTaskExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 11 09:59:01 CST 2020
-	 */
-	int updateByExampleWithBLOBs(@Param("record") TOrderTask record, @Param("example") TOrderTaskExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 11 09:59:01 CST 2020
-	 */
-	int updateByExample(@Param("record") TOrderTask record, @Param("example") TOrderTaskExample example);
-
-	/**
-	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 11 09:59:01 CST 2020
+	 * @mbg.generated  Tue Jan 26 11:11:55 CST 2021
 	 */
 	int updateByPrimaryKeySelective(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 11 09:59:01 CST 2020
+	 * @mbg.generated  Tue Jan 26 11:11:55 CST 2021
 	 */
 	int updateByPrimaryKeyWithBLOBs(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Thu Jun 11 09:59:01 CST 2020
+	 * @mbg.generated  Tue Jan 26 11:11:55 CST 2021
 	 */
 	int updateByPrimaryKey(TOrderTask record);
 

+ 276 - 442
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 11 09:59:01 CST 2020.
+      This element was generated on Tue Jan 26 11:11:55 CST 2021.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
@@ -53,151 +53,53 @@
     <result column="declaration_batch" jdbcType="INTEGER" property="declarationBatch" />
     <result column="cost_reduction" jdbcType="INTEGER" property="costReduction" />
     <result column="official_cost" jdbcType="INTEGER" property="officialCost" />
+    <result column="set_up_status" jdbcType="INTEGER" property="setUpStatus" />
+    <result column="set_up_time" jdbcType="TIMESTAMP" property="setUpTime" />
+    <result column="spot_check_status" jdbcType="INTEGER" property="spotCheckStatus" />
+    <result column="high_tech_status" jdbcType="INTEGER" property="highTechStatus" />
+    <result column="special_comment" jdbcType="VARCHAR" property="specialComment" />
+    <result column="if_certification_fee" jdbcType="INTEGER" property="ifCertificationFee" />
+    <result column="certification_fee" jdbcType="DECIMAL" property="certificationFee" />
+    <result column="certification_corporate" jdbcType="VARCHAR" property="certificationCorporate" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.goafanti.common.model.TOrderTask">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 11 09:59:01 CST 2020.
+      This element was generated on Tue Jan 26 11:11:55 CST 2021.
     -->
     <result column="attachment_url" jdbcType="LONGVARCHAR" property="attachmentUrl" />
+    <result column="time_record" jdbcType="LONGVARCHAR" property="timeRecord" />
   </resultMap>
-  <sql id="Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 11 09:59:01 CST 2020.
-    -->
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 11 09:59:01 CST 2020.
-    -->
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
   <sql id="Base_Column_List">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 11 09:59:01 CST 2020.
+      This element was generated on Tue Jan 26 11:11:55 CST 2021.
     -->
     id, order_no, main, super_id, commodity_id, commodity_name, commodity_quantity, commodity_mode, 
     commodity_price, task_status, task_distribution_time, task_allocator, task_receiver, 
     task_comment, task_start_time, task_end_time, project_status, accept_time, review_time, 
-    publicity_time, licence_time, certificate_number, status, form_retrieve, task_refund, 
+    publicity_time, licence_time, certificate_number, `status`, form_retrieve, task_refund, 
     refund_content, retrieve_content, declare_user, declare_pwd, set_up_amount, arrival_money, 
     outsource_name, outsource_price, consultant_id, manager_id, outsource, split_super, 
     split_status, split_id, split_aid, split_time, cname, receiver_name, declaration_batch, 
-    cost_reduction, official_cost
+    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
   </sql>
   <sql id="Blob_Column_List">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 11 09:59:01 CST 2020.
+      This element was generated on Tue Jan 26 11:11:55 CST 2021.
     -->
-    attachment_url
+    attachment_url, time_record
   </sql>
-  <select id="selectByExampleWithBLOBs" parameterType="com.goafanti.common.model.TOrderTaskExample" resultMap="ResultMapWithBLOBs">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 11 09:59:01 CST 2020.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from t_order_task
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByExample" parameterType="com.goafanti.common.model.TOrderTaskExample" resultMap="BaseResultMap">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 11 09:59:01 CST 2020.
-    -->
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from t_order_task
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="ResultMapWithBLOBs">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 11 09:59:01 CST 2020.
+      This element was generated on Tue Jan 26 11:11:55 CST 2021.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -210,27 +112,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 11 09:59:01 CST 2020.
+      This element was generated on Tue Jan 26 11:11:55 CST 2021.
     -->
     delete from t_order_task
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <delete id="deleteByExample" parameterType="com.goafanti.common.model.TOrderTaskExample">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 11 09:59:01 CST 2020.
-    -->
-    delete from t_order_task
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
   <insert id="insert" parameterType="com.goafanti.common.model.TOrderTask">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 11 09:59:01 CST 2020.
+      This element was generated on Tue Jan 26 11:11:55 CST 2021.
     -->
     insert into t_order_task (id, order_no, main, 
       super_id, commodity_id, commodity_name, 
@@ -239,7 +130,7 @@
       task_receiver, task_comment, task_start_time, 
       task_end_time, project_status, accept_time, 
       review_time, publicity_time, licence_time, 
-      certificate_number, status, form_retrieve, 
+      certificate_number, `status`, form_retrieve, 
       task_refund, refund_content, retrieve_content, 
       declare_user, declare_pwd, set_up_amount, 
       arrival_money, outsource_name, outsource_price, 
@@ -247,7 +138,10 @@
       split_super, split_status, split_id, 
       split_aid, split_time, cname, 
       receiver_name, declaration_batch, cost_reduction, 
-      official_cost, attachment_url)
+      official_cost, set_up_status, set_up_time, 
+      spot_check_status, high_tech_status, special_comment, 
+      if_certification_fee, certification_fee, certification_corporate, 
+      attachment_url, time_record)
     values (#{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{main,jdbcType=INTEGER}, 
       #{superId,jdbcType=VARCHAR}, #{commodityId,jdbcType=VARCHAR}, #{commodityName,jdbcType=VARCHAR}, 
       #{commodityQuantity,jdbcType=INTEGER}, #{commodityMode,jdbcType=VARCHAR}, #{commodityPrice,jdbcType=DECIMAL}, 
@@ -263,13 +157,16 @@
       #{splitSuper,jdbcType=INTEGER}, #{splitStatus,jdbcType=INTEGER}, #{splitId,jdbcType=INTEGER}, 
       #{splitAid,jdbcType=VARCHAR}, #{splitTime,jdbcType=TIMESTAMP}, #{cname,jdbcType=VARCHAR}, 
       #{receiverName,jdbcType=VARCHAR}, #{declarationBatch,jdbcType=INTEGER}, #{costReduction,jdbcType=INTEGER}, 
-      #{officialCost,jdbcType=INTEGER}, #{attachmentUrl,jdbcType=LONGVARCHAR})
+      #{officialCost,jdbcType=INTEGER}, #{setUpStatus,jdbcType=INTEGER}, #{setUpTime,jdbcType=TIMESTAMP}, 
+      #{spotCheckStatus,jdbcType=INTEGER}, #{highTechStatus,jdbcType=INTEGER}, #{specialComment,jdbcType=VARCHAR}, 
+      #{ifCertificationFee,jdbcType=INTEGER}, #{certificationFee,jdbcType=DECIMAL}, #{certificationCorporate,jdbcType=VARCHAR}, 
+      #{attachmentUrl,jdbcType=LONGVARCHAR}, #{timeRecord,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TOrderTask">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 11 09:59:01 CST 2020.
+      This element was generated on Tue Jan 26 11:11:55 CST 2021.
     -->
     insert into t_order_task
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -340,7 +237,7 @@
         certificate_number,
       </if>
       <if test="status != null">
-        status,
+        `status`,
       </if>
       <if test="formRetrieve != null">
         form_retrieve,
@@ -411,9 +308,36 @@
       <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="attachmentUrl != null">
         attachment_url,
       </if>
+      <if test="timeRecord != null">
+        time_record,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -554,296 +478,43 @@
       <if test="officialCost != null">
         #{officialCost,jdbcType=INTEGER},
       </if>
-      <if test="attachmentUrl != null">
-        #{attachmentUrl,jdbcType=LONGVARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.goafanti.common.model.TOrderTaskExample" resultType="java.lang.Long">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 11 09:59:01 CST 2020.
-    -->
-    select count(*) from t_order_task
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 11 09:59:01 CST 2020.
-    -->
-    update t_order_task
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=INTEGER},
-      </if>
-      <if test="record.orderNo != null">
-        order_no = #{record.orderNo,jdbcType=VARCHAR},
-      </if>
-      <if test="record.main != null">
-        main = #{record.main,jdbcType=INTEGER},
-      </if>
-      <if test="record.superId != null">
-        super_id = #{record.superId,jdbcType=VARCHAR},
-      </if>
-      <if test="record.commodityId != null">
-        commodity_id = #{record.commodityId,jdbcType=VARCHAR},
-      </if>
-      <if test="record.commodityName != null">
-        commodity_name = #{record.commodityName,jdbcType=VARCHAR},
-      </if>
-      <if test="record.commodityQuantity != null">
-        commodity_quantity = #{record.commodityQuantity,jdbcType=INTEGER},
-      </if>
-      <if test="record.commodityMode != null">
-        commodity_mode = #{record.commodityMode,jdbcType=VARCHAR},
-      </if>
-      <if test="record.commodityPrice != null">
-        commodity_price = #{record.commodityPrice,jdbcType=DECIMAL},
-      </if>
-      <if test="record.taskStatus != null">
-        task_status = #{record.taskStatus,jdbcType=INTEGER},
-      </if>
-      <if test="record.taskDistributionTime != null">
-        task_distribution_time = #{record.taskDistributionTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.taskAllocator != null">
-        task_allocator = #{record.taskAllocator,jdbcType=VARCHAR},
-      </if>
-      <if test="record.taskReceiver != null">
-        task_receiver = #{record.taskReceiver,jdbcType=VARCHAR},
-      </if>
-      <if test="record.taskComment != null">
-        task_comment = #{record.taskComment,jdbcType=VARCHAR},
-      </if>
-      <if test="record.taskStartTime != null">
-        task_start_time = #{record.taskStartTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.taskEndTime != null">
-        task_end_time = #{record.taskEndTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="record.projectStatus != null">
-        project_status = #{record.projectStatus,jdbcType=INTEGER},
-      </if>
-      <if test="record.acceptTime != null">
-        accept_time = #{record.acceptTime,jdbcType=DATE},
-      </if>
-      <if test="record.reviewTime != null">
-        review_time = #{record.reviewTime,jdbcType=DATE},
-      </if>
-      <if test="record.publicityTime != null">
-        publicity_time = #{record.publicityTime,jdbcType=DATE},
-      </if>
-      <if test="record.licenceTime != null">
-        licence_time = #{record.licenceTime,jdbcType=DATE},
-      </if>
-      <if test="record.certificateNumber != null">
-        certificate_number = #{record.certificateNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="record.status != null">
-        status = #{record.status,jdbcType=INTEGER},
-      </if>
-      <if test="record.formRetrieve != null">
-        form_retrieve = #{record.formRetrieve,jdbcType=INTEGER},
-      </if>
-      <if test="record.taskRefund != null">
-        task_refund = #{record.taskRefund,jdbcType=INTEGER},
-      </if>
-      <if test="record.refundContent != null">
-        refund_content = #{record.refundContent,jdbcType=VARCHAR},
-      </if>
-      <if test="record.retrieveContent != null">
-        retrieve_content = #{record.retrieveContent,jdbcType=VARCHAR},
-      </if>
-      <if test="record.declareUser != null">
-        declare_user = #{record.declareUser,jdbcType=VARCHAR},
-      </if>
-      <if test="record.declarePwd != null">
-        declare_pwd = #{record.declarePwd,jdbcType=VARCHAR},
-      </if>
-      <if test="record.setUpAmount != null">
-        set_up_amount = #{record.setUpAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="record.arrivalMoney != null">
-        arrival_money = #{record.arrivalMoney,jdbcType=INTEGER},
-      </if>
-      <if test="record.outsourceName != null">
-        outsource_name = #{record.outsourceName,jdbcType=VARCHAR},
-      </if>
-      <if test="record.outsourcePrice != null">
-        outsource_price = #{record.outsourcePrice,jdbcType=DECIMAL},
-      </if>
-      <if test="record.consultantId != null">
-        consultant_id = #{record.consultantId,jdbcType=VARCHAR},
-      </if>
-      <if test="record.managerId != null">
-        manager_id = #{record.managerId,jdbcType=VARCHAR},
-      </if>
-      <if test="record.outsource != null">
-        outsource = #{record.outsource,jdbcType=INTEGER},
-      </if>
-      <if test="record.splitSuper != null">
-        split_super = #{record.splitSuper,jdbcType=INTEGER},
-      </if>
-      <if test="record.splitStatus != null">
-        split_status = #{record.splitStatus,jdbcType=INTEGER},
+      <if test="setUpStatus != null">
+        #{setUpStatus,jdbcType=INTEGER},
       </if>
-      <if test="record.splitId != null">
-        split_id = #{record.splitId,jdbcType=INTEGER},
+      <if test="setUpTime != null">
+        #{setUpTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="record.splitAid != null">
-        split_aid = #{record.splitAid,jdbcType=VARCHAR},
+      <if test="spotCheckStatus != null">
+        #{spotCheckStatus,jdbcType=INTEGER},
       </if>
-      <if test="record.splitTime != null">
-        split_time = #{record.splitTime,jdbcType=TIMESTAMP},
+      <if test="highTechStatus != null">
+        #{highTechStatus,jdbcType=INTEGER},
       </if>
-      <if test="record.cname != null">
-        cname = #{record.cname,jdbcType=VARCHAR},
+      <if test="specialComment != null">
+        #{specialComment,jdbcType=VARCHAR},
       </if>
-      <if test="record.receiverName != null">
-        receiver_name = #{record.receiverName,jdbcType=VARCHAR},
+      <if test="ifCertificationFee != null">
+        #{ifCertificationFee,jdbcType=INTEGER},
       </if>
-      <if test="record.declarationBatch != null">
-        declaration_batch = #{record.declarationBatch,jdbcType=INTEGER},
+      <if test="certificationFee != null">
+        #{certificationFee,jdbcType=DECIMAL},
       </if>
-      <if test="record.costReduction != null">
-        cost_reduction = #{record.costReduction,jdbcType=INTEGER},
+      <if test="certificationCorporate != null">
+        #{certificationCorporate,jdbcType=VARCHAR},
       </if>
-      <if test="record.officialCost != null">
-        official_cost = #{record.officialCost,jdbcType=INTEGER},
+      <if test="attachmentUrl != null">
+        #{attachmentUrl,jdbcType=LONGVARCHAR},
       </if>
-      <if test="record.attachmentUrl != null">
-        attachment_url = #{record.attachmentUrl,jdbcType=LONGVARCHAR},
+      <if test="timeRecord != null">
+        #{timeRecord,jdbcType=LONGVARCHAR},
       </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExampleWithBLOBs" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 11 09:59:01 CST 2020.
-    -->
-    update t_order_task
-    set id = #{record.id,jdbcType=INTEGER},
-      order_no = #{record.orderNo,jdbcType=VARCHAR},
-      main = #{record.main,jdbcType=INTEGER},
-      super_id = #{record.superId,jdbcType=VARCHAR},
-      commodity_id = #{record.commodityId,jdbcType=VARCHAR},
-      commodity_name = #{record.commodityName,jdbcType=VARCHAR},
-      commodity_quantity = #{record.commodityQuantity,jdbcType=INTEGER},
-      commodity_mode = #{record.commodityMode,jdbcType=VARCHAR},
-      commodity_price = #{record.commodityPrice,jdbcType=DECIMAL},
-      task_status = #{record.taskStatus,jdbcType=INTEGER},
-      task_distribution_time = #{record.taskDistributionTime,jdbcType=TIMESTAMP},
-      task_allocator = #{record.taskAllocator,jdbcType=VARCHAR},
-      task_receiver = #{record.taskReceiver,jdbcType=VARCHAR},
-      task_comment = #{record.taskComment,jdbcType=VARCHAR},
-      task_start_time = #{record.taskStartTime,jdbcType=TIMESTAMP},
-      task_end_time = #{record.taskEndTime,jdbcType=TIMESTAMP},
-      project_status = #{record.projectStatus,jdbcType=INTEGER},
-      accept_time = #{record.acceptTime,jdbcType=DATE},
-      review_time = #{record.reviewTime,jdbcType=DATE},
-      publicity_time = #{record.publicityTime,jdbcType=DATE},
-      licence_time = #{record.licenceTime,jdbcType=DATE},
-      certificate_number = #{record.certificateNumber,jdbcType=VARCHAR},
-      status = #{record.status,jdbcType=INTEGER},
-      form_retrieve = #{record.formRetrieve,jdbcType=INTEGER},
-      task_refund = #{record.taskRefund,jdbcType=INTEGER},
-      refund_content = #{record.refundContent,jdbcType=VARCHAR},
-      retrieve_content = #{record.retrieveContent,jdbcType=VARCHAR},
-      declare_user = #{record.declareUser,jdbcType=VARCHAR},
-      declare_pwd = #{record.declarePwd,jdbcType=VARCHAR},
-      set_up_amount = #{record.setUpAmount,jdbcType=DECIMAL},
-      arrival_money = #{record.arrivalMoney,jdbcType=INTEGER},
-      outsource_name = #{record.outsourceName,jdbcType=VARCHAR},
-      outsource_price = #{record.outsourcePrice,jdbcType=DECIMAL},
-      consultant_id = #{record.consultantId,jdbcType=VARCHAR},
-      manager_id = #{record.managerId,jdbcType=VARCHAR},
-      outsource = #{record.outsource,jdbcType=INTEGER},
-      split_super = #{record.splitSuper,jdbcType=INTEGER},
-      split_status = #{record.splitStatus,jdbcType=INTEGER},
-      split_id = #{record.splitId,jdbcType=INTEGER},
-      split_aid = #{record.splitAid,jdbcType=VARCHAR},
-      split_time = #{record.splitTime,jdbcType=TIMESTAMP},
-      cname = #{record.cname,jdbcType=VARCHAR},
-      receiver_name = #{record.receiverName,jdbcType=VARCHAR},
-      declaration_batch = #{record.declarationBatch,jdbcType=INTEGER},
-      cost_reduction = #{record.costReduction,jdbcType=INTEGER},
-      official_cost = #{record.officialCost,jdbcType=INTEGER},
-      attachment_url = #{record.attachmentUrl,jdbcType=LONGVARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 11 09:59:01 CST 2020.
-    -->
-    update t_order_task
-    set id = #{record.id,jdbcType=INTEGER},
-      order_no = #{record.orderNo,jdbcType=VARCHAR},
-      main = #{record.main,jdbcType=INTEGER},
-      super_id = #{record.superId,jdbcType=VARCHAR},
-      commodity_id = #{record.commodityId,jdbcType=VARCHAR},
-      commodity_name = #{record.commodityName,jdbcType=VARCHAR},
-      commodity_quantity = #{record.commodityQuantity,jdbcType=INTEGER},
-      commodity_mode = #{record.commodityMode,jdbcType=VARCHAR},
-      commodity_price = #{record.commodityPrice,jdbcType=DECIMAL},
-      task_status = #{record.taskStatus,jdbcType=INTEGER},
-      task_distribution_time = #{record.taskDistributionTime,jdbcType=TIMESTAMP},
-      task_allocator = #{record.taskAllocator,jdbcType=VARCHAR},
-      task_receiver = #{record.taskReceiver,jdbcType=VARCHAR},
-      task_comment = #{record.taskComment,jdbcType=VARCHAR},
-      task_start_time = #{record.taskStartTime,jdbcType=TIMESTAMP},
-      task_end_time = #{record.taskEndTime,jdbcType=TIMESTAMP},
-      project_status = #{record.projectStatus,jdbcType=INTEGER},
-      accept_time = #{record.acceptTime,jdbcType=DATE},
-      review_time = #{record.reviewTime,jdbcType=DATE},
-      publicity_time = #{record.publicityTime,jdbcType=DATE},
-      licence_time = #{record.licenceTime,jdbcType=DATE},
-      certificate_number = #{record.certificateNumber,jdbcType=VARCHAR},
-      status = #{record.status,jdbcType=INTEGER},
-      form_retrieve = #{record.formRetrieve,jdbcType=INTEGER},
-      task_refund = #{record.taskRefund,jdbcType=INTEGER},
-      refund_content = #{record.refundContent,jdbcType=VARCHAR},
-      retrieve_content = #{record.retrieveContent,jdbcType=VARCHAR},
-      declare_user = #{record.declareUser,jdbcType=VARCHAR},
-      declare_pwd = #{record.declarePwd,jdbcType=VARCHAR},
-      set_up_amount = #{record.setUpAmount,jdbcType=DECIMAL},
-      arrival_money = #{record.arrivalMoney,jdbcType=INTEGER},
-      outsource_name = #{record.outsourceName,jdbcType=VARCHAR},
-      outsource_price = #{record.outsourcePrice,jdbcType=DECIMAL},
-      consultant_id = #{record.consultantId,jdbcType=VARCHAR},
-      manager_id = #{record.managerId,jdbcType=VARCHAR},
-      outsource = #{record.outsource,jdbcType=INTEGER},
-      split_super = #{record.splitSuper,jdbcType=INTEGER},
-      split_status = #{record.splitStatus,jdbcType=INTEGER},
-      split_id = #{record.splitId,jdbcType=INTEGER},
-      split_aid = #{record.splitAid,jdbcType=VARCHAR},
-      split_time = #{record.splitTime,jdbcType=TIMESTAMP},
-      cname = #{record.cname,jdbcType=VARCHAR},
-      receiver_name = #{record.receiverName,jdbcType=VARCHAR},
-      declaration_batch = #{record.declarationBatch,jdbcType=INTEGER},
-      cost_reduction = #{record.costReduction,jdbcType=INTEGER},
-      official_cost = #{record.officialCost,jdbcType=INTEGER}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
+    </trim>
+  </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TOrderTask">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 11 09:59:01 CST 2020.
+      This element was generated on Tue Jan 26 11:11:55 CST 2021.
     -->
     update t_order_task
     <set>
@@ -911,7 +582,7 @@
         certificate_number = #{certificateNumber,jdbcType=VARCHAR},
       </if>
       <if test="status != null">
-        status = #{status,jdbcType=INTEGER},
+        `status` = #{status,jdbcType=INTEGER},
       </if>
       <if test="formRetrieve != null">
         form_retrieve = #{formRetrieve,jdbcType=INTEGER},
@@ -982,23 +653,35 @@
       <if test="officialCost != null">
         official_cost = #{officialCost,jdbcType=INTEGER},
       </if>
-      <if test="attachmentUrl != null">
-        attachment_url = #{attachmentUrl,jdbcType=LONGVARCHAR},
-      </if>
       <if test="setUpStatus != null">
-      	set_up_status = #{setUpStatus,jdbcType=INTEGER},
+        set_up_status = #{setUpStatus,jdbcType=INTEGER},
       </if>
       <if test="setUpTime != null">
-      	set_up_time	 = #{setUpTime,jdbcType=VARCHAR},
-      </if>
-      <if test="highTechStatus != null">
-      	high_tech_status = #{highTechStatus,jdbcType=INTEGER},
+        set_up_time = #{setUpTime,jdbcType=TIMESTAMP},
       </if>
       <if test="spotCheckStatus != null">
-		spot_check_status = #{spotCheckStatus,jdbcType=INTEGER},
+        spot_check_status = #{spotCheckStatus,jdbcType=INTEGER},
+      </if>
+      <if test="highTechStatus != null">
+        high_tech_status = #{highTechStatus,jdbcType=INTEGER},
       </if>
       <if test="specialComment != null">
-		special_comment = #{specialComment,jdbcType=INTEGER},
+        special_comment = #{specialComment,jdbcType=VARCHAR},
+      </if>
+      <if test="ifCertificationFee != null">
+        if_certification_fee = #{ifCertificationFee,jdbcType=INTEGER},
+      </if>
+      <if test="certificationFee != null">
+        certification_fee = #{certificationFee,jdbcType=DECIMAL},
+      </if>
+      <if test="certificationCorporate != null">
+        certification_corporate = #{certificationCorporate,jdbcType=VARCHAR},
+      </if>
+      <if test="attachmentUrl != null">
+        attachment_url = #{attachmentUrl,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="timeRecord != null">
+        time_record = #{timeRecord,jdbcType=LONGVARCHAR},
       </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
@@ -1007,7 +690,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 11 09:59:01 CST 2020.
+      This element was generated on Tue Jan 26 11:11:55 CST 2021.
     -->
     update t_order_task
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -1031,7 +714,7 @@
       publicity_time = #{publicityTime,jdbcType=DATE},
       licence_time = #{licenceTime,jdbcType=DATE},
       certificate_number = #{certificateNumber,jdbcType=VARCHAR},
-      status = #{status,jdbcType=INTEGER},
+      `status` = #{status,jdbcType=INTEGER},
       form_retrieve = #{formRetrieve,jdbcType=INTEGER},
       task_refund = #{taskRefund,jdbcType=INTEGER},
       refund_content = #{refundContent,jdbcType=VARCHAR},
@@ -1055,14 +738,23 @@
       declaration_batch = #{declarationBatch,jdbcType=INTEGER},
       cost_reduction = #{costReduction,jdbcType=INTEGER},
       official_cost = #{officialCost,jdbcType=INTEGER},
-      attachment_url = #{attachmentUrl,jdbcType=LONGVARCHAR}
+      set_up_status = #{setUpStatus,jdbcType=INTEGER},
+      set_up_time = #{setUpTime,jdbcType=TIMESTAMP},
+      spot_check_status = #{spotCheckStatus,jdbcType=INTEGER},
+      high_tech_status = #{highTechStatus,jdbcType=INTEGER},
+      special_comment = #{specialComment,jdbcType=VARCHAR},
+      if_certification_fee = #{ifCertificationFee,jdbcType=INTEGER},
+      certification_fee = #{certificationFee,jdbcType=DECIMAL},
+      certification_corporate = #{certificationCorporate,jdbcType=VARCHAR},
+      attachment_url = #{attachmentUrl,jdbcType=LONGVARCHAR},
+      time_record = #{timeRecord,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.TOrderTask">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jun 11 09:59:01 CST 2020.
+      This element was generated on Tue Jan 26 11:11:55 CST 2021.
     -->
     update t_order_task
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -1086,7 +778,7 @@
       publicity_time = #{publicityTime,jdbcType=DATE},
       licence_time = #{licenceTime,jdbcType=DATE},
       certificate_number = #{certificateNumber,jdbcType=VARCHAR},
-      status = #{status,jdbcType=INTEGER},
+      `status` = #{status,jdbcType=INTEGER},
       form_retrieve = #{formRetrieve,jdbcType=INTEGER},
       task_refund = #{taskRefund,jdbcType=INTEGER},
       refund_content = #{refundContent,jdbcType=VARCHAR},
@@ -1109,16 +801,24 @@
       receiver_name = #{receiverName,jdbcType=VARCHAR},
       declaration_batch = #{declarationBatch,jdbcType=INTEGER},
       cost_reduction = #{costReduction,jdbcType=INTEGER},
-      official_cost = #{officialCost,jdbcType=INTEGER}
+      official_cost = #{officialCost,jdbcType=INTEGER},
+      set_up_status = #{setUpStatus,jdbcType=INTEGER},
+      set_up_time = #{setUpTime,jdbcType=TIMESTAMP},
+      spot_check_status = #{spotCheckStatus,jdbcType=INTEGER},
+      high_tech_status = #{highTechStatus,jdbcType=INTEGER},
+      special_comment = #{specialComment,jdbcType=VARCHAR},
+      if_certification_fee = #{ifCertificationFee,jdbcType=INTEGER},
+      certification_fee = #{certificationFee,jdbcType=DECIMAL},
+      certification_corporate = #{certificationCorporate,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <!-- 记得返回id -->
-  <!-- &amp;amp;amp;amp;amp;lt;insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TOrderTask" useGeneratedKeys="true"&amp;amp;amp;amp;amp;gt;
-  		&amp;amp;amp;amp;amp;lt;selectKey keyProperty="id" order="AFTER" resultType="int"&amp;amp;amp;amp;amp;gt;
+  <!-- &amp;amp;amp;amp;amp;amp;amp;lt;insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TOrderTask" useGeneratedKeys="true"&amp;amp;amp;amp;amp;amp;amp;gt;
+  		&amp;amp;amp;amp;amp;amp;amp;lt;selectKey keyProperty="id" order="AFTER" resultType="int"&amp;amp;amp;amp;amp;amp;amp;gt;
         SELECT LAST_INSERT_ID()
-    &amp;amp;amp;amp;amp;lt;/selectKey&amp;amp;amp;amp;amp;gt; -->
+    &amp;amp;amp;amp;amp;amp;amp;lt;/selectKey&amp;amp;amp;amp;amp;amp;amp;gt; -->
   <insert id="insertSelectiveGetId" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TOrderTask" useGeneratedKeys="true">
-      insert into t_order_task
+     insert into t_order_task
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
         id,
@@ -1187,7 +887,7 @@
         certificate_number,
       </if>
       <if test="status != null">
-        status,
+        `status`,
       </if>
       <if test="formRetrieve != null">
         form_retrieve,
@@ -1258,6 +958,30 @@
       <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="attachmentUrl != null">
         attachment_url,
       </if>
@@ -1401,6 +1125,30 @@
       <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="attachmentUrl != null">
         #{attachmentUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -1410,12 +1158,12 @@
     </selectKey>
   </insert>
   <select id="selectOrderTask" resultType="com.goafanti.order.bo.TOrderTaskBo">
-           select a.id,e.contract_no contractNo,a.order_no as orderNo,h.nickname userName,f.name salesmanName,a.outsource_name outsourceName,a.outsource,
+          select a.id,e.contract_no contractNo,a.order_no as orderNo,h.nickname userName,f.name salesmanName,a.outsource_name outsourceName,a.outsource,
   a.outsource_price outsourcePrice,g.name depName,e.order_status orderStatus,d.name as contacts,d.contact_mobile as contactsMobile,a.main, c.cname,
   c.sort cSort,a.commodity_name as commodityName,a.commodity_quantity as commodityQuantity,i.price,a.certificate_number as certificateNumber,
   a.commodity_id as commodityId,a.manager_id managerId,a.consultant_id consultantId,a.project_status as projectStatus,a.set_up_amount setUpAmount,
-  a.task_comment as taskComment ,a.commodity_price as commodityPrice, a.task_status as taskStatus,  a.task_receiver as taskReceiver ,
-  a.split_status splitStatus,a.cost_reduction costReduction,a.official_cost officialCost,i.`type` ,d.name consultantName
+  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 
   	 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
@@ -1438,7 +1186,7 @@
   
    <select id="selectOrderTaskListByPage" resultType="com.goafanti.order.bo.TOrderTaskListBo">
 	    select  a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,a.receiver_name receiverName,a.project_status as projectStatus,e.contract_no contractNo,
-a.task_receiver taskReceiver,a.task_status as taskStatus,date_format(a.task_distribution_time,'%Y-%m-%d') as taskDate, a.commodity_quantity as commodityQuantity,
+a.task_receiver taskReceiver,a.task_status as taskStatus,date_format(a.task_distribution_time,'%Y-%m-%d %H:%i:%S') as taskDate, a.commodity_quantity as commodityQuantity,
 e.approval,l.refund_status outsourceStatus,l.start_type outsourceType,ifnull(ttm.certificates_count ,0) as alreadyNumber,f.nickname as userName,h.name as depName, l.company_name as outsourceName ,
 ifnull(k.hours,0) hours,a.split_status splitStatus,a.split_super splitSuper, a.split_id splitId,b.`type` projectType,ifnull(ttm.cost_amount,0) costAmount,
 ifnull(ttm.party_amount,0) partyAmount,a.commodity_price commodityPrice,a.outsource
@@ -1574,7 +1322,7 @@ ifnull(ttm.party_amount,0) partyAmount,a.commodity_price commodityPrice,a.outsou
   	</if>
   </select>
   <select id="getOrderTaskDetail" resultType="com.goafanti.order.bo.TOrderTaskDetailBo">
-   select  
+  select  
 	a.id,a.commodity_name as taskName,a.order_no as orderNo,c.sort ,c.cname,d.name as receiverName,a.task_comment as taskComment,a.project_status as projectStatus,
 	a.task_status as taskStatus,e.contacts,a.attachment_url as attachmentUrl,a.outsource_name outsourceName, f.nickname as userName,a.set_up_amount as setUpAmount,
 	g.name as salesmanName,date_format(a.task_start_time,'%Y-%m-%d') as startDate,a.retrieve_content as retrieveContent, a.arrival_money as arrivalMoney,
@@ -1582,8 +1330,9 @@ ifnull(ttm.party_amount,0) partyAmount,a.commodity_price commodityPrice,a.outsou
 	a.refund_content as refundContent, a.declare_user as  declareUser, a.declare_pwd as declarePwd,e.contract_no as contractNo,e.contacts ,b.`type` bpType,
 	date_format(a.task_end_time,'%Y-%m-%d') as endDate,date_format(a.accept_time,'%Y-%m-%d') as acceptDate,h.name as depName,e.contact_mobile as contactMobile ,
 	date_format(a.review_time,'%Y-%m-%d') as reviewDate,date_format(a.publicity_time,'%Y-%m-%d') as publicityDate,a.outsource_price outsourcePrice,
-	date_format(a.licence_time,'%Y-%m-%d') as licenceDate,date_format(a.task_distribution_time,'%Y-%m-%d') as taskDate,e.legal_person as legalPerson,
+	date_format(a.licence_time,'%Y-%m-%d') as licenceDate,date_format(a.task_distribution_time,'%Y-%m-%d %H:%i:%S') as taskDate,e.legal_person as legalPerson,
 	e.legal_person_tel as legalPersonTel, a.split_status splitStatus, a.split_super splitSuper, a.split_id splitId,a.declaration_batch declarationBatch,
+	a.if_certification_fee ifCertificationFee , a.certification_corporate certificationCorporate ,a.certification_fee certificationFee ,a.time_record timeRecord,
 	a.cost_reduction costReduction,  a.official_cost officialCost,a.set_up_status setUpStatus ,date_format(a.set_up_time,'%Y-%m-%d') setUpTime ,a.high_tech_status highTechStatus ,
 	a.spot_check_status spotCheckStatus , a.special_comment specialComment ,ttm.certificates_count certificatesCount ,ttm.reject_count rejectCount ,
 	ttm.authorize_count authorizeCount ,ttm.end_count endCount,ttm.accept_count acceptCount,a.commodity_price  commodityPrice,a.commodity_quantity commodityQuantity
@@ -2073,10 +1822,10 @@ ifnull(ttm.party_amount,0) partyAmount,a.commodity_price commodityPrice,a.outsou
 	from t_order_task a left join t_order_new b on a.order_no =b.order_no left join t_task_mid ttm on a.id=ttm.tid 
 	left join department dep on b.order_dep =dep.id  left join admin ad on a.task_receiver =ad.id
 	left join business_project bp on a.commodity_id =bp.id 
-	left join (select id,commodity_quantity cq from t_order_task where status in(0,1,2,3,5))kcs on a.id=kcs.id
+	left join (select id,commodity_quantity cq from t_order_task where project_status BETWEEN  1 and 3)kcs on a.id=kcs.id
 	left join (select id,commodity_quantity cq from t_order_task where task_status in (1,2,3))pds on a.id=pds.id
 	<if test="status==1">
-	left join (select id,commodity_quantity cq from t_order_task where status in(4,6))wcs on a.id=wcs.id
+	left join (select id,commodity_quantity cq from t_order_task where project_status &gt; 3)wcs on a.id=wcs.id
 	left join (select id,commodity_quantity cq from t_order_task where  set_up_status =1)lxs on a.id=lxs.id
 	left join (select id,commodity_quantity cq from t_order_task where spot_check_status in (1,2))ccs on a.id=ccs.id
 	left join (select id,commodity_quantity cq from t_order_task where spot_check_status =1)wtg on a.id=wtg.id
@@ -2093,8 +1842,8 @@ ifnull(ttm.party_amount,0) partyAmount,a.commodity_price commodityPrice,a.outsou
 	where apply_count &gt; 0)tj on a.id=tj.tid
 	</if>
 	<if test="status==0">
-	left join (select id,commodity_quantity cq from t_order_task where status in(4,6))wcs on a.id=wcs.id
-	left join (select id,commodity_quantity cq from t_order_task where  publicity_time is not null)gss on a.id=gss.id
+	left join (select id,commodity_quantity cq from t_order_task where project_status &gt; 3)wcs on a.id=wcs.id
+	left join (select id,commodity_quantity cq from t_order_task where  if_publicity=1)gss on a.id=gss.id
 	</if>
 	where  b.order_dep is not null and a.split_status in(0,2) and a.task_status in (1,2,3)
 	<if test="startDate != null and endDate != null">
@@ -2150,4 +1899,89 @@ left join department de on x.department_id=de.id left join business_category bc
 	group by  dep.province,ad.department_id,bp.cid )x 
   </select>
   
+  <select id="managerSelectByPage" resultType="com.goafanti.order.bo.managerListBo">
+      select a.id,a.task_distribution_time taskDistributionTime ,tm.province_name  provinceName,tm.dep_name depName,
+    tm.salesman_name salesmanName, b.contract_no contractNo ,b.order_no orderNo,tm.buyer_name UserName,a.cname ,
+    a.commodity_name commodityName,a.commodity_quantity commodityQuantity,dep.name techDepName,a.receiver_name techName,
+    a.project_status projectStatus ,a.commodity_price commodityPrice ,a.special_comment specialComment
+     from  (select task_id from t_task_log a where task_receiver=#{aid} 
+     UNION select task_id from t_task_log a where task_allocator=#{aid}) x 
+     left join t_order_task a  on x.task_id=a.id left join t_order_new b on a.order_no =b.order_no 
+     left join t_order_mid tm on b.order_no=tm.order_no left join admin ad on a.task_receiver =ad.id 
+     left join department dep on ad.department_id =dep.id left join business_project bp on a.commodity_id =bp.id
+    where 1=1
+     <if test="orderNo !=null">
+     and a.order_no = #{orderNo}
+     </if>
+    <if test="contractNo !=null">
+    and b.contract_no = #{contractNo}
+     </if>
+    <if test="name !=null">
+    and tm.buyer_name like CONCAT('%',#{name},'%') 
+     </if>
+    <if test="cid !=null">
+    and bp.cid =#{cid}
+     </if>
+    <if test="projectType !=null">
+    and bp.`type` =#{projectType}
+     </if>
+    <if test="depId !=null">
+    and b.order_dep =#{depId}
+     </if>
+    <if test="techDepId !=null">
+    and ad.department_id =#{techDepId}
+     </if>
+    <if test="declarationBatch !=null">
+    and a.declaration_batch =#{declarationBatch}
+     </if>
+    <if test="commodityPrice !=null">
+    and a.commodity_price =#{commodityPrice}
+     </if>
+    <if test="startTime !=null and endTime !=null">
+    and a.task_distribution_time between #{startTime} and #{endTime}
+     </if>
+  <if test="page_sql!=null">
+			${page_sql}
+	</if>
+  </select>
+  
+  <select id="managerSelectCount" resultType="java.lang.Integer">
+      select count(*)
+     from  (select task_id from t_task_log a where task_receiver= #{aid} UNION 
+     select task_id from t_task_log a where task_allocator= #{aid}) x 
+     left join t_order_task a  on x.task_id=a.id left join t_order_new b on a.order_no =b.order_no 
+     left join t_order_mid tm on b.order_no=tm.order_no left join admin ad on a.task_receiver =ad.id 
+     left join department dep on ad.department_id =dep.id left join business_project bp on a.commodity_id =bp.id
+         where 1=1
+     <if test="orderNo !=null">
+     and a.order_no = #{orderNo}
+     </if>
+    <if test="contractNo !=null">
+    and b.contract_no = #{contractNo}
+     </if>
+    <if test="name !=null">
+    and tm.buyer_name like CONCAT('%',#{name},'%') 
+     </if>
+    <if test="cid !=null">
+    and bp.cid =#{cid}
+     </if>
+    <if test="projectType !=null">
+    and bp.`type` =#{projectType}
+     </if>
+    <if test="depId !=null">
+    and b.order_dep =#{depId}
+     </if>
+    <if test="techDepId !=null">
+    and ad.department_id =#{techDepId}
+     </if>
+    <if test="declarationBatch !=null">
+    and a.declaration_batch =#{declarationBatch}
+     </if>
+    <if test="commodityPrice !=null">
+    and a.commodity_price =#{commodityPrice}
+     </if>
+    <if test="startTime !=null and endTime !=null">
+    and a.task_distribution_time between #{startTime} and #{endTime}
+     </if>
+  </select>
 </mapper>

+ 6 - 0
src/main/java/com/goafanti/common/mapper/TTaskMidMapper.xml

@@ -267,6 +267,12 @@
       <if test="rejectCount != null">
         reject_count = #{rejectCount},
       </if>
+      <if test="acceptCount != null">
+        accept_count = #{acceptCount},
+      </if>
+      <if test="authorizeCount != null">
+        authorize_count = #{authorizeCount},
+      </if>
     </set>
     where tid = #{tid,jdbcType=INTEGER}
   </update>

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 446 - 207
src/main/java/com/goafanti/common/model/TOrderTask.java


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

@@ -5,6 +5,10 @@ import java.math.BigDecimal;
 import com.goafanti.common.model.TOrderTask;
 
 public class TOrderTaskBo extends TOrderTask{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 	private String contacts;
 	private String contactsMobile;
 	private String cname;

+ 31 - 3
src/main/java/com/goafanti/order/bo/TOrderTaskDetailBo.java

@@ -5,7 +5,7 @@ import java.math.BigDecimal;
 import com.goafanti.common.utils.StringUtils;
 
 public class TOrderTaskDetailBo {
-	private String id;
+	private Integer id;
 	private String taskName;
 	private String orderNo;
 	private String userName;
@@ -39,6 +39,9 @@ public class TOrderTaskDetailBo {
 	private Integer locationArea;
 	private String postalAddress;
 	private Integer declarationBatch;
+	private Integer ifCertificationFee;
+	private String certificationCorporate;
+	private BigDecimal certificationFee;
 	
 	/**
 	 * 任务状态
@@ -107,6 +110,7 @@ public class TOrderTaskDetailBo {
 	private Integer acceptCount;
 	private BigDecimal commodityPrice;
 	private Integer	commodityQuantity;
+	private String timeRecord;
 	
 	
 	
@@ -328,10 +332,10 @@ public class TOrderTaskDetailBo {
 	public void setContactMobile(String contactMobile) {
 		this.contactMobile = contactMobile;
 	}
-	public String getId() {
+	public Integer getId() {
 		return id;
 	}
-	public void setId(String id) {
+	public void setId(Integer id) {
 		this.id = id;
 	}
 	public String getTaskName() {
@@ -491,6 +495,30 @@ public class TOrderTaskDetailBo {
 	public void setSort(Integer sort) {
 		this.sort = sort;
 	}
+	public Integer getIfCertificationFee() {
+		return ifCertificationFee;
+	}
+	public void setIfCertificationFee(Integer ifCertificationFee) {
+		this.ifCertificationFee = ifCertificationFee;
+	}
+	public String getCertificationCorporate() {
+		return certificationCorporate;
+	}
+	public void setCertificationCorporate(String certificationCorporate) {
+		this.certificationCorporate = certificationCorporate;
+	}
+	public BigDecimal getCertificationFee() {
+		return certificationFee;
+	}
+	public void setCertificationFee(BigDecimal certificationFee) {
+		this.certificationFee = certificationFee;
+	}
+	public String getTimeRecord() {
+		return timeRecord;
+	}
+	public void setTimeRecord(String timeRecord) {
+		this.timeRecord = timeRecord;
+	}
 	
 	
 }

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

@@ -70,6 +70,21 @@ public class OrderProjectApiController extends CertifyApiController {
 		res.setData(orderProjectService.selectTaskList( name, orderNo, taskId, taskStatus, adminName,specially ,  depId  ,pageNo, pageSize));
 		return res;
 	}
+	
+	
+	
+	/**
+	 * 经理查询订单
+	 */
+	@RequestMapping(value="/managerSelect" ,method = RequestMethod.GET)
+	public Result managerSelect(String name,String orderNo,String contractNo,String cid,String projectType,
+			String depId,String techDepId  ,Integer declarationBatch  ,String commodityPrice,String startTime,
+			String endTime,Integer pageNo,Integer pageSize){
+		Result res=new Result();
+		res.setData(orderProjectService.managerSelect( name, orderNo, contractNo, cid, projectType,
+				 depId, techDepId  , declarationBatch  ,commodityPrice,startTime, endTime , pageNo, pageSize));
+		return res;
+	}
 	/**
 	 * 任务详情
 	 */
@@ -89,6 +104,15 @@ public class OrderProjectApiController extends CertifyApiController {
 		return res;
 	}
 	/**
+	 * 修改状态(咨询师)
+	 */
+	@RequestMapping(value="/updateProjectStatus" ,method = RequestMethod.POST)
+	public Result updateProjectStatus(Integer  tid,Integer projectStatus,String timeRecord ){
+		Result res=new Result();
+		res.setData(orderProjectService.updateProjectStatus(tid, projectStatus, timeRecord ));
+		return res;
+	}
+	/**
 	 * 添加工时
 	 */
 	@RequestMapping(value="/addTaskHours" ,method = RequestMethod.POST)

+ 5 - 0
src/main/java/com/goafanti/order/enums/OrderProjectStatus.java

@@ -3,6 +3,11 @@ package com.goafanti.order.enums;
 import java.util.HashMap;
 import java.util.Map;
 
+/**
+ * 已作废
+ * @author Administrator
+ *
+ */
 public enum OrderProjectStatus {
 	//项目状态 0-项目待提交 1-项目已提交,2-项目评审,3-项目立项,4-项目公示,5-项目抽查,6-项目备案,
 	//7-项目下证,8-项目验收,9-项目拨款 10- 项目进度10% 11- 项目进度30% 12- 项目进度70%

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

@@ -15,6 +15,7 @@ import com.goafanti.order.bo.TaskLogBo;
 import com.goafanti.order.bo.TaskProgressBo;
 import com.goafanti.order.bo.inuptTaskHoursListBo;
 import com.goafanti.order.bo.inuptTaskListBo;
+import com.goafanti.order.bo.managerListBo;
 import com.goafanti.organization.bo.OutPaymentNode;
 
 public interface OrderProjectService {
@@ -63,6 +64,11 @@ public interface OrderProjectService {
 
 	int updateTaskProgress(TaskProgressBo t);
 
+	Pagination<managerListBo> managerSelect(String name, String orderNo, String contractNo, String cid, String projectType, String depId,
+			String techDepId, Integer declarationBatch, String commodityPrice, String startTime, String endTime, Integer pageNo, Integer pageSize);
+
+	int updateProjectStatus(Integer tid, Integer projectStatus, String timeRecord);
+
 
 
 }

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

@@ -95,8 +95,10 @@ import com.goafanti.order.bo.TaskLogBo;
 import com.goafanti.order.bo.TaskProgressBo;
 import com.goafanti.order.bo.inuptTaskHoursListBo;
 import com.goafanti.order.bo.inuptTaskListBo;
+import com.goafanti.order.bo.managerListBo;
 import com.goafanti.order.enums.BonusSubject;
 import com.goafanti.order.enums.NewOrderDunType;
+import com.goafanti.order.enums.NewProjectStatus;
 import com.goafanti.order.enums.OrderDunProjectType;
 import com.goafanti.order.enums.OrderProjectStatus;
 import com.goafanti.order.enums.ProcessStatus;
@@ -347,8 +349,6 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		TOrderNew tn=checkDeleteSign(t.getOrderNo());
 		task.setAttachmentUrl(t.getAttachmentUrl());
 		task.setId(Integer.valueOf(t.getId()));
-		task.setTaskStatus(t.getTaskStatus());
-		task.setProjectStatus(t.getProjectStatus());
 		task.setTaskComment(t.getTaskComment());
 		task.setCertificateNumber(t.getCertificateNumber());
 		task.setStatus(t.getStatus());
@@ -363,11 +363,16 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		task.setOutsourceName(t.getOutsourceName());
 		task.setDeclarationBatch(t.getDeclarationBatch());
 		task.setSetUpStatus(t.getSetUpStatus());
-		task.setSetUpTime(t.getSetUpTime());
+		if(t.getSetUpTime()!=null)task.setSetUpTime(DateUtils.StringToDate(t.getSetUpTime(), AFTConstants.YYYYMMDD));
 		task.setSpotCheckStatus(t.getSpotCheckStatus());
 		task.setHighTechStatus(t.getHighTechStatus());
 		task.setSpecialComment(t.getSpecialComment());
 		if(StringUtils.isNotBlank(t.getOutsourcePrice()))task.setOutsourcePrice(new BigDecimal(t.getOutsourcePrice()));
+		if (t.getIfCertificationFee()!=null&&t.getIfCertificationFee()==1) {
+			task.setCertificationCorporate(t.getCertificationCorporate());
+			task.setCertificationFee(t.getCertificationFee());
+		}
+		
 		//根据修改的修改订单法人与联系人
 		if(StringUtils.isNotEmpty(t.getContacts()))tn.setContacts(t.getContacts());
 		if(StringUtils.isNotEmpty(t.getContactMobile()))	tn.setContactMobile(t.getContactMobile());
@@ -409,55 +414,65 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		} catch (ParseException e) {
 			e.printStackTrace();
 		}
-		TOrderTask task2=tOrderTaskMapper.selectByPrimaryKey(task.getId());//查询出项目信息
 		tOrderTaskMapper.updateByPrimaryKeySelective(task);
 		//订单中间表修改
-		if (t.getUrgentDay()!=null||t.getIfMaterial()!=null||t.getRejectCount()!=null) {
+		if (t.getUrgentDay()!=null||t.getIfMaterial()!=null||t.getRejectCount()!=null||
+				t.getAcceptCount()!=null||t.getAuthorizeCount()!=null) {
 			TTaskMid tm=new TTaskMid();
 			tm.setTid(task.getId());
 			tm.setUrgentDay(t.getUrgentDay());
 			tm.setIfMaterial(t.getIfMaterial());
 			tm.setRejectCount(t.getRejectCount());
+			tm.setAcceptCount(t.getAcceptCount());
+			tm.setAuthorizeCount(t.getAuthorizeCount());
 			tTaskMidMapper.updateByTid(tm);
 		}
 		TaskLog tl=new TaskLog();
 		tl.setCreateTime(new Date());
 		tl.setTaskId(t.getId());
 		tl.setAid(TokenManager.getAdminId());
-		if (t.getStatus()!=null) {
-			if (t.getStatus()!=task2.getStatus()) {
-				String s="将当前项目状态修改为:";
-				//状态 0未开始 1已开始 2已暂停 3已驳回 4已完成 5未完成退单 6已完成退单
-				if (t.getStatus()==0)s+="未开始";
-				else if (t.getStatus()==1)s+="已开始";
-				else if (t.getStatus()==2)s+="已暂停";
-				else if (t.getStatus()==3)s+="已驳回";
-				else if (t.getStatus()==4)s+="已完成";
-				else if (t.getStatus()==5)s+="项目已完成 已退单";
-				else if (t.getStatus()==6)s+="项目未完成 已退单";
-				tl.setContent(s);
-				taskLogMapper.insertSelective(tl);
-			}
-			if (t.getTaskRefund()!=task2.getTaskRefund()) {
-				String s="将当前项目退单修改为:";
-				if (t.getTaskRefund()==0)s+="未完成";
-				if (t.getTaskRefund()==1)s+="已完成";
-				if (t.getTaskRefund()==2)s+="其他";
-				tl.setContent(s);
-				taskLogMapper.insertSelective(tl);
-			}
-			if (t.getFormRetrieve()!=task2.getFormRetrieve()) {
-				String s="将当前满意度表格回收修改为:";
-				if (t.getFormRetrieve()==0)s+="未回收";
-				if (t.getFormRetrieve()==1)s+="已回收";
-				if (t.getFormRetrieve()==2)s+="其他";
-				tl.setContent(s);
-				taskLogMapper.insertSelective(tl);
-			}
-		}
 		//项目触发发催款
+		
+		return 1;
+	}
+	
+	
+	public int updateProjectStatus(Integer tid,Integer projectStatus,String timeRecord ) {
+		TOrderTask t=new TOrderTask();
+		t.setId(tid);
+		t.setProjectStatus(projectStatus);
+		t.setTimeRecord(timeRecord);
+		TOrderTask task2=tOrderTaskMapper.selectByPrimaryKey(tid);//查询出项目信息
+		if(projectStatus!=task2.getProjectStatus()&&
+				projectStatus==NewProjectStatus.YLX.getCode()) t.setSetUpStatus(1);
+		if(projectStatus!=task2.getProjectStatus()&&
+				projectStatus==NewProjectStatus.YGS.getCode()) t.setSetUpStatus(1);
+		tOrderTaskMapper.updateByPrimaryKeySelective(t);
+		projectSplitPush(tid, projectStatus,task2);
+		if(projectStatus!=task2.getProjectStatus())pushTaskLog(tid, projectStatus);
+		return 1;
+	}
+
+	
+
+	private void pushTaskLog(Integer tid,Integer projectStatus) {
+		TaskLog tl = new TaskLog();
+		tl.setCreateTime(new Date());
+		tl.setTaskId(tid);
+		tl.setAid(TokenManager.getAdminId());
+		StringBuffer s = new StringBuffer("将当前项目状态修改为:");
+		s.append(NewProjectStatus.getValueByCode(projectStatus));
+		tl.setContent(s.toString());
+		taskLogMapper.insertSelective(tl);
+	}
+
+
+
+	private void projectSplitPush(Integer tid, Integer projectStatus,TOrderTask task2) {
+		//0否 1父拆分 2子拆分 如果没有拆分
 		if (task2.getSplitStatus()==0) {
-			pushOrderDunAndPaymentNode(t,task2);
+			pushOrderDunAndPaymentNode(tid,projectStatus,task2);
+			//如果是子项目
 		}else if (task2.getSplitStatus()==2){
 			//查出父项目
 			List<TOrderTaskListBo> list=tOrderTaskMapper.splitProjectList(task2.getSplitSuper());
@@ -473,13 +488,13 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			TOrderTask task3=tOrderTaskMapper.selectByPrimaryKey(task2.getSplitSuper());
 			//设置父任务
 			TOrderTaskDetailBo t2=new TOrderTaskDetailBo();
-			t2.setOrderNo(t.getOrderNo());
-			t2.setId(task2.getSplitSuper().toString());
+			t2.setOrderNo(task2.getOrderNo());
+			t2.setId(task2.getSplitSuper());
 			t2.setProjectStatus(task3.getProjectStatus());
-			pushOrderDunAndPaymentNode(t2,task3);
+			pushOrderDunAndPaymentNode(t2.getId(),t2.getProjectStatus(),task3);
 		}
 		
-		if (task2.getSuperId()!=null) {//是否有父项目
+		if (task2.getSuperId()!=null) {//有父项目
 			TOrderTask task3 =tOrderTaskMapper.selectBySuperId(task2.getSuperId());
 			task3.setId(Integer.valueOf(task2.getSuperId()));
 			task3.setSuperId(null);
@@ -489,42 +504,41 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		}else {
 			meanwhileUpdateOrder(task2);
 		}
-		return 1;
 	}
 
-	private void pushOrderDunAndPaymentNode(TOrderTaskDetailBo t,TOrderTask task2) {
-		List<OutNewOrderDunBo> list=newOrderDunMapper.selectByTid(t.getId());
+	private void pushOrderDunAndPaymentNode(Integer tid,Integer projectStatus,TOrderTask task2) {
+		List<OutNewOrderDunBo> list=newOrderDunMapper.selectByTid(tid);
 		for (OutNewOrderDunBo ob : list) {
 			if (ob!=null) {
 				boolean flag=false;
 				if((ob.getProjectType()==OrderDunProjectType.CGZH.getCode()&&ob.getDunType()==2&&//成果转化 验收
-						t.getProjectStatus()==OrderProjectStatus.XMYS.getCode()))flag=true;
+						projectStatus==NewProjectStatus.YWCXZ.getCode()))flag=true;
 				if((ob.getProjectType()==OrderDunProjectType.COMMON.getCode()&&ob.getDunType()==2&&//通用 公示
-						t.getProjectStatus()==OrderProjectStatus.XMGS.getCode()))flag=true;
+						projectStatus==NewProjectStatus.YTJ.getCode()))flag=true;
 				if((ob.getProjectType()==OrderDunProjectType.COMMON.getCode()&&ob.getDunType()==3&&//通用 下证
-						t.getProjectStatus()==OrderProjectStatus.XMXZ.getCode()))flag=true;
+						projectStatus==NewProjectStatus.YWCXZ.getCode()))flag=true;
 				if((ob.getProjectType()==OrderDunProjectType.KJXM.getCode()&&ob.getDunType()==2&&//科技项目 立项或者公示
-						(t.getProjectStatus()==OrderProjectStatus.XMLX.getCode()||(t.getProjectStatus()==OrderProjectStatus.XMGS.getCode()))))flag=true;
+						projectStatus==NewProjectStatus.YLX.getCode()))flag=true;
 				if((ob.getProjectType()==OrderDunProjectType.KJXM.getCode()&&ob.getDunType()==3&&//科技项目 拨款
-						t.getProjectStatus()==OrderProjectStatus.XMBK.getCode()))flag=true;
+						projectStatus==NewProjectStatus.LXYBK.getCode()))flag=true;
 				if((ob.getProjectType()==OrderDunProjectType.KJJR.getCode()&&ob.getDunType()==2&&//科技金融 拨款
-						t.getProjectStatus()==OrderProjectStatus.XMBK.getCode()))flag=true;
+						projectStatus==NewProjectStatus.YWCXZ.getCode()))flag=true;
 				if((ob.getProjectType()==OrderDunProjectType.RJKF.getCode()&&ob.getDunType()==2&&//软件开发 立项
-						t.getProjectStatus()==OrderProjectStatus.XMLX.getCode()))flag=true;
+						projectStatus==NewProjectStatus.YTJ.getCode()))flag=true;
 				if((ob.getProjectType()==OrderDunProjectType.RJKF.getCode()&&ob.getDunType()==3&&//软件开发 验收
-						t.getProjectStatus()==OrderProjectStatus.XMYS.getCode()))flag=true;
+						projectStatus==NewProjectStatus.YWCXZ.getCode()))flag=true;
 				if(ob.getProjectType()==OrderDunProjectType.ZSCQ.getCode()){//知识产权 公示 专利受理、转让(项目已提交),软著下证
-					if(ob.getDunType()==3&&t.getProjectStatus()==OrderProjectStatus.XMXZ.getCode()) {
+					if(ob.getDunType()==3&&projectStatus==NewProjectStatus.YWCXZ.getCode()) {
 						flag=true;
 					}else if (ob.getDunType()==2) {
 						BusinessProject bp=businessProjectMapper.selectByPrimaryKey(task2.getCommodityId());
-						if (bp.getType()==0&&t.getProjectStatus()==OrderProjectStatus.XMGS.getCode()) {
+						if (bp.getType()==0&&projectStatus==NewProjectStatus.YWCXZ.getCode()) {
 							flag=true;
 						}
-						if (bp.getType()==1&&t.getProjectStatus()==OrderProjectStatus.XMYTJ.getCode()) {
+						if (bp.getType()==1&&projectStatus==NewProjectStatus.YTJ.getCode()) {
 							flag=true;
 						}
-						if (bp.getType()==2&&t.getProjectStatus()==OrderProjectStatus.XMXZ.getCode()) {
+						if (bp.getType()==2&&projectStatus==NewProjectStatus.YWCXZ.getCode()) {
 							flag=true;
 						}
 						
@@ -532,20 +546,20 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 				} 
 					if(flag) {
 					//如果启动催款,则新增欠款与应收款
-					tOrderMidMapper.addOrderReceivables(t.getOrderNo(), ob.getMoney());
-					TOrderMid tm=tOrderMidMapper.selectByOrderNo(t.getOrderNo());
+					tOrderMidMapper.addOrderReceivables(task2.getOrderNo(), ob.getMoney());
+					TOrderMid tm=tOrderMidMapper.selectByOrderNo(task2.getOrderNo());
 						TArrearsDun td=new TArrearsDun();
 						td.setOrderArrears(tm.getOrderArrears());
 						td.setOrderReceivables(tm.getOrderReceivables());
-						if (tArrearsDunMapper.checkOrderNo(t.getOrderNo(),null)<1) {
-							td.setOrderNo(t.getOrderNo());
+						if (tArrearsDunMapper.checkOrderNo(task2.getOrderNo(),null)<1) {
+							td.setOrderNo(task2.getOrderNo());
 							tArrearsDunMapper.insertSelective(td);
-						}else if(tArrearsDunMapper.checkOrderNo(t.getOrderNo(),0)>0){
-							Integer i=tArrearsDunMapper.selectByStatus(t.getOrderNo(), 0);
+						}else if(tArrearsDunMapper.checkOrderNo(task2.getOrderNo(),0)>0){
+							Integer i=tArrearsDunMapper.selectByStatus(task2.getOrderNo(), 0);
 							td.setId(i);
 							tArrearsDunMapper.updateByPrimaryKeySelective(td);
 						}
-					orderNewService.addNewDunNoticAndSendEmail(t.getOrderNo(),ob);
+					orderNewService.addNewDunNoticAndSendEmail(task2.getOrderNo(),ob);
 					ob.setStatus(1);
 					ob.setStartTime(new Date());
 					newOrderDunMapper.updateByPrimaryKeySelective(ob);
@@ -553,38 +567,38 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 				}
 			}
 		}
-		List<OutPaymentNode> list2=paymentNodeMapper.selectByTid(Integer.parseInt(t.getId()),0);
+		List<OutPaymentNode> list2=paymentNodeMapper.selectByTid(tid,0);
 		for (OutPaymentNode op : list2) {
 			if (op!=null) {
 				boolean flag=false;
 				if((op.getProjectType()==OrderDunProjectType.CGZH.getCode()&&op.getDunType()==2&&//成果转化 验收
-						t.getProjectStatus()==OrderProjectStatus.XMYS.getCode()))flag=true;
+						projectStatus==NewProjectStatus.YWCXZ.getCode()))flag=true;
 				if((op.getProjectType()==OrderDunProjectType.COMMON.getCode()&&op.getDunType()==2&&//通用 公示
-						t.getProjectStatus()==OrderProjectStatus.XMGS.getCode()))flag=true;
+						projectStatus==NewProjectStatus.YTJ.getCode()))flag=true;
 				if((op.getProjectType()==OrderDunProjectType.COMMON.getCode()&&op.getDunType()==3&&//通用 下证
-						t.getProjectStatus()==OrderProjectStatus.XMXZ.getCode()))flag=true;
+						projectStatus==NewProjectStatus.YWCXZ.getCode()))flag=true;
 				if((op.getProjectType()==OrderDunProjectType.KJXM.getCode()&&op.getDunType()==2&&//科技项目 立项或者公示
-						(t.getProjectStatus()==OrderProjectStatus.XMLX.getCode()||(t.getProjectStatus()==OrderProjectStatus.XMGS.getCode()))))flag=true;
+						projectStatus==NewProjectStatus.YLX.getCode()))flag=true;
 				if((op.getProjectType()==OrderDunProjectType.KJXM.getCode()&&op.getDunType()==3&&//科技项目 拨款
-						t.getProjectStatus()==OrderProjectStatus.XMBK.getCode()))flag=true;
+						projectStatus==NewProjectStatus.LXYBK.getCode()))flag=true;
 				if((op.getProjectType()==OrderDunProjectType.KJJR.getCode()&&op.getDunType()==2&&//科技金融 拨款
-						t.getProjectStatus()==OrderProjectStatus.XMBK.getCode()))flag=true;
+						projectStatus==NewProjectStatus.YWCXZ.getCode()))flag=true;
 				if((op.getProjectType()==OrderDunProjectType.RJKF.getCode()&&op.getDunType()==2&&//软件开发 立项
-						t.getProjectStatus()==OrderProjectStatus.XMLX.getCode()))flag=true;
+						projectStatus==NewProjectStatus.YTJ.getCode()))flag=true;
 				if((op.getProjectType()==OrderDunProjectType.RJKF.getCode()&&op.getDunType()==3&&//软件开发 验收
-						t.getProjectStatus()==OrderProjectStatus.XMYS.getCode()))flag=true;
+						projectStatus==NewProjectStatus.YWCXZ.getCode()))flag=true;
 				if(op.getProjectType()==OrderDunProjectType.ZSCQ.getCode()){//知识产权 公示 专利受理、转让(项目已提交),软著下证
-					if(op.getDunType()==3&&t.getProjectStatus()==OrderProjectStatus.XMXZ.getCode()) {
+					if(op.getDunType()==3&&projectStatus==NewProjectStatus.YWCXZ.getCode()) {
 						flag=true;
 					}else if (op.getDunType()==2) {
 						BusinessProject bp=businessProjectMapper.selectByPrimaryKey(task2.getCommodityId());
-						if (bp.getType()==0&&t.getProjectStatus()==OrderProjectStatus.XMGS.getCode()) {
+						if (bp.getType()==0&&projectStatus==NewProjectStatus.YWCXZ.getCode()) {
 							flag=true;
 						}
-						if (bp.getType()==1&&t.getProjectStatus()==OrderProjectStatus.XMYTJ.getCode()) {
+						if (bp.getType()==1&&projectStatus==NewProjectStatus.YTJ.getCode()) {
 							flag=true;
 						}
-						if (bp.getType()==2&&t.getProjectStatus()==OrderProjectStatus.XMXZ.getCode()) {
+						if (bp.getType()==2&&projectStatus==NewProjectStatus.YWCXZ.getCode()) {
 							flag=true;
 						}
 						
@@ -659,18 +673,18 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			tNew.setProjectStatus(task.getProjectStatus());
 			tNew.setOrderNo(task.getOrderNo());
 			tOrderNewMapper.updateByPrimaryKeySelective(tNew);
-			if (task.getProjectStatus()==ProjectNewStage.YTJ.getCode()||task.getProjectStatus()==ProjectNewStage.LS.getCode()||
-					task.getProjectStatus()==ProjectNewStage.GS.getCode()) {
+			if (task.getProjectStatus()==NewProjectStatus.YTJ.getCode()||task.getProjectStatus()==NewProjectStatus.YLX.getCode()||
+					task.getProjectStatus()==NewProjectStatus.YGS.getCode()) {
 				TOrderBonus tb=new TOrderBonus();
 				TOrderNew t=tOrderNewMapper.selectByPrimaryKey(task.getOrderNo());
 				tb.setId(UUID.randomUUID().toString());
 				tb.setOrderNo(task.getOrderNo());
-				if (task.getProjectStatus()==ProjectNewStage.YTJ.getCode()) {
+				if (task.getProjectStatus()==NewProjectStatus.YTJ.getCode()) {
 					tb.setBonusSubject(21);//项目已提交
 					addOrderLog(task.getOrderNo(),OrderLogProcess.XMWC.getCode(),null);
 				}
-				if (task.getProjectStatus()==ProjectNewStage.LS.getCode())tb.setBonusSubject(23);//项目立项
-				if (task.getProjectStatus()==ProjectNewStage.GS.getCode())tb.setBonusSubject(24);//项目公示
+				if (task.getProjectStatus()==NewProjectStatus.YLX.getCode())tb.setBonusSubject(23);//项目立项
+				if (task.getProjectStatus()==NewProjectStatus.YGS.getCode())tb.setBonusSubject(24);//项目公示
 				tb.setGrantType(1);//技术员
 				//新增奖金之前检查这个奖金数据是否存在
 				tb.setGrantTarget(task.getTaskReceiver());
@@ -822,8 +836,9 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		return i;
 	}
 	private void countByTid(Integer taskId, Integer type) {
-		TTaskMid ttm=tTaskMidMapper.selectCountBytid(taskId,type);
-		tTaskMidMapper.updateByPrimaryKeySelective(ttm);
+		//目前不做计算
+//		TTaskMid ttm=tTaskMidMapper.selectCountBytid(taskId,type);
+//		tTaskMidMapper.updateByPrimaryKeySelective(ttm);
 		
 	}
 
@@ -1027,5 +1042,33 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	public List<OutTaskProgressLog> selectTaskProgressLog(Integer tid) {
 		return taskProgressLogMapper.selectTaskProgressLog(tid);
 	}
+
+
+
+	@Override
+	public Pagination<managerListBo> managerSelect(String name, String orderNo, String contractNo, String cid,
+			String projectType, String depId, String techDepId, Integer declarationBatch, String commodityPrice,
+			String startTime,String endTime ,Integer pageNo, Integer pageSize) {
+		Map<String, Object> params = new HashMap<String, Object>();
+		if(pageSize==null||pageSize<0)pageSize=10;
+		if(pageNo==null||pageNo<0)pageNo=1;
+		params.put("aid", TokenManager.getAdminId()==null?"":TokenManager.getAdminId());
+		if (StringUtils.isNotBlank(name))params.put("name", name); 
+		else params.put("name", "");
+		if (StringUtils.isNotBlank(depId)) params.put("depId", depId);
+		if (StringUtils.isNotBlank(orderNo)) params.put("orderNo", orderNo);
+		if (StringUtils.isNotBlank(contractNo)) params.put("contractNo", contractNo);
+		if (StringUtils.isNotBlank(cid)) params.put("cid", cid);
+		if (StringUtils.isNotBlank(projectType)) params.put("projectType", projectType);
+		if (StringUtils.isNotBlank(depId)) params.put("depId", depId);
+		if (StringUtils.isNotBlank(techDepId)) params.put("techDepId", techDepId);
+		if (StringUtils.isNotBlank(commodityPrice)) params.put("commodityPrice", commodityPrice);
+		if (StringUtils.isNotBlank(startTime)) params.put("startTime", startTime);
+		if (StringUtils.isNotBlank(endTime)) params.put("endTime", endTime+" 23:59:59");
+		if (null != declarationBatch) params.put("declarationBatch", declarationBatch);
+		@SuppressWarnings("unchecked")
+		Pagination<managerListBo> p = (Pagination<managerListBo>)findPage("managerSelectByPage", "managerSelectCount", params, pageNo, pageSize);
+		return p;
+	}
 	
 }