Просмотр исходного кода

修改

Signed-off-by: anderx <312518615@qq.com>
anderx лет назад: 5
Родитель
Сommit
883a654d45

+ 1 - 1
GeneratorConfig.xml

@@ -9,7 +9,7 @@
     <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="kede-server" />
     <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="kede-server" />
     <javaClientGenerator  targetPackage="com.goafanti.common.dao"  type="XMLMAPPER" targetProject="kede-server"  />
-    <table schema="aft" tableName="t_order_new"/>
+    <table schema="aft" tableName="t_order_task"/>
     <!-- 如果改动 t_order_task表,记得修改修改接口,不然会导致服务器无法启动 -->
   </context>
 </generatorConfiguration>

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

@@ -12,85 +12,85 @@ 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  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:15 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  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:15 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  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:15 CST 2020
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:15 CST 2020
 	 */
 	int insert(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:15 CST 2020
 	 */
 	int insertSelective(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:15 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  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:15 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  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:15 CST 2020
 	 */
 	TOrderTask selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:15 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  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:15 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  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:15 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  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:15 CST 2020
 	 */
 	int updateByPrimaryKeySelective(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:15 CST 2020
 	 */
 	int updateByPrimaryKeyWithBLOBs(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:15 CST 2020
 	 */
 	int updateByPrimaryKey(TOrderTask record);
 

+ 322 - 28
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 Tue Mar 31 14:23:56 CST 2020.
+      This element was generated on Fri May 15 16:05:15 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
@@ -50,12 +50,13 @@
     <result column="split_time" jdbcType="TIMESTAMP" property="splitTime" />
     <result column="cname" jdbcType="VARCHAR" property="cname" />
     <result column="receiver_name" jdbcType="VARCHAR" property="receiverName" />
+    <result column="declaration_batch" jdbcType="INTEGER" property="declarationBatch" />
   </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 Tue Mar 31 14:23:56 CST 2020.
+      This element was generated on Fri May 15 16:05:15 CST 2020.
     -->
     <result column="attachment_url" jdbcType="LONGVARCHAR" property="attachmentUrl" />
   </resultMap>
@@ -63,7 +64,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 31 14:23:56 CST 2020.
+      This element was generated on Fri May 15 16:05:15 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -97,7 +98,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 31 14:23:56 CST 2020.
+      This element was generated on Fri May 15 16:05:15 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -131,7 +132,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 31 14:23:56 CST 2020.
+      This element was generated on Fri May 15 16:05:15 CST 2020.
     -->
     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, 
@@ -139,13 +140,13 @@
     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
+    split_status, split_id, split_aid, split_time, cname, receiver_name, declaration_batch
   </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 Tue Mar 31 14:23:56 CST 2020.
+      This element was generated on Fri May 15 16:05:15 CST 2020.
     -->
     attachment_url
   </sql>
@@ -153,7 +154,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 31 14:23:56 CST 2020.
+      This element was generated on Fri May 15 16:05:15 CST 2020.
     -->
     select
     <if test="distinct">
@@ -174,7 +175,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 31 14:23:56 CST 2020.
+      This element was generated on Fri May 15 16:05:15 CST 2020.
     -->
     select
     <if test="distinct">
@@ -193,7 +194,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 31 14:23:56 CST 2020.
+      This element was generated on Fri May 15 16:05:15 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -206,7 +207,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 31 14:23:56 CST 2020.
+      This element was generated on Fri May 15 16:05:15 CST 2020.
     -->
     delete from t_order_task
     where id = #{id,jdbcType=INTEGER}
@@ -215,7 +216,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 31 14:23:56 CST 2020.
+      This element was generated on Fri May 15 16:05:15 CST 2020.
     -->
     delete from t_order_task
     <if test="_parameter != null">
@@ -226,7 +227,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 31 14:23:56 CST 2020.
+      This element was generated on Fri May 15 16:05:15 CST 2020.
     -->
     insert into t_order_task (id, order_no, main, 
       super_id, commodity_id, commodity_name, 
@@ -242,7 +243,8 @@
       consultant_id, manager_id, outsource, 
       split_super, split_status, split_id, 
       split_aid, split_time, cname, 
-      receiver_name, attachment_url)
+      receiver_name, declaration_batch, attachment_url
+      )
     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}, 
@@ -257,14 +259,296 @@
       #{consultantId,jdbcType=VARCHAR}, #{managerId,jdbcType=VARCHAR}, #{outsource,jdbcType=INTEGER}, 
       #{splitSuper,jdbcType=INTEGER}, #{splitStatus,jdbcType=INTEGER}, #{splitId,jdbcType=INTEGER}, 
       #{splitAid,jdbcType=VARCHAR}, #{splitTime,jdbcType=TIMESTAMP}, #{cname,jdbcType=VARCHAR}, 
-      #{receiverName,jdbcType=VARCHAR}, #{attachmentUrl,jdbcType=LONGVARCHAR})
+      #{receiverName,jdbcType=VARCHAR}, #{declarationBatch,jdbcType=INTEGER}, #{attachmentUrl,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 Fri May 15 16:05:15 CST 2020.
+    -->
+    insert into t_order_task
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="orderNo != null">
+        order_no,
+      </if>
+      <if test="main != null">
+        main,
+      </if>
+      <if test="superId != null">
+        super_id,
+      </if>
+      <if test="commodityId != null">
+        commodity_id,
+      </if>
+      <if test="commodityName != null">
+        commodity_name,
+      </if>
+      <if test="commodityQuantity != null">
+        commodity_quantity,
+      </if>
+      <if test="commodityMode != null">
+        commodity_mode,
+      </if>
+      <if test="commodityPrice != null">
+        commodity_price,
+      </if>
+      <if test="taskStatus != null">
+        task_status,
+      </if>
+      <if test="taskDistributionTime != null">
+        task_distribution_time,
+      </if>
+      <if test="taskAllocator != null">
+        task_allocator,
+      </if>
+      <if test="taskReceiver != null">
+        task_receiver,
+      </if>
+      <if test="taskComment != null">
+        task_comment,
+      </if>
+      <if test="taskStartTime != null">
+        task_start_time,
+      </if>
+      <if test="taskEndTime != null">
+        task_end_time,
+      </if>
+      <if test="projectStatus != null">
+        project_status,
+      </if>
+      <if test="acceptTime != null">
+        accept_time,
+      </if>
+      <if test="reviewTime != null">
+        review_time,
+      </if>
+      <if test="publicityTime != null">
+        publicity_time,
+      </if>
+      <if test="licenceTime != null">
+        licence_time,
+      </if>
+      <if test="certificateNumber != null">
+        certificate_number,
+      </if>
+      <if test="status != null">
+        status,
+      </if>
+      <if test="formRetrieve != null">
+        form_retrieve,
+      </if>
+      <if test="taskRefund != null">
+        task_refund,
+      </if>
+      <if test="refundContent != null">
+        refund_content,
+      </if>
+      <if test="retrieveContent != null">
+        retrieve_content,
+      </if>
+      <if test="declareUser != null">
+        declare_user,
+      </if>
+      <if test="declarePwd != null">
+        declare_pwd,
+      </if>
+      <if test="setUpAmount != null">
+        set_up_amount,
+      </if>
+      <if test="arrivalMoney != null">
+        arrival_money,
+      </if>
+      <if test="outsourceName != null">
+        outsource_name,
+      </if>
+      <if test="outsourcePrice != null">
+        outsource_price,
+      </if>
+      <if test="consultantId != null">
+        consultant_id,
+      </if>
+      <if test="managerId != null">
+        manager_id,
+      </if>
+      <if test="outsource != null">
+        outsource,
+      </if>
+      <if test="splitSuper != null">
+        split_super,
+      </if>
+      <if test="splitStatus != null">
+        split_status,
+      </if>
+      <if test="splitId != null">
+        split_id,
+      </if>
+      <if test="splitAid != null">
+        split_aid,
+      </if>
+      <if test="splitTime != null">
+        split_time,
+      </if>
+      <if test="cname != null">
+        cname,
+      </if>
+      <if test="receiverName != null">
+        receiver_name,
+      </if>
+      <if test="declarationBatch != null">
+        declaration_batch,
+      </if>
+      <if test="attachmentUrl != null">
+        attachment_url,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="orderNo != null">
+        #{orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="main != null">
+        #{main,jdbcType=INTEGER},
+      </if>
+      <if test="superId != null">
+        #{superId,jdbcType=VARCHAR},
+      </if>
+      <if test="commodityId != null">
+        #{commodityId,jdbcType=VARCHAR},
+      </if>
+      <if test="commodityName != null">
+        #{commodityName,jdbcType=VARCHAR},
+      </if>
+      <if test="commodityQuantity != null">
+        #{commodityQuantity,jdbcType=INTEGER},
+      </if>
+      <if test="commodityMode != null">
+        #{commodityMode,jdbcType=VARCHAR},
+      </if>
+      <if test="commodityPrice != null">
+        #{commodityPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="taskStatus != null">
+        #{taskStatus,jdbcType=INTEGER},
+      </if>
+      <if test="taskDistributionTime != null">
+        #{taskDistributionTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="taskAllocator != null">
+        #{taskAllocator,jdbcType=VARCHAR},
+      </if>
+      <if test="taskReceiver != null">
+        #{taskReceiver,jdbcType=VARCHAR},
+      </if>
+      <if test="taskComment != null">
+        #{taskComment,jdbcType=VARCHAR},
+      </if>
+      <if test="taskStartTime != null">
+        #{taskStartTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="taskEndTime != null">
+        #{taskEndTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="projectStatus != null">
+        #{projectStatus,jdbcType=INTEGER},
+      </if>
+      <if test="acceptTime != null">
+        #{acceptTime,jdbcType=DATE},
+      </if>
+      <if test="reviewTime != null">
+        #{reviewTime,jdbcType=DATE},
+      </if>
+      <if test="publicityTime != null">
+        #{publicityTime,jdbcType=DATE},
+      </if>
+      <if test="licenceTime != null">
+        #{licenceTime,jdbcType=DATE},
+      </if>
+      <if test="certificateNumber != null">
+        #{certificateNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="formRetrieve != null">
+        #{formRetrieve,jdbcType=INTEGER},
+      </if>
+      <if test="taskRefund != null">
+        #{taskRefund,jdbcType=INTEGER},
+      </if>
+      <if test="refundContent != null">
+        #{refundContent,jdbcType=VARCHAR},
+      </if>
+      <if test="retrieveContent != null">
+        #{retrieveContent,jdbcType=VARCHAR},
+      </if>
+      <if test="declareUser != null">
+        #{declareUser,jdbcType=VARCHAR},
+      </if>
+      <if test="declarePwd != null">
+        #{declarePwd,jdbcType=VARCHAR},
+      </if>
+      <if test="setUpAmount != null">
+        #{setUpAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="arrivalMoney != null">
+        #{arrivalMoney,jdbcType=INTEGER},
+      </if>
+      <if test="outsourceName != null">
+        #{outsourceName,jdbcType=VARCHAR},
+      </if>
+      <if test="outsourcePrice != null">
+        #{outsourcePrice,jdbcType=DECIMAL},
+      </if>
+      <if test="consultantId != null">
+        #{consultantId,jdbcType=VARCHAR},
+      </if>
+      <if test="managerId != null">
+        #{managerId,jdbcType=VARCHAR},
+      </if>
+      <if test="outsource != null">
+        #{outsource,jdbcType=INTEGER},
+      </if>
+      <if test="splitSuper != null">
+        #{splitSuper,jdbcType=INTEGER},
+      </if>
+      <if test="splitStatus != null">
+        #{splitStatus,jdbcType=INTEGER},
+      </if>
+      <if test="splitId != null">
+        #{splitId,jdbcType=INTEGER},
+      </if>
+      <if test="splitAid != null">
+        #{splitAid,jdbcType=VARCHAR},
+      </if>
+      <if test="splitTime != null">
+        #{splitTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="cname != null">
+        #{cname,jdbcType=VARCHAR},
+      </if>
+      <if test="receiverName != null">
+        #{receiverName,jdbcType=VARCHAR},
+      </if>
+      <if test="declarationBatch != null">
+        #{declarationBatch,jdbcType=INTEGER},
+      </if>
+      <if test="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 Tue Mar 31 14:23:56 CST 2020.
+      This element was generated on Fri May 15 16:05:15 CST 2020.
     -->
     select count(*) from t_order_task
     <if test="_parameter != null">
@@ -275,7 +559,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 31 14:23:56 CST 2020.
+      This element was generated on Fri May 15 16:05:15 CST 2020.
     -->
     update t_order_task
     <set>
@@ -408,6 +692,9 @@
       <if test="record.receiverName != null">
         receiver_name = #{record.receiverName,jdbcType=VARCHAR},
       </if>
+      <if test="record.declarationBatch != null">
+        declaration_batch = #{record.declarationBatch,jdbcType=INTEGER},
+      </if>
       <if test="record.attachmentUrl != null">
         attachment_url = #{record.attachmentUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -420,7 +707,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 31 14:23:56 CST 2020.
+      This element was generated on Fri May 15 16:05:15 CST 2020.
     -->
     update t_order_task
     set id = #{record.id,jdbcType=INTEGER},
@@ -466,6 +753,7 @@
       split_time = #{record.splitTime,jdbcType=TIMESTAMP},
       cname = #{record.cname,jdbcType=VARCHAR},
       receiver_name = #{record.receiverName,jdbcType=VARCHAR},
+      declaration_batch = #{record.declarationBatch,jdbcType=INTEGER},
       attachment_url = #{record.attachmentUrl,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -475,7 +763,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 31 14:23:56 CST 2020.
+      This element was generated on Fri May 15 16:05:15 CST 2020.
     -->
     update t_order_task
     set id = #{record.id,jdbcType=INTEGER},
@@ -520,7 +808,8 @@
       split_aid = #{record.splitAid,jdbcType=VARCHAR},
       split_time = #{record.splitTime,jdbcType=TIMESTAMP},
       cname = #{record.cname,jdbcType=VARCHAR},
-      receiver_name = #{record.receiverName,jdbcType=VARCHAR}
+      receiver_name = #{record.receiverName,jdbcType=VARCHAR},
+      declaration_batch = #{record.declarationBatch,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -529,7 +818,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 31 14:23:56 CST 2020.
+      This element was generated on Fri May 15 16:05:15 CST 2020.
     -->
     update t_order_task
     <set>
@@ -659,6 +948,9 @@
       <if test="receiverName != null">
         receiver_name = #{receiverName,jdbcType=VARCHAR},
       </if>
+      <if test="declarationBatch != null">
+        declaration_batch = #{declarationBatch,jdbcType=INTEGER},
+      </if>
       <if test="attachmentUrl != null">
         attachment_url = #{attachmentUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -669,7 +961,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 31 14:23:56 CST 2020.
+      This element was generated on Fri May 15 16:05:15 CST 2020.
     -->
     update t_order_task
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -714,6 +1006,7 @@
       split_time = #{splitTime,jdbcType=TIMESTAMP},
       cname = #{cname,jdbcType=VARCHAR},
       receiver_name = #{receiverName,jdbcType=VARCHAR},
+      declaration_batch = #{declarationBatch,jdbcType=INTEGER},
       attachment_url = #{attachmentUrl,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -721,7 +1014,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 31 14:23:56 CST 2020.
+      This element was generated on Fri May 15 16:05:15 CST 2020.
     -->
     update t_order_task
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -765,14 +1058,15 @@
       split_aid = #{splitAid,jdbcType=VARCHAR},
       split_time = #{splitTime,jdbcType=TIMESTAMP},
       cname = #{cname,jdbcType=VARCHAR},
-      receiver_name = #{receiverName,jdbcType=VARCHAR}
+      receiver_name = #{receiverName,jdbcType=VARCHAR},
+      declaration_batch = #{declarationBatch,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <!-- 记得返回id -->
-  <!-- &lt;insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TOrderTask" useGeneratedKeys="true"&gt;
-  		&lt;selectKey keyProperty="id" order="AFTER" resultType="int"&gt;
+  <!-- &amp;lt;insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TOrderTask" useGeneratedKeys="true"&amp;gt;
+  		&amp;lt;selectKey keyProperty="id" order="AFTER" resultType="int"&amp;gt;
         SELECT LAST_INSERT_ID()
-    &lt;/selectKey&gt; -->
+    &amp;lt;/selectKey&amp;gt; -->
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TOrderTask" useGeneratedKeys="true">
     insert into t_order_task
     <trim prefix="(" suffix=")" suffixOverrides=",">

Разница между файлами не показана из-за своего большого размера
+ 155 - 134
src/main/java/com/goafanti/common/model/TOrderTask.java


+ 76 - 16
src/main/java/com/goafanti/common/model/TOrderTaskExample.java

@@ -9,23 +9,23 @@ import java.util.List;
 public class TOrderTaskExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:14 CST 2020
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:14 CST 2020
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:14 CST 2020
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:14 CST 2020
 	 */
 	public TOrderTaskExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -33,7 +33,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:14 CST 2020
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -41,7 +41,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:14 CST 2020
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -49,7 +49,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:14 CST 2020
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -57,7 +57,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:14 CST 2020
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -65,7 +65,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:14 CST 2020
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -73,7 +73,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:14 CST 2020
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -81,7 +81,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:14 CST 2020
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -91,7 +91,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:14 CST 2020
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -103,7 +103,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:14 CST 2020
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -112,7 +112,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:14 CST 2020
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -122,7 +122,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:14 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -2960,11 +2960,71 @@ public class TOrderTaskExample {
 			addCriterion("receiver_name not between", value1, value2, "receiverName");
 			return (Criteria) this;
 		}
+
+		public Criteria andDeclarationBatchIsNull() {
+			addCriterion("declaration_batch is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarationBatchIsNotNull() {
+			addCriterion("declaration_batch is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarationBatchEqualTo(Integer value) {
+			addCriterion("declaration_batch =", value, "declarationBatch");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarationBatchNotEqualTo(Integer value) {
+			addCriterion("declaration_batch <>", value, "declarationBatch");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarationBatchGreaterThan(Integer value) {
+			addCriterion("declaration_batch >", value, "declarationBatch");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarationBatchGreaterThanOrEqualTo(Integer value) {
+			addCriterion("declaration_batch >=", value, "declarationBatch");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarationBatchLessThan(Integer value) {
+			addCriterion("declaration_batch <", value, "declarationBatch");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarationBatchLessThanOrEqualTo(Integer value) {
+			addCriterion("declaration_batch <=", value, "declarationBatch");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarationBatchIn(List<Integer> values) {
+			addCriterion("declaration_batch in", values, "declarationBatch");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarationBatchNotIn(List<Integer> values) {
+			addCriterion("declaration_batch not in", values, "declarationBatch");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarationBatchBetween(Integer value1, Integer value2) {
+			addCriterion("declaration_batch between", value1, value2, "declarationBatch");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarationBatchNotBetween(Integer value1, Integer value2) {
+			addCriterion("declaration_batch not between", value1, value2, "declarationBatch");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:15 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

+ 1 - 0
src/main/java/com/goafanti/common/task/PatentTask.java

@@ -174,6 +174,7 @@ public class PatentTask {
 		LoggerUtils.debug(getClass(), "=====================专利提醒结束======================");
 	}
 	
+	
 
 	private String StrToString(String name, String email, String applicant,  String adminName, String pantentName,
 		String pantentNo, String money, String format) {

+ 7 - 0
src/main/java/com/goafanti/order/bo/TOrderTaskDetailBo.java

@@ -35,6 +35,7 @@ public class TOrderTaskDetailBo {
 	private Integer locationCity;
 	private Integer locationArea;
 	private String postalAddress;
+	private Integer declarationBatch;
 	/**
 	 * 任务状态
 	 */
@@ -345,6 +346,12 @@ public class TOrderTaskDetailBo {
 	public void setTaskReceiver(String taskReceiver) {
 		this.taskReceiver = taskReceiver;
 	}
+	public Integer getDeclarationBatch() {
+		return declarationBatch;
+	}
+	public void setDeclarationBatch(Integer declarationBatch) {
+		this.declarationBatch = declarationBatch;
+	}
 	
 	
 }

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

@@ -269,6 +269,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		task.setArrivalMoney(t.getArrivalMoney());
 		task.setSetUpAmount(t.getSetUpAmount());
 		task.setOutsourceName(t.getOutsourceName());
+		task.setDeclarationBatch(t.getDeclarationBatch());
 		if(StringUtils.isNotBlank(t.getOutsourcePrice()))task.setOutsourcePrice(new BigDecimal(t.getOutsourcePrice()));
 		//根据修改的修改订单法人与联系人
 		if(StringUtils.isNotEmpty(t.getContacts()))tn.setContacts(t.getContacts());