Browse Source

新增项目标签

anderx 2 years ago
parent
commit
3b4c601b6c

+ 221 - 195
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -67,6 +67,7 @@
     <result column="picture_url" jdbcType="VARCHAR" property="pictureUrl" />
     <result column="satisfaction_degree" jdbcType="INTEGER" property="satisfactionDegree" />
     <result column="satisfaction_degree_url" jdbcType="VARCHAR" property="satisfactionDegreeUrl" />
+    <result column="tag" jdbcType="INTEGER" property="tag" />
   </resultMap>
   <sql id="Base_Column_List">
     id, order_no, main, super_id, commodity_id, commodity_name, commodity_quantity, commodity_mode,
@@ -79,7 +80,7 @@
     declaration_batch, cost_reduction, official_cost, set_up_status, set_up_time, spot_check_status,
     high_tech_status, special_comment, if_certification_fee, certification_fee, certification_corporate,
     time_record, if_publicity, check_status, patent_type, pubicity_url, process_status,
-    member_type, picture_url, satisfaction_degree, satisfaction_degree_url
+    member_type, picture_url, satisfaction_degree, satisfaction_degree_url, tag
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
@@ -113,8 +114,8 @@
       certification_corporate, time_record, if_publicity,
       check_status, patent_type, pubicity_url,
       process_status, member_type, picture_url,
-      satisfaction_degree, satisfaction_degree_url
-      )
+      satisfaction_degree, satisfaction_degree_url,
+      tag)
     values (#{orderNo,jdbcType=VARCHAR}, #{main,jdbcType=INTEGER}, #{superId,jdbcType=VARCHAR},
       #{commodityId,jdbcType=VARCHAR}, #{commodityName,jdbcType=VARCHAR}, #{commodityQuantity,jdbcType=INTEGER},
       #{commodityMode,jdbcType=VARCHAR}, #{commodityPrice,jdbcType=DECIMAL}, #{taskStatus,jdbcType=INTEGER},
@@ -136,8 +137,8 @@
       #{certificationCorporate,jdbcType=VARCHAR}, #{timeRecord,jdbcType=VARCHAR}, #{ifPublicity,jdbcType=INTEGER},
       #{checkStatus,jdbcType=INTEGER}, #{patentType,jdbcType=INTEGER}, #{pubicityUrl,jdbcType=VARCHAR},
       #{processStatus,jdbcType=INTEGER}, #{memberType,jdbcType=INTEGER}, #{pictureUrl,jdbcType=VARCHAR},
-      #{satisfactionDegree,jdbcType=INTEGER}, #{satisfactionDegreeUrl,jdbcType=VARCHAR}
-      )
+      #{satisfactionDegree,jdbcType=INTEGER}, #{satisfactionDegreeUrl,jdbcType=VARCHAR},
+      #{tag,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TOrderTask" useGeneratedKeys="true">
     insert into t_order_task
@@ -334,6 +335,9 @@
       <if test="satisfactionDegreeUrl != null">
         satisfaction_degree_url,
       </if>
+      <if test="tag != null">
+        tag,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="orderNo != null">
@@ -528,6 +532,9 @@
       <if test="satisfactionDegreeUrl != null">
         #{satisfactionDegreeUrl,jdbcType=VARCHAR},
       </if>
+      <if test="tag != null">
+        #{tag,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TOrderTask">
@@ -725,6 +732,9 @@
       <if test="satisfactionDegreeUrl != null">
         satisfaction_degree_url = #{satisfactionDegreeUrl,jdbcType=VARCHAR},
       </if>
+      <if test="tag != null">
+        tag = #{tag,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -793,10 +803,214 @@
       member_type = #{memberType,jdbcType=INTEGER},
       picture_url = #{pictureUrl,jdbcType=VARCHAR},
       satisfaction_degree = #{satisfactionDegree,jdbcType=INTEGER},
-      satisfaction_degree_url = #{satisfactionDegreeUrl,jdbcType=VARCHAR}
+      satisfaction_degree_url = #{satisfactionDegreeUrl,jdbcType=VARCHAR},
+      tag = #{tag,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
 
+
+
+
+
+  <update id="updateBySuperId">
+    update t_order_task
+    <set>
+      <if test="orderNo != null">
+        order_no = #{orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="main != null">
+        main = #{main,jdbcType=INTEGER},
+      </if>
+      <if test="superId != null">
+        super_id = #{superId,jdbcType=VARCHAR},
+      </if>
+      <if test="commodityId != null">
+        commodity_id = #{commodityId,jdbcType=VARCHAR},
+      </if>
+      <if test="commodityName != null">
+        commodity_name = #{commodityName,jdbcType=VARCHAR},
+      </if>
+      <if test="commodityQuantity != null">
+        commodity_quantity = #{commodityQuantity,jdbcType=INTEGER},
+      </if>
+      <if test="commodityMode != null">
+        commodity_mode = #{commodityMode,jdbcType=VARCHAR},
+      </if>
+      <if test="commodityPrice != null">
+        commodity_price = #{commodityPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="taskStatus != null">
+        task_status = #{taskStatus,jdbcType=INTEGER},
+      </if>
+      <if test="taskDistributionTime != null">
+        task_distribution_time = #{taskDistributionTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="taskAllocator != null">
+        task_allocator = #{taskAllocator,jdbcType=VARCHAR},
+      </if>
+      <if test="taskReceiver != null">
+        task_receiver = #{taskReceiver,jdbcType=VARCHAR},
+      </if>
+      <if test="taskComment != null">
+        task_comment = #{taskComment,jdbcType=VARCHAR},
+      </if>
+      <if test="taskStartTime != null">
+        task_start_time = #{taskStartTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="taskEndTime != null">
+        task_end_time = #{taskEndTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="attachmentUrl != null">
+        attachment_url = #{attachmentUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="projectStatus != null">
+        project_status = #{projectStatus,jdbcType=INTEGER},
+      </if>
+      <if test="acceptTime != null">
+        accept_time = #{acceptTime,jdbcType=DATE},
+      </if>
+      <if test="reviewTime != null">
+        review_time = #{reviewTime,jdbcType=DATE},
+      </if>
+      <if test="publicityTime != null">
+        publicity_time = #{publicityTime,jdbcType=DATE},
+      </if>
+      <if test="licenceTime != null">
+        licence_time = #{licenceTime,jdbcType=DATE},
+      </if>
+      <if test="certificateNumber != null">
+        certificate_number = #{certificateNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="status != null">
+        `status` = #{status,jdbcType=INTEGER},
+      </if>
+      <if test="formRetrieve != null">
+        form_retrieve = #{formRetrieve,jdbcType=INTEGER},
+      </if>
+      <if test="taskRefund != null">
+        task_refund = #{taskRefund,jdbcType=INTEGER},
+      </if>
+      <if test="refundContent != null">
+        refund_content = #{refundContent,jdbcType=VARCHAR},
+      </if>
+      <if test="retrieveContent != null">
+        retrieve_content = #{retrieveContent,jdbcType=VARCHAR},
+      </if>
+      <if test="declareUser != null">
+        declare_user = #{declareUser,jdbcType=VARCHAR},
+      </if>
+      <if test="declarePwd != null">
+        declare_pwd = #{declarePwd,jdbcType=VARCHAR},
+      </if>
+      <if test="setUpAmount != null">
+        set_up_amount = #{setUpAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="arrivalMoney != null">
+        arrival_money = #{arrivalMoney,jdbcType=INTEGER},
+      </if>
+      <if test="outsourceName != null">
+        outsource_name = #{outsourceName,jdbcType=VARCHAR},
+      </if>
+      <if test="outsourcePrice != null">
+        outsource_price = #{outsourcePrice,jdbcType=DECIMAL},
+      </if>
+      <if test="consultantId != null">
+        consultant_id = #{consultantId,jdbcType=VARCHAR},
+      </if>
+      <if test="managerId != null">
+        manager_id = #{managerId,jdbcType=VARCHAR},
+      </if>
+      <if test="outsource != null">
+        outsource = #{outsource,jdbcType=INTEGER},
+      </if>
+      <if test="splitStatus != null">
+        split_status = #{splitStatus,jdbcType=INTEGER},
+      </if>
+      <if test="splitId != null">
+        split_id = #{splitId,jdbcType=INTEGER},
+      </if>
+      <if test="splitAid != null">
+        split_aid = #{splitAid,jdbcType=VARCHAR},
+      </if>
+      <if test="splitTime != null">
+        split_time = #{splitTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="cname != null">
+        cname = #{cname,jdbcType=VARCHAR},
+      </if>
+      <if test="receiverName != null">
+        receiver_name = #{receiverName,jdbcType=VARCHAR},
+      </if>
+      <if test="declarationBatch != null">
+        declaration_batch = #{declarationBatch,jdbcType=INTEGER},
+      </if>
+      <if test="costReduction != null">
+        cost_reduction = #{costReduction,jdbcType=INTEGER},
+      </if>
+      <if test="officialCost != null">
+        official_cost = #{officialCost,jdbcType=INTEGER},
+      </if>
+      <if test="setUpStatus != null">
+        set_up_status = #{setUpStatus,jdbcType=INTEGER},
+      </if>
+      <if test="setUpTime != null">
+        set_up_time = #{setUpTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="spotCheckStatus != null">
+        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=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="timeRecord != null">
+        time_record = #{timeRecord,jdbcType=VARCHAR},
+      </if>
+      <if test="ifPublicity != null">
+        if_publicity = #{ifPublicity,jdbcType=INTEGER},
+      </if>
+      <if test="checkStatus != null">
+        check_status = #{checkStatus,jdbcType=INTEGER},
+      </if>
+      <if test="patentType != null">
+        patent_type = #{patentType,jdbcType=INTEGER},
+      </if>
+      <if test="pubicityUrl != null">
+        pubicity_url = #{pubicityUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="processStatus != null">
+        process_status = #{processStatus,jdbcType=INTEGER},
+      </if>
+      <if test="memberType != null">
+        member_type = #{memberType,jdbcType=INTEGER},
+      </if>
+      <if test="pictureUrl != null">
+        picture_url = #{pictureUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="satisfactionDegree != null">
+        satisfaction_degree = #{satisfactionDegree,jdbcType=INTEGER},
+      </if>
+      <if test="satisfactionDegreeUrl != null">
+        satisfaction_degree_url = #{satisfactionDegreeUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="tag != null">
+        tag = #{tag,jdbcType=INTEGER},
+      </if>
+    </set>
+    where split_super = #{splitSuper,jdbcType=INTEGER}
+  </update>
+
   <select id="selectOrderTask" resultType="com.goafanti.order.bo.TOrderTaskBo">
     select a.id,e.contract_no contractNo,a.order_no as orderNo,h.nickname userName,f.name salesmanName,
     a.outsource_name outsourceName,a.outsource, a.outsource_price outsourcePrice,g.name depName,
@@ -2171,195 +2385,7 @@
     </if>
   </select>
 
-  <update id="updateBySuperId">
-    update t_order_task
-    <set>
-      <if test="orderNo != null">
-        order_no = #{orderNo,jdbcType=VARCHAR},
-      </if>
-      <if test="main != null">
-        main = #{main,jdbcType=INTEGER},
-      </if>
-      <if test="superId != null">
-        super_id = #{superId,jdbcType=VARCHAR},
-      </if>
-      <if test="commodityId != null">
-        commodity_id = #{commodityId,jdbcType=VARCHAR},
-      </if>
-      <if test="commodityName != null">
-        commodity_name = #{commodityName,jdbcType=VARCHAR},
-      </if>
-      <if test="commodityQuantity != null">
-        commodity_quantity = #{commodityQuantity,jdbcType=INTEGER},
-      </if>
-      <if test="commodityMode != null">
-        commodity_mode = #{commodityMode,jdbcType=VARCHAR},
-      </if>
-      <if test="commodityPrice != null">
-        commodity_price = #{commodityPrice,jdbcType=DECIMAL},
-      </if>
-      <if test="taskStatus != null">
-        task_status = #{taskStatus,jdbcType=INTEGER},
-      </if>
-      <if test="taskDistributionTime != null">
-        task_distribution_time = #{taskDistributionTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="taskAllocator != null">
-        task_allocator = #{taskAllocator,jdbcType=VARCHAR},
-      </if>
-      <if test="taskReceiver != null">
-        task_receiver = #{taskReceiver,jdbcType=VARCHAR},
-      </if>
-      <if test="taskComment != null">
-        task_comment = #{taskComment,jdbcType=VARCHAR},
-      </if>
-      <if test="taskStartTime != null">
-        task_start_time = #{taskStartTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="taskEndTime != null">
-        task_end_time = #{taskEndTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="attachmentUrl != null">
-        attachment_url = #{attachmentUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="projectStatus != null">
-        project_status = #{projectStatus,jdbcType=INTEGER},
-      </if>
-      <if test="acceptTime != null">
-        accept_time = #{acceptTime,jdbcType=DATE},
-      </if>
-      <if test="reviewTime != null">
-        review_time = #{reviewTime,jdbcType=DATE},
-      </if>
-      <if test="publicityTime != null">
-        publicity_time = #{publicityTime,jdbcType=DATE},
-      </if>
-      <if test="licenceTime != null">
-        licence_time = #{licenceTime,jdbcType=DATE},
-      </if>
-      <if test="certificateNumber != null">
-        certificate_number = #{certificateNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="status != null">
-        `status` = #{status,jdbcType=INTEGER},
-      </if>
-      <if test="formRetrieve != null">
-        form_retrieve = #{formRetrieve,jdbcType=INTEGER},
-      </if>
-      <if test="taskRefund != null">
-        task_refund = #{taskRefund,jdbcType=INTEGER},
-      </if>
-      <if test="refundContent != null">
-        refund_content = #{refundContent,jdbcType=VARCHAR},
-      </if>
-      <if test="retrieveContent != null">
-        retrieve_content = #{retrieveContent,jdbcType=VARCHAR},
-      </if>
-      <if test="declareUser != null">
-        declare_user = #{declareUser,jdbcType=VARCHAR},
-      </if>
-      <if test="declarePwd != null">
-        declare_pwd = #{declarePwd,jdbcType=VARCHAR},
-      </if>
-      <if test="setUpAmount != null">
-        set_up_amount = #{setUpAmount,jdbcType=DECIMAL},
-      </if>
-      <if test="arrivalMoney != null">
-        arrival_money = #{arrivalMoney,jdbcType=INTEGER},
-      </if>
-      <if test="outsourceName != null">
-        outsource_name = #{outsourceName,jdbcType=VARCHAR},
-      </if>
-      <if test="outsourcePrice != null">
-        outsource_price = #{outsourcePrice,jdbcType=DECIMAL},
-      </if>
-      <if test="consultantId != null">
-        consultant_id = #{consultantId,jdbcType=VARCHAR},
-      </if>
-      <if test="managerId != null">
-        manager_id = #{managerId,jdbcType=VARCHAR},
-      </if>
-      <if test="outsource != null">
-        outsource = #{outsource,jdbcType=INTEGER},
-      </if>
-      <if test="splitStatus != null">
-        split_status = #{splitStatus,jdbcType=INTEGER},
-      </if>
-      <if test="splitId != null">
-        split_id = #{splitId,jdbcType=INTEGER},
-      </if>
-      <if test="splitAid != null">
-        split_aid = #{splitAid,jdbcType=VARCHAR},
-      </if>
-      <if test="splitTime != null">
-        split_time = #{splitTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="cname != null">
-        cname = #{cname,jdbcType=VARCHAR},
-      </if>
-      <if test="receiverName != null">
-        receiver_name = #{receiverName,jdbcType=VARCHAR},
-      </if>
-      <if test="declarationBatch != null">
-        declaration_batch = #{declarationBatch,jdbcType=INTEGER},
-      </if>
-      <if test="costReduction != null">
-        cost_reduction = #{costReduction,jdbcType=INTEGER},
-      </if>
-      <if test="officialCost != null">
-        official_cost = #{officialCost,jdbcType=INTEGER},
-      </if>
-      <if test="setUpStatus != null">
-        set_up_status = #{setUpStatus,jdbcType=INTEGER},
-      </if>
-      <if test="setUpTime != null">
-        set_up_time = #{setUpTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="spotCheckStatus != null">
-        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=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="timeRecord != null">
-        time_record = #{timeRecord,jdbcType=VARCHAR},
-      </if>
-      <if test="ifPublicity != null">
-        if_publicity = #{ifPublicity,jdbcType=INTEGER},
-      </if>
-      <if test="checkStatus != null">
-        check_status = #{checkStatus,jdbcType=INTEGER},
-      </if>
-      <if test="patentType != null">
-        patent_type = #{patentType,jdbcType=INTEGER},
-      </if>
-      <if test="pubicityUrl != null">
-        pubicity_url = #{pubicityUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="processStatus != null">
-        process_status = #{processStatus,jdbcType=INTEGER},
-      </if>
-      <if test="memberType != null">
-        member_type = #{memberType,jdbcType=INTEGER},
-      </if>
-      <if test="pictureUrl != null">
-        picture_url = #{pictureUrl,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where split_super = #{splitSuper,jdbcType=INTEGER}
-  </update>
+
 
   <delete id="deleteBySplitId" parameterType="java.lang.Integer">
     delete from t_order_task

+ 13 - 0
src/main/java/com/goafanti/common/model/TOrderTask.java

@@ -334,6 +334,11 @@ public class TOrderTask implements Serializable {
      */
     private String satisfactionDegreeUrl;
 
+    /**
+     * 标签 0=默认,1=待处理,2=待派单,3=暂不处理,4=已过期,已作废
+     */
+    private Integer tag;
+
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {
@@ -855,4 +860,12 @@ public class TOrderTask implements Serializable {
     public void setSatisfactionDegreeUrl(String satisfactionDegreeUrl) {
         this.satisfactionDegreeUrl = satisfactionDegreeUrl;
     }
+
+    public Integer getTag() {
+        return tag;
+    }
+
+    public void setTag(Integer tag) {
+        this.tag = tag;
+    }
 }