Procházet zdrojové kódy

第三方客户新增、修改、模糊查询新增

Signed-off-by: anderx <312518615@qq.com>
anderx před 5 roky
rodič
revize
b06cabecd7
32 změnil soubory, kde provedl 5127 přidání a 321 odebrání
  1. 1 1
      GeneratorConfig.xml
  2. 3 2
      src/main/java/com/goafanti/business/controller/AdminBusinessProjectController.java
  3. 1 1
      src/main/java/com/goafanti/business/service/BusinessProjectService.java
  4. 8 10
      src/main/java/com/goafanti/business/service/impl/BusinessProjectServiceImpl.java
  5. 4 4
      src/main/java/com/goafanti/common/constant/ErrorConstants.java
  6. 103 0
      src/main/java/com/goafanti/common/dao/CompanyLibraryMapper.java
  7. 75 0
      src/main/java/com/goafanti/common/dao/TOrderExtendMapper.java
  8. 14 14
      src/main/java/com/goafanti/common/dao/TOrderTaskMapper.java
  9. 76 0
      src/main/java/com/goafanti/common/dao/ThirdPartyCompanyMapper.java
  10. 7 2
      src/main/java/com/goafanti/common/mapper/BusinessProjectMapper.xml
  11. 316 0
      src/main/java/com/goafanti/common/mapper/CompanyLibraryMapper.xml
  12. 351 0
      src/main/java/com/goafanti/common/mapper/TOrderExtendMapper.xml
  13. 56 56
      src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml
  14. 428 0
      src/main/java/com/goafanti/common/mapper/ThirdPartyCompanyMapper.xml
  15. 137 0
      src/main/java/com/goafanti/common/model/CompanyLibrary.java
  16. 563 0
      src/main/java/com/goafanti/common/model/CompanyLibraryExample.java
  17. 215 0
      src/main/java/com/goafanti/common/model/TOrderExtend.java
  18. 833 0
      src/main/java/com/goafanti/common/model/TOrderExtendExample.java
  19. 49 1
      src/main/java/com/goafanti/common/model/TOrderNewWithBLOBs.java
  20. 161 161
      src/main/java/com/goafanti/common/model/TOrderTask.java
  21. 64 64
      src/main/java/com/goafanti/common/model/TOrderTaskExample.java
  22. 330 0
      src/main/java/com/goafanti/common/model/ThirdPartyCompany.java
  23. 1143 0
      src/main/java/com/goafanti/common/model/ThirdPartyCompanyExample.java
  24. 9 0
      src/main/java/com/goafanti/order/bo/TOrderTaskBo.java
  25. 2 1
      src/main/java/com/goafanti/order/service/OrderNewService.java
  26. 24 2
      src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java
  27. 62 0
      src/main/java/com/goafanti/organization/controller/ThirdPartyCompanyApiController.java
  28. 16 0
      src/main/java/com/goafanti/organization/service/ThirdPartyCompanyService.java
  29. 64 0
      src/main/java/com/goafanti/organization/service/impl/ThirdPartyCompanyServiceImpl.java
  30. 9 0
      src/main/java/com/goafanti/techproject/bo/ProjectListBo.java
  31. 1 0
      src/main/java/com/goafanti/techproject/service/impl/TechProjectServiceImpl.java
  32. 2 2
      src/main/resources/props/config_local.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"  type="XMLMAPPER" targetProject="kede-server"  />
-    <table schema="aft" tableName="t_order_task"/>
+    <table schema="aft" tableName="third_party_company"/>
   </context>
 </generatorConfiguration>

+ 3 - 2
src/main/java/com/goafanti/business/controller/AdminBusinessProjectController.java

@@ -62,7 +62,8 @@ public class AdminBusinessProjectController extends CertifyApiController{
 	 * 项目搜索
 	 */
 	@RequestMapping(value = "/listProject" , method = RequestMethod.POST)
-	public Result listProject(String bname,String cid,String country,String province,String city,String district,String activityFlag,String status,Integer pageNo, Integer pageSize ){
+	public Result listProject(String bname,String cid,String country,String province,String city,
+			String district,String activityFlag,String status,Integer type,Integer pageNo, Integer pageSize ){
 		Result res=new Result();
 		if (country==AFTConstants.USER_TYPE_PERSONAL) {
 			if (StringUtils.isBlank(province)) {
@@ -71,7 +72,7 @@ public class AdminBusinessProjectController extends CertifyApiController{
 			}
 		}
 		
-		 res.setData(businessprojectService.listProject( bname, cid, country,province, city, district ,activityFlag, status, pageNo,pageSize ));
+		 res.setData(businessprojectService.listProject( bname, cid, country,province, city, district ,activityFlag, status, type,pageNo,pageSize ));
 		return res;
 	}
 	/**

+ 1 - 1
src/main/java/com/goafanti/business/service/BusinessProjectService.java

@@ -17,7 +17,7 @@ public interface BusinessProjectService {
 	int insert(String bname,String cid,String country,String province,String city,String district,String boutique);
 	
 	Pagination<BusinessProjectBo> listProject(String bname,String cid,String country,String province,String city,String district,String activityFlag,
-										String status,Integer pageNo, Integer pageSize );
+										String status,Integer type, Integer pageNo, Integer pageSize );
 	int getBnamecount(String bname);
 	
 	int deleteProject(String id);

+ 8 - 10
src/main/java/com/goafanti/business/service/impl/BusinessProjectServiceImpl.java

@@ -66,17 +66,12 @@ public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMa
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<BusinessProjectBo> listProject(String bname, String cid, String country,String province,String city,String district, String activityFlag,
-			String status, Integer pNo, Integer pSize) {
-		if (pNo == null || pNo < 0) {
-			pNo = 1;
-		}
-
-		if (pSize == null || pSize < 0 ) {
-			pSize = 10;
-		} 	
+			String status,Integer type, Integer pNo, Integer pSize) {
+		if (pNo == null || pNo < 0)pNo = 1;
+		if (pSize == null || pSize < 0 )pSize = 10;
 		Pagination<BusinessProjectBo> pt=(Pagination<BusinessProjectBo>)findPage("findProjectListByPage", "findProjectListCount",
 				disposeParams(bname,  cid,  country, province, city, district,  activityFlag,
-						 status),pNo,pSize);
+						 status,type),pNo,pSize);
 		List<BusinessProjectBo> list=(List<BusinessProjectBo>) pt.getList();
 		for (BusinessProjectBo o : list) {
 			o.setCname(getAllCname(o.getCid()));
@@ -84,7 +79,7 @@ public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMa
 		return pt;
 	}
 	private Map<String, Object> disposeParams(String bname, String cid, String country,String province,String city,String district, String activityFlag,
-			String status) {
+			String status,Integer type) {
 		Map<String, Object> params = new HashMap<>();
 		if (StringUtils.isNotBlank(bname)) {
 			params.put("bname", bname);
@@ -110,6 +105,9 @@ public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMa
 		if (StringUtils.isNotBlank(status)) {
 			params.put("status", status);
 		}
+		if (type!=null ) {
+			params.put("type", type);
+		}
 		return params;
 	}
 	@Override

+ 4 - 4
src/main/java/com/goafanti/common/constant/ErrorConstants.java

@@ -9,13 +9,13 @@ public class ErrorConstants {
 	public static final String	VCODE_ERROR							= "VCODE_ERROR";
 
 	public static final String	NO_AUTH_ERROR						= "NO_AUTH_ERROR";
-
+	/** 0参数错误 */
 	public static final String	PARAM_ERROR							= "PARAM_ERROR";
-
+	/** 0必须为数字*/
 	public static final String	PARAM_INTEGER_ERROR					= "PARAM_INTEGER_ERROR";
-
+	/** 0必须在指定*/
 	public static final String	PARAM_EMPTY_ERROR					= "PARAM_EMPTY_ERROR";
-	
+	/** 0已存在*/
 	public static final String	PARAM_BEING_ERROR					= "PARAM_BEING_ERROR";
 	
 	public static final String	PARAM_SIZE_ERROR					= "PARAM_SIZE_ERROR";

+ 103 - 0
src/main/java/com/goafanti/common/dao/CompanyLibraryMapper.java

@@ -0,0 +1,103 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.CompanyLibrary;
+import com.goafanti.common.model.CompanyLibraryExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface CompanyLibraryMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table company_library
+     *
+     * @mbg.generated Thu Jun 11 15:36:42 CST 2020
+     */
+    long countByExample(CompanyLibraryExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table company_library
+     *
+     * @mbg.generated Thu Jun 11 15:36:42 CST 2020
+     */
+    int deleteByExample(CompanyLibraryExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table company_library
+     *
+     * @mbg.generated Thu Jun 11 15:36:42 CST 2020
+     */
+    int deleteByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table company_library
+     *
+     * @mbg.generated Thu Jun 11 15:36:42 CST 2020
+     */
+    int insert(CompanyLibrary record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table company_library
+     *
+     * @mbg.generated Thu Jun 11 15:36:42 CST 2020
+     */
+    int insertSelective(CompanyLibrary record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table company_library
+     *
+     * @mbg.generated Thu Jun 11 15:36:42 CST 2020
+     */
+    List<CompanyLibrary> selectByExample(CompanyLibraryExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table company_library
+     *
+     * @mbg.generated Thu Jun 11 15:36:42 CST 2020
+     */
+    CompanyLibrary selectByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table company_library
+     *
+     * @mbg.generated Thu Jun 11 15:36:42 CST 2020
+     */
+    int updateByExampleSelective(@Param("record") CompanyLibrary record, @Param("example") CompanyLibraryExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table company_library
+     *
+     * @mbg.generated Thu Jun 11 15:36:42 CST 2020
+     */
+    int updateByExample(@Param("record") CompanyLibrary record, @Param("example") CompanyLibraryExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table company_library
+     *
+     * @mbg.generated Thu Jun 11 15:36:42 CST 2020
+     */
+    int updateByPrimaryKeySelective(CompanyLibrary record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table company_library
+     *
+     * @mbg.generated Thu Jun 11 15:36:42 CST 2020
+     */
+    int updateByPrimaryKey(CompanyLibrary record);
+
+
+	List<CompanyLibrary> selectVague(String name);
+
+	int insertSelectiveGetId(CompanyLibrary c);
+
+	List<String> selectName(String companyName);
+}

+ 75 - 0
src/main/java/com/goafanti/common/dao/TOrderExtendMapper.java

@@ -0,0 +1,75 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.TOrderExtend;
+import com.goafanti.common.model.TOrderExtendExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface TOrderExtendMapper {
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_extend
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	long countByExample(TOrderExtendExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_extend
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	int deleteByExample(TOrderExtendExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_extend
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	int deleteByPrimaryKey(String orderNo);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_extend
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	int insert(TOrderExtend record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_extend
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	int insertSelective(TOrderExtend record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_extend
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	List<TOrderExtend> selectByExample(TOrderExtendExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_extend
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	TOrderExtend selectByPrimaryKey(String orderNo);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_extend
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	int updateByExampleSelective(@Param("record") TOrderExtend record, @Param("example") TOrderExtendExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_extend
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	int updateByExample(@Param("record") TOrderExtend record, @Param("example") TOrderExtendExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_extend
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	int updateByPrimaryKeySelective(TOrderExtend record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_extend
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	int updateByPrimaryKey(TOrderExtend record);
+}

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

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

+ 76 - 0
src/main/java/com/goafanti/common/dao/ThirdPartyCompanyMapper.java

@@ -0,0 +1,76 @@
+package com.goafanti.common.dao;
+
+import com.goafanti.common.model.ThirdPartyCompany;
+import com.goafanti.common.model.ThirdPartyCompanyExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface ThirdPartyCompanyMapper {
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	long countByExample(ThirdPartyCompanyExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	int deleteByExample(ThirdPartyCompanyExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	int deleteByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	int insert(ThirdPartyCompany record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	int insertSelective(ThirdPartyCompany record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	List<ThirdPartyCompany> selectByExample(ThirdPartyCompanyExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	ThirdPartyCompany selectByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	int updateByExampleSelective(@Param("record") ThirdPartyCompany record,
+			@Param("example") ThirdPartyCompanyExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	int updateByExample(@Param("record") ThirdPartyCompany record, @Param("example") ThirdPartyCompanyExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	int updateByPrimaryKeySelective(ThirdPartyCompany record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	int updateByPrimaryKey(ThirdPartyCompany record);
+}

+ 7 - 2
src/main/java/com/goafanti/common/mapper/BusinessProjectMapper.xml

@@ -636,7 +636,7 @@
   	<select id="findProjectListByPage" resultType="com.goafanti.business.bo.BusinessProjectBo">
  		select b.id, b.create_id as createId, b.create_time as createTime, b.update_time as updateTime,  b.delete_sign deleteSign, b.bname,
  		  b.cid,  b.price,  b.offset,  b.activity_price as activityPrice,  b.activity_flag as activityFlag,  b.member_price as memberPrice, 
- 		  b.introduce,  b.status,  b.country,  b.province,  b.city,  b.district, 
+ 		  b.introduce,  b.status,  b.country,  b.province,  b.city,  b.district, b.type,
           b.principal_id as principalId,  b.Value_effect as ValueEffect,  b.client_size as  clientSize,b2.cname 
   		from business_project b
   		left join business_category b2 on b.cid = b2.id
@@ -665,6 +665,9 @@
 		<if test="status != null">
 		and b.status = #{status,jdbcType=VARCHAR}
 		</if>
+		<if test="type != null">
+		and b.type = #{type,jdbcType=VARCHAR}
+		</if>
 		<if test="page_sql!=null">
 			${page_sql}
 	</if>
@@ -699,7 +702,9 @@
 		<if test="status != null">
 		and b.status = #{status,jdbcType=VARCHAR}
 		</if>
-		
+		<if test="type != null">
+		and b.type = #{type,jdbcType=VARCHAR}
+		</if>
   </select>
   
   <select id="getBnamecount" resultType="Integer">

+ 316 - 0
src/main/java/com/goafanti/common/mapper/CompanyLibraryMapper.xml

@@ -0,0 +1,316 @@
+<?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.CompanyLibraryMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.CompanyLibrary">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 11 15:36:42 CST 2020.
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="company_name" jdbcType="VARCHAR" property="companyName" />
+    <result column="aid" jdbcType="VARCHAR" property="aid" />
+    <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 Thu Jun 11 15:36:42 CST 2020.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 11 15:36:42 CST 2020.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 11 15:36:42 CST 2020.
+    -->
+    id, company_name, aid, create_time
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.CompanyLibraryExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 11 15:36:42 CST 2020.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from company_library
+    <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 Thu Jun 11 15:36:42 CST 2020.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from company_library
+    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 Thu Jun 11 15:36:42 CST 2020.
+    -->
+    delete from company_library
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.CompanyLibraryExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 11 15:36:42 CST 2020.
+    -->
+    delete from company_library
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.CompanyLibrary">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 11 15:36:42 CST 2020.
+    -->
+    insert into company_library (id, company_name, aid, 
+      create_time)
+    values (#{id,jdbcType=INTEGER}, #{companyName,jdbcType=VARCHAR}, #{aid,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.CompanyLibrary">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 11 15:36:42 CST 2020.
+    -->
+    insert into company_library
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="companyName != null">
+        company_name,
+      </if>
+      <if test="aid != null">
+        aid,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="companyName != null">
+        #{companyName,jdbcType=VARCHAR},
+      </if>
+      <if test="aid != null">
+        #{aid,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.CompanyLibraryExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 11 15:36:42 CST 2020.
+    -->
+    select count(*) from company_library
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 11 15:36:42 CST 2020.
+    -->
+    update company_library
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.companyName != null">
+        company_name = #{record.companyName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.aid != null">
+        aid = #{record.aid,jdbcType=VARCHAR},
+      </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 Thu Jun 11 15:36:42 CST 2020.
+    -->
+    update company_library
+    set id = #{record.id,jdbcType=INTEGER},
+      company_name = #{record.companyName,jdbcType=VARCHAR},
+      aid = #{record.aid,jdbcType=VARCHAR},
+      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.CompanyLibrary">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 11 15:36:42 CST 2020.
+    -->
+    update company_library
+    <set>
+      <if test="companyName != null">
+        company_name = #{companyName,jdbcType=VARCHAR},
+      </if>
+      <if test="aid != null">
+        aid = #{aid,jdbcType=VARCHAR},
+      </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.CompanyLibrary">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 11 15:36:42 CST 2020.
+    -->
+    update company_library
+    set company_name = #{companyName,jdbcType=VARCHAR},
+      aid = #{aid,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  
+  <insert id="insertSelectiveGetId" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.CompanyLibrary" useGeneratedKeys="true">
+    insert into company_library
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="companyName != null">
+        company_name,
+      </if>
+      <if test="aid != null">
+        aid,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="companyName != null">
+        #{companyName,jdbcType=VARCHAR},
+      </if>
+      <if test="aid != null">
+        #{aid,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+    <selectKey keyProperty="id" order="AFTER" resultType="int">
+        SELECT LAST_INSERT_ID()
+    </selectKey>
+  </insert>
+  
+  <select id="selectName" resultType="java.lang.String">
+  select id from  company_library
+    where  company_name = #{companyName,jdbcType=VARCHAR}
+  </select>
+  
+  <select id="selectVague" resultType="com.goafanti.common.model.CompanyLibrary">
+  select id,company_name companyName from  company_library
+    where  company_name like concat('%',#{companyName,jdbcType=VARCHAR},'%')
+  </select>
+</mapper>

+ 351 - 0
src/main/java/com/goafanti/common/mapper/TOrderExtendMapper.xml

@@ -0,0 +1,351 @@
+<?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.TOrderExtendMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.TOrderExtend">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 11 14:25:54 CST 2020.
+    -->
+    <id column="order_no" jdbcType="VARCHAR" property="orderNo" />
+    <result column="service_status" jdbcType="INTEGER" property="serviceStatus" />
+    <result column="service_name" jdbcType="VARCHAR" property="serviceName" />
+    <result column="payment_method" jdbcType="INTEGER" property="paymentMethod" />
+    <result column="payment_ratio" jdbcType="DECIMAL" property="paymentRatio" />
+    <result column="service_amount" jdbcType="DECIMAL" property="serviceAmount" />
+    <result column="service_remarks" jdbcType="VARCHAR" property="serviceRemarks" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="payment_status" jdbcType="INTEGER" property="paymentStatus" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 11 14:25:54 CST 2020.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 11 14:25:54 CST 2020.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 11 14:25:54 CST 2020.
+    -->
+    order_no, service_status, service_name, payment_method, payment_ratio, service_amount, 
+    service_remarks, create_time, payment_status
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.TOrderExtendExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 11 14:25:54 CST 2020.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from t_order_extend
+    <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.String" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 11 14:25:54 CST 2020.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from t_order_extend
+    where order_no = #{orderNo,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 11 14:25:54 CST 2020.
+    -->
+    delete from t_order_extend
+    where order_no = #{orderNo,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.TOrderExtendExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 11 14:25:54 CST 2020.
+    -->
+    delete from t_order_extend
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.TOrderExtend">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 11 14:25:54 CST 2020.
+    -->
+    insert into t_order_extend (order_no, service_status, service_name, 
+      payment_method, payment_ratio, service_amount, 
+      service_remarks, create_time, payment_status
+      )
+    values (#{orderNo,jdbcType=VARCHAR}, #{serviceStatus,jdbcType=INTEGER}, #{serviceName,jdbcType=VARCHAR}, 
+      #{paymentMethod,jdbcType=INTEGER}, #{paymentRatio,jdbcType=DECIMAL}, #{serviceAmount,jdbcType=DECIMAL}, 
+      #{serviceRemarks,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{paymentStatus,jdbcType=INTEGER}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.TOrderExtend">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 11 14:25:54 CST 2020.
+    -->
+    insert into t_order_extend
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="orderNo != null">
+        order_no,
+      </if>
+      <if test="serviceStatus != null">
+        service_status,
+      </if>
+      <if test="serviceName != null">
+        service_name,
+      </if>
+      <if test="paymentMethod != null">
+        payment_method,
+      </if>
+      <if test="paymentRatio != null">
+        payment_ratio,
+      </if>
+      <if test="serviceAmount != null">
+        service_amount,
+      </if>
+      <if test="serviceRemarks != null">
+        service_remarks,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="paymentStatus != null">
+        payment_status,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="orderNo != null">
+        #{orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="serviceStatus != null">
+        #{serviceStatus,jdbcType=INTEGER},
+      </if>
+      <if test="serviceName != null">
+        #{serviceName,jdbcType=VARCHAR},
+      </if>
+      <if test="paymentMethod != null">
+        #{paymentMethod,jdbcType=INTEGER},
+      </if>
+      <if test="paymentRatio != null">
+        #{paymentRatio,jdbcType=DECIMAL},
+      </if>
+      <if test="serviceAmount != null">
+        #{serviceAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="serviceRemarks != null">
+        #{serviceRemarks,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="paymentStatus != null">
+        #{paymentStatus,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.TOrderExtendExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 11 14:25:54 CST 2020.
+    -->
+    select count(*) from t_order_extend
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 11 14:25:54 CST 2020.
+    -->
+    update t_order_extend
+    <set>
+      <if test="record.orderNo != null">
+        order_no = #{record.orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.serviceStatus != null">
+        service_status = #{record.serviceStatus,jdbcType=INTEGER},
+      </if>
+      <if test="record.serviceName != null">
+        service_name = #{record.serviceName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.paymentMethod != null">
+        payment_method = #{record.paymentMethod,jdbcType=INTEGER},
+      </if>
+      <if test="record.paymentRatio != null">
+        payment_ratio = #{record.paymentRatio,jdbcType=DECIMAL},
+      </if>
+      <if test="record.serviceAmount != null">
+        service_amount = #{record.serviceAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.serviceRemarks != null">
+        service_remarks = #{record.serviceRemarks,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.paymentStatus != null">
+        payment_status = #{record.paymentStatus,jdbcType=INTEGER},
+      </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 Thu Jun 11 14:25:54 CST 2020.
+    -->
+    update t_order_extend
+    set order_no = #{record.orderNo,jdbcType=VARCHAR},
+      service_status = #{record.serviceStatus,jdbcType=INTEGER},
+      service_name = #{record.serviceName,jdbcType=VARCHAR},
+      payment_method = #{record.paymentMethod,jdbcType=INTEGER},
+      payment_ratio = #{record.paymentRatio,jdbcType=DECIMAL},
+      service_amount = #{record.serviceAmount,jdbcType=DECIMAL},
+      service_remarks = #{record.serviceRemarks,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      payment_status = #{record.paymentStatus,jdbcType=INTEGER}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TOrderExtend">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 11 14:25:54 CST 2020.
+    -->
+    update t_order_extend
+    <set>
+      <if test="serviceStatus != null">
+        service_status = #{serviceStatus,jdbcType=INTEGER},
+      </if>
+      <if test="serviceName != null">
+        service_name = #{serviceName,jdbcType=VARCHAR},
+      </if>
+      <if test="paymentMethod != null">
+        payment_method = #{paymentMethod,jdbcType=INTEGER},
+      </if>
+      <if test="paymentRatio != null">
+        payment_ratio = #{paymentRatio,jdbcType=DECIMAL},
+      </if>
+      <if test="serviceAmount != null">
+        service_amount = #{serviceAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="serviceRemarks != null">
+        service_remarks = #{serviceRemarks,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="paymentStatus != null">
+        payment_status = #{paymentStatus,jdbcType=INTEGER},
+      </if>
+    </set>
+    where order_no = #{orderNo,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.TOrderExtend">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 11 14:25:54 CST 2020.
+    -->
+    update t_order_extend
+    set service_status = #{serviceStatus,jdbcType=INTEGER},
+      service_name = #{serviceName,jdbcType=VARCHAR},
+      payment_method = #{paymentMethod,jdbcType=INTEGER},
+      payment_ratio = #{paymentRatio,jdbcType=DECIMAL},
+      service_amount = #{serviceAmount,jdbcType=DECIMAL},
+      service_remarks = #{serviceRemarks,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      payment_status = #{paymentStatus,jdbcType=INTEGER}
+    where order_no = #{orderNo,jdbcType=VARCHAR}
+  </update>
+</mapper>

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

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 09 15:36:58 CST 2020.
+      This element was generated on Thu Jun 11 09:59:01 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
@@ -51,14 +51,14 @@
     <result column="cname" jdbcType="VARCHAR" property="cname" />
     <result column="receiver_name" jdbcType="VARCHAR" property="receiverName" />
     <result column="declaration_batch" jdbcType="INTEGER" property="declarationBatch" />
-    <result column="official_fees" jdbcType="INTEGER" property="officialFees" />
     <result column="cost_reduction" jdbcType="INTEGER" property="costReduction" />
+    <result column="official_cost" jdbcType="INTEGER" property="officialCost" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.goafanti.common.model.TOrderTask">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 09 15:36:58 CST 2020.
+      This element was generated on Thu Jun 11 09:59:01 CST 2020.
     -->
     <result column="attachment_url" jdbcType="LONGVARCHAR" property="attachmentUrl" />
   </resultMap>
@@ -66,7 +66,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 09 15:36:58 CST 2020.
+      This element was generated on Thu Jun 11 09:59:01 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -100,7 +100,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 09 15:36:58 CST 2020.
+      This element was generated on Thu Jun 11 09:59:01 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -134,7 +134,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 09 15:36:58 CST 2020.
+      This element was generated on Thu Jun 11 09:59:01 CST 2020.
     -->
     id, order_no, main, super_id, commodity_id, commodity_name, commodity_quantity, commodity_mode, 
     commodity_price, task_status, task_distribution_time, task_allocator, task_receiver, 
@@ -143,13 +143,13 @@
     refund_content, retrieve_content, declare_user, declare_pwd, set_up_amount, arrival_money, 
     outsource_name, outsource_price, consultant_id, manager_id, outsource, split_super, 
     split_status, split_id, split_aid, split_time, cname, receiver_name, declaration_batch, 
-    official_fees, cost_reduction
+    cost_reduction, official_cost
   </sql>
   <sql id="Blob_Column_List">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 09 15:36:58 CST 2020.
+      This element was generated on Thu Jun 11 09:59:01 CST 2020.
     -->
     attachment_url
   </sql>
@@ -157,7 +157,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 09 15:36:58 CST 2020.
+      This element was generated on Thu Jun 11 09:59:01 CST 2020.
     -->
     select
     <if test="distinct">
@@ -178,7 +178,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 09 15:36:58 CST 2020.
+      This element was generated on Thu Jun 11 09:59:01 CST 2020.
     -->
     select
     <if test="distinct">
@@ -197,7 +197,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 09 15:36:58 CST 2020.
+      This element was generated on Thu Jun 11 09:59:01 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -210,7 +210,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 09 15:36:58 CST 2020.
+      This element was generated on Thu Jun 11 09:59:01 CST 2020.
     -->
     delete from t_order_task
     where id = #{id,jdbcType=INTEGER}
@@ -219,7 +219,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 09 15:36:58 CST 2020.
+      This element was generated on Thu Jun 11 09:59:01 CST 2020.
     -->
     delete from t_order_task
     <if test="_parameter != null">
@@ -230,7 +230,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 09 15:36:58 CST 2020.
+      This element was generated on Thu Jun 11 09:59:01 CST 2020.
     -->
     insert into t_order_task (id, order_no, main, 
       super_id, commodity_id, commodity_name, 
@@ -246,8 +246,8 @@
       consultant_id, manager_id, outsource, 
       split_super, split_status, split_id, 
       split_aid, split_time, cname, 
-      receiver_name, declaration_batch, official_fees, 
-      cost_reduction, attachment_url)
+      receiver_name, declaration_batch, cost_reduction, 
+      official_cost, 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}, 
@@ -262,14 +262,14 @@
       #{consultantId,jdbcType=VARCHAR}, #{managerId,jdbcType=VARCHAR}, #{outsource,jdbcType=INTEGER}, 
       #{splitSuper,jdbcType=INTEGER}, #{splitStatus,jdbcType=INTEGER}, #{splitId,jdbcType=INTEGER}, 
       #{splitAid,jdbcType=VARCHAR}, #{splitTime,jdbcType=TIMESTAMP}, #{cname,jdbcType=VARCHAR}, 
-      #{receiverName,jdbcType=VARCHAR}, #{declarationBatch,jdbcType=INTEGER}, #{officialFees,jdbcType=INTEGER}, 
-      #{costReduction,jdbcType=INTEGER}, #{attachmentUrl,jdbcType=LONGVARCHAR})
+      #{receiverName,jdbcType=VARCHAR}, #{declarationBatch,jdbcType=INTEGER}, #{costReduction,jdbcType=INTEGER}, 
+      #{officialCost,jdbcType=INTEGER}, #{attachmentUrl,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TOrderTask">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 09 15:36:58 CST 2020.
+      This element was generated on Thu Jun 11 09:59:01 CST 2020.
     -->
     insert into t_order_task
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -405,12 +405,12 @@
       <if test="declarationBatch != null">
         declaration_batch,
       </if>
-      <if test="officialFees != null">
-        official_fees,
-      </if>
       <if test="costReduction != null">
         cost_reduction,
       </if>
+      <if test="officialCost != null">
+        official_cost,
+      </if>
       <if test="attachmentUrl != null">
         attachment_url,
       </if>
@@ -548,12 +548,12 @@
       <if test="declarationBatch != null">
         #{declarationBatch,jdbcType=INTEGER},
       </if>
-      <if test="officialFees != null">
-        #{officialFees,jdbcType=INTEGER},
-      </if>
       <if test="costReduction != null">
         #{costReduction,jdbcType=INTEGER},
       </if>
+      <if test="officialCost != null">
+        #{officialCost,jdbcType=INTEGER},
+      </if>
       <if test="attachmentUrl != null">
         #{attachmentUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -563,7 +563,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 09 15:36:58 CST 2020.
+      This element was generated on Thu Jun 11 09:59:01 CST 2020.
     -->
     select count(*) from t_order_task
     <if test="_parameter != null">
@@ -574,7 +574,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 09 15:36:58 CST 2020.
+      This element was generated on Thu Jun 11 09:59:01 CST 2020.
     -->
     update t_order_task
     <set>
@@ -710,12 +710,12 @@
       <if test="record.declarationBatch != null">
         declaration_batch = #{record.declarationBatch,jdbcType=INTEGER},
       </if>
-      <if test="record.officialFees != null">
-        official_fees = #{record.officialFees,jdbcType=INTEGER},
-      </if>
       <if test="record.costReduction != null">
         cost_reduction = #{record.costReduction,jdbcType=INTEGER},
       </if>
+      <if test="record.officialCost != null">
+        official_cost = #{record.officialCost,jdbcType=INTEGER},
+      </if>
       <if test="record.attachmentUrl != null">
         attachment_url = #{record.attachmentUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -728,7 +728,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 09 15:36:58 CST 2020.
+      This element was generated on Thu Jun 11 09:59:01 CST 2020.
     -->
     update t_order_task
     set id = #{record.id,jdbcType=INTEGER},
@@ -775,8 +775,8 @@
       cname = #{record.cname,jdbcType=VARCHAR},
       receiver_name = #{record.receiverName,jdbcType=VARCHAR},
       declaration_batch = #{record.declarationBatch,jdbcType=INTEGER},
-      official_fees = #{record.officialFees,jdbcType=INTEGER},
       cost_reduction = #{record.costReduction,jdbcType=INTEGER},
+      official_cost = #{record.officialCost,jdbcType=INTEGER},
       attachment_url = #{record.attachmentUrl,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -786,7 +786,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 09 15:36:58 CST 2020.
+      This element was generated on Thu Jun 11 09:59:01 CST 2020.
     -->
     update t_order_task
     set id = #{record.id,jdbcType=INTEGER},
@@ -833,8 +833,8 @@
       cname = #{record.cname,jdbcType=VARCHAR},
       receiver_name = #{record.receiverName,jdbcType=VARCHAR},
       declaration_batch = #{record.declarationBatch,jdbcType=INTEGER},
-      official_fees = #{record.officialFees,jdbcType=INTEGER},
-      cost_reduction = #{record.costReduction,jdbcType=INTEGER}
+      cost_reduction = #{record.costReduction,jdbcType=INTEGER},
+      official_cost = #{record.officialCost,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -843,7 +843,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 09 15:36:58 CST 2020.
+      This element was generated on Thu Jun 11 09:59:01 CST 2020.
     -->
     update t_order_task
     <set>
@@ -976,12 +976,12 @@
       <if test="declarationBatch != null">
         declaration_batch = #{declarationBatch,jdbcType=INTEGER},
       </if>
-      <if test="officialFees != null">
-        official_fees = #{officialFees,jdbcType=INTEGER},
-      </if>
       <if test="costReduction != null">
         cost_reduction = #{costReduction,jdbcType=INTEGER},
       </if>
+      <if test="officialCost != null">
+        official_cost = #{officialCost,jdbcType=INTEGER},
+      </if>
       <if test="attachmentUrl != null">
         attachment_url = #{attachmentUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -992,7 +992,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 09 15:36:58 CST 2020.
+      This element was generated on Thu Jun 11 09:59:01 CST 2020.
     -->
     update t_order_task
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -1038,8 +1038,8 @@
       cname = #{cname,jdbcType=VARCHAR},
       receiver_name = #{receiverName,jdbcType=VARCHAR},
       declaration_batch = #{declarationBatch,jdbcType=INTEGER},
-      official_fees = #{officialFees,jdbcType=INTEGER},
       cost_reduction = #{costReduction,jdbcType=INTEGER},
+      official_cost = #{officialCost,jdbcType=INTEGER},
       attachment_url = #{attachmentUrl,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -1047,7 +1047,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 09 15:36:58 CST 2020.
+      This element was generated on Thu Jun 11 09:59:01 CST 2020.
     -->
     update t_order_task
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -1093,17 +1093,17 @@
       cname = #{cname,jdbcType=VARCHAR},
       receiver_name = #{receiverName,jdbcType=VARCHAR},
       declaration_batch = #{declarationBatch,jdbcType=INTEGER},
-      official_fees = #{officialFees,jdbcType=INTEGER},
-      cost_reduction = #{costReduction,jdbcType=INTEGER}
+      cost_reduction = #{costReduction,jdbcType=INTEGER},
+      official_cost = #{officialCost,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <!-- 记得返回id -->
-  <!-- &amp;amp;amp;amp;lt;insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TOrderTask" useGeneratedKeys="true"&amp;amp;amp;amp;gt;
-  		&amp;amp;amp;amp;lt;selectKey keyProperty="id" order="AFTER" resultType="int"&amp;amp;amp;amp;gt;
+  <!-- &amp;amp;amp;amp;amp;lt;insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TOrderTask" useGeneratedKeys="true"&amp;amp;amp;amp;amp;gt;
+  		&amp;amp;amp;amp;amp;lt;selectKey keyProperty="id" order="AFTER" resultType="int"&amp;amp;amp;amp;amp;gt;
         SELECT LAST_INSERT_ID()
-    &amp;amp;amp;amp;lt;/selectKey&amp;amp;amp;amp;gt; -->
+    &amp;amp;amp;amp;amp;lt;/selectKey&amp;amp;amp;amp;amp;gt; -->
   <insert id="insertSelectiveGetId" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TOrderTask" useGeneratedKeys="true">
-     insert into t_order_task
+      insert into t_order_task
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
         id,
@@ -1237,12 +1237,12 @@
       <if test="declarationBatch != null">
         declaration_batch,
       </if>
-      <if test="officialFees != null">
-        official_fees,
-      </if>
       <if test="costReduction != null">
         cost_reduction,
       </if>
+      <if test="officialCost != null">
+        official_cost,
+      </if>
       <if test="attachmentUrl != null">
         attachment_url,
       </if>
@@ -1380,12 +1380,12 @@
       <if test="declarationBatch != null">
         #{declarationBatch,jdbcType=INTEGER},
       </if>
-      <if test="officialFees != null">
-        #{officialFees,jdbcType=INTEGER},
-      </if>
       <if test="costReduction != null">
         #{costReduction,jdbcType=INTEGER},
       </if>
+      <if test="officialCost != null">
+        #{officialCost,jdbcType=INTEGER},
+      </if>
       <if test="attachmentUrl != null">
         #{attachmentUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -1395,12 +1395,12 @@
     </selectKey>
   </insert>
   <select id="selectOrderTask" resultType="com.goafanti.order.bo.TOrderTaskBo">
-       select a.id,e.contract_no contractNo,a.order_no as orderNo,h.nickname userName,f.name salesmanName,a.outsource_name outsourceName,a.outsource,
+           select a.id,e.contract_no contractNo,a.order_no as orderNo,h.nickname userName,f.name salesmanName,a.outsource_name outsourceName,a.outsource,
   a.outsource_price outsourcePrice,g.name depName,e.order_status orderStatus,d.name as contacts,d.contact_mobile as contactsMobile,a.main, c.cname,
   c.sort cSort,a.commodity_name as commodityName,a.commodity_quantity as commodityQuantity,i.price,a.certificate_number as certificateNumber,
   a.commodity_id as commodityId,a.manager_id managerId,a.consultant_id consultantId,a.project_status as projectStatus,a.set_up_amount setUpAmount,
   a.task_comment as taskComment ,a.commodity_price as commodityPrice, a.task_status as taskStatus,  a.task_receiver as taskReceiver ,
-  a.split_status splitStatus,a.cost_reduction costReduction,a.official_fees officialFees
+  a.split_status splitStatus,a.cost_reduction costReduction,a.official_cost officialCost,i.`type` 
   	 from t_order_task a left join business_project b on a.commodity_id=b.id left join t_order_new e on a.order_no=e.order_no
   	 left join admin f on e.salesman_id=f.id left join department g on e.order_dep=g.id left join user h on e.buyer_id=h.id
   	 left join business_project i on a.commodity_id=i.id left join business_category c on b.cid=c.id left join admin d on a.task_receiver=d.id

+ 428 - 0
src/main/java/com/goafanti/common/mapper/ThirdPartyCompanyMapper.xml

@@ -0,0 +1,428 @@
+<?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.ThirdPartyCompanyMapper">
+  <resultMap id="BaseResultMap" type="com.goafanti.common.model.ThirdPartyCompany">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 11 16:01:49 CST 2020.
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="tid" jdbcType="INTEGER" property="tid" />
+    <result column="company_name" jdbcType="VARCHAR" property="companyName" />
+    <result column="unit_price" jdbcType="DECIMAL" property="unitPrice" />
+    <result column="quantity" jdbcType="INTEGER" property="quantity" />
+    <result column="total_amount" jdbcType="DECIMAL" property="totalAmount" />
+    <result column="material" jdbcType="INTEGER" property="material" />
+    <result column="urgent" jdbcType="INTEGER" property="urgent" />
+    <result column="audit" jdbcType="INTEGER" property="audit" />
+    <result column="assets" jdbcType="VARCHAR" property="assets" />
+    <result column="income" jdbcType="VARCHAR" property="income" />
+    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="cid" jdbcType="INTEGER" property="cid" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 11 16:01:49 CST 2020.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 11 16:01:49 CST 2020.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 11 16:01:49 CST 2020.
+    -->
+    id, tid, company_name, unit_price, quantity, total_amount, material, urgent, audit, 
+    assets, income, remarks, create_time, cid
+  </sql>
+  <select id="selectByExample" parameterType="com.goafanti.common.model.ThirdPartyCompanyExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 11 16:01:49 CST 2020.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from third_party_company
+    <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 Thu Jun 11 16:01:49 CST 2020.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from third_party_company
+    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 Thu Jun 11 16:01:49 CST 2020.
+    -->
+    delete from third_party_company
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.goafanti.common.model.ThirdPartyCompanyExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 11 16:01:49 CST 2020.
+    -->
+    delete from third_party_company
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.goafanti.common.model.ThirdPartyCompany">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 11 16:01:49 CST 2020.
+    -->
+    insert into third_party_company (id, tid, company_name, 
+      unit_price, quantity, total_amount, 
+      material, urgent, audit, 
+      assets, income, remarks, 
+      create_time, cid)
+    values (#{id,jdbcType=INTEGER}, #{tid,jdbcType=INTEGER}, #{companyName,jdbcType=VARCHAR}, 
+      #{unitPrice,jdbcType=DECIMAL}, #{quantity,jdbcType=INTEGER}, #{totalAmount,jdbcType=DECIMAL}, 
+      #{material,jdbcType=INTEGER}, #{urgent,jdbcType=INTEGER}, #{audit,jdbcType=INTEGER}, 
+      #{assets,jdbcType=VARCHAR}, #{income,jdbcType=VARCHAR}, #{remarks,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{cid,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.ThirdPartyCompany">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 11 16:01:49 CST 2020.
+    -->
+    insert into third_party_company
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="tid != null">
+        tid,
+      </if>
+      <if test="companyName != null">
+        company_name,
+      </if>
+      <if test="unitPrice != null">
+        unit_price,
+      </if>
+      <if test="quantity != null">
+        quantity,
+      </if>
+      <if test="totalAmount != null">
+        total_amount,
+      </if>
+      <if test="material != null">
+        material,
+      </if>
+      <if test="urgent != null">
+        urgent,
+      </if>
+      <if test="audit != null">
+        audit,
+      </if>
+      <if test="assets != null">
+        assets,
+      </if>
+      <if test="income != null">
+        income,
+      </if>
+      <if test="remarks != null">
+        remarks,
+      </if>
+      <if test="createTime != null">
+        create_time,
+      </if>
+      <if test="cid != null">
+        cid,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="tid != null">
+        #{tid,jdbcType=INTEGER},
+      </if>
+      <if test="companyName != null">
+        #{companyName,jdbcType=VARCHAR},
+      </if>
+      <if test="unitPrice != null">
+        #{unitPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="quantity != null">
+        #{quantity,jdbcType=INTEGER},
+      </if>
+      <if test="totalAmount != null">
+        #{totalAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="material != null">
+        #{material,jdbcType=INTEGER},
+      </if>
+      <if test="urgent != null">
+        #{urgent,jdbcType=INTEGER},
+      </if>
+      <if test="audit != null">
+        #{audit,jdbcType=INTEGER},
+      </if>
+      <if test="assets != null">
+        #{assets,jdbcType=VARCHAR},
+      </if>
+      <if test="income != null">
+        #{income,jdbcType=VARCHAR},
+      </if>
+      <if test="remarks != null">
+        #{remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="cid != null">
+        #{cid,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.goafanti.common.model.ThirdPartyCompanyExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 11 16:01:49 CST 2020.
+    -->
+    select count(*) from third_party_company
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 11 16:01:49 CST 2020.
+    -->
+    update third_party_company
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.tid != null">
+        tid = #{record.tid,jdbcType=INTEGER},
+      </if>
+      <if test="record.companyName != null">
+        company_name = #{record.companyName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.unitPrice != null">
+        unit_price = #{record.unitPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="record.quantity != null">
+        quantity = #{record.quantity,jdbcType=INTEGER},
+      </if>
+      <if test="record.totalAmount != null">
+        total_amount = #{record.totalAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.material != null">
+        material = #{record.material,jdbcType=INTEGER},
+      </if>
+      <if test="record.urgent != null">
+        urgent = #{record.urgent,jdbcType=INTEGER},
+      </if>
+      <if test="record.audit != null">
+        audit = #{record.audit,jdbcType=INTEGER},
+      </if>
+      <if test="record.assets != null">
+        assets = #{record.assets,jdbcType=VARCHAR},
+      </if>
+      <if test="record.income != null">
+        income = #{record.income,jdbcType=VARCHAR},
+      </if>
+      <if test="record.remarks != null">
+        remarks = #{record.remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.cid != null">
+        cid = #{record.cid,jdbcType=INTEGER},
+      </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 Thu Jun 11 16:01:49 CST 2020.
+    -->
+    update third_party_company
+    set id = #{record.id,jdbcType=INTEGER},
+      tid = #{record.tid,jdbcType=INTEGER},
+      company_name = #{record.companyName,jdbcType=VARCHAR},
+      unit_price = #{record.unitPrice,jdbcType=DECIMAL},
+      quantity = #{record.quantity,jdbcType=INTEGER},
+      total_amount = #{record.totalAmount,jdbcType=DECIMAL},
+      material = #{record.material,jdbcType=INTEGER},
+      urgent = #{record.urgent,jdbcType=INTEGER},
+      audit = #{record.audit,jdbcType=INTEGER},
+      assets = #{record.assets,jdbcType=VARCHAR},
+      income = #{record.income,jdbcType=VARCHAR},
+      remarks = #{record.remarks,jdbcType=VARCHAR},
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      cid = #{record.cid,jdbcType=INTEGER}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.ThirdPartyCompany">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 11 16:01:49 CST 2020.
+    -->
+    update third_party_company
+    <set>
+      <if test="tid != null">
+        tid = #{tid,jdbcType=INTEGER},
+      </if>
+      <if test="companyName != null">
+        company_name = #{companyName,jdbcType=VARCHAR},
+      </if>
+      <if test="unitPrice != null">
+        unit_price = #{unitPrice,jdbcType=DECIMAL},
+      </if>
+      <if test="quantity != null">
+        quantity = #{quantity,jdbcType=INTEGER},
+      </if>
+      <if test="totalAmount != null">
+        total_amount = #{totalAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="material != null">
+        material = #{material,jdbcType=INTEGER},
+      </if>
+      <if test="urgent != null">
+        urgent = #{urgent,jdbcType=INTEGER},
+      </if>
+      <if test="audit != null">
+        audit = #{audit,jdbcType=INTEGER},
+      </if>
+      <if test="assets != null">
+        assets = #{assets,jdbcType=VARCHAR},
+      </if>
+      <if test="income != null">
+        income = #{income,jdbcType=VARCHAR},
+      </if>
+      <if test="remarks != null">
+        remarks = #{remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="cid != null">
+        cid = #{cid,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.ThirdPartyCompany">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 11 16:01:49 CST 2020.
+    -->
+    update third_party_company
+    set tid = #{tid,jdbcType=INTEGER},
+      company_name = #{companyName,jdbcType=VARCHAR},
+      unit_price = #{unitPrice,jdbcType=DECIMAL},
+      quantity = #{quantity,jdbcType=INTEGER},
+      total_amount = #{totalAmount,jdbcType=DECIMAL},
+      material = #{material,jdbcType=INTEGER},
+      urgent = #{urgent,jdbcType=INTEGER},
+      audit = #{audit,jdbcType=INTEGER},
+      assets = #{assets,jdbcType=VARCHAR},
+      income = #{income,jdbcType=VARCHAR},
+      remarks = #{remarks,jdbcType=VARCHAR},
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      cid = #{cid,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

+ 137 - 0
src/main/java/com/goafanti/common/model/CompanyLibrary.java

@@ -0,0 +1,137 @@
+package com.goafanti.common.model;
+
+import java.util.Date;
+
+public class CompanyLibrary {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column company_library.id
+     *
+     * @mbg.generated Thu Jun 11 15:36:42 CST 2020
+     */
+    private Integer id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column company_library.company_name
+     *
+     * @mbg.generated Thu Jun 11 15:36:42 CST 2020
+     */
+    private String companyName;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column company_library.aid
+     *
+     * @mbg.generated Thu Jun 11 15:36:42 CST 2020
+     */
+    private String aid;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column company_library.create_time
+     *
+     * @mbg.generated Thu Jun 11 15:36:42 CST 2020
+     */
+    private Date createTime;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column company_library.id
+     *
+     * @return the value of company_library.id
+     *
+     * @mbg.generated Thu Jun 11 15:36:42 CST 2020
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column company_library.id
+     *
+     * @param id the value for company_library.id
+     *
+     * @mbg.generated Thu Jun 11 15:36:42 CST 2020
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column company_library.company_name
+     *
+     * @return the value of company_library.company_name
+     *
+     * @mbg.generated Thu Jun 11 15:36:42 CST 2020
+     */
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column company_library.company_name
+     *
+     * @param companyName the value for company_library.company_name
+     *
+     * @mbg.generated Thu Jun 11 15:36:42 CST 2020
+     */
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column company_library.aid
+     *
+     * @return the value of company_library.aid
+     *
+     * @mbg.generated Thu Jun 11 15:36:42 CST 2020
+     */
+    public String getAid() {
+        return aid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column company_library.aid
+     *
+     * @param aid the value for company_library.aid
+     *
+     * @mbg.generated Thu Jun 11 15:36:42 CST 2020
+     */
+    public void setAid(String aid) {
+        this.aid = aid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column company_library.create_time
+     *
+     * @return the value of company_library.create_time
+     *
+     * @mbg.generated Thu Jun 11 15:36:42 CST 2020
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column company_library.create_time
+     *
+     * @param createTime the value for company_library.create_time
+     *
+     * @mbg.generated Thu Jun 11 15:36:42 CST 2020
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}

+ 563 - 0
src/main/java/com/goafanti/common/model/CompanyLibraryExample.java

@@ -0,0 +1,563 @@
+package com.goafanti.common.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class CompanyLibraryExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table company_library
+     *
+     * @mbg.generated Thu Jun 11 15:36:42 CST 2020
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table company_library
+     *
+     * @mbg.generated Thu Jun 11 15:36:42 CST 2020
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table company_library
+     *
+     * @mbg.generated Thu Jun 11 15:36:42 CST 2020
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table company_library
+     *
+     * @mbg.generated Thu Jun 11 15:36:42 CST 2020
+     */
+    public CompanyLibraryExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table company_library
+     *
+     * @mbg.generated Thu Jun 11 15:36:42 CST 2020
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table company_library
+     *
+     * @mbg.generated Thu Jun 11 15:36:42 CST 2020
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table company_library
+     *
+     * @mbg.generated Thu Jun 11 15:36:42 CST 2020
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table company_library
+     *
+     * @mbg.generated Thu Jun 11 15:36:42 CST 2020
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table company_library
+     *
+     * @mbg.generated Thu Jun 11 15:36:42 CST 2020
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table company_library
+     *
+     * @mbg.generated Thu Jun 11 15:36:42 CST 2020
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table company_library
+     *
+     * @mbg.generated Thu Jun 11 15:36:42 CST 2020
+     */
+    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 company_library
+     *
+     * @mbg.generated Thu Jun 11 15:36:42 CST 2020
+     */
+    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 company_library
+     *
+     * @mbg.generated Thu Jun 11 15:36:42 CST 2020
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table company_library
+     *
+     * @mbg.generated Thu Jun 11 15:36:42 CST 2020
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table company_library
+     *
+     * @mbg.generated Thu Jun 11 15:36:42 CST 2020
+     */
+    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 andCompanyNameIsNull() {
+            addCriterion("company_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameIsNotNull() {
+            addCriterion("company_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameEqualTo(String value) {
+            addCriterion("company_name =", value, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameNotEqualTo(String value) {
+            addCriterion("company_name <>", value, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameGreaterThan(String value) {
+            addCriterion("company_name >", value, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameGreaterThanOrEqualTo(String value) {
+            addCriterion("company_name >=", value, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameLessThan(String value) {
+            addCriterion("company_name <", value, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameLessThanOrEqualTo(String value) {
+            addCriterion("company_name <=", value, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameLike(String value) {
+            addCriterion("company_name like", value, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameNotLike(String value) {
+            addCriterion("company_name not like", value, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameIn(List<String> values) {
+            addCriterion("company_name in", values, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameNotIn(List<String> values) {
+            addCriterion("company_name not in", values, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameBetween(String value1, String value2) {
+            addCriterion("company_name between", value1, value2, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameNotBetween(String value1, String value2) {
+            addCriterion("company_name not between", value1, value2, "companyName");
+            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;
+        }
+
+        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 company_library
+     *
+     * @mbg.generated do_not_delete_during_merge Thu Jun 11 15:36:42 CST 2020
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table company_library
+     *
+     * @mbg.generated Thu Jun 11 15:36:42 CST 2020
+     */
+    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);
+        }
+    }
+}

+ 215 - 0
src/main/java/com/goafanti/common/model/TOrderExtend.java

@@ -0,0 +1,215 @@
+package com.goafanti.common.model;
+
+import java.util.Date;
+import java.math.BigDecimal;
+
+public class TOrderExtend {
+
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_extend.order_no
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	private String orderNo;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_extend.service_status
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	private Integer serviceStatus;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_extend.service_name
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	private String serviceName;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_extend.payment_method
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	private Integer paymentMethod;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_extend.payment_ratio
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	private BigDecimal paymentRatio;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_extend.service_amount
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	private BigDecimal serviceAmount;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_extend.service_remarks
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	private String serviceRemarks;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_extend.create_time
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	private Date createTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_extend.payment_status
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	private Integer paymentStatus;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_extend.order_no
+	 * @return  the value of t_order_extend.order_no
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	public String getOrderNo() {
+		return orderNo;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_extend.order_no
+	 * @param orderNo  the value for t_order_extend.order_no
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_extend.service_status
+	 * @return  the value of t_order_extend.service_status
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	public Integer getServiceStatus() {
+		return serviceStatus;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_extend.service_status
+	 * @param serviceStatus  the value for t_order_extend.service_status
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	public void setServiceStatus(Integer serviceStatus) {
+		this.serviceStatus = serviceStatus;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_extend.service_name
+	 * @return  the value of t_order_extend.service_name
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	public String getServiceName() {
+		return serviceName;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_extend.service_name
+	 * @param serviceName  the value for t_order_extend.service_name
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	public void setServiceName(String serviceName) {
+		this.serviceName = serviceName;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_extend.payment_method
+	 * @return  the value of t_order_extend.payment_method
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	public Integer getPaymentMethod() {
+		return paymentMethod;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_extend.payment_method
+	 * @param paymentMethod  the value for t_order_extend.payment_method
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	public void setPaymentMethod(Integer paymentMethod) {
+		this.paymentMethod = paymentMethod;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_extend.payment_ratio
+	 * @return  the value of t_order_extend.payment_ratio
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	public BigDecimal getPaymentRatio() {
+		return paymentRatio;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_extend.payment_ratio
+	 * @param paymentRatio  the value for t_order_extend.payment_ratio
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	public void setPaymentRatio(BigDecimal paymentRatio) {
+		this.paymentRatio = paymentRatio;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_extend.service_amount
+	 * @return  the value of t_order_extend.service_amount
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	public BigDecimal getServiceAmount() {
+		return serviceAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_extend.service_amount
+	 * @param serviceAmount  the value for t_order_extend.service_amount
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	public void setServiceAmount(BigDecimal serviceAmount) {
+		this.serviceAmount = serviceAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_extend.service_remarks
+	 * @return  the value of t_order_extend.service_remarks
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	public String getServiceRemarks() {
+		return serviceRemarks;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_extend.service_remarks
+	 * @param serviceRemarks  the value for t_order_extend.service_remarks
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	public void setServiceRemarks(String serviceRemarks) {
+		this.serviceRemarks = serviceRemarks;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_extend.create_time
+	 * @return  the value of t_order_extend.create_time
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_extend.create_time
+	 * @param createTime  the value for t_order_extend.create_time
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_extend.payment_status
+	 * @return  the value of t_order_extend.payment_status
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	public Integer getPaymentStatus() {
+		return paymentStatus;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_extend.payment_status
+	 * @param paymentStatus  the value for t_order_extend.payment_status
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	public void setPaymentStatus(Integer paymentStatus) {
+		this.paymentStatus = paymentStatus;
+	}
+}

+ 833 - 0
src/main/java/com/goafanti/common/model/TOrderExtendExample.java

@@ -0,0 +1,833 @@
+package com.goafanti.common.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.math.BigDecimal;
+
+public class TOrderExtendExample {
+    /**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_extend
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	protected String orderByClause;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_extend
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	protected boolean distinct;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_extend
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	protected List<Criteria> oredCriteria;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_extend
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	public TOrderExtendExample() {
+		oredCriteria = new ArrayList<Criteria>();
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_extend
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	public void setOrderByClause(String orderByClause) {
+		this.orderByClause = orderByClause;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_extend
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	public String getOrderByClause() {
+		return orderByClause;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_extend
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	public void setDistinct(boolean distinct) {
+		this.distinct = distinct;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_extend
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	public boolean isDistinct() {
+		return distinct;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_extend
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	public List<Criteria> getOredCriteria() {
+		return oredCriteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_extend
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	public void or(Criteria criteria) {
+		oredCriteria.add(criteria);
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_extend
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	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 t_order_extend
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	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 t_order_extend
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	protected Criteria createCriteriaInternal() {
+		Criteria criteria = new Criteria();
+		return criteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_extend
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	public void clear() {
+		oredCriteria.clear();
+		orderByClause = null;
+		distinct = false;
+	}
+
+	/**
+	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_extend
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	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 andOrderNoIsNull() {
+			addCriterion("order_no is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoIsNotNull() {
+			addCriterion("order_no is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoEqualTo(String value) {
+			addCriterion("order_no =", value, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoNotEqualTo(String value) {
+			addCriterion("order_no <>", value, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoGreaterThan(String value) {
+			addCriterion("order_no >", value, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoGreaterThanOrEqualTo(String value) {
+			addCriterion("order_no >=", value, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoLessThan(String value) {
+			addCriterion("order_no <", value, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoLessThanOrEqualTo(String value) {
+			addCriterion("order_no <=", value, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoLike(String value) {
+			addCriterion("order_no like", value, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoNotLike(String value) {
+			addCriterion("order_no not like", value, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoIn(List<String> values) {
+			addCriterion("order_no in", values, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoNotIn(List<String> values) {
+			addCriterion("order_no not in", values, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoBetween(String value1, String value2) {
+			addCriterion("order_no between", value1, value2, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andOrderNoNotBetween(String value1, String value2) {
+			addCriterion("order_no not between", value1, value2, "orderNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceStatusIsNull() {
+			addCriterion("service_status is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceStatusIsNotNull() {
+			addCriterion("service_status is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceStatusEqualTo(Integer value) {
+			addCriterion("service_status =", value, "serviceStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceStatusNotEqualTo(Integer value) {
+			addCriterion("service_status <>", value, "serviceStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceStatusGreaterThan(Integer value) {
+			addCriterion("service_status >", value, "serviceStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceStatusGreaterThanOrEqualTo(Integer value) {
+			addCriterion("service_status >=", value, "serviceStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceStatusLessThan(Integer value) {
+			addCriterion("service_status <", value, "serviceStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceStatusLessThanOrEqualTo(Integer value) {
+			addCriterion("service_status <=", value, "serviceStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceStatusIn(List<Integer> values) {
+			addCriterion("service_status in", values, "serviceStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceStatusNotIn(List<Integer> values) {
+			addCriterion("service_status not in", values, "serviceStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceStatusBetween(Integer value1, Integer value2) {
+			addCriterion("service_status between", value1, value2, "serviceStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceStatusNotBetween(Integer value1, Integer value2) {
+			addCriterion("service_status not between", value1, value2, "serviceStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceNameIsNull() {
+			addCriterion("service_name is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceNameIsNotNull() {
+			addCriterion("service_name is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceNameEqualTo(String value) {
+			addCriterion("service_name =", value, "serviceName");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceNameNotEqualTo(String value) {
+			addCriterion("service_name <>", value, "serviceName");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceNameGreaterThan(String value) {
+			addCriterion("service_name >", value, "serviceName");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceNameGreaterThanOrEqualTo(String value) {
+			addCriterion("service_name >=", value, "serviceName");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceNameLessThan(String value) {
+			addCriterion("service_name <", value, "serviceName");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceNameLessThanOrEqualTo(String value) {
+			addCriterion("service_name <=", value, "serviceName");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceNameLike(String value) {
+			addCriterion("service_name like", value, "serviceName");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceNameNotLike(String value) {
+			addCriterion("service_name not like", value, "serviceName");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceNameIn(List<String> values) {
+			addCriterion("service_name in", values, "serviceName");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceNameNotIn(List<String> values) {
+			addCriterion("service_name not in", values, "serviceName");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceNameBetween(String value1, String value2) {
+			addCriterion("service_name between", value1, value2, "serviceName");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceNameNotBetween(String value1, String value2) {
+			addCriterion("service_name not between", value1, value2, "serviceName");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentMethodIsNull() {
+			addCriterion("payment_method is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentMethodIsNotNull() {
+			addCriterion("payment_method is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentMethodEqualTo(Integer value) {
+			addCriterion("payment_method =", value, "paymentMethod");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentMethodNotEqualTo(Integer value) {
+			addCriterion("payment_method <>", value, "paymentMethod");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentMethodGreaterThan(Integer value) {
+			addCriterion("payment_method >", value, "paymentMethod");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentMethodGreaterThanOrEqualTo(Integer value) {
+			addCriterion("payment_method >=", value, "paymentMethod");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentMethodLessThan(Integer value) {
+			addCriterion("payment_method <", value, "paymentMethod");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentMethodLessThanOrEqualTo(Integer value) {
+			addCriterion("payment_method <=", value, "paymentMethod");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentMethodIn(List<Integer> values) {
+			addCriterion("payment_method in", values, "paymentMethod");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentMethodNotIn(List<Integer> values) {
+			addCriterion("payment_method not in", values, "paymentMethod");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentMethodBetween(Integer value1, Integer value2) {
+			addCriterion("payment_method between", value1, value2, "paymentMethod");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentMethodNotBetween(Integer value1, Integer value2) {
+			addCriterion("payment_method not between", value1, value2, "paymentMethod");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentRatioIsNull() {
+			addCriterion("payment_ratio is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentRatioIsNotNull() {
+			addCriterion("payment_ratio is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentRatioEqualTo(BigDecimal value) {
+			addCriterion("payment_ratio =", value, "paymentRatio");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentRatioNotEqualTo(BigDecimal value) {
+			addCriterion("payment_ratio <>", value, "paymentRatio");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentRatioGreaterThan(BigDecimal value) {
+			addCriterion("payment_ratio >", value, "paymentRatio");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentRatioGreaterThanOrEqualTo(BigDecimal value) {
+			addCriterion("payment_ratio >=", value, "paymentRatio");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentRatioLessThan(BigDecimal value) {
+			addCriterion("payment_ratio <", value, "paymentRatio");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentRatioLessThanOrEqualTo(BigDecimal value) {
+			addCriterion("payment_ratio <=", value, "paymentRatio");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentRatioIn(List<BigDecimal> values) {
+			addCriterion("payment_ratio in", values, "paymentRatio");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentRatioNotIn(List<BigDecimal> values) {
+			addCriterion("payment_ratio not in", values, "paymentRatio");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentRatioBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("payment_ratio between", value1, value2, "paymentRatio");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentRatioNotBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("payment_ratio not between", value1, value2, "paymentRatio");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceAmountIsNull() {
+			addCriterion("service_amount is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceAmountIsNotNull() {
+			addCriterion("service_amount is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceAmountEqualTo(BigDecimal value) {
+			addCriterion("service_amount =", value, "serviceAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceAmountNotEqualTo(BigDecimal value) {
+			addCriterion("service_amount <>", value, "serviceAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceAmountGreaterThan(BigDecimal value) {
+			addCriterion("service_amount >", value, "serviceAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceAmountGreaterThanOrEqualTo(BigDecimal value) {
+			addCriterion("service_amount >=", value, "serviceAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceAmountLessThan(BigDecimal value) {
+			addCriterion("service_amount <", value, "serviceAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceAmountLessThanOrEqualTo(BigDecimal value) {
+			addCriterion("service_amount <=", value, "serviceAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceAmountIn(List<BigDecimal> values) {
+			addCriterion("service_amount in", values, "serviceAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceAmountNotIn(List<BigDecimal> values) {
+			addCriterion("service_amount not in", values, "serviceAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceAmountBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("service_amount between", value1, value2, "serviceAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceAmountNotBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("service_amount not between", value1, value2, "serviceAmount");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceRemarksIsNull() {
+			addCriterion("service_remarks is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceRemarksIsNotNull() {
+			addCriterion("service_remarks is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceRemarksEqualTo(String value) {
+			addCriterion("service_remarks =", value, "serviceRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceRemarksNotEqualTo(String value) {
+			addCriterion("service_remarks <>", value, "serviceRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceRemarksGreaterThan(String value) {
+			addCriterion("service_remarks >", value, "serviceRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceRemarksGreaterThanOrEqualTo(String value) {
+			addCriterion("service_remarks >=", value, "serviceRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceRemarksLessThan(String value) {
+			addCriterion("service_remarks <", value, "serviceRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceRemarksLessThanOrEqualTo(String value) {
+			addCriterion("service_remarks <=", value, "serviceRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceRemarksLike(String value) {
+			addCriterion("service_remarks like", value, "serviceRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceRemarksNotLike(String value) {
+			addCriterion("service_remarks not like", value, "serviceRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceRemarksIn(List<String> values) {
+			addCriterion("service_remarks in", values, "serviceRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceRemarksNotIn(List<String> values) {
+			addCriterion("service_remarks not in", values, "serviceRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceRemarksBetween(String value1, String value2) {
+			addCriterion("service_remarks between", value1, value2, "serviceRemarks");
+			return (Criteria) this;
+		}
+
+		public Criteria andServiceRemarksNotBetween(String value1, String value2) {
+			addCriterion("service_remarks not between", value1, value2, "serviceRemarks");
+			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 andPaymentStatusIsNull() {
+			addCriterion("payment_status is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentStatusIsNotNull() {
+			addCriterion("payment_status is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentStatusEqualTo(Integer value) {
+			addCriterion("payment_status =", value, "paymentStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentStatusNotEqualTo(Integer value) {
+			addCriterion("payment_status <>", value, "paymentStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentStatusGreaterThan(Integer value) {
+			addCriterion("payment_status >", value, "paymentStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentStatusGreaterThanOrEqualTo(Integer value) {
+			addCriterion("payment_status >=", value, "paymentStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentStatusLessThan(Integer value) {
+			addCriterion("payment_status <", value, "paymentStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentStatusLessThanOrEqualTo(Integer value) {
+			addCriterion("payment_status <=", value, "paymentStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentStatusIn(List<Integer> values) {
+			addCriterion("payment_status in", values, "paymentStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentStatusNotIn(List<Integer> values) {
+			addCriterion("payment_status not in", values, "paymentStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentStatusBetween(Integer value1, Integer value2) {
+			addCriterion("payment_status between", value1, value2, "paymentStatus");
+			return (Criteria) this;
+		}
+
+		public Criteria andPaymentStatusNotBetween(Integer value1, Integer value2) {
+			addCriterion("payment_status not between", value1, value2, "paymentStatus");
+			return (Criteria) this;
+		}
+	}
+
+	/**
+	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_extend
+	 * @mbg.generated  Thu Jun 11 14:25:54 CST 2020
+	 */
+	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 t_order_extend
+     *
+     * @mbg.generated do_not_delete_during_merge Thu Jun 11 10:21:30 CST 2020
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+}

+ 49 - 1
src/main/java/com/goafanti/common/model/TOrderNewWithBLOBs.java

@@ -1,3 +1,51 @@
 package com.goafanti.common.model;
 
-public class TOrderNewWithBLOBs extends TOrderNew {}
+import java.math.BigDecimal;
+
+public class TOrderNewWithBLOBs extends TOrderNew {
+	private Integer serviceStatus;
+	private String serviceName;
+	private Integer paymentMethod;
+	private BigDecimal paymentRatio;
+	private BigDecimal serviceAmount;
+	private String serviceRemarks;
+	public Integer getServiceStatus() {
+		return serviceStatus;
+	}
+	public void setServiceStatus(Integer serviceStatus) {
+		this.serviceStatus = serviceStatus;
+	}
+	public String getServiceName() {
+		return serviceName;
+	}
+	public void setServiceName(String serviceName) {
+		this.serviceName = serviceName;
+	}
+	public Integer getPaymentMethod() {
+		return paymentMethod;
+	}
+	public void setPaymentMethod(Integer paymentMethod) {
+		this.paymentMethod = paymentMethod;
+	}
+	public BigDecimal getPaymentRatio() {
+		return paymentRatio;
+	}
+	public void setPaymentRatio(BigDecimal paymentRatio) {
+		this.paymentRatio = paymentRatio;
+	}
+	public BigDecimal getServiceAmount() {
+		return serviceAmount;
+	}
+	public void setServiceAmount(BigDecimal serviceAmount) {
+		this.serviceAmount = serviceAmount;
+	}
+	public String getServiceRemarks() {
+		return serviceRemarks;
+	}
+	public void setServiceRemarks(String serviceRemarks) {
+		this.serviceRemarks = serviceRemarks;
+	}
+	
+	
+	
+}

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


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

@@ -9,23 +9,23 @@ import java.util.List;
 public class TOrderTaskExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Jun 09 15:36:58 CST 2020
+	 * @mbg.generated  Thu Jun 11 09:59:01 CST 2020
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Jun 09 15:36:58 CST 2020
+	 * @mbg.generated  Thu Jun 11 09:59:01 CST 2020
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Jun 09 15:36:58 CST 2020
+	 * @mbg.generated  Thu Jun 11 09:59:01 CST 2020
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Jun 09 15:36:58 CST 2020
+	 * @mbg.generated  Thu Jun 11 09:59:01 CST 2020
 	 */
 	public TOrderTaskExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -33,7 +33,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Jun 09 15:36:58 CST 2020
+	 * @mbg.generated  Thu Jun 11 09:59:01 CST 2020
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -41,7 +41,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Jun 09 15:36:58 CST 2020
+	 * @mbg.generated  Thu Jun 11 09:59:01 CST 2020
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -49,7 +49,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Jun 09 15:36:58 CST 2020
+	 * @mbg.generated  Thu Jun 11 09:59:01 CST 2020
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -57,7 +57,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Jun 09 15:36:58 CST 2020
+	 * @mbg.generated  Thu Jun 11 09:59:01 CST 2020
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -65,7 +65,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Jun 09 15:36:58 CST 2020
+	 * @mbg.generated  Thu Jun 11 09:59:01 CST 2020
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -73,7 +73,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Jun 09 15:36:58 CST 2020
+	 * @mbg.generated  Thu Jun 11 09:59:01 CST 2020
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -81,7 +81,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Jun 09 15:36:58 CST 2020
+	 * @mbg.generated  Thu Jun 11 09:59:01 CST 2020
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -91,7 +91,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Jun 09 15:36:58 CST 2020
+	 * @mbg.generated  Thu Jun 11 09:59:01 CST 2020
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -103,7 +103,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Jun 09 15:36:58 CST 2020
+	 * @mbg.generated  Thu Jun 11 09:59:01 CST 2020
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -112,7 +112,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Jun 09 15:36:58 CST 2020
+	 * @mbg.generated  Thu Jun 11 09:59:01 CST 2020
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -122,7 +122,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Jun 09 15:36:58 CST 2020
+	 * @mbg.generated  Thu Jun 11 09:59:01 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -3021,130 +3021,130 @@ public class TOrderTaskExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andOfficialFeesIsNull() {
-			addCriterion("official_fees is null");
+		public Criteria andCostReductionIsNull() {
+			addCriterion("cost_reduction is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andOfficialFeesIsNotNull() {
-			addCriterion("official_fees is not null");
+		public Criteria andCostReductionIsNotNull() {
+			addCriterion("cost_reduction is not null");
 			return (Criteria) this;
 		}
 
-		public Criteria andOfficialFeesEqualTo(Integer value) {
-			addCriterion("official_fees =", value, "officialFees");
+		public Criteria andCostReductionEqualTo(Integer value) {
+			addCriterion("cost_reduction =", value, "costReduction");
 			return (Criteria) this;
 		}
 
-		public Criteria andOfficialFeesNotEqualTo(Integer value) {
-			addCriterion("official_fees <>", value, "officialFees");
+		public Criteria andCostReductionNotEqualTo(Integer value) {
+			addCriterion("cost_reduction <>", value, "costReduction");
 			return (Criteria) this;
 		}
 
-		public Criteria andOfficialFeesGreaterThan(Integer value) {
-			addCriterion("official_fees >", value, "officialFees");
+		public Criteria andCostReductionGreaterThan(Integer value) {
+			addCriterion("cost_reduction >", value, "costReduction");
 			return (Criteria) this;
 		}
 
-		public Criteria andOfficialFeesGreaterThanOrEqualTo(Integer value) {
-			addCriterion("official_fees >=", value, "officialFees");
+		public Criteria andCostReductionGreaterThanOrEqualTo(Integer value) {
+			addCriterion("cost_reduction >=", value, "costReduction");
 			return (Criteria) this;
 		}
 
-		public Criteria andOfficialFeesLessThan(Integer value) {
-			addCriterion("official_fees <", value, "officialFees");
+		public Criteria andCostReductionLessThan(Integer value) {
+			addCriterion("cost_reduction <", value, "costReduction");
 			return (Criteria) this;
 		}
 
-		public Criteria andOfficialFeesLessThanOrEqualTo(Integer value) {
-			addCriterion("official_fees <=", value, "officialFees");
+		public Criteria andCostReductionLessThanOrEqualTo(Integer value) {
+			addCriterion("cost_reduction <=", value, "costReduction");
 			return (Criteria) this;
 		}
 
-		public Criteria andOfficialFeesIn(List<Integer> values) {
-			addCriterion("official_fees in", values, "officialFees");
+		public Criteria andCostReductionIn(List<Integer> values) {
+			addCriterion("cost_reduction in", values, "costReduction");
 			return (Criteria) this;
 		}
 
-		public Criteria andOfficialFeesNotIn(List<Integer> values) {
-			addCriterion("official_fees not in", values, "officialFees");
+		public Criteria andCostReductionNotIn(List<Integer> values) {
+			addCriterion("cost_reduction not in", values, "costReduction");
 			return (Criteria) this;
 		}
 
-		public Criteria andOfficialFeesBetween(Integer value1, Integer value2) {
-			addCriterion("official_fees between", value1, value2, "officialFees");
+		public Criteria andCostReductionBetween(Integer value1, Integer value2) {
+			addCriterion("cost_reduction between", value1, value2, "costReduction");
 			return (Criteria) this;
 		}
 
-		public Criteria andOfficialFeesNotBetween(Integer value1, Integer value2) {
-			addCriterion("official_fees not between", value1, value2, "officialFees");
+		public Criteria andCostReductionNotBetween(Integer value1, Integer value2) {
+			addCriterion("cost_reduction not between", value1, value2, "costReduction");
 			return (Criteria) this;
 		}
 
-		public Criteria andCostReductionIsNull() {
-			addCriterion("cost_reduction is null");
+		public Criteria andOfficialCostIsNull() {
+			addCriterion("official_cost is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andCostReductionIsNotNull() {
-			addCriterion("cost_reduction is not null");
+		public Criteria andOfficialCostIsNotNull() {
+			addCriterion("official_cost is not null");
 			return (Criteria) this;
 		}
 
-		public Criteria andCostReductionEqualTo(Integer value) {
-			addCriterion("cost_reduction =", value, "costReduction");
+		public Criteria andOfficialCostEqualTo(Integer value) {
+			addCriterion("official_cost =", value, "officialCost");
 			return (Criteria) this;
 		}
 
-		public Criteria andCostReductionNotEqualTo(Integer value) {
-			addCriterion("cost_reduction <>", value, "costReduction");
+		public Criteria andOfficialCostNotEqualTo(Integer value) {
+			addCriterion("official_cost <>", value, "officialCost");
 			return (Criteria) this;
 		}
 
-		public Criteria andCostReductionGreaterThan(Integer value) {
-			addCriterion("cost_reduction >", value, "costReduction");
+		public Criteria andOfficialCostGreaterThan(Integer value) {
+			addCriterion("official_cost >", value, "officialCost");
 			return (Criteria) this;
 		}
 
-		public Criteria andCostReductionGreaterThanOrEqualTo(Integer value) {
-			addCriterion("cost_reduction >=", value, "costReduction");
+		public Criteria andOfficialCostGreaterThanOrEqualTo(Integer value) {
+			addCriterion("official_cost >=", value, "officialCost");
 			return (Criteria) this;
 		}
 
-		public Criteria andCostReductionLessThan(Integer value) {
-			addCriterion("cost_reduction <", value, "costReduction");
+		public Criteria andOfficialCostLessThan(Integer value) {
+			addCriterion("official_cost <", value, "officialCost");
 			return (Criteria) this;
 		}
 
-		public Criteria andCostReductionLessThanOrEqualTo(Integer value) {
-			addCriterion("cost_reduction <=", value, "costReduction");
+		public Criteria andOfficialCostLessThanOrEqualTo(Integer value) {
+			addCriterion("official_cost <=", value, "officialCost");
 			return (Criteria) this;
 		}
 
-		public Criteria andCostReductionIn(List<Integer> values) {
-			addCriterion("cost_reduction in", values, "costReduction");
+		public Criteria andOfficialCostIn(List<Integer> values) {
+			addCriterion("official_cost in", values, "officialCost");
 			return (Criteria) this;
 		}
 
-		public Criteria andCostReductionNotIn(List<Integer> values) {
-			addCriterion("cost_reduction not in", values, "costReduction");
+		public Criteria andOfficialCostNotIn(List<Integer> values) {
+			addCriterion("official_cost not in", values, "officialCost");
 			return (Criteria) this;
 		}
 
-		public Criteria andCostReductionBetween(Integer value1, Integer value2) {
-			addCriterion("cost_reduction between", value1, value2, "costReduction");
+		public Criteria andOfficialCostBetween(Integer value1, Integer value2) {
+			addCriterion("official_cost between", value1, value2, "officialCost");
 			return (Criteria) this;
 		}
 
-		public Criteria andCostReductionNotBetween(Integer value1, Integer value2) {
-			addCriterion("cost_reduction not between", value1, value2, "costReduction");
+		public Criteria andOfficialCostNotBetween(Integer value1, Integer value2) {
+			addCriterion("official_cost not between", value1, value2, "officialCost");
 			return (Criteria) this;
 		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Jun 09 15:36:58 CST 2020
+	 * @mbg.generated  Thu Jun 11 09:59:01 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

+ 330 - 0
src/main/java/com/goafanti/common/model/ThirdPartyCompany.java

@@ -0,0 +1,330 @@
+package com.goafanti.common.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class ThirdPartyCompany {
+
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.id
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	private Integer id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.tid
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	private Integer tid;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.company_name
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	private String companyName;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.unit_price
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	private BigDecimal unitPrice;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.quantity
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	private Integer quantity;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.total_amount
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	private BigDecimal totalAmount;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.material
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	private Integer material;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.urgent
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	private Integer urgent;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.audit
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	private Integer audit;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.assets
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	private String assets;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.income
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	private String income;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.remarks
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	private String remarks;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.create_time
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	private Date createTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.cid
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	private Integer cid;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.id
+	 * @return  the value of third_party_company.id
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	public Integer getId() {
+		return id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.id
+	 * @param id  the value for third_party_company.id
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.tid
+	 * @return  the value of third_party_company.tid
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	public Integer getTid() {
+		return tid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.tid
+	 * @param tid  the value for third_party_company.tid
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	public void setTid(Integer tid) {
+		this.tid = tid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.company_name
+	 * @return  the value of third_party_company.company_name
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	public String getCompanyName() {
+		return companyName;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.company_name
+	 * @param companyName  the value for third_party_company.company_name
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	public void setCompanyName(String companyName) {
+		this.companyName = companyName;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.unit_price
+	 * @return  the value of third_party_company.unit_price
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	public BigDecimal getUnitPrice() {
+		return unitPrice;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.unit_price
+	 * @param unitPrice  the value for third_party_company.unit_price
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	public void setUnitPrice(BigDecimal unitPrice) {
+		this.unitPrice = unitPrice;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.quantity
+	 * @return  the value of third_party_company.quantity
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	public Integer getQuantity() {
+		return quantity;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.quantity
+	 * @param quantity  the value for third_party_company.quantity
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	public void setQuantity(Integer quantity) {
+		this.quantity = quantity;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.total_amount
+	 * @return  the value of third_party_company.total_amount
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	public BigDecimal getTotalAmount() {
+		return totalAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.total_amount
+	 * @param totalAmount  the value for third_party_company.total_amount
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	public void setTotalAmount(BigDecimal totalAmount) {
+		this.totalAmount = totalAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.material
+	 * @return  the value of third_party_company.material
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	public Integer getMaterial() {
+		return material;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.material
+	 * @param material  the value for third_party_company.material
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	public void setMaterial(Integer material) {
+		this.material = material;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.urgent
+	 * @return  the value of third_party_company.urgent
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	public Integer getUrgent() {
+		return urgent;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.urgent
+	 * @param urgent  the value for third_party_company.urgent
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	public void setUrgent(Integer urgent) {
+		this.urgent = urgent;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.audit
+	 * @return  the value of third_party_company.audit
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	public Integer getAudit() {
+		return audit;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.audit
+	 * @param audit  the value for third_party_company.audit
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	public void setAudit(Integer audit) {
+		this.audit = audit;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.assets
+	 * @return  the value of third_party_company.assets
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	public String getAssets() {
+		return assets;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.assets
+	 * @param assets  the value for third_party_company.assets
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	public void setAssets(String assets) {
+		this.assets = assets;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.income
+	 * @return  the value of third_party_company.income
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	public String getIncome() {
+		return income;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.income
+	 * @param income  the value for third_party_company.income
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	public void setIncome(String income) {
+		this.income = income;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.remarks
+	 * @return  the value of third_party_company.remarks
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	public String getRemarks() {
+		return remarks;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.remarks
+	 * @param remarks  the value for third_party_company.remarks
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.create_time
+	 * @return  the value of third_party_company.create_time
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.create_time
+	 * @param createTime  the value for third_party_company.create_time
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.cid
+	 * @return  the value of third_party_company.cid
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	public Integer getCid() {
+		return cid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.cid
+	 * @param cid  the value for third_party_company.cid
+	 * @mbg.generated  Thu Jun 11 16:01:49 CST 2020
+	 */
+	public void setCid(Integer cid) {
+		this.cid = cid;
+	}
+}

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


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

@@ -18,6 +18,9 @@ public class TOrderTaskBo extends TOrderTask{
 	private String userName;
 	
 	private Integer orderStatus;
+	
+	private Integer type;
+	
 	private BigDecimal price;
 	
 	private BigDecimal appropriationRatio;
@@ -89,6 +92,12 @@ public class TOrderTaskBo extends TOrderTask{
 	public void setAppropriationRatio(BigDecimal appropriationRatio) {
 		this.appropriationRatio = appropriationRatio;
 	}
+	public Integer getType() {
+		return type;
+	}
+	public void setType(Integer type) {
+		this.type = type;
+	}
 	
 	
 }

+ 2 - 1
src/main/java/com/goafanti/order/service/OrderNewService.java

@@ -11,6 +11,7 @@ import javax.servlet.http.HttpServletResponse;
 import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.TOrderDun;
 import com.goafanti.common.model.TOrderNew;
+import com.goafanti.common.model.TOrderNewWithBLOBs;
 import com.goafanti.common.model.TOrderOutsource;
 import com.goafanti.common.model.TOrderRefundWithBLOBs;
 import com.goafanti.common.model.TOrderTask;
@@ -65,7 +66,7 @@ public interface OrderNewService {
 	  * @param isSubmit
 	  * @return
 	  */
-	int updateServiceOrder(TOrderNew t, Integer isSubmit);
+	int updateServiceOrder(TOrderNewWithBLOBs t, Integer isSubmit);
 	/**
 	 * 订单详情
 	 * @param orderNo

+ 24 - 2
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -47,6 +47,7 @@ import com.goafanti.common.dao.TArrearsDunMapper;
 import com.goafanti.common.dao.TDunLogMapper;
 import com.goafanti.common.dao.TOrderBackMapper;
 import com.goafanti.common.dao.TOrderDunMapper;
+import com.goafanti.common.dao.TOrderExtendMapper;
 import com.goafanti.common.dao.TOrderLogMapper;
 import com.goafanti.common.dao.TOrderMidMapper;
 import com.goafanti.common.dao.TOrderNewMapper;
@@ -68,9 +69,11 @@ import com.goafanti.common.model.TArrearsDun;
 import com.goafanti.common.model.TDunLog;
 import com.goafanti.common.model.TOrderBack;
 import com.goafanti.common.model.TOrderDun;
+import com.goafanti.common.model.TOrderExtend;
 import com.goafanti.common.model.TOrderLog;
 import com.goafanti.common.model.TOrderMid;
 import com.goafanti.common.model.TOrderNew;
+import com.goafanti.common.model.TOrderNewWithBLOBs;
 import com.goafanti.common.model.TOrderOutsource;
 import com.goafanti.common.model.TOrderRefundWithBLOBs;
 import com.goafanti.common.model.TOrderTask;
@@ -151,6 +154,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	@Autowired
 	private TArrearsDunMapper	tArrearsDunMapper;
 	@Autowired
+	private TOrderExtendMapper	tOrderExtendMapper;
+	@Autowired
 	private UserMapper	userMapper;
 	@Value(value = "${mobileRemindCodeTemplate}")
 	private String					mobileRemindCodeTemplate	= null;
@@ -170,7 +175,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	public int createServiceOrder(String uid, Integer orderType) {
 		BigDecimal initial = new BigDecimal(0);
 		TOrderNew t=new TOrderNew();
-		t.setOrderNo(idGenerator.generateId().toString());
+		String orderNo=idGenerator.generateId().toString();
+		t.setOrderNo(orderNo);
 		t.setOrderType(orderType);
 		t.setOrderStatus(OrderNewState.DQD.getCode());
 		t.setFirstAmount(initial);
@@ -187,6 +193,10 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		t.setCreateTime(new Date());
 		t.setUpdateTime(new Date());
 		t.setBuyerId(uid);
+		TOrderExtend te=new TOrderExtend();
+		te.setOrderNo(orderNo);
+		te.setServiceStatus(0);
+		tOrderExtendMapper.insertSelective(te);
 		return tOrderNewMapper.insertSelective(t); 
 	}
 
@@ -260,7 +270,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 
 	@Override
-	public int updateServiceOrder(TOrderNew t, Integer isSubmit) {
+	public int updateServiceOrder(TOrderNewWithBLOBs t, Integer isSubmit) {
 		TOrderNew t2=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
 		//判断手机号码是否存在
 		if (StringUtils.isNotBlank(t.getContacts())&&StringUtils.isNotBlank(t.getContactMobile())&&
@@ -273,6 +283,18 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			contactBook.setMobile(t.getContactMobile());
 			organizationContactBookMapper.insertSelective(contactBook);
 		}
+		if (t.getServiceStatus()==1) {
+			TOrderExtend te=new TOrderExtend();
+			te.setOrderNo(t.getOrderNo());
+			te.setServiceStatus(t.getServiceStatus());
+			te.setPaymentMethod(t.getPaymentMethod());
+			te.setPaymentRatio(t.getPaymentRatio());
+			te.setServiceAmount(t.getServiceAmount());
+			te.setServiceName(t.getServiceName());
+			te.setServiceRemarks(t.getServiceRemarks());
+			te.setPaymentStatus(1);//设定为已发起
+			tOrderExtendMapper.updateByPrimaryKeySelective(te);
+		}
 		if (StringUtils.isBlank(t.getOrderDep())) {
 			t.setOrderDep(adminMapper.selectByPrimaryKey(TokenManager.getAdminId()).getDepartmentId());
 		}

+ 62 - 0
src/main/java/com/goafanti/organization/controller/ThirdPartyCompanyApiController.java

@@ -0,0 +1,62 @@
+package com.goafanti.organization.controller;
+
+
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.goafanti.common.bo.Result;
+import com.goafanti.common.constant.ErrorConstants;
+import com.goafanti.common.controller.BaseApiController;
+import com.goafanti.common.model.ThirdPartyCompany;
+import com.goafanti.common.utils.StringUtils;
+import com.goafanti.organization.service.ThirdPartyCompanyService;
+
+
+
+@RestController
+@RequestMapping("/api/admin/company")
+public class ThirdPartyCompanyApiController extends BaseApiController{
+	@Resource
+	private ThirdPartyCompanyService thirdPartyCompanyService;
+	
+	@RequestMapping(value = "/addCompany" , method = RequestMethod.POST)
+	public Result addCompany(ThirdPartyCompany t) {
+		Result res =new Result();
+		if (StringUtils.isBlank(t.getCompanyName())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"名称","名称"));
+			return res;
+		}
+		res.data(thirdPartyCompanyService.addCompany(t));
+		return res;
+	}
+	
+	@RequestMapping(value = "/updateCompany" , method = RequestMethod.POST)
+	public Result updateCompany(ThirdPartyCompany t) {
+		Result res =new Result();
+		if (null==t.getId()) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"编号","编号"));
+			return res;
+		}
+		if (StringUtils.isBlank(t.getCompanyName())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"名称","名称"));
+			return res;
+		}
+		res.data(thirdPartyCompanyService.updateCompany(t));
+		return res;
+	}
+	
+	@RequestMapping(value = "/selectVague" , method = RequestMethod.GET)
+	public Result selectVague(String  name) {
+		Result res =new Result();
+		if (StringUtils.isBlank(name)) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"名称","名称"));
+			return res;
+		}
+		res.data(thirdPartyCompanyService.selectVague(name));
+		return res;
+	}
+	
+}

+ 16 - 0
src/main/java/com/goafanti/organization/service/ThirdPartyCompanyService.java

@@ -0,0 +1,16 @@
+package com.goafanti.organization.service;
+
+import java.util.List;
+
+import com.goafanti.common.model.CompanyLibrary;
+import com.goafanti.common.model.ThirdPartyCompany;
+
+public interface ThirdPartyCompanyService {
+
+	int addCompany(ThirdPartyCompany t);
+
+	List<CompanyLibrary> selectVague(String name);
+
+	int updateCompany(ThirdPartyCompany t);
+
+}

+ 64 - 0
src/main/java/com/goafanti/organization/service/impl/ThirdPartyCompanyServiceImpl.java

@@ -0,0 +1,64 @@
+package com.goafanti.organization.service.impl;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.goafanti.common.dao.CompanyLibraryMapper;
+import com.goafanti.common.dao.ThirdPartyCompanyMapper;
+import com.goafanti.common.model.CompanyLibrary;
+import com.goafanti.common.model.ThirdPartyCompany;
+import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.shiro.token.TokenManager;
+import com.goafanti.organization.service.ThirdPartyCompanyService;
+
+@Service
+public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyCompanyMapper> implements ThirdPartyCompanyService {
+
+	@Autowired
+	private ThirdPartyCompanyMapper	thirdPartyCompanyMapper;
+	@Autowired
+	private CompanyLibraryMapper	companyLibraryMapper;
+	
+
+
+	@Override
+	public int addCompany(ThirdPartyCompany t) {
+		if (t.getCid()==null) {
+			List<String> list=companyLibraryMapper.selectName(t.getCompanyName());
+			if (list.size()<1) {
+				CompanyLibrary c=new CompanyLibrary();
+				c.setCompanyName(t.getCompanyName());
+				c.setAid(TokenManager.getAdminId());
+				companyLibraryMapper.insertSelectiveGetId(c);
+				t.setCid(c.getId());
+			}else {
+				t.setCid(Integer.parseInt(list.get(0)));
+			}
+		}
+		return thirdPartyCompanyMapper.insertSelective(t);
+	}
+
+
+	@Override
+	public int updateCompany(ThirdPartyCompany t) {
+		if (t.getCid()==null) {
+			CompanyLibrary c=new CompanyLibrary();
+			c.setCompanyName(t.getCompanyName());
+			c.setAid(TokenManager.getAdminId());
+			companyLibraryMapper.insertSelectiveGetId(c);
+			t.setCid(c.getId());
+		}
+		return thirdPartyCompanyMapper.updateByPrimaryKeySelective(t);
+	}
+
+
+	@Override
+	public List<CompanyLibrary> selectVague(String name) {
+		return companyLibraryMapper.selectVague(name);
+	}
+
+
+
+}

+ 9 - 0
src/main/java/com/goafanti/techproject/bo/ProjectListBo.java

@@ -40,6 +40,9 @@ public class ProjectListBo {
 	private String completeDate;
 	/** 任务分配情况 **/
 	private Integer taskDistribution;
+	
+	/** 项目类型 */
+	private Integer type;
 	public String getId() {
 		return id;
 	}
@@ -160,4 +163,10 @@ public class ProjectListBo {
 	public void setTaskDistribution(Integer taskDistribution) {
 		this.taskDistribution = taskDistribution;
 	}
+	public Integer getType() {
+		return type;
+	}
+	public void setType(Integer type) {
+		this.type = type;
+	}
 }

+ 1 - 0
src/main/java/com/goafanti/techproject/service/impl/TechProjectServiceImpl.java

@@ -336,6 +336,7 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 		Map<String, Object> params = new HashMap<>();
 		if(StringUtils.isNotBlank(bo.getBuyerName())) params.put("buyerName", bo.getBuyerName());
 		if(bo.getDeletedSign() != null) params.put("deletedSign", bo.getDeletedSign());
+		if(bo.getType() != null) params.put("type", bo.getType());
 		if(bo.getTaskDistribution() != null) params.put("taskDistribution", bo.getTaskDistribution());
 		if(StringUtils.isNotBlank(bo.getOrderNo())) params.put("orderNo", bo.getOrderNo());
 		if(StringUtils.isNotBlank(bo.getSalesmanName())) params.put("salesmanName", bo.getSalesmanName());

+ 2 - 2
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.46
+#static.host=//sb.jishutao.com/1.1.47
 #avatar.host=//sb.jishutao.com
 
 #连测试
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.1.46
+static.host=//static.jishutao.com/1.1.47
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload