anderx лет назад: 6
Родитель
Сommit
384ffef007

+ 1 - 1
GeneratorConfig.xml

@@ -9,6 +9,6 @@
     <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="kede-server" />
     <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="kede-server" />
     <javaClientGenerator targetPackage="com.goafanti.common.dao" targetProject="kede-server" type="XMLMAPPER" />
-    <table schema="aft" tableName="task_progress"/>
+    <table schema="aft" tableName="t_order_task"/>
   </context>
 </generatorConfiguration>

+ 2 - 0
src/main/java/com/goafanti/common/dao/OrganizationIdentityMapper.java

@@ -97,4 +97,6 @@ public interface OrganizationIdentityMapper {
     List<OrgUnitNames> selectManagerAchievementOrgOwner(@Param("aid")String aid, @Param("name")String name);
     
     List<OrgUnitNames> selectAchievementOrgOwner(@Param("aid")String aid, @Param("name")String name);
+
+	int updateServiceByUid(OrganizationIdentity org);
 }

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

@@ -11,85 +11,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  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	long countByExample(TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	int deleteByExample(TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	int insert(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	int insertSelective(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	List<TOrderTask> selectByExampleWithBLOBs(TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	List<TOrderTask> selectByExample(TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	TOrderTask selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	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  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	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  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	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  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	int updateByPrimaryKeySelective(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	int updateByPrimaryKeyWithBLOBs(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	int updateByPrimaryKey(TOrderTask record);
 

+ 206 - 0
src/main/java/com/goafanti/common/mapper/OrganizationIdentityMapper.xml

@@ -1500,4 +1500,210 @@
 				AND oi.unit_name like CONCAT('%', #{name,jdbcType=VARCHAR}, '%')
 			</if>
   </select>
+  
+  <update id="updateServiceByUid" parameterType="com.goafanti.common.model.OrganizationIdentity">
+   
+    update organization_identity
+    <set>
+      <if test="contacts != null">
+        contacts = #{contacts,jdbcType=VARCHAR},
+      </if>
+      <if test="contactMobile != null">
+        contact_mobile = #{contactMobile,jdbcType=VARCHAR},
+      </if>
+      <if test="fixedTel != null">
+        fixed_tel = #{fixedTel,jdbcType=VARCHAR},
+      </if>
+      <if test="qq != null">
+        qq = #{qq,jdbcType=VARCHAR},
+      </if>
+      <if test="postalAddress != null">
+        postal_address = #{postalAddress,jdbcType=VARCHAR},
+      </if>
+      <if test="postcode != null">
+        postcode = #{postcode,jdbcType=VARCHAR},
+      </if>
+      <if test="unitName != null">
+        unit_name = #{unitName,jdbcType=VARCHAR},
+      </if>
+      <if test="registeredCapital != null">
+        registered_capital = #{registeredCapital,jdbcType=DECIMAL},
+      </if>
+      <if test="licenceNumber != null">
+        licence_number = #{licenceNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="licenceProvince != null">
+        licence_province = #{licenceProvince,jdbcType=INTEGER},
+      </if>
+      <if test="licenceCity != null">
+        licence_city = #{licenceCity,jdbcType=INTEGER},
+      </if>
+      <if test="licenceArea != null">
+        licence_area = #{licenceArea,jdbcType=INTEGER},
+      </if>
+      <if test="licenceScanningUrl != null">
+        licence_scanning_url = #{licenceScanningUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="orgCode != null">
+        org_code = #{orgCode,jdbcType=VARCHAR},
+      </if>
+      <if test="orgCodeUrl != null">
+        org_code_url = #{orgCodeUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="bankAccount != null">
+        bank_account = #{bankAccount,jdbcType=VARCHAR},
+      </if>
+      <if test="banks != null">
+        banks = #{banks,jdbcType=VARCHAR},
+      </if>
+      <if test="bankBranch != null">
+        bank_branch = #{bankBranch,jdbcType=VARCHAR},
+      </if>
+      <if test="bankCardNumber != null">
+        bank_card_number = #{bankCardNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="validationAmount != null">
+        validation_amount = #{validationAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="identityType != null">
+        identity_type = #{identityType,jdbcType=INTEGER},
+      </if>
+      <if test="locationProvince != null">
+        location_province = #{locationProvince,jdbcType=INTEGER},
+      </if>
+      <if test="locationCity != null">
+        location_city = #{locationCity,jdbcType=INTEGER},
+      </if>
+      <if test="locationArea != null">
+        location_area = #{locationArea,jdbcType=INTEGER},
+      </if>
+      <if test="legalPerson != null">
+        legal_person = #{legalPerson,jdbcType=VARCHAR},
+      </if>
+      <if test="legalPersonIdCard != null">
+        legal_person_id_card = #{legalPersonIdCard,jdbcType=VARCHAR},
+      </if>
+      <if test="lastYearTaxReportUrl != null">
+        last_year_tax_report_url = #{lastYearTaxReportUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="auditStatus != null">
+        audit_status = #{auditStatus,jdbcType=INTEGER},
+      </if>
+      <if test="process != null">
+        process = #{process,jdbcType=INTEGER},
+      </if>
+      <if test="wrongCount != null">
+        wrong_count = #{wrongCount,jdbcType=INTEGER},
+      </if>
+      <if test="paymentDate != null">
+        payment_date = #{paymentDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="listed != null">
+        listed = #{listed,jdbcType=INTEGER},
+      </if>
+      <if test="listedDate != null">
+        listed_date = #{listedDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="listedType != null">
+        listed_type = #{listedType,jdbcType=INTEGER},
+      </if>
+      <if test="stockCode != null">
+        stock_code = #{stockCode,jdbcType=VARCHAR},
+      </if>
+      <if test="certificateNumber != null">
+        certificate_number = #{certificateNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="issuingDate != null">
+        issuing_date = #{issuingDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="cogContacts != null">
+        cog_contacts = #{cogContacts,jdbcType=INTEGER},
+      </if>
+      <if test="techPrincipal != null">
+        tech_principal = #{techPrincipal,jdbcType=VARCHAR},
+      </if>
+      <if test="contactsFixedTel != null">
+        contacts_fixed_tel = #{contactsFixedTel,jdbcType=VARCHAR},
+      </if>
+      <if test="contactsFax != null">
+        contacts_fax = #{contactsFax,jdbcType=VARCHAR},
+      </if>
+      <if test="legalPersonTel != null">
+        legal_person_tel = #{legalPersonTel,jdbcType=VARCHAR},
+      </if>
+      <if test="legalPersonFax != null">
+        legal_person_fax = #{legalPersonFax,jdbcType=VARCHAR},
+      </if>
+      <if test="legalPersonEmail != null">
+        legal_person_email = #{legalPersonEmail,jdbcType=VARCHAR},
+      </if>
+      <if test="registrationTime != null">
+        registration_time = #{registrationTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="ratepayCode != null">
+        ratepay_code = #{ratepayCode,jdbcType=VARCHAR},
+      </if>
+      <if test="industry != null">
+        industry = #{industry,jdbcType=INTEGER},
+      </if>
+      <if test="enterpriseScale != null">
+        enterprise_scale = #{enterpriseScale,jdbcType=VARCHAR},
+      </if>
+      <if test="registerType != null">
+        register_type = #{registerType,jdbcType=VARCHAR},
+      </if>
+      <if test="foreignInvestment != null">
+        foreign_investment = #{foreignInvestment,jdbcType=VARCHAR},
+      </if>
+      <if test="field != null">
+        field = #{field,jdbcType=VARCHAR},
+      </if>
+      <if test="taxAuthority != null">
+        tax_authority = #{taxAuthority,jdbcType=INTEGER},
+      </if>
+      <if test="ratepayMethod != null">
+        ratepay_method = #{ratepayMethod,jdbcType=INTEGER},
+      </if>
+      <if test="highTechZone != null">
+        high_tech_zone = #{highTechZone,jdbcType=INTEGER},
+      </if>
+      <if test="riskInvestment != null">
+        risk_investment = #{riskInvestment,jdbcType=INTEGER},
+      </if>
+      <if test="businessScope != null">
+        business_scope = #{businessScope,jdbcType=VARCHAR},
+      </if>
+      <if test="highTechName != null">
+        high_tech_name = #{highTechName,jdbcType=VARCHAR},
+      </if>
+      <if test="patentProryStatementUrl != null">
+        patent_prory_statement_url = #{patentProryStatementUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="international != null">
+        international = #{international,jdbcType=INTEGER},
+      </if>
+      <if test="reviewInstructions != null">
+        review_instructions = #{reviewInstructions,jdbcType=VARCHAR},
+      </if>
+      <if test="investment != null">
+        investment = #{investment,jdbcType=INTEGER},
+      </if>
+      <if test="yearSalesAmount != null">
+        year_sales_amount = #{yearSalesAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="lastYearResearchAmount != null">
+        last_year_research_amount = #{lastYearResearchAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="assets != null">
+        assets = #{assets,jdbcType=DECIMAL},
+      </if>
+      <if test="qualification != null">
+        qualification = #{qualification,jdbcType=VARCHAR},
+      </if>
+      <if test="cooperationSituation != null">
+        cooperation_situation = #{cooperationSituation,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where uid = #{uid,jdbcType=VARCHAR}
+  </update>
 </mapper>

+ 5 - 7
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1387,14 +1387,12 @@ where super_id is null ) e on e.order_no=a.order_no
     a.sign_time as signTime, a.settlement_time as settlementTime, a.contract_no as contractNo, a.contract_type as contractType, a.contacts, a.contact_mobile as contactMobile, 
     a.legal_person as legalPerson, a.legal_person_tel as legalPersonTel, a.proof_count as proofCount, a.proof_aid as proofAid,contract_picture_url as contractPictureUrl,
     c.name as salesmanName,dep.name as depName,d.name as financeName,c.contact_mobile as salesmanMobile,d.contact_mobile as financeMobile,b.nickname as userName
-    ,e.back_status as backStatus,f.name as initiateName,e.reason,date_format(e.create_time,'%Y-%m-%d') as backDate,a.buyer_id as uid,a.order_dep as orderDep
-    from t_order_new a
-    left join `user` b on a.buyer_id=b.id
-    left join admin c on a.salesman_id=c.id
-    left join department dep on a.order_dep=dep.id
-  	left join admin d on a.finance_id=d.id
+    ,e.back_status as backStatus,f.name as initiateName,e.reason,date_format(e.create_time,'%Y-%m-%d') as backDate,a.buyer_id as uid,a.order_dep as orderDep,
+    g.location_province as locationProvince,g.location_city as locationCity,g.location_area locationArea,g.postal_address postalAddress
+    from t_order_new a left join `user` b on a.buyer_id=b.id left join admin c on a.salesman_id=c.id
+    left join department dep on a.order_dep=dep.id left join admin d on a.finance_id=d.id
   	left join (select * from t_order_back a where back_status=0) e on a.order_no=e.order_no
-  	left join admin f on e.initiate=f.id
+  	left join admin f on e.initiate=f.id left join organization_identity g on a.buyer_id=g.uid
     where a.order_no = #{orderNo,jdbcType=VARCHAR}
   </select>
   

+ 44 - 27
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 Mon Jun 03 14:30:20 CST 2019.
+      This element was generated on Thu Jun 06 14:08:45 CST 2019.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
@@ -37,12 +37,13 @@
     <result column="refund_content" jdbcType="VARCHAR" property="refundContent" />
     <result column="set_up_amount" jdbcType="DECIMAL" property="setUpAmount" />
     <result column="arrival_money" jdbcType="INTEGER" property="arrivalMoney" />
+    <result column="retrieve_content" jdbcType="VARCHAR" property="retrieveContent" />
   </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 Mon Jun 03 14:30:20 CST 2019.
+      This element was generated on Thu Jun 06 14:08:45 CST 2019.
     -->
     <result column="attachment_url" jdbcType="LONGVARCHAR" property="attachmentUrl" />
   </resultMap>
@@ -50,7 +51,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 03 14:30:20 CST 2019.
+      This element was generated on Thu Jun 06 14:08:45 CST 2019.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -84,7 +85,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 03 14:30:20 CST 2019.
+      This element was generated on Thu Jun 06 14:08:45 CST 2019.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -118,19 +119,19 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 03 14:30:20 CST 2019.
+      This element was generated on Thu Jun 06 14:08:45 CST 2019.
     -->
     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, declare_user, 
-    declare_pwd, task_refund, refund_content, set_up_amount, arrival_money
+    declare_pwd, task_refund, refund_content, set_up_amount, arrival_money, retrieve_content
   </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 Mon Jun 03 14:30:20 CST 2019.
+      This element was generated on Thu Jun 06 14:08:45 CST 2019.
     -->
     attachment_url
   </sql>
@@ -138,7 +139,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 03 14:30:20 CST 2019.
+      This element was generated on Thu Jun 06 14:08:45 CST 2019.
     -->
     select
     <if test="distinct">
@@ -159,7 +160,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 03 14:30:20 CST 2019.
+      This element was generated on Thu Jun 06 14:08:45 CST 2019.
     -->
     select
     <if test="distinct">
@@ -178,7 +179,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 03 14:30:20 CST 2019.
+      This element was generated on Thu Jun 06 14:08:45 CST 2019.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -191,7 +192,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 03 14:30:20 CST 2019.
+      This element was generated on Thu Jun 06 14:08:45 CST 2019.
     -->
     delete from t_order_task
     where id = #{id,jdbcType=INTEGER}
@@ -200,7 +201,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 03 14:30:20 CST 2019.
+      This element was generated on Thu Jun 06 14:08:45 CST 2019.
     -->
     delete from t_order_task
     <if test="_parameter != null">
@@ -211,7 +212,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 03 14:30:20 CST 2019.
+      This element was generated on Thu Jun 06 14:08:45 CST 2019.
     -->
     insert into t_order_task (id, order_no, main, 
       super_id, commodity_id, commodity_name, 
@@ -223,7 +224,7 @@
       certificate_number, status, form_retrieve, 
       declare_user, declare_pwd, task_refund, 
       refund_content, set_up_amount, arrival_money, 
-      attachment_url)
+      retrieve_content, 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}, 
@@ -234,13 +235,13 @@
       #{certificateNumber,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{formRetrieve,jdbcType=INTEGER}, 
       #{declareUser,jdbcType=VARCHAR}, #{declarePwd,jdbcType=VARCHAR}, #{taskRefund,jdbcType=INTEGER}, 
       #{refundContent,jdbcType=VARCHAR}, #{setUpAmount,jdbcType=DECIMAL}, #{arrivalMoney,jdbcType=INTEGER}, 
-      #{attachmentUrl,jdbcType=LONGVARCHAR})
+      #{retrieveContent,jdbcType=VARCHAR}, #{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 Mon Jun 03 14:30:20 CST 2019.
+      This element was generated on Thu Jun 06 14:08:45 CST 2019.
     -->
     insert into t_order_task
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -334,6 +335,9 @@
       <if test="arrivalMoney != null">
         arrival_money,
       </if>
+      <if test="retrieveContent != null">
+        retrieve_content,
+      </if>
       <if test="attachmentUrl != null">
         attachment_url,
       </if>
@@ -429,6 +433,9 @@
       <if test="arrivalMoney != null">
         #{arrivalMoney,jdbcType=INTEGER},
       </if>
+      <if test="retrieveContent != null">
+        #{retrieveContent,jdbcType=VARCHAR},
+      </if>
       <if test="attachmentUrl != null">
         #{attachmentUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -438,7 +445,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 03 14:30:20 CST 2019.
+      This element was generated on Thu Jun 06 14:08:45 CST 2019.
     -->
     select count(*) from t_order_task
     <if test="_parameter != null">
@@ -449,7 +456,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 03 14:30:20 CST 2019.
+      This element was generated on Thu Jun 06 14:08:45 CST 2019.
     -->
     update t_order_task
     <set>
@@ -543,6 +550,9 @@
       <if test="record.arrivalMoney != null">
         arrival_money = #{record.arrivalMoney,jdbcType=INTEGER},
       </if>
+      <if test="record.retrieveContent != null">
+        retrieve_content = #{record.retrieveContent,jdbcType=VARCHAR},
+      </if>
       <if test="record.attachmentUrl != null">
         attachment_url = #{record.attachmentUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -555,7 +565,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 03 14:30:20 CST 2019.
+      This element was generated on Thu Jun 06 14:08:45 CST 2019.
     -->
     update t_order_task
     set id = #{record.id,jdbcType=INTEGER},
@@ -588,6 +598,7 @@
       refund_content = #{record.refundContent,jdbcType=VARCHAR},
       set_up_amount = #{record.setUpAmount,jdbcType=DECIMAL},
       arrival_money = #{record.arrivalMoney,jdbcType=INTEGER},
+      retrieve_content = #{record.retrieveContent,jdbcType=VARCHAR},
       attachment_url = #{record.attachmentUrl,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -597,7 +608,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 03 14:30:20 CST 2019.
+      This element was generated on Thu Jun 06 14:08:45 CST 2019.
     -->
     update t_order_task
     set id = #{record.id,jdbcType=INTEGER},
@@ -629,7 +640,8 @@
       task_refund = #{record.taskRefund,jdbcType=INTEGER},
       refund_content = #{record.refundContent,jdbcType=VARCHAR},
       set_up_amount = #{record.setUpAmount,jdbcType=DECIMAL},
-      arrival_money = #{record.arrivalMoney,jdbcType=INTEGER}
+      arrival_money = #{record.arrivalMoney,jdbcType=INTEGER},
+      retrieve_content = #{record.retrieveContent,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -638,7 +650,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 03 14:30:20 CST 2019.
+      This element was generated on Thu Jun 06 14:08:45 CST 2019.
     -->
     update t_order_task
     <set>
@@ -729,6 +741,9 @@
       <if test="arrivalMoney != null">
         arrival_money = #{arrivalMoney,jdbcType=INTEGER},
       </if>
+      <if test="retrieveContent != null">
+        retrieve_content = #{retrieveContent,jdbcType=VARCHAR},
+      </if>
       <if test="attachmentUrl != null">
         attachment_url = #{attachmentUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -739,7 +754,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 03 14:30:20 CST 2019.
+      This element was generated on Thu Jun 06 14:08:45 CST 2019.
     -->
     update t_order_task
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -771,6 +786,7 @@
       refund_content = #{refundContent,jdbcType=VARCHAR},
       set_up_amount = #{setUpAmount,jdbcType=DECIMAL},
       arrival_money = #{arrivalMoney,jdbcType=INTEGER},
+      retrieve_content = #{retrieveContent,jdbcType=VARCHAR},
       attachment_url = #{attachmentUrl,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -778,7 +794,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 03 14:30:20 CST 2019.
+      This element was generated on Thu Jun 06 14:08:45 CST 2019.
     -->
     update t_order_task
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -809,7 +825,8 @@
       task_refund = #{taskRefund,jdbcType=INTEGER},
       refund_content = #{refundContent,jdbcType=VARCHAR},
       set_up_amount = #{setUpAmount,jdbcType=DECIMAL},
-      arrival_money = #{arrivalMoney,jdbcType=INTEGER}
+      arrival_money = #{arrivalMoney,jdbcType=INTEGER},
+      retrieve_content = #{retrieveContent,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="selectOrderTask" resultType="com.goafanti.order.bo.TOrderTaskBo">
@@ -981,15 +998,15 @@ from t_order_task a left join business_project b on a.commodity_id=b.id
    <select id="selectTaskListByPage" resultType="com.goafanti.order.bo.TOrderTaskListBo">
   	select  a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,
     a.project_status as projectStatus,a.task_status as taskStatus,date_format(a.task_distribution_time,'%Y-%m-%d') as taskDate,
-    a.commodity_quantity as commodityQuantity,f.nickname as userName,h.name as depName
+    a.commodity_quantity as commodityQuantity,f.nickname as userName,h.name as depName,ifnull(i.alreadyNumber,0)as alreadyNumber
     from t_task_log x left join  t_order_task a on x.task_id=a.id 
   	left join business_project b on a.commodity_id=b.id
   	left join business_category c on b.cid=c.id
     left join admin d on a.task_receiver=d.id
     left join t_order_new e on a.order_no=e.order_no
     left join user f on e.buyer_id=f.id
-    left join admin g on e.salesman_id=g.id
     left join department h on e.order_dep=h.id
+    left join (select task_id , sum(already_number) as alreadyNumber from task_progress group by task_id) i on a.id=i.task_id
     where e.delete_sign=0 
     and x.task_receiver= #{aid,jdbcType=VARCHAR}
     <if test="orderNo != null">

+ 3 - 2
src/main/java/com/goafanti/common/mapper/TaskProgressMapper.xml

@@ -295,9 +295,9 @@ order by a.create_time
 	where task_id=  #{id,jdbcType=INTEGER}
   </select>
   <select id="selectMyTaskList" resultType="com.goafanti.order.bo.TOrderTaskListBo">
- 	select  a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,
+ 	  select  a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,
     a.project_status as projectStatus,a.task_status as taskStatus,date_format(a.task_distribution_time,'%Y-%m-%d') as taskDate,
-    a.commodity_quantity as commodityQuantity,f.nickname as userName,h.name as depName
+    a.commodity_quantity as commodityQuantity,f.nickname as userName,h.name as depName,ifnull(i.alreadyNumber,0)as alreadyNumber
     from t_task_log x left join  t_order_task a on x.task_id=a.id 
   	left join business_project b on a.commodity_id=b.id
   	left join business_category c on b.cid=c.id
@@ -305,6 +305,7 @@ order by a.create_time
     left join t_order_new e on a.order_no=e.order_no
     left join user f on e.buyer_id=f.id
     left join department h on e.order_dep=h.id
+    left join (select task_id , sum(already_number) as alreadyNumber from task_progress group by task_id) i on a.id=i.task_id
     where e.delete_sign=0 
     and x.task_receiver= #{aid,jdbcType=VARCHAR}
     order by a.task_distribution_time desc 

+ 122 - 104
src/main/java/com/goafanti/common/model/TOrderTask.java

@@ -8,169 +8,168 @@ import com.goafanti.common.utils.StringUtils;
 public class TOrderTask {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.id
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	private Integer id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.order_no
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	private String orderNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.main
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	private Integer main;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.super_id
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	private String superId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.commodity_id
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	private String commodityId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.commodity_name
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	private String commodityName;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.commodity_quantity
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	private Integer commodityQuantity;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.commodity_mode
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	private String commodityMode;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.commodity_price
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	private BigDecimal commodityPrice;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.task_status
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	private Integer taskStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.task_distribution_time
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	private Date taskDistributionTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.task_allocator
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	private String taskAllocator;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.task_receiver
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	private String taskReceiver;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.task_comment
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	private String taskComment;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.task_start_time
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	private Date taskStartTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.task_end_time
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	private Date taskEndTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.project_status
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	private Integer projectStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.accept_time
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	private Date acceptTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.review_time
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	private Date reviewTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.publicity_time
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	private Date publicityTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.licence_time
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	private Date licenceTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.certificate_number
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	private String certificateNumber;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.status
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	private Integer status;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.form_retrieve
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	private Integer formRetrieve;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.declare_user
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	private String declareUser;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.declare_pwd
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	private String declarePwd;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.task_refund
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	private Integer taskRefund;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.refund_content
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	private String refundContent;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.set_up_amount
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	private BigDecimal setUpAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.arrival_money
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	private Integer arrivalMoney;
 	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.retrieve_content
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 */
+	private String retrieveContent;
+	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_task.attachment_url
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	private String attachmentUrl;
-
-
-
-
-
-
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.id
 	 * @return  the value of t_order_task.id
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public Integer getId() {
 		return id;
@@ -179,7 +178,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.id
 	 * @param id  the value for t_order_task.id
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -188,7 +187,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.order_no
 	 * @return  the value of t_order_task.order_no
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -197,7 +196,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.order_no
 	 * @param orderNo  the value for t_order_task.order_no
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -206,7 +205,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.main
 	 * @return  the value of t_order_task.main
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public Integer getMain() {
 		return main;
@@ -215,7 +214,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.main
 	 * @param main  the value for t_order_task.main
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public void setMain(Integer main) {
 		this.main = main;
@@ -224,7 +223,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.super_id
 	 * @return  the value of t_order_task.super_id
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public String getSuperId() {
 		return superId;
@@ -233,7 +232,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.super_id
 	 * @param superId  the value for t_order_task.super_id
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public void setSuperId(String superId) {
 		this.superId = superId;
@@ -242,7 +241,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.commodity_id
 	 * @return  the value of t_order_task.commodity_id
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public String getCommodityId() {
 		return commodityId;
@@ -251,7 +250,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.commodity_id
 	 * @param commodityId  the value for t_order_task.commodity_id
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public void setCommodityId(String commodityId) {
 		this.commodityId = commodityId;
@@ -260,7 +259,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.commodity_name
 	 * @return  the value of t_order_task.commodity_name
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public String getCommodityName() {
 		return commodityName;
@@ -269,7 +268,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.commodity_name
 	 * @param commodityName  the value for t_order_task.commodity_name
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public void setCommodityName(String commodityName) {
 		this.commodityName = commodityName;
@@ -278,7 +277,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.commodity_quantity
 	 * @return  the value of t_order_task.commodity_quantity
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public Integer getCommodityQuantity() {
 		return commodityQuantity;
@@ -287,7 +286,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.commodity_quantity
 	 * @param commodityQuantity  the value for t_order_task.commodity_quantity
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public void setCommodityQuantity(Integer commodityQuantity) {
 		this.commodityQuantity = commodityQuantity;
@@ -296,7 +295,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.commodity_mode
 	 * @return  the value of t_order_task.commodity_mode
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public String getCommodityMode() {
 		return commodityMode;
@@ -305,7 +304,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.commodity_mode
 	 * @param commodityMode  the value for t_order_task.commodity_mode
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public void setCommodityMode(String commodityMode) {
 		this.commodityMode = commodityMode;
@@ -314,7 +313,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.commodity_price
 	 * @return  the value of t_order_task.commodity_price
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public BigDecimal getCommodityPrice() {
 		return commodityPrice;
@@ -323,7 +322,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.commodity_price
 	 * @param commodityPrice  the value for t_order_task.commodity_price
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public void setCommodityPrice(BigDecimal commodityPrice) {
 		this.commodityPrice = commodityPrice;
@@ -332,7 +331,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.task_status
 	 * @return  the value of t_order_task.task_status
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public Integer getTaskStatus() {
 		return taskStatus;
@@ -341,7 +340,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.task_status
 	 * @param taskStatus  the value for t_order_task.task_status
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public void setTaskStatus(Integer taskStatus) {
 		this.taskStatus = taskStatus;
@@ -350,7 +349,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.task_distribution_time
 	 * @return  the value of t_order_task.task_distribution_time
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public Date getTaskDistributionTime() {
 		return taskDistributionTime;
@@ -359,7 +358,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.task_distribution_time
 	 * @param taskDistributionTime  the value for t_order_task.task_distribution_time
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public void setTaskDistributionTime(Date taskDistributionTime) {
 		this.taskDistributionTime = taskDistributionTime;
@@ -368,7 +367,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.task_allocator
 	 * @return  the value of t_order_task.task_allocator
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public String getTaskAllocator() {
 		return taskAllocator;
@@ -377,7 +376,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.task_allocator
 	 * @param taskAllocator  the value for t_order_task.task_allocator
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public void setTaskAllocator(String taskAllocator) {
 		this.taskAllocator = taskAllocator;
@@ -386,7 +385,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.task_receiver
 	 * @return  the value of t_order_task.task_receiver
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public String getTaskReceiver() {
 		return taskReceiver;
@@ -395,7 +394,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.task_receiver
 	 * @param taskReceiver  the value for t_order_task.task_receiver
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public void setTaskReceiver(String taskReceiver) {
 		this.taskReceiver = taskReceiver;
@@ -404,7 +403,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.task_comment
 	 * @return  the value of t_order_task.task_comment
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public String getTaskComment() {
 		return taskComment;
@@ -413,7 +412,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.task_comment
 	 * @param taskComment  the value for t_order_task.task_comment
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public void setTaskComment(String taskComment) {
 		this.taskComment = taskComment;
@@ -422,7 +421,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.task_start_time
 	 * @return  the value of t_order_task.task_start_time
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public Date getTaskStartTime() {
 		return taskStartTime;
@@ -431,7 +430,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.task_start_time
 	 * @param taskStartTime  the value for t_order_task.task_start_time
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public void setTaskStartTime(Date taskStartTime) {
 		this.taskStartTime = taskStartTime;
@@ -440,7 +439,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.task_end_time
 	 * @return  the value of t_order_task.task_end_time
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public Date getTaskEndTime() {
 		return taskEndTime;
@@ -449,7 +448,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.task_end_time
 	 * @param taskEndTime  the value for t_order_task.task_end_time
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public void setTaskEndTime(Date taskEndTime) {
 		this.taskEndTime = taskEndTime;
@@ -458,7 +457,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.project_status
 	 * @return  the value of t_order_task.project_status
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public Integer getProjectStatus() {
 		return projectStatus;
@@ -467,7 +466,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.project_status
 	 * @param projectStatus  the value for t_order_task.project_status
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public void setProjectStatus(Integer projectStatus) {
 		this.projectStatus = projectStatus;
@@ -476,7 +475,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.accept_time
 	 * @return  the value of t_order_task.accept_time
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public Date getAcceptTime() {
 		return acceptTime;
@@ -485,7 +484,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.accept_time
 	 * @param acceptTime  the value for t_order_task.accept_time
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public void setAcceptTime(Date acceptTime) {
 		this.acceptTime = acceptTime;
@@ -494,7 +493,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.review_time
 	 * @return  the value of t_order_task.review_time
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public Date getReviewTime() {
 		return reviewTime;
@@ -503,7 +502,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.review_time
 	 * @param reviewTime  the value for t_order_task.review_time
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public void setReviewTime(Date reviewTime) {
 		this.reviewTime = reviewTime;
@@ -512,7 +511,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.publicity_time
 	 * @return  the value of t_order_task.publicity_time
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public Date getPublicityTime() {
 		return publicityTime;
@@ -521,7 +520,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.publicity_time
 	 * @param publicityTime  the value for t_order_task.publicity_time
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public void setPublicityTime(Date publicityTime) {
 		this.publicityTime = publicityTime;
@@ -530,7 +529,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.licence_time
 	 * @return  the value of t_order_task.licence_time
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public Date getLicenceTime() {
 		return licenceTime;
@@ -539,7 +538,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.licence_time
 	 * @param licenceTime  the value for t_order_task.licence_time
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public void setLicenceTime(Date licenceTime) {
 		this.licenceTime = licenceTime;
@@ -548,7 +547,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.certificate_number
 	 * @return  the value of t_order_task.certificate_number
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public String getCertificateNumber() {
 		return certificateNumber;
@@ -557,7 +556,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.certificate_number
 	 * @param certificateNumber  the value for t_order_task.certificate_number
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public void setCertificateNumber(String certificateNumber) {
 		this.certificateNumber = certificateNumber;
@@ -566,7 +565,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.status
 	 * @return  the value of t_order_task.status
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public Integer getStatus() {
 		return status;
@@ -575,7 +574,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.status
 	 * @param status  the value for t_order_task.status
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public void setStatus(Integer status) {
 		this.status = status;
@@ -584,7 +583,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.form_retrieve
 	 * @return  the value of t_order_task.form_retrieve
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public Integer getFormRetrieve() {
 		return formRetrieve;
@@ -593,7 +592,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.form_retrieve
 	 * @param formRetrieve  the value for t_order_task.form_retrieve
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public void setFormRetrieve(Integer formRetrieve) {
 		this.formRetrieve = formRetrieve;
@@ -602,7 +601,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.declare_user
 	 * @return  the value of t_order_task.declare_user
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public String getDeclareUser() {
 		return declareUser;
@@ -611,7 +610,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.declare_user
 	 * @param declareUser  the value for t_order_task.declare_user
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public void setDeclareUser(String declareUser) {
 		this.declareUser = declareUser;
@@ -620,7 +619,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.declare_pwd
 	 * @return  the value of t_order_task.declare_pwd
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public String getDeclarePwd() {
 		return declarePwd;
@@ -629,7 +628,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.declare_pwd
 	 * @param declarePwd  the value for t_order_task.declare_pwd
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public void setDeclarePwd(String declarePwd) {
 		this.declarePwd = declarePwd;
@@ -638,7 +637,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.task_refund
 	 * @return  the value of t_order_task.task_refund
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public Integer getTaskRefund() {
 		return taskRefund;
@@ -647,7 +646,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.task_refund
 	 * @param taskRefund  the value for t_order_task.task_refund
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public void setTaskRefund(Integer taskRefund) {
 		this.taskRefund = taskRefund;
@@ -656,7 +655,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.refund_content
 	 * @return  the value of t_order_task.refund_content
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public String getRefundContent() {
 		return refundContent;
@@ -665,7 +664,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.refund_content
 	 * @param refundContent  the value for t_order_task.refund_content
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public void setRefundContent(String refundContent) {
 		this.refundContent = refundContent;
@@ -674,7 +673,7 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.set_up_amount
 	 * @return  the value of t_order_task.set_up_amount
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public BigDecimal getSetUpAmount() {
 		return setUpAmount;
@@ -683,21 +682,16 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.set_up_amount
 	 * @param setUpAmount  the value for t_order_task.set_up_amount
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public void setSetUpAmount(BigDecimal setUpAmount) {
 		this.setUpAmount = setUpAmount;
 	}
-	public void setSetUpAmount(String setUpAmount) {
-		if (StringUtils.isNotBlank(setUpAmount)) {
-			this.setUpAmount =new BigDecimal(setUpAmount);
-		}
-	}
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.arrival_money
 	 * @return  the value of t_order_task.arrival_money
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public Integer getArrivalMoney() {
 		return arrivalMoney;
@@ -706,16 +700,34 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.arrival_money
 	 * @param arrivalMoney  the value for t_order_task.arrival_money
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public void setArrivalMoney(Integer arrivalMoney) {
 		this.arrivalMoney = arrivalMoney;
 	}
 
 	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.retrieve_content
+	 * @return  the value of t_order_task.retrieve_content
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 */
+	public String getRetrieveContent() {
+		return retrieveContent;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.retrieve_content
+	 * @param retrieveContent  the value for t_order_task.retrieve_content
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
+	 */
+	public void setRetrieveContent(String retrieveContent) {
+		this.retrieveContent = retrieveContent;
+	}
+
+	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_task.attachment_url
 	 * @return  the value of t_order_task.attachment_url
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public String getAttachmentUrl() {
 		return attachmentUrl;
@@ -724,12 +736,18 @@ public class TOrderTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_task.attachment_url
 	 * @param attachmentUrl  the value for t_order_task.attachment_url
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public void setAttachmentUrl(String attachmentUrl) {
 		this.attachmentUrl = attachmentUrl;
 	}
 
+	public void setSetUpAmount(String setUpAmount) {
+		if (StringUtils.isNotBlank(setUpAmount)) {
+			this.setUpAmount =new BigDecimal(setUpAmount);
+		}
+	}
+
 	private String name;
     private String email;
     public String getName() {

+ 86 - 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  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	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  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	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  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	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  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	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  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	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  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	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  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	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  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	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  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	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  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	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  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	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  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -2110,11 +2110,81 @@ public class TOrderTaskExample {
 			addCriterion("arrival_money not between", value1, value2, "arrivalMoney");
 			return (Criteria) this;
 		}
+
+		public Criteria andRetrieveContentIsNull() {
+			addCriterion("retrieve_content is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andRetrieveContentIsNotNull() {
+			addCriterion("retrieve_content is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andRetrieveContentEqualTo(String value) {
+			addCriterion("retrieve_content =", value, "retrieveContent");
+			return (Criteria) this;
+		}
+
+		public Criteria andRetrieveContentNotEqualTo(String value) {
+			addCriterion("retrieve_content <>", value, "retrieveContent");
+			return (Criteria) this;
+		}
+
+		public Criteria andRetrieveContentGreaterThan(String value) {
+			addCriterion("retrieve_content >", value, "retrieveContent");
+			return (Criteria) this;
+		}
+
+		public Criteria andRetrieveContentGreaterThanOrEqualTo(String value) {
+			addCriterion("retrieve_content >=", value, "retrieveContent");
+			return (Criteria) this;
+		}
+
+		public Criteria andRetrieveContentLessThan(String value) {
+			addCriterion("retrieve_content <", value, "retrieveContent");
+			return (Criteria) this;
+		}
+
+		public Criteria andRetrieveContentLessThanOrEqualTo(String value) {
+			addCriterion("retrieve_content <=", value, "retrieveContent");
+			return (Criteria) this;
+		}
+
+		public Criteria andRetrieveContentLike(String value) {
+			addCriterion("retrieve_content like", value, "retrieveContent");
+			return (Criteria) this;
+		}
+
+		public Criteria andRetrieveContentNotLike(String value) {
+			addCriterion("retrieve_content not like", value, "retrieveContent");
+			return (Criteria) this;
+		}
+
+		public Criteria andRetrieveContentIn(List<String> values) {
+			addCriterion("retrieve_content in", values, "retrieveContent");
+			return (Criteria) this;
+		}
+
+		public Criteria andRetrieveContentNotIn(List<String> values) {
+			addCriterion("retrieve_content not in", values, "retrieveContent");
+			return (Criteria) this;
+		}
+
+		public Criteria andRetrieveContentBetween(String value1, String value2) {
+			addCriterion("retrieve_content between", value1, value2, "retrieveContent");
+			return (Criteria) this;
+		}
+
+		public Criteria andRetrieveContentNotBetween(String value1, String value2) {
+			addCriterion("retrieve_content not between", value1, value2, "retrieveContent");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_task
-	 * @mbg.generated  Mon Jun 03 14:30:20 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public static class Criterion {
 		private String condition;

+ 10 - 3
src/main/java/com/goafanti/common/utils/ExportExcelUtil.java

@@ -506,14 +506,21 @@ public class ExportExcelUtil {
 				XSSFRow r = sheet.createRow(sheet.getLastRowNum()+1);
 				for (int i = 0; i < comment.length; i++) {
 					//当前列的只
-					String o ;
+					String o="" ;
 					switch (comment[i]) {
 					//"任务编号","任务名称","订单编号","业务别类","客户名称","任务状态","项目状态","分配时间","订单部门"
 					case "任务编号": o = ob.getId(); setWidth(sheet, i, o,1); break;
 					case "任务名称": o = ob.getTaskName(); setWidth(sheet, i, o,2);break;
 					case "订单编号": o = ob.getOrderNo();setWidth(sheet, i, o,1); break;
 					case "业务别类": o = ob.getCname();setWidth(sheet, i, o,2);break;
-					case "客户名称": o = ob.getUserName(); setWidth(sheet, i, o,2);break;
+					case "客户名称(软著数/下证数)":  
+						if(null!=ob.getTaskName()&&ob.getTaskName().contains("软著")){
+							o =ob.getUserName()+"("+ob.getCommodityQuantity()+"/"+ob.getAlreadyNumber()+")";
+						}else {
+							o = ob.getUserName(); 
+						}
+					
+					setWidth(sheet, i, o,2);break;
 					case "任务状态": o = TaskState.getValueByCode(ob.getTaskStatus()); setWidth(sheet, i, o,2);break;
 					case "项目状态": o = ProjectNewStage.getValueByCode(ob.getProjectStatus()); setWidth(sheet, i, o,1);break;
 					case "分配时间": o = ob.getTaskDate();setWidth(sheet, i, o,1); break;
@@ -529,7 +536,7 @@ public class ExportExcelUtil {
 
 	private static void setWidth(XSSFSheet sheet, int i, String o,int x) {
 		if (StringUtils.isNotBlank(o)) {
-			sheet.setColumnWidth(i, o.getBytes().length*x*265);
+			sheet.setColumnWidth(i, o.getBytes().length*x*280);
 			
 		}
 		

+ 36 - 0
src/main/java/com/goafanti/order/bo/TOrderNewBo.java

@@ -27,7 +27,43 @@ public class TOrderNewBo extends TOrderNew{
 	private String depName;
 	private String accountsReceivable;
 	private String uncollectedAmount;
+	private String locationProvince;
+	private String locationCity;
+	private String locationArea;
+	private String postalAddress;
 	
+	public String getLocationProvince() {
+		return locationProvince;
+	}
+
+	public void setLocationProvince(String locationProvince) {
+		this.locationProvince = locationProvince;
+	}
+
+	public String getLocationCity() {
+		return locationCity;
+	}
+
+	public void setLocationCity(String locationCity) {
+		this.locationCity = locationCity;
+	}
+
+	public String getLocationArea() {
+		return locationArea;
+	}
+
+	public void setLocationArea(String locationArea) {
+		this.locationArea = locationArea;
+	}
+
+	public String getPostalAddress() {
+		return postalAddress;
+	}
+
+	public void setPostalAddress(String postalAddress) {
+		this.postalAddress = postalAddress;
+	}
+
 	public String getSignDate() {
 		if (StringUtils.isBlank(signDate)&&super.getSignTime()!=null) {
 			return DateFormatUtils.format(super.getSignTime(), AFTConstants.YYYYMMDD);

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

@@ -28,6 +28,10 @@ public class TOrderTaskDetailBo {
 	private String depName;
 	private String setUpAmount;
 	private Integer arrivalMoney;
+	private Integer locationProvince;
+	private Integer locationCity;
+	private Integer locationArea;
+	private String postalAddress;
 	/**
 	 * 任务状态
 	 */
@@ -54,6 +58,30 @@ public class TOrderTaskDetailBo {
 	private String declarePwd;
 	
 	
+	public Integer getLocationProvince() {
+		return locationProvince;
+	}
+	public void setLocationProvince(Integer locationProvince) {
+		this.locationProvince = locationProvince;
+	}
+	public Integer getLocationCity() {
+		return locationCity;
+	}
+	public void setLocationCity(Integer locationCity) {
+		this.locationCity = locationCity;
+	}
+	public Integer getLocationArea() {
+		return locationArea;
+	}
+	public void setLocationArea(Integer locationArea) {
+		this.locationArea = locationArea;
+	}
+	public String getPostalAddress() {
+		return postalAddress;
+	}
+	public void setPostalAddress(String postalAddress) {
+		this.postalAddress = postalAddress;
+	}
 	public Integer getStatus() {
 		return status;
 	}

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

@@ -22,6 +22,7 @@ import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.common.model.TTaskHours;
 import com.goafanti.common.model.TaskProgress;
 import com.goafanti.common.utils.StringUtils;
+import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.order.bo.TOrderTaskDetailBo;
 import com.goafanti.order.bo.TaskProgressBo;
 import com.goafanti.order.service.OrderProjectService;
@@ -215,6 +216,10 @@ public class OrderProjectApiController extends CertifyApiController {
 	@RequestMapping(value = "/exportMyTaskList", method = RequestMethod.GET)
 	public Result exportMyTaskList(HttpServletResponse response) throws IOException{
 		 Result res = new Result();
+		 if(StringUtils.isBlank(TokenManager.getAdminId())){
+			 res.getError().add(buildError("", "没有找到数据"));
+			 return res;
+		 }
 		 XSSFWorkbook wb = orderProjectService.exportMyTaskList();//个人列表
 		 if(null == wb){
 			 res.getError().add(buildError("", "没有找到数据"));

+ 51 - 37
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -27,6 +27,7 @@ import com.goafanti.common.bo.Error;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.dao.OrganizationContactBookMapper;
+import com.goafanti.common.dao.OrganizationIdentityMapper;
 import com.goafanti.common.dao.TOrderBonusMapper;
 import com.goafanti.common.dao.TOrderLogMapper;
 import com.goafanti.common.dao.TOrderNewMapper;
@@ -38,6 +39,7 @@ import com.goafanti.common.dao.TaskProgressMapper;
 import com.goafanti.common.enums.OrderLogProcess;
 import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.OrganizationContactBook;
+import com.goafanti.common.model.OrganizationIdentity;
 import com.goafanti.common.model.TOrderBonus;
 import com.goafanti.common.model.TOrderLog;
 import com.goafanti.common.model.TOrderNew;
@@ -80,6 +82,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	@Autowired
 	private OrganizationContactBookMapper	organizationContactBookMapper;
 	@Autowired
+	private OrganizationIdentityMapper	 organizationIdentityMapper;
+	@Autowired
 	private TaskLogMapper	taskLogMapper;
 	@Value(value = "${upload.path}")
 	private String 					uploadPath 			= null;
@@ -182,13 +186,25 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		task.setDeclarePwd(t.getDeclarePwd());
 		task.setArrivalMoney(t.getArrivalMoney());
 		task.setSetUpAmount(t.getSetUpAmount());
-		
-		TOrderNew tn=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo()); 
+		TOrderNew tn=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
+		//根据修改的修改订单法人与联系人
 		if(StringUtils.isNotEmpty(t.getContacts()))tn.setContacts(t.getContacts());
-		if(StringUtils.isNotEmpty(t.getContacts()))	tn.setContactMobile(t.getContactMobile());
-		if(StringUtils.isNotEmpty(t.getContacts()))tn.setLegalPerson(t.getLegalPerson());
-		if(StringUtils.isNotEmpty(t.getContacts()))tn.setLegalPersonTel(t.getLegalPersonTel());
+		if(StringUtils.isNotEmpty(t.getContactMobile()))	tn.setContactMobile(t.getContactMobile());
+		if(StringUtils.isNotEmpty(t.getLegalPerson()))tn.setLegalPerson(t.getLegalPerson());
+		if(StringUtils.isNotEmpty(t.getLegalPersonTel()))tn.setLegalPersonTel(t.getLegalPersonTel());
 		tOrderNewMapper.updateByPrimaryKeySelective(tn);
+		//修改公司地址信息
+		if (null!=t.getLocationProvince()||null!=t.getLocationArea()||null!=t.getLocationCity()||null!=t.getPostalAddress()) {
+			OrganizationIdentity org=new OrganizationIdentity();
+			org.setUid(tn.getBuyerId());
+			org.setLocationProvince(t.getLocationProvince());
+			org.setLocationArea(t.getLocationArea());
+			org.setLocationCity(t.getLocationCity());
+			org.setPostalAddress(t.getPostalAddress());
+			organizationIdentityMapper.updateServiceByUid(org);
+		}
+		
+		//修改公司联系人
 		int adcount=organizationContactBookMapper.checkContacts(tn.getBuyerId(), t.getContactMobile(),tn.getSalesmanId());
 		if (StringUtils.isNotBlank(t.getContacts())&&StringUtils.isNotBlank(t.getContactMobile())&&adcount<1) {
 			OrganizationContactBook contactBook=new OrganizationContactBook();
@@ -218,29 +234,32 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		tl.setCreateTime(new Date());
 		tl.setTaskId(t.getId());
 		tl.setAid(TokenManager.getAdminId());
-		if (t.getStatus()!=task2.getStatus()) {
-			String s="将当前项目状态修改为";
-			if (t.getStatus()==0)s+="开启";
-			if (t.getStatus()==1)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);
+		if (t.getStatus()!=null) {
+			if (t.getStatus()!=task2.getStatus()) {
+				String s="将当前项目状态修改为";
+				if (t.getStatus()==0)s+="开启";
+				if (t.getStatus()==1)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);
+			}
 		}
+		
 		if (task2.getSuperId()!=null) {//是否有父项目
 			TOrderTask task3 =tOrderTaskMapper.selectBySuperId(task2.getSuperId());
 			task3.setId(Integer.valueOf(task2.getSuperId()));
@@ -337,14 +356,12 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		return p;
 	}
 
-	@SuppressWarnings("null")
+	
 	@Override
 	public XSSFWorkbook exportTaskHoursListData(String name, String taskId, String startTime, String endTime) {
 		if(StringUtils.isNoneBlank(endTime)) endTime=endTime+" 23:59:59";
 		List<TOrderTaskListBo> list=tTaskHoursMapper.getTaskHoursData(name,taskId,startTime,endTime);
-		if (list==null && list.size()==0) {
-			return null;
-		}
+		if (list==null || list.size()==0) return null;
 		String[] comment = {"任务编号","任务名称","订单编号","业务别类","订单部门","客户名称","任务负责人","任务状态","工时","合同编号","签单日期","派单日期"};
 		String filePath = uploadPath + "/TaskHours";
 		XSSFWorkbook wb = ExportExcelUtil.exportTaskHoursListData(list, comment, filePath);
@@ -402,12 +419,9 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	}
 	@Override
 	public XSSFWorkbook exportMyTaskList() {
-		//List<TOrderTaskListBo> list=taskProgressMapper.selectMyTaskList(TokenManager.getAdminId());
-		List<TOrderTaskListBo> list=taskProgressMapper.selectMyTaskList("a47f2728-215a-4e7a-ac88-6ec45c8fe962");
-		if (list==null && list.size()==0) {
-			return null;
-		}
-		String[] comment = {"任务编号","任务名称","订单编号","业务别类","客户名称","任务状态","项目状态","分配时间","订单部门"};
+		List<TOrderTaskListBo> list=taskProgressMapper.selectMyTaskList(TokenManager.getAdminId());
+		if (list==null || list.size()==0) return null;
+		String[] comment = {"任务编号","任务名称","订单编号","业务别类","客户名称(软著数/下证数)","任务状态","项目状态","分配时间","订单部门"};
 		String filePath = uploadPath + "/MyTaskList";
 		XSSFWorkbook wb = ExportExcelUtil.exportSelectMyTaskList(list, comment, filePath);
 		return wb;