Browse Source

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

anderx 6 years ago
parent
commit
b0cbacca72
33 changed files with 4432 additions and 783 deletions
  1. 1 1
      GeneratorConfig.xml
  2. 1 12
      src/main/java/com/goafanti/common/controller/CertifyApiController.java
  3. 2 0
      src/main/java/com/goafanti/common/dao/OrganizationIdentityMapper.java
  4. 1 1
      src/main/java/com/goafanti/common/dao/TOrderInvoiceMapper.java
  5. 14 14
      src/main/java/com/goafanti/common/dao/TOrderTaskMapper.java
  6. 79 0
      src/main/java/com/goafanti/common/dao/TaskLogMapper.java
  7. 85 0
      src/main/java/com/goafanti/common/dao/TaskProgressMapper.java
  8. 206 0
      src/main/java/com/goafanti/common/mapper/OrganizationIdentityMapper.xml
  9. 1 1
      src/main/java/com/goafanti/common/mapper/TOrderInvoiceMapper.xml
  10. 5 7
      src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml
  11. 204 49
      src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml
  12. 290 0
      src/main/java/com/goafanti/common/mapper/TaskLogMapper.xml
  13. 313 0
      src/main/java/com/goafanti/common/mapper/TaskProgressMapper.xml
  14. 680 650
      src/main/java/com/goafanti/common/model/TOrderTask.java
  15. 596 16
      src/main/java/com/goafanti/common/model/TOrderTaskExample.java
  16. 125 0
      src/main/java/com/goafanti/common/model/TaskLog.java
  17. 582 0
      src/main/java/com/goafanti/common/model/TaskLogExample.java
  18. 125 0
      src/main/java/com/goafanti/common/model/TaskProgress.java
  19. 562 0
      src/main/java/com/goafanti/common/model/TaskProgressExample.java
  20. 16 0
      src/main/java/com/goafanti/common/utils/DateUtils.java
  21. 58 0
      src/main/java/com/goafanti/common/utils/ExportExcelUtil.java
  22. 36 0
      src/main/java/com/goafanti/order/bo/TOrderNewBo.java
  23. 126 0
      src/main/java/com/goafanti/order/bo/TOrderTaskDetailBo.java
  24. 7 0
      src/main/java/com/goafanti/order/bo/TOrderTaskListBo.java
  25. 25 0
      src/main/java/com/goafanti/order/bo/TaskLogBo.java
  26. 49 0
      src/main/java/com/goafanti/order/bo/TaskProgressBo.java
  27. 83 0
      src/main/java/com/goafanti/order/controller/OrderProjectApiController.java
  28. 6 0
      src/main/java/com/goafanti/order/enums/ProjectNewStage.java
  29. 16 0
      src/main/java/com/goafanti/order/service/OrderProjectService.java
  30. 7 2
      src/main/java/com/goafanti/order/service/impl/OrderInvoiceServiceImpl.java
  31. 126 25
      src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java
  32. 4 4
      src/main/resources/props/config_local.properties
  33. 1 1
      src/main/resources/props/config_test.properties

+ 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="department"/>
+    <table schema="aft" tableName="t_order_task"/>
   </context>
 </generatorConfiguration>

+ 1 - 12
src/main/java/com/goafanti/common/controller/CertifyApiController.java

@@ -1,30 +1,19 @@
 package com.goafanti.common.controller;
 
-import javax.annotation.Resource;
 
 import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
-import com.goafanti.common.enums.UserLevel;
 import com.goafanti.common.model.User;
 import com.goafanti.core.shiro.token.TokenManager;
-import com.goafanti.user.service.OrganizationIdentityService;
-import com.goafanti.user.service.UserIdentityService;
 
 public class CertifyApiController extends BaseApiController {
-	@Resource
-	private OrganizationIdentityService	organizationIdentityService;
-	@Resource
-	private UserIdentityService			userIdentityService;
+
 
 	public boolean checkCertify(Result res, User user) {
 		if (user == null) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "用户未指定", "用户"));
 			return false;
 		}
-		if (UserLevel.getStatus(user.getLvl()).equals(UserLevel.GENERAL)) {
-			res.getError().add(buildError(ErrorConstants.NON_CERTIFIED, "未通过实名认证,无法操作!"));
-			return false;
-		}
 		return true;
 	}
 

+ 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);
 }

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

@@ -75,7 +75,7 @@ public interface TOrderInvoiceMapper {
 	 */
 	int updateByPrimaryKey(TOrderInvoice record);
 
-	Double checkApplyAmount(@Param("orderNo")String orderNo,@Param("id")Integer id);
+	String checkApplyAmount(@Param("orderNo")String orderNo,@Param("id")Integer id);
 
 	TOrderInvoiceDetails selectByInvoiceDitails(Integer id);
 }

+ 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  Sun May 05 08:49:10 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  Sun May 05 08:49:10 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  Sun May 05 08:49:10 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  Sun May 05 08:49:10 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  Sun May 05 08:49:10 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  Sun May 05 08:49:10 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  Sun May 05 08:49:10 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  Sun May 05 08:49:10 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  Sun May 05 08:49:10 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  Sun May 05 08:49:10 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  Sun May 05 08:49:10 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  Sun May 05 08:49:10 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  Sun May 05 08:49:10 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  Sun May 05 08:49:10 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	int updateByPrimaryKey(TOrderTask record);
 

+ 79 - 0
src/main/java/com/goafanti/common/dao/TaskLogMapper.java

@@ -0,0 +1,79 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.TaskLog;
+import com.goafanti.common.model.TaskLogExample;
+import com.goafanti.order.bo.TaskLogBo;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface TaskLogMapper {
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_log
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	long countByExample(TaskLogExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_log
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	int deleteByExample(TaskLogExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_log
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	int deleteByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_log
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	int insert(TaskLog record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_log
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	int insertSelective(TaskLog record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_log
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	List<TaskLog> selectByExample(TaskLogExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_log
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	TaskLog selectByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_log
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	int updateByExampleSelective(@Param("record") TaskLog record, @Param("example") TaskLogExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_log
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	int updateByExample(@Param("record") TaskLog record, @Param("example") TaskLogExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_log
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	int updateByPrimaryKeySelective(TaskLog record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_log
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	int updateByPrimaryKey(TaskLog record);
+
+	List<TaskLogBo> selectTaskLogList(Integer id);
+}

+ 85 - 0
src/main/java/com/goafanti/common/dao/TaskProgressMapper.java

@@ -0,0 +1,85 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.TaskProgress;
+import com.goafanti.common.model.TaskProgressExample;
+import com.goafanti.order.bo.TOrderTaskListBo;
+import com.goafanti.order.bo.TaskProgressBo;
+
+import java.util.Date;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface TaskProgressMapper {
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_progress
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	long countByExample(TaskProgressExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_progress
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	int deleteByExample(TaskProgressExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_progress
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	int deleteByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_progress
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	int insert(TaskProgress record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_progress
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	int insertSelective(TaskProgress record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_progress
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	List<TaskProgress> selectByExample(TaskProgressExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_progress
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	TaskProgress selectByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_progress
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	int updateByExampleSelective(@Param("record") TaskProgress record, @Param("example") TaskProgressExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_progress
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	int updateByExample(@Param("record") TaskProgress record, @Param("example") TaskProgressExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_progress
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	int updateByPrimaryKeySelective(TaskProgress record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_progress
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	int updateByPrimaryKey(TaskProgress record);
+
+	List<TaskProgressBo> selectTaskProgress(Integer tid);
+
+	int AlreadyNuberCount(Integer taskId);
+
+	List<TOrderTaskListBo> selectMyTaskList(String aid);
+}

+ 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>

+ 1 - 1
src/main/java/com/goafanti/common/mapper/TOrderInvoiceMapper.xml

@@ -632,7 +632,7 @@
       already_amount = #{alreadyAmount,jdbcType=DECIMAL}
     where id = #{id,jdbcType=INTEGER}
   </update>
-  <select id="checkApplyAmount" resultType="java.lang.Double">
+  <select id="checkApplyAmount" resultType="java.lang.String">
   select ifnull(sum(amount),0) from t_order_invoice
 	where order_no= #{orderNo,jdbcType=VARCHAR}  and status !=4
 	<if test="id != null">

+ 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>
   

+ 204 - 49
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 Sun May 05 08:49:10 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" />
@@ -29,12 +29,21 @@
     <result column="publicity_time" jdbcType="DATE" property="publicityTime" />
     <result column="licence_time" jdbcType="DATE" property="licenceTime" />
     <result column="certificate_number" jdbcType="VARCHAR" property="certificateNumber" />
+    <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="form_retrieve" jdbcType="INTEGER" property="formRetrieve" />
+    <result column="declare_user" jdbcType="VARCHAR" property="declareUser" />
+    <result column="declare_pwd" jdbcType="VARCHAR" property="declarePwd" />
+    <result column="task_refund" jdbcType="INTEGER" property="taskRefund" />
+    <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 Sun May 05 08:49:10 CST 2019.
+      This element was generated on Thu Jun 06 14:08:45 CST 2019.
     -->
     <result column="attachment_url" jdbcType="LONGVARCHAR" property="attachmentUrl" />
   </resultMap>
@@ -42,7 +51,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun May 05 08:49:10 CST 2019.
+      This element was generated on Thu Jun 06 14:08:45 CST 2019.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -76,7 +85,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun May 05 08:49:10 CST 2019.
+      This element was generated on Thu Jun 06 14:08:45 CST 2019.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -110,18 +119,19 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun May 05 08:49:10 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
+    publicity_time, licence_time, certificate_number, status, form_retrieve, declare_user, 
+    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 Sun May 05 08:49:10 CST 2019.
+      This element was generated on Thu Jun 06 14:08:45 CST 2019.
     -->
     attachment_url
   </sql>
@@ -129,7 +139,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun May 05 08:49:10 CST 2019.
+      This element was generated on Thu Jun 06 14:08:45 CST 2019.
     -->
     select
     <if test="distinct">
@@ -150,7 +160,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun May 05 08:49:10 CST 2019.
+      This element was generated on Thu Jun 06 14:08:45 CST 2019.
     -->
     select
     <if test="distinct">
@@ -169,7 +179,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun May 05 08:49:10 CST 2019.
+      This element was generated on Thu Jun 06 14:08:45 CST 2019.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -182,7 +192,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun May 05 08:49:10 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}
@@ -191,7 +201,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun May 05 08:49:10 CST 2019.
+      This element was generated on Thu Jun 06 14:08:45 CST 2019.
     -->
     delete from t_order_task
     <if test="_parameter != null">
@@ -202,7 +212,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun May 05 08:49:10 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, 
@@ -211,7 +221,10 @@
       task_receiver, task_comment, task_start_time, 
       task_end_time, project_status, accept_time, 
       review_time, publicity_time, licence_time, 
-      certificate_number, attachment_url)
+      certificate_number, status, form_retrieve, 
+      declare_user, declare_pwd, task_refund, 
+      refund_content, set_up_amount, arrival_money, 
+      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}, 
@@ -219,13 +232,16 @@
       #{taskReceiver,jdbcType=VARCHAR}, #{taskComment,jdbcType=VARCHAR}, #{taskStartTime,jdbcType=TIMESTAMP}, 
       #{taskEndTime,jdbcType=TIMESTAMP}, #{projectStatus,jdbcType=INTEGER}, #{acceptTime,jdbcType=DATE}, 
       #{reviewTime,jdbcType=DATE}, #{publicityTime,jdbcType=DATE}, #{licenceTime,jdbcType=DATE}, 
-      #{certificateNumber,jdbcType=VARCHAR}, #{attachmentUrl,jdbcType=LONGVARCHAR})
+      #{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}, 
+      #{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 Sun May 05 08:49:10 CST 2019.
+      This element was generated on Thu Jun 06 14:08:45 CST 2019.
     -->
     insert into t_order_task
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -295,6 +311,33 @@
       <if test="certificateNumber != null">
         certificate_number,
       </if>
+      <if test="status != null">
+        status,
+      </if>
+      <if test="formRetrieve != null">
+        form_retrieve,
+      </if>
+      <if test="declareUser != null">
+        declare_user,
+      </if>
+      <if test="declarePwd != null">
+        declare_pwd,
+      </if>
+      <if test="taskRefund != null">
+        task_refund,
+      </if>
+      <if test="refundContent != null">
+        refund_content,
+      </if>
+      <if test="setUpAmount != null">
+        set_up_amount,
+      </if>
+      <if test="arrivalMoney != null">
+        arrival_money,
+      </if>
+      <if test="retrieveContent != null">
+        retrieve_content,
+      </if>
       <if test="attachmentUrl != null">
         attachment_url,
       </if>
@@ -366,6 +409,33 @@
       <if test="certificateNumber != null">
         #{certificateNumber,jdbcType=VARCHAR},
       </if>
+      <if test="status != null">
+        #{status,jdbcType=INTEGER},
+      </if>
+      <if test="formRetrieve != null">
+        #{formRetrieve,jdbcType=INTEGER},
+      </if>
+      <if test="declareUser != null">
+        #{declareUser,jdbcType=VARCHAR},
+      </if>
+      <if test="declarePwd != null">
+        #{declarePwd,jdbcType=VARCHAR},
+      </if>
+      <if test="taskRefund != null">
+        #{taskRefund,jdbcType=INTEGER},
+      </if>
+      <if test="refundContent != null">
+        #{refundContent,jdbcType=VARCHAR},
+      </if>
+      <if test="setUpAmount != null">
+        #{setUpAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="arrivalMoney != null">
+        #{arrivalMoney,jdbcType=INTEGER},
+      </if>
+      <if test="retrieveContent != null">
+        #{retrieveContent,jdbcType=VARCHAR},
+      </if>
       <if test="attachmentUrl != null">
         #{attachmentUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -375,7 +445,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun May 05 08:49:10 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">
@@ -386,7 +456,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun May 05 08:49:10 CST 2019.
+      This element was generated on Thu Jun 06 14:08:45 CST 2019.
     -->
     update t_order_task
     <set>
@@ -456,6 +526,33 @@
       <if test="record.certificateNumber != null">
         certificate_number = #{record.certificateNumber,jdbcType=VARCHAR},
       </if>
+      <if test="record.status != null">
+        status = #{record.status,jdbcType=INTEGER},
+      </if>
+      <if test="record.formRetrieve != null">
+        form_retrieve = #{record.formRetrieve,jdbcType=INTEGER},
+      </if>
+      <if test="record.declareUser != null">
+        declare_user = #{record.declareUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.declarePwd != null">
+        declare_pwd = #{record.declarePwd,jdbcType=VARCHAR},
+      </if>
+      <if test="record.taskRefund != null">
+        task_refund = #{record.taskRefund,jdbcType=INTEGER},
+      </if>
+      <if test="record.refundContent != null">
+        refund_content = #{record.refundContent,jdbcType=VARCHAR},
+      </if>
+      <if test="record.setUpAmount != null">
+        set_up_amount = #{record.setUpAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.arrivalMoney != null">
+        arrival_money = #{record.arrivalMoney,jdbcType=INTEGER},
+      </if>
+      <if test="record.retrieveContent != null">
+        retrieve_content = #{record.retrieveContent,jdbcType=VARCHAR},
+      </if>
       <if test="record.attachmentUrl != null">
         attachment_url = #{record.attachmentUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -468,7 +565,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun May 05 08:49:10 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},
@@ -493,6 +590,15 @@
       publicity_time = #{record.publicityTime,jdbcType=DATE},
       licence_time = #{record.licenceTime,jdbcType=DATE},
       certificate_number = #{record.certificateNumber,jdbcType=VARCHAR},
+      status = #{record.status,jdbcType=INTEGER},
+      form_retrieve = #{record.formRetrieve,jdbcType=INTEGER},
+      declare_user = #{record.declareUser,jdbcType=VARCHAR},
+      declare_pwd = #{record.declarePwd,jdbcType=VARCHAR},
+      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},
+      retrieve_content = #{record.retrieveContent,jdbcType=VARCHAR},
       attachment_url = #{record.attachmentUrl,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -502,7 +608,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun May 05 08:49:10 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},
@@ -526,7 +632,16 @@
       review_time = #{record.reviewTime,jdbcType=DATE},
       publicity_time = #{record.publicityTime,jdbcType=DATE},
       licence_time = #{record.licenceTime,jdbcType=DATE},
-      certificate_number = #{record.certificateNumber,jdbcType=VARCHAR}
+      certificate_number = #{record.certificateNumber,jdbcType=VARCHAR},
+      status = #{record.status,jdbcType=INTEGER},
+      form_retrieve = #{record.formRetrieve,jdbcType=INTEGER},
+      declare_user = #{record.declareUser,jdbcType=VARCHAR},
+      declare_pwd = #{record.declarePwd,jdbcType=VARCHAR},
+      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},
+      retrieve_content = #{record.retrieveContent,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -535,7 +650,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun May 05 08:49:10 CST 2019.
+      This element was generated on Thu Jun 06 14:08:45 CST 2019.
     -->
     update t_order_task
     <set>
@@ -602,12 +717,36 @@
       <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="declareUser != null">
+        declare_user = #{declareUser,jdbcType=VARCHAR},
+      </if>
+      <if test="declarePwd != null">
+        declare_pwd = #{declarePwd,jdbcType=VARCHAR},
+      </if>
+      <if test="taskRefund != null">
+        task_refund = #{taskRefund,jdbcType=INTEGER},
+      </if>
+      <if test="refundContent != null">
+        refund_content = #{refundContent,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="retrieveContent != null">
+        retrieve_content = #{retrieveContent,jdbcType=VARCHAR},
+      </if>
       <if test="attachmentUrl != null">
         attachment_url = #{attachmentUrl,jdbcType=LONGVARCHAR},
       </if>
-      <if test="certificateNumber != null">
-        certificate_number = #{certificateNumber,jdbcType=VARCHAR},
-      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -615,7 +754,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun May 05 08:49:10 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},
@@ -639,6 +778,15 @@
       publicity_time = #{publicityTime,jdbcType=DATE},
       licence_time = #{licenceTime,jdbcType=DATE},
       certificate_number = #{certificateNumber,jdbcType=VARCHAR},
+      status = #{status,jdbcType=INTEGER},
+      form_retrieve = #{formRetrieve,jdbcType=INTEGER},
+      declare_user = #{declareUser,jdbcType=VARCHAR},
+      declare_pwd = #{declarePwd,jdbcType=VARCHAR},
+      task_refund = #{taskRefund,jdbcType=INTEGER},
+      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>
@@ -646,7 +794,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sun May 05 08:49:10 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},
@@ -669,7 +817,16 @@
       review_time = #{reviewTime,jdbcType=DATE},
       publicity_time = #{publicityTime,jdbcType=DATE},
       licence_time = #{licenceTime,jdbcType=DATE},
-      certificate_number = #{certificateNumber,jdbcType=VARCHAR}
+      certificate_number = #{certificateNumber,jdbcType=VARCHAR},
+      status = #{status,jdbcType=INTEGER},
+      form_retrieve = #{formRetrieve,jdbcType=INTEGER},
+      declare_user = #{declareUser,jdbcType=VARCHAR},
+      declare_pwd = #{declarePwd,jdbcType=VARCHAR},
+      task_refund = #{taskRefund,jdbcType=INTEGER},
+      refund_content = #{refundContent,jdbcType=VARCHAR},
+      set_up_amount = #{setUpAmount,jdbcType=DECIMAL},
+      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">
@@ -685,23 +842,18 @@
   
   
    <select id="selectOrderTaskListByPage" 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
-  	from t_order_task a left join business_project b on a.commodity_id=b.id
-  	left join business_category c on b.cid=c.id
-    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 department h on e.order_dep=h.id
-    where e.delete_sign=0  and e.order_status not in (5,7)
+    a.commodity_quantity as commodityQuantity,ifnull(i.alreadyNumber,0) as alreadyNumber,f.nickname as userName,h.name as depName
+  	from t_order_task a left join business_project b on a.commodity_id=b.id left join business_category c on b.cid=c.id 
+  	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 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 e.order_status not in (5,7)
     <if test="specially == 0">
     and a.task_receiver= #{aid,jdbcType=VARCHAR}
-    and a.commodity_quantity =1
     </if>
     <if test="specially == 1">
     and a.task_receiver= #{aid,jdbcType=VARCHAR}
-    and a.super_id is null
     </if>
     <if test="specially == 2">
     and d.superior_id= (select department_id from admin where  id= #{aid,jdbcType=VARCHAR})
@@ -743,11 +895,9 @@
     where e.delete_sign=0  and e.order_status not in (5,7)
     <if test="specially == 0">
     and a.task_receiver= #{aid,jdbcType=VARCHAR}
-    and a.commodity_quantity =1
     </if>
     <if test="specially == 1">
     and a.task_receiver= #{aid,jdbcType=VARCHAR}
-    and a.super_id is null
     </if>
     <if test="specially == 2">
     and d.superior_id= (select department_id from admin where  id= #{aid,jdbcType=VARCHAR})
@@ -775,18 +925,22 @@
   	</if>
   </select>
   <select id="getOrderTaskDetail" resultType="com.goafanti.order.bo.TOrderTaskDetailBo">
-  select  
+select  
 	a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,a.task_comment as taskComment,
     a.project_status as projectStatus,a.task_status as taskStatus,e.contacts,a.attachment_url as attachmentUrl,
-	f.nickname as userName,g.name as salesmanName,date_format(a.task_start_time,'%Y-%m-%d') as startDate,a.certificate_number as certificateNumber,
-	date_format(a.task_end_time,'%Y-%m-%d') as endDate,date_format(a.accept_time,'%Y-%m-%d') as acceptDate,
+	f.nickname as userName,g.name as salesmanName,date_format(a.task_start_time,'%Y-%m-%d') as startDate,a.retrieve_content as retrieveContent,
+	a.certificate_number as certificateNumber, a.status,a.form_retrieve as formRetrieve, a.task_refund as taskRefund,
+	a.refund_content as refundContent, a.declare_user as  declareUser, a.declare_pwd as declarePwd,e.contract_no as contractNo,
+	date_format(a.task_end_time,'%Y-%m-%d') as endDate,date_format(a.accept_time,'%Y-%m-%d') as acceptDate,h.name as depName,
 	date_format(a.review_time,'%Y-%m-%d') as reviewDate,date_format(a.publicity_time,'%Y-%m-%d') as publicityDate,
 	date_format(a.licence_time,'%Y-%m-%d') as licenceDate,date_format(a.task_distribution_time,'%Y-%m-%d') as taskDate,
-	e.contacts ,e.contact_mobile as contactMobile ,e.legal_person as legalPerson,e.legal_person_tel as legalPersonTel
+	e.contacts ,e.contact_mobile as contactMobile ,e.legal_person as legalPerson,e.legal_person_tel as legalPersonTel,
+	a.set_up_amount as setUpAmount,a.arrival_money as arrivalMoney
 from t_order_task a left join business_project b on a.commodity_id=b.id
   	left join business_category c on b.cid=c.id
     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 department h on e.order_dep=h.id
     left join user f on e.buyer_id=f.id
     left join admin g on e.salesman_id=g.id
     where a.id= #{id,jdbcType=VARCHAR}
@@ -845,17 +999,17 @@ 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}
+    and (x.task_receiver= #{aid,jdbcType=VARCHAR} or x.task_allocator= #{aid,jdbcType=VARCHAR})
     <if test="orderNo != null">
   	and a.order_no= #{orderNo,jdbcType=VARCHAR}
   	</if>
@@ -890,7 +1044,7 @@ from t_order_task a left join business_project b on a.commodity_id=b.id
     left join t_order_new e on a.order_no=e.order_no
     left join user f on e.buyer_id=f.id
     where e.delete_sign=0 
-    and x.task_receiver= #{aid,jdbcType=VARCHAR}
+    and (x.task_receiver= #{aid,jdbcType=VARCHAR} or x.task_allocator= #{aid,jdbcType=VARCHAR})
     <if test="orderNo != null">
   	and a.order_no= #{orderNo,jdbcType=VARCHAR}
   	</if>
@@ -923,4 +1077,5 @@ from t_order_task a left join business_project b on a.commodity_id=b.id
     update t_order_task set task_allocator= #{aid,jdbcType=VARCHAR},task_receiver= #{transferId,jdbcType=VARCHAR}
 	where task_receiver=#{aid,jdbcType=VARCHAR}
   </update>
+  
 </mapper>

+ 290 - 0
src/main/java/com/goafanti/common/mapper/TaskLogMapper.xml

@@ -0,0 +1,290 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.goafanti.common.dao.TaskLogMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.TaskLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 04 10:17:22 CST 2019.
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="content" jdbcType="VARCHAR" property="content" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="task_id" jdbcType="INTEGER" property="taskId" />
+    <result column="aid" jdbcType="VARCHAR" property="aid" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 04 10:17:22 CST 2019.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 04 10:17:22 CST 2019.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 04 10:17:22 CST 2019.
+    -->
+    id, content, create_time, task_id, aid
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.TaskLogExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 04 10:17:22 CST 2019.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from task_log
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 04 10:17:22 CST 2019.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from task_log
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 04 10:17:22 CST 2019.
+    -->
+    delete from task_log
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.TaskLogExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 04 10:17:22 CST 2019.
+    -->
+    delete from task_log
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.TaskLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 04 10:17:22 CST 2019.
+    -->
+    insert into task_log (id, content, create_time, 
+      task_id, aid)
+    values (#{id,jdbcType=INTEGER}, #{content,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{taskId,jdbcType=INTEGER}, #{aid,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.TaskLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 04 10:17:22 CST 2019.
+    -->
+    insert into task_log
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="content != null">
+        content,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="taskId != null">
+        task_id,
+      </if>
+      <if test="aid != null">
+        aid,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="content != null">
+        #{content,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="taskId != null">
+        #{taskId,jdbcType=INTEGER},
+      </if>
+      <if test="aid != null">
+        #{aid,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.TaskLogExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 04 10:17:22 CST 2019.
+    -->
+    select count(*) from task_log
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 04 10:17:22 CST 2019.
+    -->
+    update task_log
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.content != null">
+        content = #{record.content,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.taskId != null">
+        task_id = #{record.taskId,jdbcType=INTEGER},
+      </if>
+      <if test="record.aid != null">
+        aid = #{record.aid,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 04 10:17:22 CST 2019.
+    -->
+    update task_log
+    set id = #{record.id,jdbcType=INTEGER},
+      content = #{record.content,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      task_id = #{record.taskId,jdbcType=INTEGER},
+      aid = #{record.aid,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TaskLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 04 10:17:22 CST 2019.
+    -->
+    update task_log
+    <set>
+      <if test="content != null">
+        content = #{content,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="taskId != null">
+        task_id = #{taskId,jdbcType=INTEGER},
+      </if>
+      <if test="aid != null">
+        aid = #{aid,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.TaskLog">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 04 10:17:22 CST 2019.
+    -->
+    update task_log
+    set content = #{content,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      task_id = #{taskId,jdbcType=INTEGER},
+      aid = #{aid,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <select id="selectTaskLogList" resultType="com.goafanti.order.bo.TaskLogBo">
+  select a.id,a.task_id taskId,a.content,date_format(a.create_time,'%Y-%m-%d %H:%i:%S') as createTimes,b.name as aName  
+  from task_log a left join admin b on a.aid=b.id where a.task_id= #{id,jdbcType=INTEGER} order by a.create_time
+  </select>
+</mapper>

+ 313 - 0
src/main/java/com/goafanti/common/mapper/TaskProgressMapper.xml

@@ -0,0 +1,313 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.goafanti.common.dao.TaskProgressMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.TaskProgress">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 05 14:03:08 CST 2019.
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="already_number" jdbcType="INTEGER" property="alreadyNumber" />
+    <result column="licence_time" jdbcType="TIMESTAMP" property="licenceTime" />
+    <result column="task_id" jdbcType="INTEGER" property="taskId" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 05 14:03:08 CST 2019.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 05 14:03:08 CST 2019.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 05 14:03:08 CST 2019.
+    -->
+    id, already_number, licence_time, task_id, create_time
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.TaskProgressExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 05 14:03:08 CST 2019.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from task_progress
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 05 14:03:08 CST 2019.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from task_progress
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 05 14:03:08 CST 2019.
+    -->
+    delete from task_progress
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.TaskProgressExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 05 14:03:08 CST 2019.
+    -->
+    delete from task_progress
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.TaskProgress">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 05 14:03:08 CST 2019.
+    -->
+    insert into task_progress (id, already_number, licence_time, 
+      task_id, create_time)
+    values (#{id,jdbcType=INTEGER}, #{alreadyNumber,jdbcType=INTEGER}, #{licenceTime,jdbcType=TIMESTAMP}, 
+      #{taskId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.TaskProgress">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 05 14:03:08 CST 2019.
+    -->
+    insert into task_progress
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="alreadyNumber != null">
+        already_number,
+      </if>
+      <if test="licenceTime != null">
+        licence_time,
+      </if>
+      <if test="taskId != null">
+        task_id,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="alreadyNumber != null">
+        #{alreadyNumber,jdbcType=INTEGER},
+      </if>
+      <if test="licenceTime != null">
+        #{licenceTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="taskId != null">
+        #{taskId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.TaskProgressExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 05 14:03:08 CST 2019.
+    -->
+    select count(*) from task_progress
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 05 14:03:08 CST 2019.
+    -->
+    update task_progress
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.alreadyNumber != null">
+        already_number = #{record.alreadyNumber,jdbcType=INTEGER},
+      </if>
+      <if test="record.licenceTime != null">
+        licence_time = #{record.licenceTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.taskId != null">
+        task_id = #{record.taskId,jdbcType=INTEGER},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 05 14:03:08 CST 2019.
+    -->
+    update task_progress
+    set id = #{record.id,jdbcType=INTEGER},
+      already_number = #{record.alreadyNumber,jdbcType=INTEGER},
+      licence_time = #{record.licenceTime,jdbcType=TIMESTAMP},
+      task_id = #{record.taskId,jdbcType=INTEGER},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TaskProgress">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 05 14:03:08 CST 2019.
+    -->
+    update task_progress
+    <set>
+      <if test="alreadyNumber != null">
+        already_number = #{alreadyNumber,jdbcType=INTEGER},
+      </if>
+      <if test="licenceTime != null">
+        licence_time = #{licenceTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="taskId != null">
+        task_id = #{taskId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.TaskProgress">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 05 14:03:08 CST 2019.
+    -->
+    update task_progress
+    set already_number = #{alreadyNumber,jdbcType=INTEGER},
+      licence_time = #{licenceTime,jdbcType=TIMESTAMP},
+      task_id = #{taskId,jdbcType=INTEGER},
+      create_time = #{createTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <select id="selectTaskProgress" resultType="com.goafanti.order.bo.TaskProgressBo">
+      select a.id,a.task_id as taskId,a.already_number as alreadyNumber,date_format(a.licence_time,'%Y-%m-%d')as licenceTimes,
+date_format(a.create_time,'%Y-%m-%d %H:%i:%S')as createTimes ,b.commodity_quantity as ingCount
+from task_progress a left join t_order_task b on a.task_id=b.id
+where a.task_id=  #{id,jdbcType=INTEGER}
+order by a.create_time
+  </select>
+  <select id="AlreadyNuberCount" resultType="java.lang.Integer">
+  	select ifnull(sum(already_number),0) from task_progress
+	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,
+    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,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 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 
+  </select>
+</mapper>

File diff suppressed because it is too large
+ 680 - 650
src/main/java/com/goafanti/common/model/TOrderTask.java


+ 596 - 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  Sun May 05 08:49:10 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  Sun May 05 08:49:10 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  Sun May 05 08:49:10 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  Sun May 05 08:49:10 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  Sun May 05 08:49:10 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  Sun May 05 08:49:10 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  Sun May 05 08:49:10 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  Sun May 05 08:49:10 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  Sun May 05 08:49:10 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  Sun May 05 08:49:10 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  Sun May 05 08:49:10 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  Sun May 05 08:49:10 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  Sun May 05 08:49:10 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  Sun May 05 08:49:10 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  Sun May 05 08:49:10 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -1600,11 +1600,591 @@ public class TOrderTaskExample {
 			addCriterion("certificate_number not between", value1, value2, "certificateNumber");
 			return (Criteria) this;
 		}
+
+		public Criteria andStatusIsNull() {
+			addCriterion("status is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusIsNotNull() {
+			addCriterion("status is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusEqualTo(Integer value) {
+			addCriterion("status =", value, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusNotEqualTo(Integer value) {
+			addCriterion("status <>", value, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusGreaterThan(Integer value) {
+			addCriterion("status >", value, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusGreaterThanOrEqualTo(Integer value) {
+			addCriterion("status >=", value, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusLessThan(Integer value) {
+			addCriterion("status <", value, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusLessThanOrEqualTo(Integer value) {
+			addCriterion("status <=", value, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusIn(List<Integer> values) {
+			addCriterion("status in", values, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusNotIn(List<Integer> values) {
+			addCriterion("status not in", values, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusBetween(Integer value1, Integer value2) {
+			addCriterion("status between", value1, value2, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andStatusNotBetween(Integer value1, Integer value2) {
+			addCriterion("status not between", value1, value2, "status");
+			return (Criteria) this;
+		}
+
+		public Criteria andFormRetrieveIsNull() {
+			addCriterion("form_retrieve is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andFormRetrieveIsNotNull() {
+			addCriterion("form_retrieve is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andFormRetrieveEqualTo(Integer value) {
+			addCriterion("form_retrieve =", value, "formRetrieve");
+			return (Criteria) this;
+		}
+
+		public Criteria andFormRetrieveNotEqualTo(Integer value) {
+			addCriterion("form_retrieve <>", value, "formRetrieve");
+			return (Criteria) this;
+		}
+
+		public Criteria andFormRetrieveGreaterThan(Integer value) {
+			addCriterion("form_retrieve >", value, "formRetrieve");
+			return (Criteria) this;
+		}
+
+		public Criteria andFormRetrieveGreaterThanOrEqualTo(Integer value) {
+			addCriterion("form_retrieve >=", value, "formRetrieve");
+			return (Criteria) this;
+		}
+
+		public Criteria andFormRetrieveLessThan(Integer value) {
+			addCriterion("form_retrieve <", value, "formRetrieve");
+			return (Criteria) this;
+		}
+
+		public Criteria andFormRetrieveLessThanOrEqualTo(Integer value) {
+			addCriterion("form_retrieve <=", value, "formRetrieve");
+			return (Criteria) this;
+		}
+
+		public Criteria andFormRetrieveIn(List<Integer> values) {
+			addCriterion("form_retrieve in", values, "formRetrieve");
+			return (Criteria) this;
+		}
+
+		public Criteria andFormRetrieveNotIn(List<Integer> values) {
+			addCriterion("form_retrieve not in", values, "formRetrieve");
+			return (Criteria) this;
+		}
+
+		public Criteria andFormRetrieveBetween(Integer value1, Integer value2) {
+			addCriterion("form_retrieve between", value1, value2, "formRetrieve");
+			return (Criteria) this;
+		}
+
+		public Criteria andFormRetrieveNotBetween(Integer value1, Integer value2) {
+			addCriterion("form_retrieve not between", value1, value2, "formRetrieve");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclareUserIsNull() {
+			addCriterion("declare_user is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclareUserIsNotNull() {
+			addCriterion("declare_user is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclareUserEqualTo(String value) {
+			addCriterion("declare_user =", value, "declareUser");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclareUserNotEqualTo(String value) {
+			addCriterion("declare_user <>", value, "declareUser");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclareUserGreaterThan(String value) {
+			addCriterion("declare_user >", value, "declareUser");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclareUserGreaterThanOrEqualTo(String value) {
+			addCriterion("declare_user >=", value, "declareUser");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclareUserLessThan(String value) {
+			addCriterion("declare_user <", value, "declareUser");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclareUserLessThanOrEqualTo(String value) {
+			addCriterion("declare_user <=", value, "declareUser");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclareUserLike(String value) {
+			addCriterion("declare_user like", value, "declareUser");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclareUserNotLike(String value) {
+			addCriterion("declare_user not like", value, "declareUser");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclareUserIn(List<String> values) {
+			addCriterion("declare_user in", values, "declareUser");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclareUserNotIn(List<String> values) {
+			addCriterion("declare_user not in", values, "declareUser");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclareUserBetween(String value1, String value2) {
+			addCriterion("declare_user between", value1, value2, "declareUser");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclareUserNotBetween(String value1, String value2) {
+			addCriterion("declare_user not between", value1, value2, "declareUser");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarePwdIsNull() {
+			addCriterion("declare_pwd is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarePwdIsNotNull() {
+			addCriterion("declare_pwd is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarePwdEqualTo(String value) {
+			addCriterion("declare_pwd =", value, "declarePwd");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarePwdNotEqualTo(String value) {
+			addCriterion("declare_pwd <>", value, "declarePwd");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarePwdGreaterThan(String value) {
+			addCriterion("declare_pwd >", value, "declarePwd");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarePwdGreaterThanOrEqualTo(String value) {
+			addCriterion("declare_pwd >=", value, "declarePwd");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarePwdLessThan(String value) {
+			addCriterion("declare_pwd <", value, "declarePwd");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarePwdLessThanOrEqualTo(String value) {
+			addCriterion("declare_pwd <=", value, "declarePwd");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarePwdLike(String value) {
+			addCriterion("declare_pwd like", value, "declarePwd");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarePwdNotLike(String value) {
+			addCriterion("declare_pwd not like", value, "declarePwd");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarePwdIn(List<String> values) {
+			addCriterion("declare_pwd in", values, "declarePwd");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarePwdNotIn(List<String> values) {
+			addCriterion("declare_pwd not in", values, "declarePwd");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarePwdBetween(String value1, String value2) {
+			addCriterion("declare_pwd between", value1, value2, "declarePwd");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarePwdNotBetween(String value1, String value2) {
+			addCriterion("declare_pwd not between", value1, value2, "declarePwd");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskRefundIsNull() {
+			addCriterion("task_refund is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskRefundIsNotNull() {
+			addCriterion("task_refund is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskRefundEqualTo(Integer value) {
+			addCriterion("task_refund =", value, "taskRefund");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskRefundNotEqualTo(Integer value) {
+			addCriterion("task_refund <>", value, "taskRefund");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskRefundGreaterThan(Integer value) {
+			addCriterion("task_refund >", value, "taskRefund");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskRefundGreaterThanOrEqualTo(Integer value) {
+			addCriterion("task_refund >=", value, "taskRefund");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskRefundLessThan(Integer value) {
+			addCriterion("task_refund <", value, "taskRefund");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskRefundLessThanOrEqualTo(Integer value) {
+			addCriterion("task_refund <=", value, "taskRefund");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskRefundIn(List<Integer> values) {
+			addCriterion("task_refund in", values, "taskRefund");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskRefundNotIn(List<Integer> values) {
+			addCriterion("task_refund not in", values, "taskRefund");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskRefundBetween(Integer value1, Integer value2) {
+			addCriterion("task_refund between", value1, value2, "taskRefund");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskRefundNotBetween(Integer value1, Integer value2) {
+			addCriterion("task_refund not between", value1, value2, "taskRefund");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundContentIsNull() {
+			addCriterion("refund_content is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundContentIsNotNull() {
+			addCriterion("refund_content is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundContentEqualTo(String value) {
+			addCriterion("refund_content =", value, "refundContent");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundContentNotEqualTo(String value) {
+			addCriterion("refund_content <>", value, "refundContent");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundContentGreaterThan(String value) {
+			addCriterion("refund_content >", value, "refundContent");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundContentGreaterThanOrEqualTo(String value) {
+			addCriterion("refund_content >=", value, "refundContent");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundContentLessThan(String value) {
+			addCriterion("refund_content <", value, "refundContent");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundContentLessThanOrEqualTo(String value) {
+			addCriterion("refund_content <=", value, "refundContent");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundContentLike(String value) {
+			addCriterion("refund_content like", value, "refundContent");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundContentNotLike(String value) {
+			addCriterion("refund_content not like", value, "refundContent");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundContentIn(List<String> values) {
+			addCriterion("refund_content in", values, "refundContent");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundContentNotIn(List<String> values) {
+			addCriterion("refund_content not in", values, "refundContent");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundContentBetween(String value1, String value2) {
+			addCriterion("refund_content between", value1, value2, "refundContent");
+			return (Criteria) this;
+		}
+
+		public Criteria andRefundContentNotBetween(String value1, String value2) {
+			addCriterion("refund_content not between", value1, value2, "refundContent");
+			return (Criteria) this;
+		}
+
+		public Criteria andSetUpAmountIsNull() {
+			addCriterion("set_up_amount is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andSetUpAmountIsNotNull() {
+			addCriterion("set_up_amount is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andSetUpAmountEqualTo(BigDecimal value) {
+			addCriterion("set_up_amount =", value, "setUpAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andSetUpAmountNotEqualTo(BigDecimal value) {
+			addCriterion("set_up_amount <>", value, "setUpAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andSetUpAmountGreaterThan(BigDecimal value) {
+			addCriterion("set_up_amount >", value, "setUpAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andSetUpAmountGreaterThanOrEqualTo(BigDecimal value) {
+			addCriterion("set_up_amount >=", value, "setUpAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andSetUpAmountLessThan(BigDecimal value) {
+			addCriterion("set_up_amount <", value, "setUpAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andSetUpAmountLessThanOrEqualTo(BigDecimal value) {
+			addCriterion("set_up_amount <=", value, "setUpAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andSetUpAmountIn(List<BigDecimal> values) {
+			addCriterion("set_up_amount in", values, "setUpAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andSetUpAmountNotIn(List<BigDecimal> values) {
+			addCriterion("set_up_amount not in", values, "setUpAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andSetUpAmountBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("set_up_amount between", value1, value2, "setUpAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andSetUpAmountNotBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("set_up_amount not between", value1, value2, "setUpAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andArrivalMoneyIsNull() {
+			addCriterion("arrival_money is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andArrivalMoneyIsNotNull() {
+			addCriterion("arrival_money is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andArrivalMoneyEqualTo(Integer value) {
+			addCriterion("arrival_money =", value, "arrivalMoney");
+			return (Criteria) this;
+		}
+
+		public Criteria andArrivalMoneyNotEqualTo(Integer value) {
+			addCriterion("arrival_money <>", value, "arrivalMoney");
+			return (Criteria) this;
+		}
+
+		public Criteria andArrivalMoneyGreaterThan(Integer value) {
+			addCriterion("arrival_money >", value, "arrivalMoney");
+			return (Criteria) this;
+		}
+
+		public Criteria andArrivalMoneyGreaterThanOrEqualTo(Integer value) {
+			addCriterion("arrival_money >=", value, "arrivalMoney");
+			return (Criteria) this;
+		}
+
+		public Criteria andArrivalMoneyLessThan(Integer value) {
+			addCriterion("arrival_money <", value, "arrivalMoney");
+			return (Criteria) this;
+		}
+
+		public Criteria andArrivalMoneyLessThanOrEqualTo(Integer value) {
+			addCriterion("arrival_money <=", value, "arrivalMoney");
+			return (Criteria) this;
+		}
+
+		public Criteria andArrivalMoneyIn(List<Integer> values) {
+			addCriterion("arrival_money in", values, "arrivalMoney");
+			return (Criteria) this;
+		}
+
+		public Criteria andArrivalMoneyNotIn(List<Integer> values) {
+			addCriterion("arrival_money not in", values, "arrivalMoney");
+			return (Criteria) this;
+		}
+
+		public Criteria andArrivalMoneyBetween(Integer value1, Integer value2) {
+			addCriterion("arrival_money between", value1, value2, "arrivalMoney");
+			return (Criteria) this;
+		}
+
+		public Criteria andArrivalMoneyNotBetween(Integer value1, Integer value2) {
+			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  Sun May 05 08:49:10 CST 2019
+	 * @mbg.generated  Thu Jun 06 14:08:45 CST 2019
 	 */
 	public static class Criterion {
 		private String condition;

+ 125 - 0
src/main/java/com/goafanti/common/model/TaskLog.java

@@ -0,0 +1,125 @@
+package com.goafanti.common.model;
+
+import java.util.Date;
+
+public class TaskLog {
+    /**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column task_log.id
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	private Integer id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column task_log.content
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	private String content;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column task_log.create_time
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	private Date createTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column task_log.task_id
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	private Integer taskId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column task_log.aid
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	private String aid;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column task_log.id
+	 * @return  the value of task_log.id
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	public Integer getId() {
+		return id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column task_log.id
+	 * @param id  the value for task_log.id
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column task_log.content
+	 * @return  the value of task_log.content
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	public String getContent() {
+		return content;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column task_log.content
+	 * @param content  the value for task_log.content
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	public void setContent(String content) {
+		this.content = content;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column task_log.create_time
+	 * @return  the value of task_log.create_time
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column task_log.create_time
+	 * @param createTime  the value for task_log.create_time
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column task_log.task_id
+	 * @return  the value of task_log.task_id
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	public Integer getTaskId() {
+		return taskId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column task_log.task_id
+	 * @param taskId  the value for task_log.task_id
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	public void setTaskId(Integer taskId) {
+		this.taskId = taskId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column task_log.aid
+	 * @return  the value of task_log.aid
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	public String getAid() {
+		return aid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column task_log.aid
+	 * @param aid  the value for task_log.aid
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	public void setAid(String aid) {
+		this.aid = aid;
+	}
+
+	public void setTaskId(String taskId) {
+        this.taskId = Integer.valueOf(taskId);
+    }
+}

+ 582 - 0
src/main/java/com/goafanti/common/model/TaskLogExample.java

@@ -0,0 +1,582 @@
+package com.goafanti.common.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class TaskLogExample {
+    /**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table task_log
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	protected String orderByClause;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table task_log
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	protected boolean distinct;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table task_log
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	protected List<Criteria> oredCriteria;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_log
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	public TaskLogExample() {
+		oredCriteria = new ArrayList<Criteria>();
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_log
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	public void setOrderByClause(String orderByClause) {
+		this.orderByClause = orderByClause;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_log
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	public String getOrderByClause() {
+		return orderByClause;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_log
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	public void setDistinct(boolean distinct) {
+		this.distinct = distinct;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_log
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	public boolean isDistinct() {
+		return distinct;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_log
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	public List<Criteria> getOredCriteria() {
+		return oredCriteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_log
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	public void or(Criteria criteria) {
+		oredCriteria.add(criteria);
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_log
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	public Criteria or() {
+		Criteria criteria = createCriteriaInternal();
+		oredCriteria.add(criteria);
+		return criteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_log
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	public Criteria createCriteria() {
+		Criteria criteria = createCriteriaInternal();
+		if (oredCriteria.size() == 0) {
+			oredCriteria.add(criteria);
+		}
+		return criteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_log
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	protected Criteria createCriteriaInternal() {
+		Criteria criteria = new Criteria();
+		return criteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_log
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	public void clear() {
+		oredCriteria.clear();
+		orderByClause = null;
+		distinct = false;
+	}
+
+	/**
+	 * This class was generated by MyBatis Generator. This class corresponds to the database table task_log
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	protected abstract static class GeneratedCriteria {
+		protected List<Criterion> criteria;
+
+		protected GeneratedCriteria() {
+			super();
+			criteria = new ArrayList<Criterion>();
+		}
+
+		public boolean isValid() {
+			return criteria.size() > 0;
+		}
+
+		public List<Criterion> getAllCriteria() {
+			return criteria;
+		}
+
+		public List<Criterion> getCriteria() {
+			return criteria;
+		}
+
+		protected void addCriterion(String condition) {
+			if (condition == null) {
+				throw new RuntimeException("Value for condition cannot be null");
+			}
+			criteria.add(new Criterion(condition));
+		}
+
+		protected void addCriterion(String condition, Object value, String property) {
+			if (value == null) {
+				throw new RuntimeException("Value for " + property + " cannot be null");
+			}
+			criteria.add(new Criterion(condition, value));
+		}
+
+		protected void addCriterion(String condition, Object value1, Object value2, String property) {
+			if (value1 == null || value2 == null) {
+				throw new RuntimeException("Between values for " + property + " cannot be null");
+			}
+			criteria.add(new Criterion(condition, value1, value2));
+		}
+
+		public Criteria andIdIsNull() {
+			addCriterion("id is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdIsNotNull() {
+			addCriterion("id is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdEqualTo(Integer value) {
+			addCriterion("id =", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdNotEqualTo(Integer value) {
+			addCriterion("id <>", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdGreaterThan(Integer value) {
+			addCriterion("id >", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+			addCriterion("id >=", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdLessThan(Integer value) {
+			addCriterion("id <", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdLessThanOrEqualTo(Integer value) {
+			addCriterion("id <=", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdIn(List<Integer> values) {
+			addCriterion("id in", values, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdNotIn(List<Integer> values) {
+			addCriterion("id not in", values, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdBetween(Integer value1, Integer value2) {
+			addCriterion("id between", value1, value2, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdNotBetween(Integer value1, Integer value2) {
+			addCriterion("id not between", value1, value2, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andContentIsNull() {
+			addCriterion("content is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andContentIsNotNull() {
+			addCriterion("content is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andContentEqualTo(String value) {
+			addCriterion("content =", value, "content");
+			return (Criteria) this;
+		}
+
+		public Criteria andContentNotEqualTo(String value) {
+			addCriterion("content <>", value, "content");
+			return (Criteria) this;
+		}
+
+		public Criteria andContentGreaterThan(String value) {
+			addCriterion("content >", value, "content");
+			return (Criteria) this;
+		}
+
+		public Criteria andContentGreaterThanOrEqualTo(String value) {
+			addCriterion("content >=", value, "content");
+			return (Criteria) this;
+		}
+
+		public Criteria andContentLessThan(String value) {
+			addCriterion("content <", value, "content");
+			return (Criteria) this;
+		}
+
+		public Criteria andContentLessThanOrEqualTo(String value) {
+			addCriterion("content <=", value, "content");
+			return (Criteria) this;
+		}
+
+		public Criteria andContentLike(String value) {
+			addCriterion("content like", value, "content");
+			return (Criteria) this;
+		}
+
+		public Criteria andContentNotLike(String value) {
+			addCriterion("content not like", value, "content");
+			return (Criteria) this;
+		}
+
+		public Criteria andContentIn(List<String> values) {
+			addCriterion("content in", values, "content");
+			return (Criteria) this;
+		}
+
+		public Criteria andContentNotIn(List<String> values) {
+			addCriterion("content not in", values, "content");
+			return (Criteria) this;
+		}
+
+		public Criteria andContentBetween(String value1, String value2) {
+			addCriterion("content between", value1, value2, "content");
+			return (Criteria) this;
+		}
+
+		public Criteria andContentNotBetween(String value1, String value2) {
+			addCriterion("content not between", value1, value2, "content");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeIsNull() {
+			addCriterion("create_time is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeIsNotNull() {
+			addCriterion("create_time is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeEqualTo(Date value) {
+			addCriterion("create_time =", value, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeNotEqualTo(Date value) {
+			addCriterion("create_time <>", value, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeGreaterThan(Date value) {
+			addCriterion("create_time >", value, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+			addCriterion("create_time >=", value, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeLessThan(Date value) {
+			addCriterion("create_time <", value, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+			addCriterion("create_time <=", value, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeIn(List<Date> values) {
+			addCriterion("create_time in", values, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeNotIn(List<Date> values) {
+			addCriterion("create_time not in", values, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeBetween(Date value1, Date value2) {
+			addCriterion("create_time between", value1, value2, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+			addCriterion("create_time not between", value1, value2, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskIdIsNull() {
+			addCriterion("task_id is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskIdIsNotNull() {
+			addCriterion("task_id is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskIdEqualTo(Integer value) {
+			addCriterion("task_id =", value, "taskId");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskIdNotEqualTo(Integer value) {
+			addCriterion("task_id <>", value, "taskId");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskIdGreaterThan(Integer value) {
+			addCriterion("task_id >", value, "taskId");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskIdGreaterThanOrEqualTo(Integer value) {
+			addCriterion("task_id >=", value, "taskId");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskIdLessThan(Integer value) {
+			addCriterion("task_id <", value, "taskId");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskIdLessThanOrEqualTo(Integer value) {
+			addCriterion("task_id <=", value, "taskId");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskIdIn(List<Integer> values) {
+			addCriterion("task_id in", values, "taskId");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskIdNotIn(List<Integer> values) {
+			addCriterion("task_id not in", values, "taskId");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskIdBetween(Integer value1, Integer value2) {
+			addCriterion("task_id between", value1, value2, "taskId");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskIdNotBetween(Integer value1, Integer value2) {
+			addCriterion("task_id not between", value1, value2, "taskId");
+			return (Criteria) this;
+		}
+
+		public Criteria andAidIsNull() {
+			addCriterion("aid is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andAidIsNotNull() {
+			addCriterion("aid is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andAidEqualTo(String value) {
+			addCriterion("aid =", value, "aid");
+			return (Criteria) this;
+		}
+
+		public Criteria andAidNotEqualTo(String value) {
+			addCriterion("aid <>", value, "aid");
+			return (Criteria) this;
+		}
+
+		public Criteria andAidGreaterThan(String value) {
+			addCriterion("aid >", value, "aid");
+			return (Criteria) this;
+		}
+
+		public Criteria andAidGreaterThanOrEqualTo(String value) {
+			addCriterion("aid >=", value, "aid");
+			return (Criteria) this;
+		}
+
+		public Criteria andAidLessThan(String value) {
+			addCriterion("aid <", value, "aid");
+			return (Criteria) this;
+		}
+
+		public Criteria andAidLessThanOrEqualTo(String value) {
+			addCriterion("aid <=", value, "aid");
+			return (Criteria) this;
+		}
+
+		public Criteria andAidLike(String value) {
+			addCriterion("aid like", value, "aid");
+			return (Criteria) this;
+		}
+
+		public Criteria andAidNotLike(String value) {
+			addCriterion("aid not like", value, "aid");
+			return (Criteria) this;
+		}
+
+		public Criteria andAidIn(List<String> values) {
+			addCriterion("aid in", values, "aid");
+			return (Criteria) this;
+		}
+
+		public Criteria andAidNotIn(List<String> values) {
+			addCriterion("aid not in", values, "aid");
+			return (Criteria) this;
+		}
+
+		public Criteria andAidBetween(String value1, String value2) {
+			addCriterion("aid between", value1, value2, "aid");
+			return (Criteria) this;
+		}
+
+		public Criteria andAidNotBetween(String value1, String value2) {
+			addCriterion("aid not between", value1, value2, "aid");
+			return (Criteria) this;
+		}
+	}
+
+	/**
+	 * This class was generated by MyBatis Generator. This class corresponds to the database table task_log
+	 * @mbg.generated  Tue Jun 04 10:17:22 CST 2019
+	 */
+	public static class Criterion {
+		private String condition;
+		private Object value;
+		private Object secondValue;
+		private boolean noValue;
+		private boolean singleValue;
+		private boolean betweenValue;
+		private boolean listValue;
+		private String typeHandler;
+
+		public String getCondition() {
+			return condition;
+		}
+
+		public Object getValue() {
+			return value;
+		}
+
+		public Object getSecondValue() {
+			return secondValue;
+		}
+
+		public boolean isNoValue() {
+			return noValue;
+		}
+
+		public boolean isSingleValue() {
+			return singleValue;
+		}
+
+		public boolean isBetweenValue() {
+			return betweenValue;
+		}
+
+		public boolean isListValue() {
+			return listValue;
+		}
+
+		public String getTypeHandler() {
+			return typeHandler;
+		}
+
+		protected Criterion(String condition) {
+			super();
+			this.condition = condition;
+			this.typeHandler = null;
+			this.noValue = true;
+		}
+
+		protected Criterion(String condition, Object value, String typeHandler) {
+			super();
+			this.condition = condition;
+			this.value = value;
+			this.typeHandler = typeHandler;
+			if (value instanceof List<?>) {
+				this.listValue = true;
+			} else {
+				this.singleValue = true;
+			}
+		}
+
+		protected Criterion(String condition, Object value) {
+			this(condition, value, null);
+		}
+
+		protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+			super();
+			this.condition = condition;
+			this.value = value;
+			this.secondValue = secondValue;
+			this.typeHandler = typeHandler;
+			this.betweenValue = true;
+		}
+
+		protected Criterion(String condition, Object value, Object secondValue) {
+			this(condition, value, secondValue, null);
+		}
+	}
+
+	/**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table task_log
+     *
+     * @mbg.generated do_not_delete_during_merge Mon Jun 03 11:03:37 CST 2019
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+}

+ 125 - 0
src/main/java/com/goafanti/common/model/TaskProgress.java

@@ -0,0 +1,125 @@
+package com.goafanti.common.model;
+
+import java.util.Date;
+
+public class TaskProgress {
+
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column task_progress.id
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	private Integer id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column task_progress.already_number
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	private Integer alreadyNumber;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column task_progress.licence_time
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	private Date licenceTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column task_progress.task_id
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	private Integer taskId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column task_progress.create_time
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	private Date createTime;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column task_progress.id
+	 * @return  the value of task_progress.id
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	public Integer getId() {
+		return id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column task_progress.id
+	 * @param id  the value for task_progress.id
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column task_progress.already_number
+	 * @return  the value of task_progress.already_number
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	public Integer getAlreadyNumber() {
+		if (alreadyNumber==null) {
+			return 0;
+		}
+		return alreadyNumber;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column task_progress.already_number
+	 * @param alreadyNumber  the value for task_progress.already_number
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	public void setAlreadyNumber(Integer alreadyNumber) {
+		this.alreadyNumber = alreadyNumber;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column task_progress.licence_time
+	 * @return  the value of task_progress.licence_time
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	public Date getLicenceTime() {
+		return licenceTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column task_progress.licence_time
+	 * @param licenceTime  the value for task_progress.licence_time
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	public void setLicenceTime(Date licenceTime) {
+		this.licenceTime = licenceTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column task_progress.task_id
+	 * @return  the value of task_progress.task_id
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	public Integer getTaskId() {
+		return taskId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column task_progress.task_id
+	 * @param taskId  the value for task_progress.task_id
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	public void setTaskId(Integer taskId) {
+		this.taskId = taskId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column task_progress.create_time
+	 * @return  the value of task_progress.create_time
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column task_progress.create_time
+	 * @param createTime  the value for task_progress.create_time
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+}

+ 562 - 0
src/main/java/com/goafanti/common/model/TaskProgressExample.java

@@ -0,0 +1,562 @@
+package com.goafanti.common.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class TaskProgressExample {
+    /**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table task_progress
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	protected String orderByClause;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table task_progress
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	protected boolean distinct;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table task_progress
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	protected List<Criteria> oredCriteria;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_progress
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	public TaskProgressExample() {
+		oredCriteria = new ArrayList<Criteria>();
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_progress
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	public void setOrderByClause(String orderByClause) {
+		this.orderByClause = orderByClause;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_progress
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	public String getOrderByClause() {
+		return orderByClause;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_progress
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	public void setDistinct(boolean distinct) {
+		this.distinct = distinct;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_progress
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	public boolean isDistinct() {
+		return distinct;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_progress
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	public List<Criteria> getOredCriteria() {
+		return oredCriteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_progress
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	public void or(Criteria criteria) {
+		oredCriteria.add(criteria);
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_progress
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	public Criteria or() {
+		Criteria criteria = createCriteriaInternal();
+		oredCriteria.add(criteria);
+		return criteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_progress
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	public Criteria createCriteria() {
+		Criteria criteria = createCriteriaInternal();
+		if (oredCriteria.size() == 0) {
+			oredCriteria.add(criteria);
+		}
+		return criteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_progress
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	protected Criteria createCriteriaInternal() {
+		Criteria criteria = new Criteria();
+		return criteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table task_progress
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	public void clear() {
+		oredCriteria.clear();
+		orderByClause = null;
+		distinct = false;
+	}
+
+	/**
+	 * This class was generated by MyBatis Generator. This class corresponds to the database table task_progress
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	protected abstract static class GeneratedCriteria {
+		protected List<Criterion> criteria;
+
+		protected GeneratedCriteria() {
+			super();
+			criteria = new ArrayList<Criterion>();
+		}
+
+		public boolean isValid() {
+			return criteria.size() > 0;
+		}
+
+		public List<Criterion> getAllCriteria() {
+			return criteria;
+		}
+
+		public List<Criterion> getCriteria() {
+			return criteria;
+		}
+
+		protected void addCriterion(String condition) {
+			if (condition == null) {
+				throw new RuntimeException("Value for condition cannot be null");
+			}
+			criteria.add(new Criterion(condition));
+		}
+
+		protected void addCriterion(String condition, Object value, String property) {
+			if (value == null) {
+				throw new RuntimeException("Value for " + property + " cannot be null");
+			}
+			criteria.add(new Criterion(condition, value));
+		}
+
+		protected void addCriterion(String condition, Object value1, Object value2, String property) {
+			if (value1 == null || value2 == null) {
+				throw new RuntimeException("Between values for " + property + " cannot be null");
+			}
+			criteria.add(new Criterion(condition, value1, value2));
+		}
+
+		public Criteria andIdIsNull() {
+			addCriterion("id is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdIsNotNull() {
+			addCriterion("id is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdEqualTo(Integer value) {
+			addCriterion("id =", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdNotEqualTo(Integer value) {
+			addCriterion("id <>", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdGreaterThan(Integer value) {
+			addCriterion("id >", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+			addCriterion("id >=", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdLessThan(Integer value) {
+			addCriterion("id <", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdLessThanOrEqualTo(Integer value) {
+			addCriterion("id <=", value, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdIn(List<Integer> values) {
+			addCriterion("id in", values, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdNotIn(List<Integer> values) {
+			addCriterion("id not in", values, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdBetween(Integer value1, Integer value2) {
+			addCriterion("id between", value1, value2, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andIdNotBetween(Integer value1, Integer value2) {
+			addCriterion("id not between", value1, value2, "id");
+			return (Criteria) this;
+		}
+
+		public Criteria andAlreadyNumberIsNull() {
+			addCriterion("already_number is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andAlreadyNumberIsNotNull() {
+			addCriterion("already_number is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andAlreadyNumberEqualTo(Integer value) {
+			addCriterion("already_number =", value, "alreadyNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andAlreadyNumberNotEqualTo(Integer value) {
+			addCriterion("already_number <>", value, "alreadyNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andAlreadyNumberGreaterThan(Integer value) {
+			addCriterion("already_number >", value, "alreadyNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andAlreadyNumberGreaterThanOrEqualTo(Integer value) {
+			addCriterion("already_number >=", value, "alreadyNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andAlreadyNumberLessThan(Integer value) {
+			addCriterion("already_number <", value, "alreadyNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andAlreadyNumberLessThanOrEqualTo(Integer value) {
+			addCriterion("already_number <=", value, "alreadyNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andAlreadyNumberIn(List<Integer> values) {
+			addCriterion("already_number in", values, "alreadyNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andAlreadyNumberNotIn(List<Integer> values) {
+			addCriterion("already_number not in", values, "alreadyNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andAlreadyNumberBetween(Integer value1, Integer value2) {
+			addCriterion("already_number between", value1, value2, "alreadyNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andAlreadyNumberNotBetween(Integer value1, Integer value2) {
+			addCriterion("already_number not between", value1, value2, "alreadyNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andLicenceTimeIsNull() {
+			addCriterion("licence_time is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andLicenceTimeIsNotNull() {
+			addCriterion("licence_time is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andLicenceTimeEqualTo(Date value) {
+			addCriterion("licence_time =", value, "licenceTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andLicenceTimeNotEqualTo(Date value) {
+			addCriterion("licence_time <>", value, "licenceTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andLicenceTimeGreaterThan(Date value) {
+			addCriterion("licence_time >", value, "licenceTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andLicenceTimeGreaterThanOrEqualTo(Date value) {
+			addCriterion("licence_time >=", value, "licenceTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andLicenceTimeLessThan(Date value) {
+			addCriterion("licence_time <", value, "licenceTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andLicenceTimeLessThanOrEqualTo(Date value) {
+			addCriterion("licence_time <=", value, "licenceTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andLicenceTimeIn(List<Date> values) {
+			addCriterion("licence_time in", values, "licenceTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andLicenceTimeNotIn(List<Date> values) {
+			addCriterion("licence_time not in", values, "licenceTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andLicenceTimeBetween(Date value1, Date value2) {
+			addCriterion("licence_time between", value1, value2, "licenceTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andLicenceTimeNotBetween(Date value1, Date value2) {
+			addCriterion("licence_time not between", value1, value2, "licenceTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskIdIsNull() {
+			addCriterion("task_id is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskIdIsNotNull() {
+			addCriterion("task_id is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskIdEqualTo(Integer value) {
+			addCriterion("task_id =", value, "taskId");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskIdNotEqualTo(Integer value) {
+			addCriterion("task_id <>", value, "taskId");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskIdGreaterThan(Integer value) {
+			addCriterion("task_id >", value, "taskId");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskIdGreaterThanOrEqualTo(Integer value) {
+			addCriterion("task_id >=", value, "taskId");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskIdLessThan(Integer value) {
+			addCriterion("task_id <", value, "taskId");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskIdLessThanOrEqualTo(Integer value) {
+			addCriterion("task_id <=", value, "taskId");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskIdIn(List<Integer> values) {
+			addCriterion("task_id in", values, "taskId");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskIdNotIn(List<Integer> values) {
+			addCriterion("task_id not in", values, "taskId");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskIdBetween(Integer value1, Integer value2) {
+			addCriterion("task_id between", value1, value2, "taskId");
+			return (Criteria) this;
+		}
+
+		public Criteria andTaskIdNotBetween(Integer value1, Integer value2) {
+			addCriterion("task_id not between", value1, value2, "taskId");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeIsNull() {
+			addCriterion("create_time is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeIsNotNull() {
+			addCriterion("create_time is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeEqualTo(Date value) {
+			addCriterion("create_time =", value, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeNotEqualTo(Date value) {
+			addCriterion("create_time <>", value, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeGreaterThan(Date value) {
+			addCriterion("create_time >", value, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+			addCriterion("create_time >=", value, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeLessThan(Date value) {
+			addCriterion("create_time <", value, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+			addCriterion("create_time <=", value, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeIn(List<Date> values) {
+			addCriterion("create_time in", values, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeNotIn(List<Date> values) {
+			addCriterion("create_time not in", values, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeBetween(Date value1, Date value2) {
+			addCriterion("create_time between", value1, value2, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+			addCriterion("create_time not between", value1, value2, "createTime");
+			return (Criteria) this;
+		}
+	}
+
+	/**
+	 * This class was generated by MyBatis Generator. This class corresponds to the database table task_progress
+	 * @mbg.generated  Wed Jun 05 14:03:08 CST 2019
+	 */
+	public static class Criterion {
+		private String condition;
+		private Object value;
+		private Object secondValue;
+		private boolean noValue;
+		private boolean singleValue;
+		private boolean betweenValue;
+		private boolean listValue;
+		private String typeHandler;
+
+		public String getCondition() {
+			return condition;
+		}
+
+		public Object getValue() {
+			return value;
+		}
+
+		public Object getSecondValue() {
+			return secondValue;
+		}
+
+		public boolean isNoValue() {
+			return noValue;
+		}
+
+		public boolean isSingleValue() {
+			return singleValue;
+		}
+
+		public boolean isBetweenValue() {
+			return betweenValue;
+		}
+
+		public boolean isListValue() {
+			return listValue;
+		}
+
+		public String getTypeHandler() {
+			return typeHandler;
+		}
+
+		protected Criterion(String condition) {
+			super();
+			this.condition = condition;
+			this.typeHandler = null;
+			this.noValue = true;
+		}
+
+		protected Criterion(String condition, Object value, String typeHandler) {
+			super();
+			this.condition = condition;
+			this.value = value;
+			this.typeHandler = typeHandler;
+			if (value instanceof List<?>) {
+				this.listValue = true;
+			} else {
+				this.singleValue = true;
+			}
+		}
+
+		protected Criterion(String condition, Object value) {
+			this(condition, value, null);
+		}
+
+		protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+			super();
+			this.condition = condition;
+			this.value = value;
+			this.secondValue = secondValue;
+			this.typeHandler = typeHandler;
+			this.betweenValue = true;
+		}
+
+		protected Criterion(String condition, Object value, Object secondValue) {
+			this(condition, value, secondValue, null);
+		}
+	}
+
+	/**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table task_progress
+     *
+     * @mbg.generated do_not_delete_during_merge Mon Jun 03 11:03:50 CST 2019
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+}

+ 16 - 0
src/main/java/com/goafanti/common/utils/DateUtils.java

@@ -456,6 +456,22 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 		return c.getTime();
 	}
 	
+	/**
+	 * 字符串转日期
+	 * @param date
+	 * @param ymd
+	 * @return
+	 * @throws ParseException
+	 */
+	public static Date StringToDate(String date,String ymd) throws ParseException
+	{
+	SimpleDateFormat dateFormat=new SimpleDateFormat(ymd);
+	
+	Date parse = dateFormat.parse(date);
+	return parse;
+
+	}
+	
 
 
 }

+ 58 - 0
src/main/java/com/goafanti/common/utils/ExportExcelUtil.java

@@ -483,6 +483,64 @@ public class ExportExcelUtil {
 			}
 		return wb;
 	}
+	
+	public static XSSFWorkbook exportSelectMyTaskList(List<TOrderTaskListBo> list, String[] comment, String filePath) {
+		//map 数据 comment表头 (列名称)
+ 		//1,创建一个workbook,对应的是一个excel文件
+		XSSFWorkbook wb = new XSSFWorkbook();
+		//2.创建一个sheet
+			XSSFSheet sheet = wb.createSheet();
+			//创建表头
+			XSSFCellStyle style1 = setCellStyle1(wb);
+			XSSFRow row = sheet.createRow(0);
+			for(int i = 0; i < comment.length; i++){
+				sheet.autoSizeColumn(i);  
+				sheet.autoSizeColumn(i, true);
+				sheet.setColumnWidth(i, 3000);//设置列宽
+				XSSFCell c = row.createCell(i);
+				c.setCellValue(comment[i]);
+				c.setCellStyle(style1);
+			}
+			for (TOrderTaskListBo ob : list) {
+				//新增一行
+				XSSFRow r = sheet.createRow(sheet.getLastRowNum()+1);
+				for (int i = 0; i < comment.length; i++) {
+					//当前列的只
+					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 "客户名称(软著数/下证数)":  
+						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;
+					case "订单部门": o = ob.getDepName();setWidth(sheet, i, o,2);break;
+					default: o = ""; break;
+					}
+					XSSFCell c = r.createCell(i);
+					c.setCellValue(o);
+				}
+			}
+		return wb;
+	}
+
+	private static void setWidth(XSSFSheet sheet, int i, String o,int x) {
+		if (StringUtils.isNotBlank(o)) {
+			sheet.setColumnWidth(i, o.getBytes().length*x*280);
+			
+		}
+		
+	}
 	/**
 	 * 年度导出数据模板
 	 * @return

+ 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 Integer locationProvince;
+	private Integer locationCity;
+	private Integer locationArea;
+	private String postalAddress;
 	
+	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 String getSignDate() {
 		if (StringUtils.isBlank(signDate)&&super.getSignTime()!=null) {
 			return DateFormatUtils.format(super.getSignTime(), AFTConstants.YYYYMMDD);

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

@@ -24,8 +24,104 @@ public class TOrderTaskDetailBo {
 	private String legalPerson;
 	private String legalPersonTel;
 	private String certificateNumber;
+	private String contractNo;
+	private String depName;
+	private String setUpAmount;
+	private Integer arrivalMoney;
+	private Integer locationProvince;
+	private Integer locationCity;
+	private Integer locationArea;
+	private String postalAddress;
+	/**
+	 * 任务状态
+	 */
+	private Integer status;
+	/**
+	 * 满意度表格回收
+	 */
+	private Integer formRetrieve;
+	/**
+	 * 回收详情
+	 */
+	private String retrieveContent;
+	/**
+	 * 任务退单
+	 */
+	private Integer taskRefund;
+	/**
+	 * 退单详情
+	 */
+	private String refundContent;
+	/**
+	 * 申报账号
+	 */
+	private String declareUser;
+	/**
+	 * 申报密码
+	 */
+	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;
+	}
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+	public Integer getFormRetrieve() {
+		return formRetrieve;
+	}
+	public void setFormRetrieve(Integer formRetrieve) {
+		this.formRetrieve = formRetrieve;
+	}
+	public Integer getTaskRefund() {
+		return taskRefund;
+	}
+	public void setTaskRefund(Integer taskRefund) {
+		this.taskRefund = taskRefund;
+	}
+	public String getRefundContent() {
+		return refundContent;
+	}
+	public void setRefundContent(String refundContent) {
+		this.refundContent = refundContent;
+	}
+	public String getDeclareUser() {
+		return declareUser;
+	}
+	public void setDeclareUser(String declareUser) {
+		this.declareUser = declareUser;
+	}
+	public String getDeclarePwd() {
+		return declarePwd;
+	}
+	public void setDeclarePwd(String declarePwd) {
+		this.declarePwd = declarePwd;
+	}
 	public String getTaskComment() {
 		return taskComment;
 	}
@@ -165,5 +261,35 @@ public class TOrderTaskDetailBo {
 	public void setCertificateNumber(String certificateNumber) {
 		this.certificateNumber = certificateNumber;
 	}
+	public String getContractNo() {
+		return contractNo;
+	}
+	public void setContractNo(String contractNo) {
+		this.contractNo = contractNo;
+	}
+	public String getDepName() {
+		return depName;
+	}
+	public void setDepName(String depName) {
+		this.depName = depName;
+	}
+	public String getSetUpAmount() {
+		return setUpAmount;
+	}
+	public void setSetUpAmount(String setUpAmount) {
+		this.setUpAmount = setUpAmount;
+	}
+	public Integer getArrivalMoney() {
+		return arrivalMoney;
+	}
+	public void setArrivalMoney(Integer arrivalMoney) {
+		this.arrivalMoney = arrivalMoney;
+	}
+	public String getRetrieveContent() {
+		return retrieveContent;
+	}
+	public void setRetrieveContent(String retrieveContent) {
+		this.retrieveContent = retrieveContent;
+	}
 	
 }

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

@@ -16,6 +16,7 @@ public class TOrderTaskListBo {
 	private String contractNo;
 	private String creteTime;
 	private String signTime;
+	private Integer alreadyNumber;
 	public String getContractNo() {
 		return contractNo;
 	}
@@ -106,5 +107,11 @@ public class TOrderTaskListBo {
 	public void setDepName(String depName) {
 		this.depName = depName;
 	}
+	public Integer getAlreadyNumber() {
+		return alreadyNumber;
+	}
+	public void setAlreadyNumber(Integer alreadyNumber) {
+		this.alreadyNumber = alreadyNumber;
+	}
 	
 }

+ 25 - 0
src/main/java/com/goafanti/order/bo/TaskLogBo.java

@@ -0,0 +1,25 @@
+package com.goafanti.order.bo;
+
+import com.goafanti.common.model.TaskLog;
+
+public class TaskLogBo extends TaskLog{
+		private String aName;
+		
+		private String createTimes;
+
+		public String getaName() {
+			return aName;
+		}
+
+		public void setaName(String aName) {
+			this.aName = aName;
+		}
+
+		public String getCreateTimes() {
+			return createTimes;
+		}
+
+		public void setCreateTimes(String createTimes) {
+			this.createTimes = createTimes;
+		}
+}

+ 49 - 0
src/main/java/com/goafanti/order/bo/TaskProgressBo.java

@@ -0,0 +1,49 @@
+package com.goafanti.order.bo;
+
+
+import com.goafanti.common.model.TaskProgress;
+
+public class TaskProgressBo extends TaskProgress {
+	
+	private String licenceTimes;
+	
+	private String createTimes;
+	
+	private Integer ingCount;
+	
+	private Integer notCount;
+
+	public String getLicenceTimes() {
+		return licenceTimes;
+	}
+
+	public void setLicenceTimes(String licenceTimes) {
+		this.licenceTimes = licenceTimes;
+	}
+
+	public String getCreateTimes() {
+		return createTimes;
+	}
+
+	public void setCreateTimes(String createTimes) {
+		this.createTimes = createTimes;
+	}
+
+	public Integer getNotCount() {
+		return notCount;
+	}
+
+	public void setNotCount(Integer notCount) {
+		this.notCount = notCount;
+	}
+
+	public Integer getIngCount() {
+		return ingCount;
+	}
+
+	public void setIngCount(Integer ingCount) {
+		this.ingCount = ingCount;
+	}
+	
+	
+}

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

@@ -20,8 +20,11 @@ import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 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;
 
 @RestController
@@ -123,6 +126,16 @@ public class OrderProjectApiController extends CertifyApiController {
 		res.setData(orderProjectService.taskHoursList(name,taskId,  starTime, endTime ,pageNo, pageSize));
 		return res;
 	}
+	
+	/**
+	 * 任务操作日志
+	 */
+	@RequestMapping(value="/TaskLogList" ,method = RequestMethod.GET)
+	public Result TaskLogList(Integer id){
+		Result res=new Result();
+		res.setData(orderProjectService.TaskLogList(id));
+		return res;
+	}
 	/** 任务文件上传 **/
 	@RequestMapping(value = "/uploadOrderTaskFile", method = RequestMethod.POST)
 	public Result uploadOrderTaskFile(HttpServletRequest req,String sign){
@@ -131,6 +144,43 @@ public class OrderProjectApiController extends CertifyApiController {
 		return res;
 	}
 	/**
+	 * 	新增项目申报进度
+	 */
+	@RequestMapping(value="/createTaskProgress" ,method = RequestMethod.POST)
+	public Result createTaskProgress(TaskProgressBo t){
+		Result res=new Result();
+		if (StringUtils.isBlank(t.getLicenceTimes())|| null==t.getTaskId()|| null==t.getAlreadyNumber()) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"参数","参数"));
+		}
+		res.setData(orderProjectService.createTaskProgress(t));
+		return res;
+	}
+	
+	/**
+	 * 	删除项目申报进度
+	 */
+	@RequestMapping(value="/delectTaskProgress" ,method = RequestMethod.POST)
+	public Result delectTaskProgress(Integer id){
+		Result res=new Result();
+		if (null==id) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"参数","参数"));
+		}
+		res.setData(orderProjectService.delectTaskProgress(id));
+		return res;
+	}
+	/**
+	 * 	查看项目申报进度
+	 */
+	@RequestMapping(value="/selectTaskProgress" ,method = RequestMethod.GET)
+	public Result selectTaskProgress(Integer tid){
+		Result res=new Result();
+		if (null==tid) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"参数","参数"));
+		}
+		res.setData(orderProjectService.selectTaskProgress(tid));
+		return res;
+	}
+	/**
 	 * 任务工时表
 	 * @throws IOException 
 	 */
@@ -158,4 +208,37 @@ public class OrderProjectApiController extends CertifyApiController {
 		
 		return res;
 	}
+	
+	/**
+	 * 我的任务列表导出xls
+	 * @throws IOException 
+	 */
+	@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("", "没有找到数据"));
+			 return res;
+		 }
+		 String fileName = "我的任务列表  " + new SimpleDateFormat("yyyy-MM-dd").format(new Date()) + ".xls";
+		 OutputStream out = response.getOutputStream();
+		 response.addHeader("Content-Disposition", "attachment;filename="  + new String(fileName.getBytes(),"iso-8859-1"));  
+         response.setContentType("application/octet-stream;charset=utf-8");  
+		try {
+			// 返回数据流
+			wb.write(out);
+			out.flush();
+			out.close();
+		} finally {
+			out.flush();
+			out.close();
+		}
+		
+		return res;
+	}
 }

+ 6 - 0
src/main/java/com/goafanti/order/enums/ProjectNewStage.java

@@ -29,6 +29,12 @@ public enum ProjectNewStage {
 	YS(8,"项目验收"),
 	/** 项目拨款 **/
 	BK(9,"项目拨款"),
+
+	JD10(10,"项目进度10%"),
+	
+	JD30(11,"项目进度30%"),
+	
+	JD70(12,"项目进度70%"),
 	/** 无效 **/
 	INVALID(10, "INVALID");
 	

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

@@ -1,11 +1,17 @@
 package com.goafanti.order.service;
 
+import java.util.List;
+
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
 import com.goafanti.common.model.TTaskHours;
+import com.goafanti.common.model.TaskLog;
+import com.goafanti.common.model.TaskProgress;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.order.bo.TOrderTaskDetailBo;
 import com.goafanti.order.bo.TOrderTaskListBo;
+import com.goafanti.order.bo.TaskLogBo;
+import com.goafanti.order.bo.TaskProgressBo;
 
 public interface OrderProjectService {
 
@@ -27,5 +33,15 @@ public interface OrderProjectService {
 
 	Pagination<TOrderTaskListBo>  selectTaskList(String name, String orderNo, String taskId, Integer taskStatus, String adminName,
 			Integer specially,String depId  , Integer pageNo, Integer pageSize);
+
+	List<TaskLogBo> TaskLogList(Integer id);
+
+	int createTaskProgress(TaskProgressBo t);
+
+	int delectTaskProgress(Integer id);
+
+	List<TaskProgressBo> selectTaskProgress(Integer tid);
+
+	XSSFWorkbook exportMyTaskList();
 	
 }

+ 7 - 2
src/main/java/com/goafanti/order/service/impl/OrderInvoiceServiceImpl.java

@@ -8,6 +8,7 @@ import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
+import org.apache.xmlbeans.BindingConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -49,14 +50,18 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 	public boolean checkAmount(TOrderInvoice t) {
 		TOrderNew tn=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
 		
-			Double i=tOrderInvoiceMapper.checkApplyAmount(t.getOrderNo(),t.getId());//新建时直接查所有数据,修改时除掉修改订单
-		int	flag=t.getAmount().add(new BigDecimal(i)).compareTo(tn.getTotalAmount());
+			String i=tOrderInvoiceMapper.checkApplyAmount(t.getOrderNo(),t.getId());//新建时直接查所有数据,修改时除掉修改订单
+			//处理精度问题
+		BigDecimal q=t.getAmount().add(new BigDecimal(i)).setScale(4, BigDecimal.ROUND_DOWN);;
+		BigDecimal w=tn.getTotalAmount();
+		int	flag=q.compareTo(w);
 		if (flag>0) {
 			return true;
 		}
 		return false;
 	}
 
+	
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<TOrderInvoiceBo> financeOrderInvoiceList(String orderDep, String orderNo, String name, Integer type,Integer pageNo,

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

@@ -14,28 +14,41 @@ import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.beanutils.ConvertUtils;
 import org.apache.commons.beanutils.converters.DateConverter;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.DateUtil;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+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;
 import com.goafanti.common.dao.TOrderTaskMapper;
 import com.goafanti.common.dao.TTaskHoursMapper;
 import com.goafanti.common.dao.TTaskLogMapper;
+import com.goafanti.common.dao.TaskLogMapper;
+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;
 import com.goafanti.common.model.TOrderTask;
 import com.goafanti.common.model.TTaskHours;
 import com.goafanti.common.model.TTaskLog;
+import com.goafanti.common.model.TaskLog;
+import com.goafanti.common.model.TaskProgress;
+import com.goafanti.common.utils.DateUtils;
 import com.goafanti.common.utils.ExportExcelUtil;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.page.Pagination;
@@ -43,6 +56,8 @@ import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.order.bo.TOrderTaskBo;
 import com.goafanti.order.bo.TOrderTaskDetailBo;
 import com.goafanti.order.bo.TOrderTaskListBo;
+import com.goafanti.order.bo.TaskLogBo;
+import com.goafanti.order.bo.TaskProgressBo;
 import com.goafanti.order.enums.BonusSubject;
 import com.goafanti.order.enums.ProcessStatus;
 import com.goafanti.order.enums.ProjectNewStage;
@@ -63,7 +78,13 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	@Autowired
 	private TOrderLogMapper	tOrderLogMapper;
 	@Autowired
+	private TaskProgressMapper	taskProgressMapper;
+	@Autowired
 	private OrganizationContactBookMapper	organizationContactBookMapper;
+	@Autowired
+	private OrganizationIdentityMapper	 organizationIdentityMapper;
+	@Autowired
+	private TaskLogMapper	taskLogMapper;
 	@Value(value = "${upload.path}")
 	private String 					uploadPath 			= null;
 	
@@ -85,21 +106,6 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		}else if (specially==0) {
 			addOrderLog(t.getOrderNo(), OrderLogProcess.XMPD.getCode());
 		}
-		if (specially==0&&t.getCommodityQuantity()>1) {
-			for (int i = 0; i < t.getCommodityQuantity(); i++) {
-				TOrderTask tOrderTask=new TOrderTask();
-				try {
-					ConvertUtils.register(new DateConverter(null), java.util.Date.class);
-					BeanUtils.copyProperties(tOrderTask, t);
-					tOrderTask.setId(null);
-					tOrderTask.setCommodityQuantity(1);
-					tOrderTask.setSuperId(t.getId().toString());
-					tOrderTaskMapper.insertSelective(tOrderTask);
-				} catch (IllegalAccessException | InvocationTargetException e) {
-					e.printStackTrace();
-				}
-			}
-		}
 		return 1;
 	}
 	public void addOrderLog(String orderNo, Integer code) {
@@ -172,12 +178,33 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		task.setProjectStatus(t.getProjectStatus());
 		task.setTaskComment(t.getTaskComment());
 		task.setCertificateNumber(t.getCertificateNumber());
-		TOrderNew tn=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo()); 
+		task.setStatus(t.getStatus());
+		task.setFormRetrieve(t.getFormRetrieve());
+		task.setTaskRefund(t.getTaskRefund());
+		task.setRefundContent(t.getRefundContent());
+		task.setDeclareUser(t.getDeclareUser());
+		task.setDeclarePwd(t.getDeclarePwd());
+		task.setArrivalMoney(t.getArrivalMoney());
+		task.setSetUpAmount(t.getSetUpAmount());
+		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();
@@ -201,8 +228,38 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		} catch (ParseException e) {
 			e.printStackTrace();
 		}
-		tOrderTaskMapper.updateByPrimaryKeySelective(task);
 		TOrderTask task2=tOrderTaskMapper.selectByPrimaryKey(task.getId());//查询出项目信息
+		tOrderTaskMapper.updateByPrimaryKeySelective(task);
+		TaskLog tl=new TaskLog();
+		tl.setCreateTime(new Date());
+		tl.setTaskId(t.getId());
+		tl.setAid(TokenManager.getAdminId());
+		if (t.getStatus()!=null) {
+			if (t.getStatus()!=task2.getStatus()) {
+				String s="将当前项目状态修改为";
+				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()));
@@ -299,19 +356,20 @@ 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);
 		return wb;
 	}
+	
+
+
 
 	@SuppressWarnings("unchecked")
 	@Override
@@ -320,7 +378,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		Map<String, Object> params = new HashMap<String, Object>();
 		if(pageSize==null||pageSize<0)pageSize=10;
 		if(pageNo==null||pageNo<0)pageNo=1;
-		params.put("aid", TokenManager.getAdminId()==null?"e82a4405-2104-481d-ba5f-72a639589efd":TokenManager.getAdminId());
+		params.put("aid", TokenManager.getAdminId()==null?"":TokenManager.getAdminId());
 		if (StringUtils.isNotBlank(name)) params.put("name", name);
 		if (StringUtils.isNotBlank(depId)) params.put("depId", depId);
 		if (StringUtils.isNotBlank(orderNo)) params.put("orderNo", orderNo);
@@ -330,6 +388,49 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		Pagination<TOrderTaskListBo> p = (Pagination<TOrderTaskListBo>)findPage("selectTaskListByPage", "selectTaskListCount", params, pageNo, pageSize);
 		return p;
 	}
+	@Override
+	public List<TaskLogBo> TaskLogList(Integer id) {
+		return taskLogMapper.selectTaskLogList(id);
+	}
+	@Override
+	public int createTaskProgress(TaskProgressBo t) {
+		TaskProgress tp=new TaskProgress();
+		TOrderTask tt=tOrderTaskMapper.selectByPrimaryKey(t.getTaskId());
+		int count =taskProgressMapper.AlreadyNuberCount(t.getTaskId());
+		count +=t.getAlreadyNumber();
+		if(tt.getCommodityQuantity()<count)throw new BusinessException(new Error( "数量不能大于总量!" ,"数量不能大于总量!"));
+		tp.setAlreadyNumber(t.getAlreadyNumber());
+		try {
+			tp.setLicenceTime(DateUtils.StringToDate(t.getLicenceTimes(), AFTConstants.YYYYMMDD));
+		} catch (ParseException e) {
+			 throw new BusinessException(new Error( "日期错误" ,"日期错误"));
+		}
+		tp.setTaskId(t.getTaskId());
+		return taskProgressMapper.insertSelective(tp);
+	}
+	@Override
+	public int delectTaskProgress(Integer id) {
+		return taskProgressMapper.deleteByPrimaryKey(id);
+	}
+	@Override
+	public List<TaskProgressBo> selectTaskProgress(Integer tid) {
+		List<TaskProgressBo>  l=taskProgressMapper.selectTaskProgress(tid);
+		int notcount=0;
+		for (TaskProgressBo t : l) {
+			notcount+=t.getAlreadyNumber();
+			t.setNotCount(t.getIngCount()-notcount);
+		}
+		return l;
+	}
+	@Override
+	public XSSFWorkbook exportMyTaskList() {
+		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;
+	}
 	
 	
 }

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

@@ -60,12 +60,12 @@ template.cacheable=false
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload
 #连接开发
-#static.host=//sb.jishutao.com/1.1.05
-#avatar.host=//sb.jishutao.com
+static.host=//sb.jishutao.com/1.1.06
+avatar.host=//sb.jishutao.com
 
 #连生产
-avatar.host=//static.kedexinxi.com
-static.host=//s.kedexinxi.com/1.1.05
+#avatar.host=//static.kedexinxi.com
+#static.host=//s.kedexinxi.com/1.1.06
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload

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

@@ -54,7 +54,7 @@ session.validate.timespan=18000000
 app.name=AFT
 template.cacheable=false
 
-static.host=//static.kedexinxi.com/1.1.05
+static.host=//static.kedexinxi.com/1.1.06
 portal.host=//static.kedexinxi.com/portal/2.0.6
 avatar.host=//static.kedexinxi.com
 avatar.upload.host=//static.kedexinxi.com/upload