ソースを参照

项目模块修改

Signed-off-by: anderx <312518615@qq.com>
anderx 6 年 前
コミット
f80032afc5

+ 1 - 1
GeneratorConfig.xml

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

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

@@ -91,7 +91,7 @@ public class AdminVarietiesApiController extends CertifyApiController{
 	 * 保存编辑信息
 	 */
 	@RequestMapping(value = "/editVarieties", method = RequestMethod.POST)
-	public Result editVarieties (String id,String cname,String superId,String  status,String varietiesLogo) {
+	public Result editVarieties (String id,String cname,String superId,String  status,String varietiesLogo,Integer sort) {
 		Result res = new Result();
 		if (StringUtils.isBlank(cname)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "品类名称为空", "品类名称"));
@@ -117,7 +117,7 @@ public class AdminVarietiesApiController extends CertifyApiController{
 			res.getError().add(buildError( "品类下级最多存在99个", "品类下级最多存在99个")); 
 			return res;
 		}
-		res.setData(businessVarietiesService.updateVarietoes(id, cname, superId, status, varietiesLogo));
+		res.setData(businessVarietiesService.updateVarietoes(id, cname, superId, status, varietiesLogo,sort));
 		return res; 
 	}
 	/**

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

@@ -18,7 +18,7 @@ public interface BusinessVarietiesService {
 	
 	BusinessVarietiesBo editVarieties(String id);
 	
-	int updateVarietoes(String id,String cname,String superId,String status,String varietiesLogo);
+	int updateVarietoes(String id,String cname,String superId,String status,String varietiesLogo,Integer sort);
 	
 	int deleteState(String id);
 	

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

@@ -255,7 +255,7 @@ public class BusinessProjectServiceImpl extends BaseMybatisDao<BusinessProjectMa
 		bp.setBoutique(s.getBoutique());
 		bp.setProjectUrl(s.getProjectUrl());
 		bp.setFirstPayment(s.getFirstPayment());
-		
+		bp.setType(s.getType());
 		if (null!=(s.getStatus())) {
 			bp.setStatus(s.getStatus());
 		}

+ 3 - 3
src/main/java/com/goafanti/business/service/impl/BusinessVarietiesServiceImpl.java

@@ -135,8 +135,7 @@ public class BusinessVarietiesServiceImpl extends BaseMybatisDao<BusinessCategor
 		return businessVarietiesMapper.editVarieties(id);
 	}
 	@Override
-	public int updateVarietoes(String id, String cname, String superId, String status,String varietiesLogo) {
-		
+	public int updateVarietoes(String id, String cname, String superId, String status,String varietiesLogo,Integer sort) {
 		BusinessCategory bs=new BusinessCategory();
 		bs=businessVarietiesMapper.selectByPrimaryKey(id);
 		bs.setCname(cname);
@@ -174,8 +173,9 @@ public class BusinessVarietiesServiceImpl extends BaseMybatisDao<BusinessCategor
 		bs.setLayer(bs.getCid().length()/2-1);
 		bs.setUpdateTime(new Date());
 		bs.setStatus(status);
+		bs.setSort(sort);
 		bs.setVarietiesLogo(varietiesLogo);
-		return businessVarietiesMapper.updateByPrimaryKey(bs);
+		return businessVarietiesMapper.updateByPrimaryKeySelective(bs);
 	}
 	
 	/**

+ 11 - 11
src/main/java/com/goafanti/common/dao/BusinessProjectMapper.java

@@ -13,68 +13,68 @@ public interface BusinessProjectMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	long countByExample(BusinessProjectExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	int deleteByExample(BusinessProjectExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	int deleteByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	int insert(BusinessProject record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	int insertSelective(BusinessProject record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	List<BusinessProject> selectByExample(BusinessProjectExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	BusinessProject selectByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	int updateByExampleSelective(@Param("record") BusinessProject record,
 			@Param("example") BusinessProjectExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	int updateByExample(@Param("record") BusinessProject record, @Param("example") BusinessProjectExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	int updateByPrimaryKeySelective(BusinessProject record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	int updateByPrimaryKey(BusinessProject record);
 

+ 66 - 49
src/main/java/com/goafanti/common/mapper/BusinessProjectMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Jan 20 14:53:04 CST 2018.
+      This element was generated on Thu Dec 05 10:07:00 CST 2019.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="create_id" jdbcType="VARCHAR" property="createId" />
@@ -28,17 +28,18 @@
     <result column="principal_id" jdbcType="VARCHAR" property="principalId" />
     <result column="Value_effect" jdbcType="VARCHAR" property="valueEffect" />
     <result column="client_size" jdbcType="VARCHAR" property="clientSize" />
-    <result column="max_logo" jdbcType="VARCHAR" property="maxLogo" />
     <result column="min_logo" jdbcType="VARCHAR" property="minLogo" />
-    <result column="boutique" jdbcType="INTEGER" property="boutique" />
+    <result column="max_logo" jdbcType="VARCHAR" property="maxLogo" />
     <result column="project_url" jdbcType="VARCHAR" property="projectUrl" />
+    <result column="boutique" jdbcType="INTEGER" property="boutique" />
     <result column="first_payment" jdbcType="DECIMAL" property="firstPayment" />
+    <result column="type" jdbcType="INTEGER" property="type" />
   </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 Sat Jan 20 14:53:04 CST 2018.
+      This element was generated on Thu Dec 05 10:07:00 CST 2019.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -72,7 +73,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Jan 20 14:53:04 CST 2018.
+      This element was generated on Thu Dec 05 10:07:00 CST 2019.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -106,18 +107,18 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Jan 20 14:53:04 CST 2018.
+      This element was generated on Thu Dec 05 10:07:00 CST 2019.
     -->
     id, create_id, create_time, update_time, delete_sign, bname, cid, price, offset, 
     activity_price, activity_flag, member_price, introduce, status, country, province, 
-    city, district, principal_id, Value_effect, client_size, max_logo, min_logo, boutique, 
-    project_url, first_payment
+    city, district, principal_id, Value_effect, client_size, min_logo, max_logo, project_url, 
+    boutique, first_payment, type
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.BusinessProjectExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Jan 20 14:53:04 CST 2018.
+      This element was generated on Thu Dec 05 10:07:00 CST 2019.
     -->
     select
     <if test="distinct">
@@ -136,7 +137,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Jan 20 14:53:04 CST 2018.
+      This element was generated on Thu Dec 05 10:07:00 CST 2019.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -147,7 +148,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Jan 20 14:53:04 CST 2018.
+      This element was generated on Thu Dec 05 10:07:00 CST 2019.
     -->
     delete from business_project
     where id = #{id,jdbcType=VARCHAR}
@@ -156,7 +157,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Jan 20 14:53:04 CST 2018.
+      This element was generated on Thu Dec 05 10:07:00 CST 2019.
     -->
     delete from business_project
     <if test="_parameter != null">
@@ -167,7 +168,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Jan 20 14:53:04 CST 2018.
+      This element was generated on Thu Dec 05 10:07:00 CST 2019.
     -->
     insert into business_project (id, create_id, create_time, 
       update_time, delete_sign, bname, 
@@ -176,8 +177,9 @@
       introduce, status, country, 
       province, city, district, 
       principal_id, Value_effect, client_size, 
-      max_logo, min_logo, boutique, 
-      project_url, first_payment)
+      min_logo, max_logo, project_url, 
+      boutique, first_payment, type
+      )
     values (#{id,jdbcType=VARCHAR}, #{createId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
       #{updateTime,jdbcType=TIMESTAMP}, #{deleteSign,jdbcType=INTEGER}, #{bname,jdbcType=VARCHAR}, 
       #{cid,jdbcType=VARCHAR}, #{price,jdbcType=DECIMAL}, #{offset,jdbcType=DECIMAL}, 
@@ -185,14 +187,15 @@
       #{introduce,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{country,jdbcType=VARCHAR}, 
       #{province,jdbcType=VARCHAR}, #{city,jdbcType=VARCHAR}, #{district,jdbcType=VARCHAR}, 
       #{principalId,jdbcType=VARCHAR}, #{valueEffect,jdbcType=VARCHAR}, #{clientSize,jdbcType=VARCHAR}, 
-      #{maxLogo,jdbcType=VARCHAR}, #{minLogo,jdbcType=VARCHAR}, #{boutique,jdbcType=INTEGER}, 
-      #{projectUrl,jdbcType=VARCHAR}, #{firstPayment,jdbcType=DECIMAL})
+      #{minLogo,jdbcType=VARCHAR}, #{maxLogo,jdbcType=VARCHAR}, #{projectUrl,jdbcType=VARCHAR}, 
+      #{boutique,jdbcType=INTEGER}, #{firstPayment,jdbcType=DECIMAL}, #{type,jdbcType=INTEGER}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.BusinessProject">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Jan 20 14:53:04 CST 2018.
+      This element was generated on Thu Dec 05 10:07:00 CST 2019.
     -->
     insert into business_project
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -259,21 +262,24 @@
       <if test="clientSize != null">
         client_size,
       </if>
-      <if test="maxLogo != null">
-        max_logo,
-      </if>
       <if test="minLogo != null">
         min_logo,
       </if>
-      <if test="boutique != null">
-        boutique,
+      <if test="maxLogo != null">
+        max_logo,
       </if>
       <if test="projectUrl != null">
         project_url,
       </if>
+      <if test="boutique != null">
+        boutique,
+      </if>
       <if test="firstPayment != null">
         first_payment,
       </if>
+      <if test="type != null">
+        type,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -339,28 +345,31 @@
       <if test="clientSize != null">
         #{clientSize,jdbcType=VARCHAR},
       </if>
-      <if test="maxLogo != null">
-        #{maxLogo,jdbcType=VARCHAR},
-      </if>
       <if test="minLogo != null">
         #{minLogo,jdbcType=VARCHAR},
       </if>
-      <if test="boutique != null">
-        #{boutique,jdbcType=INTEGER},
+      <if test="maxLogo != null">
+        #{maxLogo,jdbcType=VARCHAR},
       </if>
       <if test="projectUrl != null">
         #{projectUrl,jdbcType=VARCHAR},
       </if>
+      <if test="boutique != null">
+        #{boutique,jdbcType=INTEGER},
+      </if>
       <if test="firstPayment != null">
         #{firstPayment,jdbcType=DECIMAL},
       </if>
+      <if test="type != null">
+        #{type,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.BusinessProjectExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Jan 20 14:53:04 CST 2018.
+      This element was generated on Thu Dec 05 10:07:00 CST 2019.
     -->
     select count(*) from business_project
     <if test="_parameter != null">
@@ -371,7 +380,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Jan 20 14:53:04 CST 2018.
+      This element was generated on Thu Dec 05 10:07:00 CST 2019.
     -->
     update business_project
     <set>
@@ -438,21 +447,24 @@
       <if test="record.clientSize != null">
         client_size = #{record.clientSize,jdbcType=VARCHAR},
       </if>
-      <if test="record.maxLogo != null">
-        max_logo = #{record.maxLogo,jdbcType=VARCHAR},
-      </if>
       <if test="record.minLogo != null">
         min_logo = #{record.minLogo,jdbcType=VARCHAR},
       </if>
-      <if test="record.boutique != null">
-        boutique = #{record.boutique,jdbcType=INTEGER},
+      <if test="record.maxLogo != null">
+        max_logo = #{record.maxLogo,jdbcType=VARCHAR},
       </if>
       <if test="record.projectUrl != null">
         project_url = #{record.projectUrl,jdbcType=VARCHAR},
       </if>
+      <if test="record.boutique != null">
+        boutique = #{record.boutique,jdbcType=INTEGER},
+      </if>
       <if test="record.firstPayment != null">
         first_payment = #{record.firstPayment,jdbcType=DECIMAL},
       </if>
+      <if test="record.type != null">
+        type = #{record.type,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -462,7 +474,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Jan 20 14:53:04 CST 2018.
+      This element was generated on Thu Dec 05 10:07:00 CST 2019.
     -->
     update business_project
     set id = #{record.id,jdbcType=VARCHAR},
@@ -486,11 +498,12 @@
       principal_id = #{record.principalId,jdbcType=VARCHAR},
       Value_effect = #{record.valueEffect,jdbcType=VARCHAR},
       client_size = #{record.clientSize,jdbcType=VARCHAR},
-      max_logo = #{record.maxLogo,jdbcType=VARCHAR},
       min_logo = #{record.minLogo,jdbcType=VARCHAR},
-      boutique = #{record.boutique,jdbcType=INTEGER},
+      max_logo = #{record.maxLogo,jdbcType=VARCHAR},
       project_url = #{record.projectUrl,jdbcType=VARCHAR},
-      first_payment = #{record.firstPayment,jdbcType=DECIMAL}
+      boutique = #{record.boutique,jdbcType=INTEGER},
+      first_payment = #{record.firstPayment,jdbcType=DECIMAL},
+      type = #{record.type,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -499,7 +512,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Jan 20 14:53:04 CST 2018.
+      This element was generated on Thu Dec 05 10:07:00 CST 2019.
     -->
     update business_project
     <set>
@@ -563,21 +576,24 @@
       <if test="clientSize != null">
         client_size = #{clientSize,jdbcType=VARCHAR},
       </if>
-      <if test="maxLogo != null">
-        max_logo = #{maxLogo,jdbcType=VARCHAR},
-      </if>
       <if test="minLogo != null">
         min_logo = #{minLogo,jdbcType=VARCHAR},
       </if>
-      <if test="boutique != null">
-        boutique = #{boutique,jdbcType=INTEGER},
+      <if test="maxLogo != null">
+        max_logo = #{maxLogo,jdbcType=VARCHAR},
       </if>
       <if test="projectUrl != null">
         project_url = #{projectUrl,jdbcType=VARCHAR},
       </if>
+      <if test="boutique != null">
+        boutique = #{boutique,jdbcType=INTEGER},
+      </if>
       <if test="firstPayment != null">
         first_payment = #{firstPayment,jdbcType=DECIMAL},
       </if>
+      <if test="type != null">
+        type = #{type,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -585,7 +601,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Sat Jan 20 14:53:04 CST 2018.
+      This element was generated on Thu Dec 05 10:07:00 CST 2019.
     -->
     update business_project
     set create_id = #{createId,jdbcType=VARCHAR},
@@ -608,11 +624,12 @@
       principal_id = #{principalId,jdbcType=VARCHAR},
       Value_effect = #{valueEffect,jdbcType=VARCHAR},
       client_size = #{clientSize,jdbcType=VARCHAR},
-      max_logo = #{maxLogo,jdbcType=VARCHAR},
       min_logo = #{minLogo,jdbcType=VARCHAR},
-      boutique = #{boutique,jdbcType=INTEGER},
+      max_logo = #{maxLogo,jdbcType=VARCHAR},
       project_url = #{projectUrl,jdbcType=VARCHAR},
-      first_payment = #{firstPayment,jdbcType=DECIMAL}
+      boutique = #{boutique,jdbcType=INTEGER},
+      first_payment = #{firstPayment,jdbcType=DECIMAL},
+      type = #{type,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 

+ 5 - 8
src/main/java/com/goafanti/common/mapper/NewOrderDunMapper.xml

@@ -379,19 +379,16 @@
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="selectListNewOrderDun" resultType="com.goafanti.order.bo.OutNewOrderDunBo">
-  select id, order_no orderNo, tid, project_type projectType, dun_type dunType, wait_day waitDay, 
-  effective_year effectiveYear, aid, create_time createTime
-  from new_order_dun where 1=1
+  	 select a.id,a.order_no orderNo, a.tid, a.project_type projectType, a.dun_type dunType, a.wait_day waitDay, 
+  a.effective_year effectiveYear, a.aid, a.create_time createTime ,b.commodity_name commodityName
+  from new_order_dun a left join t_order_task b on a.tid=b.id where 1=1
   <if test="orderNo != null">
-  and  order_no= #{orderNo}
+  and  a.order_no= #{orderNo}
   </if>
   <if test="status != null">
-  and  status= #{status}
+  and  a.status= #{status}
   </if>
   
-  <if test="aid != null">
-  and  aid= #{aid}
-  </if>
   </select>
   <select id="selectAllOrderDun" resultType="com.goafanti.order.bo.OutNewOrderDunBo"> 
   select a.id, a.order_no orderNo, a.tid, a.project_type projectType, a.dun_type dunType, a.wait_day waitDay, 

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

@@ -903,9 +903,9 @@
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="selectOrderTask" resultType="com.goafanti.order.bo.TOrderTaskBo">
-  select a.id,e.contract_no contractNo,a.order_no as orderNo,h.nickname userName,f.name salesmanName,a.outsource_name outsourceName,
+    select a.id,e.contract_no contractNo,a.order_no as orderNo,h.nickname userName,f.name salesmanName,a.outsource_name outsourceName,
   a.outsource_price outsourcePrice,g.name depName,e.order_status orderStatus,d.name as contacts,d.contact_mobile as contactsMobile,a.main, c.cname,
-  a.commodity_name as commodityName,a.commodity_quantity as commodityQuantity,i.price,a.certificate_number as certificateNumber,
+  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.task_comment as taskComment ,a.commodity_price as commodityPrice, a.task_status as taskStatus,  a.task_receiver as taskReceiver 
   	 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

+ 131 - 108
src/main/java/com/goafanti/common/model/BusinessProject.java

@@ -8,139 +8,144 @@ public class BusinessProject {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.id
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	private String id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.create_id
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	private String createId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.create_time
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.update_time
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	private Date updateTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.delete_sign
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	private Integer deleteSign;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.bname
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	private String bname;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.cid
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	private String cid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.price
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	private BigDecimal price;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.offset
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	private BigDecimal offset;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.activity_price
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	private BigDecimal activityPrice;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.activity_flag
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	private String activityFlag;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.member_price
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	private BigDecimal memberPrice;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.introduce
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	private String introduce;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.status
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	private String status;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.country
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	private String country;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.province
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	private String province;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.city
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	private String city;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.district
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	private String district;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.principal_id
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	private String principalId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.Value_effect
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	private String valueEffect;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.client_size
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	private String clientSize;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.max_logo
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
-	 */
-	private String maxLogo;
-	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.min_logo
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	private String minLogo;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.boutique
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.max_logo
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
-	private Integer boutique;
+	private String maxLogo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.project_url
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	private String projectUrl;
 	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.boutique
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
+	 */
+	private Integer boutique;
+	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.first_payment
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	private BigDecimal firstPayment;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column business_project.type
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
+	 */
+	private Integer type;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.id
 	 * @return  the value of business_project.id
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public String getId() {
 		return id;
@@ -149,7 +154,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.id
 	 * @param id  the value for business_project.id
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public void setId(String id) {
 		this.id = id;
@@ -158,7 +163,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.create_id
 	 * @return  the value of business_project.create_id
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public String getCreateId() {
 		return createId;
@@ -167,7 +172,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.create_id
 	 * @param createId  the value for business_project.create_id
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public void setCreateId(String createId) {
 		this.createId = createId;
@@ -176,7 +181,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.create_time
 	 * @return  the value of business_project.create_time
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -185,7 +190,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.create_time
 	 * @param createTime  the value for business_project.create_time
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -194,7 +199,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.update_time
 	 * @return  the value of business_project.update_time
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public Date getUpdateTime() {
 		return updateTime;
@@ -203,7 +208,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.update_time
 	 * @param updateTime  the value for business_project.update_time
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public void setUpdateTime(Date updateTime) {
 		this.updateTime = updateTime;
@@ -212,7 +217,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.delete_sign
 	 * @return  the value of business_project.delete_sign
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public Integer getDeleteSign() {
 		return deleteSign;
@@ -221,7 +226,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.delete_sign
 	 * @param deleteSign  the value for business_project.delete_sign
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public void setDeleteSign(Integer deleteSign) {
 		this.deleteSign = deleteSign;
@@ -230,7 +235,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.bname
 	 * @return  the value of business_project.bname
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public String getBname() {
 		return bname;
@@ -239,7 +244,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.bname
 	 * @param bname  the value for business_project.bname
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public void setBname(String bname) {
 		this.bname = bname;
@@ -248,7 +253,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.cid
 	 * @return  the value of business_project.cid
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public String getCid() {
 		return cid;
@@ -257,7 +262,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.cid
 	 * @param cid  the value for business_project.cid
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public void setCid(String cid) {
 		this.cid = cid;
@@ -266,7 +271,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.price
 	 * @return  the value of business_project.price
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public BigDecimal getPrice() {
 		return price;
@@ -275,7 +280,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.price
 	 * @param price  the value for business_project.price
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public void setPrice(BigDecimal price) {
 		this.price = price;
@@ -284,7 +289,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.offset
 	 * @return  the value of business_project.offset
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public BigDecimal getOffset() {
 		return offset;
@@ -293,7 +298,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.offset
 	 * @param offset  the value for business_project.offset
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public void setOffset(BigDecimal offset) {
 		this.offset = offset;
@@ -302,7 +307,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.activity_price
 	 * @return  the value of business_project.activity_price
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public BigDecimal getActivityPrice() {
 		return activityPrice;
@@ -311,7 +316,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.activity_price
 	 * @param activityPrice  the value for business_project.activity_price
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public void setActivityPrice(BigDecimal activityPrice) {
 		this.activityPrice = activityPrice;
@@ -320,7 +325,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.activity_flag
 	 * @return  the value of business_project.activity_flag
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public String getActivityFlag() {
 		return activityFlag;
@@ -329,7 +334,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.activity_flag
 	 * @param activityFlag  the value for business_project.activity_flag
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public void setActivityFlag(String activityFlag) {
 		this.activityFlag = activityFlag;
@@ -338,7 +343,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.member_price
 	 * @return  the value of business_project.member_price
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public BigDecimal getMemberPrice() {
 		return memberPrice;
@@ -347,7 +352,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.member_price
 	 * @param memberPrice  the value for business_project.member_price
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public void setMemberPrice(BigDecimal memberPrice) {
 		this.memberPrice = memberPrice;
@@ -356,7 +361,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.introduce
 	 * @return  the value of business_project.introduce
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public String getIntroduce() {
 		return introduce;
@@ -365,7 +370,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.introduce
 	 * @param introduce  the value for business_project.introduce
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public void setIntroduce(String introduce) {
 		this.introduce = introduce;
@@ -374,7 +379,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.status
 	 * @return  the value of business_project.status
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public String getStatus() {
 		return status;
@@ -383,7 +388,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.status
 	 * @param status  the value for business_project.status
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public void setStatus(String status) {
 		this.status = status;
@@ -392,7 +397,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.country
 	 * @return  the value of business_project.country
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public String getCountry() {
 		return country;
@@ -401,7 +406,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.country
 	 * @param country  the value for business_project.country
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public void setCountry(String country) {
 		this.country = country;
@@ -410,7 +415,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.province
 	 * @return  the value of business_project.province
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public String getProvince() {
 		return province;
@@ -419,7 +424,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.province
 	 * @param province  the value for business_project.province
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public void setProvince(String province) {
 		this.province = province;
@@ -428,7 +433,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.city
 	 * @return  the value of business_project.city
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public String getCity() {
 		return city;
@@ -437,7 +442,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.city
 	 * @param city  the value for business_project.city
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public void setCity(String city) {
 		this.city = city;
@@ -446,7 +451,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.district
 	 * @return  the value of business_project.district
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public String getDistrict() {
 		return district;
@@ -455,7 +460,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.district
 	 * @param district  the value for business_project.district
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public void setDistrict(String district) {
 		this.district = district;
@@ -464,7 +469,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.principal_id
 	 * @return  the value of business_project.principal_id
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public String getPrincipalId() {
 		return principalId;
@@ -473,7 +478,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.principal_id
 	 * @param principalId  the value for business_project.principal_id
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public void setPrincipalId(String principalId) {
 		this.principalId = principalId;
@@ -482,7 +487,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.Value_effect
 	 * @return  the value of business_project.Value_effect
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public String getValueEffect() {
 		return valueEffect;
@@ -491,7 +496,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.Value_effect
 	 * @param valueEffect  the value for business_project.Value_effect
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public void setValueEffect(String valueEffect) {
 		this.valueEffect = valueEffect;
@@ -500,7 +505,7 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.client_size
 	 * @return  the value of business_project.client_size
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public String getClientSize() {
 		return clientSize;
@@ -509,34 +514,16 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.client_size
 	 * @param clientSize  the value for business_project.client_size
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public void setClientSize(String clientSize) {
 		this.clientSize = clientSize;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.max_logo
-	 * @return  the value of business_project.max_logo
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
-	 */
-	public String getMaxLogo() {
-		return maxLogo;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.max_logo
-	 * @param maxLogo  the value for business_project.max_logo
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
-	 */
-	public void setMaxLogo(String maxLogo) {
-		this.maxLogo = maxLogo;
-	}
-
-	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.min_logo
 	 * @return  the value of business_project.min_logo
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public String getMinLogo() {
 		return minLogo;
@@ -545,34 +532,34 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.min_logo
 	 * @param minLogo  the value for business_project.min_logo
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public void setMinLogo(String minLogo) {
 		this.minLogo = minLogo;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.boutique
-	 * @return  the value of business_project.boutique
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.max_logo
+	 * @return  the value of business_project.max_logo
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
-	public Integer getBoutique() {
-		return boutique;
+	public String getMaxLogo() {
+		return maxLogo;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.boutique
-	 * @param boutique  the value for business_project.boutique
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.max_logo
+	 * @param maxLogo  the value for business_project.max_logo
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
-	public void setBoutique(Integer boutique) {
-		this.boutique = boutique;
+	public void setMaxLogo(String maxLogo) {
+		this.maxLogo = maxLogo;
 	}
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.project_url
 	 * @return  the value of business_project.project_url
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public String getProjectUrl() {
 		return projectUrl;
@@ -581,16 +568,34 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.project_url
 	 * @param projectUrl  the value for business_project.project_url
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public void setProjectUrl(String projectUrl) {
 		this.projectUrl = projectUrl;
 	}
 
 	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.boutique
+	 * @return  the value of business_project.boutique
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
+	 */
+	public Integer getBoutique() {
+		return boutique;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.boutique
+	 * @param boutique  the value for business_project.boutique
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
+	 */
+	public void setBoutique(Integer boutique) {
+		this.boutique = boutique;
+	}
+
+	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.first_payment
 	 * @return  the value of business_project.first_payment
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public BigDecimal getFirstPayment() {
 		return firstPayment;
@@ -599,12 +604,30 @@ public class BusinessProject {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.first_payment
 	 * @param firstPayment  the value for business_project.first_payment
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public void setFirstPayment(BigDecimal firstPayment) {
 		this.firstPayment = firstPayment;
 	}
 
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column business_project.type
+	 * @return  the value of business_project.type
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
+	 */
+	public Integer getType() {
+		return type;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column business_project.type
+	 * @param type  the value for business_project.type
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
+	 */
+	public void setType(Integer type) {
+		this.type = type;
+	}
+
 	@Override
 	public String toString() {
 		return "BusinessProject [id=" + id + ", createId=" + createId + ", createTime=" + createTime + ", updateTime="

+ 162 - 102
src/main/java/com/goafanti/common/model/BusinessProjectExample.java

@@ -8,23 +8,23 @@ import java.util.List;
 public class BusinessProjectExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table business_project
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table business_project
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table business_project
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public BusinessProjectExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -32,7 +32,7 @@ public class BusinessProjectExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -40,7 +40,7 @@ public class BusinessProjectExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -48,7 +48,7 @@ public class BusinessProjectExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -56,7 +56,7 @@ public class BusinessProjectExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -64,7 +64,7 @@ public class BusinessProjectExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -72,7 +72,7 @@ public class BusinessProjectExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -80,7 +80,7 @@ public class BusinessProjectExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -90,7 +90,7 @@ public class BusinessProjectExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -102,7 +102,7 @@ public class BusinessProjectExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -111,7 +111,7 @@ public class BusinessProjectExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table business_project
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -121,7 +121,7 @@ public class BusinessProjectExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table business_project
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -1564,6 +1564,76 @@ public class BusinessProjectExample {
 			return (Criteria) this;
 		}
 
+		public Criteria andMinLogoIsNull() {
+			addCriterion("min_logo is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andMinLogoIsNotNull() {
+			addCriterion("min_logo is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andMinLogoEqualTo(String value) {
+			addCriterion("min_logo =", value, "minLogo");
+			return (Criteria) this;
+		}
+
+		public Criteria andMinLogoNotEqualTo(String value) {
+			addCriterion("min_logo <>", value, "minLogo");
+			return (Criteria) this;
+		}
+
+		public Criteria andMinLogoGreaterThan(String value) {
+			addCriterion("min_logo >", value, "minLogo");
+			return (Criteria) this;
+		}
+
+		public Criteria andMinLogoGreaterThanOrEqualTo(String value) {
+			addCriterion("min_logo >=", value, "minLogo");
+			return (Criteria) this;
+		}
+
+		public Criteria andMinLogoLessThan(String value) {
+			addCriterion("min_logo <", value, "minLogo");
+			return (Criteria) this;
+		}
+
+		public Criteria andMinLogoLessThanOrEqualTo(String value) {
+			addCriterion("min_logo <=", value, "minLogo");
+			return (Criteria) this;
+		}
+
+		public Criteria andMinLogoLike(String value) {
+			addCriterion("min_logo like", value, "minLogo");
+			return (Criteria) this;
+		}
+
+		public Criteria andMinLogoNotLike(String value) {
+			addCriterion("min_logo not like", value, "minLogo");
+			return (Criteria) this;
+		}
+
+		public Criteria andMinLogoIn(List<String> values) {
+			addCriterion("min_logo in", values, "minLogo");
+			return (Criteria) this;
+		}
+
+		public Criteria andMinLogoNotIn(List<String> values) {
+			addCriterion("min_logo not in", values, "minLogo");
+			return (Criteria) this;
+		}
+
+		public Criteria andMinLogoBetween(String value1, String value2) {
+			addCriterion("min_logo between", value1, value2, "minLogo");
+			return (Criteria) this;
+		}
+
+		public Criteria andMinLogoNotBetween(String value1, String value2) {
+			addCriterion("min_logo not between", value1, value2, "minLogo");
+			return (Criteria) this;
+		}
+
 		public Criteria andMaxLogoIsNull() {
 			addCriterion("max_logo is null");
 			return (Criteria) this;
@@ -1634,73 +1704,73 @@ public class BusinessProjectExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andMinLogoIsNull() {
-			addCriterion("min_logo is null");
+		public Criteria andProjectUrlIsNull() {
+			addCriterion("project_url is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andMinLogoIsNotNull() {
-			addCriterion("min_logo is not null");
+		public Criteria andProjectUrlIsNotNull() {
+			addCriterion("project_url is not null");
 			return (Criteria) this;
 		}
 
-		public Criteria andMinLogoEqualTo(String value) {
-			addCriterion("min_logo =", value, "minLogo");
+		public Criteria andProjectUrlEqualTo(String value) {
+			addCriterion("project_url =", value, "projectUrl");
 			return (Criteria) this;
 		}
 
-		public Criteria andMinLogoNotEqualTo(String value) {
-			addCriterion("min_logo <>", value, "minLogo");
+		public Criteria andProjectUrlNotEqualTo(String value) {
+			addCriterion("project_url <>", value, "projectUrl");
 			return (Criteria) this;
 		}
 
-		public Criteria andMinLogoGreaterThan(String value) {
-			addCriterion("min_logo >", value, "minLogo");
+		public Criteria andProjectUrlGreaterThan(String value) {
+			addCriterion("project_url >", value, "projectUrl");
 			return (Criteria) this;
 		}
 
-		public Criteria andMinLogoGreaterThanOrEqualTo(String value) {
-			addCriterion("min_logo >=", value, "minLogo");
+		public Criteria andProjectUrlGreaterThanOrEqualTo(String value) {
+			addCriterion("project_url >=", value, "projectUrl");
 			return (Criteria) this;
 		}
 
-		public Criteria andMinLogoLessThan(String value) {
-			addCriterion("min_logo <", value, "minLogo");
+		public Criteria andProjectUrlLessThan(String value) {
+			addCriterion("project_url <", value, "projectUrl");
 			return (Criteria) this;
 		}
 
-		public Criteria andMinLogoLessThanOrEqualTo(String value) {
-			addCriterion("min_logo <=", value, "minLogo");
+		public Criteria andProjectUrlLessThanOrEqualTo(String value) {
+			addCriterion("project_url <=", value, "projectUrl");
 			return (Criteria) this;
 		}
 
-		public Criteria andMinLogoLike(String value) {
-			addCriterion("min_logo like", value, "minLogo");
+		public Criteria andProjectUrlLike(String value) {
+			addCriterion("project_url like", value, "projectUrl");
 			return (Criteria) this;
 		}
 
-		public Criteria andMinLogoNotLike(String value) {
-			addCriterion("min_logo not like", value, "minLogo");
+		public Criteria andProjectUrlNotLike(String value) {
+			addCriterion("project_url not like", value, "projectUrl");
 			return (Criteria) this;
 		}
 
-		public Criteria andMinLogoIn(List<String> values) {
-			addCriterion("min_logo in", values, "minLogo");
+		public Criteria andProjectUrlIn(List<String> values) {
+			addCriterion("project_url in", values, "projectUrl");
 			return (Criteria) this;
 		}
 
-		public Criteria andMinLogoNotIn(List<String> values) {
-			addCriterion("min_logo not in", values, "minLogo");
+		public Criteria andProjectUrlNotIn(List<String> values) {
+			addCriterion("project_url not in", values, "projectUrl");
 			return (Criteria) this;
 		}
 
-		public Criteria andMinLogoBetween(String value1, String value2) {
-			addCriterion("min_logo between", value1, value2, "minLogo");
+		public Criteria andProjectUrlBetween(String value1, String value2) {
+			addCriterion("project_url between", value1, value2, "projectUrl");
 			return (Criteria) this;
 		}
 
-		public Criteria andMinLogoNotBetween(String value1, String value2) {
-			addCriterion("min_logo not between", value1, value2, "minLogo");
+		public Criteria andProjectUrlNotBetween(String value1, String value2) {
+			addCriterion("project_url not between", value1, value2, "projectUrl");
 			return (Criteria) this;
 		}
 
@@ -1764,140 +1834,130 @@ public class BusinessProjectExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andProjectUrlIsNull() {
-			addCriterion("project_url is null");
-			return (Criteria) this;
-		}
-
-		public Criteria andProjectUrlIsNotNull() {
-			addCriterion("project_url is not null");
-			return (Criteria) this;
-		}
-
-		public Criteria andProjectUrlEqualTo(String value) {
-			addCriterion("project_url =", value, "projectUrl");
+		public Criteria andFirstPaymentIsNull() {
+			addCriterion("first_payment is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andProjectUrlNotEqualTo(String value) {
-			addCriterion("project_url <>", value, "projectUrl");
+		public Criteria andFirstPaymentIsNotNull() {
+			addCriterion("first_payment is not null");
 			return (Criteria) this;
 		}
 
-		public Criteria andProjectUrlGreaterThan(String value) {
-			addCriterion("project_url >", value, "projectUrl");
+		public Criteria andFirstPaymentEqualTo(BigDecimal value) {
+			addCriterion("first_payment =", value, "firstPayment");
 			return (Criteria) this;
 		}
 
-		public Criteria andProjectUrlGreaterThanOrEqualTo(String value) {
-			addCriterion("project_url >=", value, "projectUrl");
+		public Criteria andFirstPaymentNotEqualTo(BigDecimal value) {
+			addCriterion("first_payment <>", value, "firstPayment");
 			return (Criteria) this;
 		}
 
-		public Criteria andProjectUrlLessThan(String value) {
-			addCriterion("project_url <", value, "projectUrl");
+		public Criteria andFirstPaymentGreaterThan(BigDecimal value) {
+			addCriterion("first_payment >", value, "firstPayment");
 			return (Criteria) this;
 		}
 
-		public Criteria andProjectUrlLessThanOrEqualTo(String value) {
-			addCriterion("project_url <=", value, "projectUrl");
+		public Criteria andFirstPaymentGreaterThanOrEqualTo(BigDecimal value) {
+			addCriterion("first_payment >=", value, "firstPayment");
 			return (Criteria) this;
 		}
 
-		public Criteria andProjectUrlLike(String value) {
-			addCriterion("project_url like", value, "projectUrl");
+		public Criteria andFirstPaymentLessThan(BigDecimal value) {
+			addCriterion("first_payment <", value, "firstPayment");
 			return (Criteria) this;
 		}
 
-		public Criteria andProjectUrlNotLike(String value) {
-			addCriterion("project_url not like", value, "projectUrl");
+		public Criteria andFirstPaymentLessThanOrEqualTo(BigDecimal value) {
+			addCriterion("first_payment <=", value, "firstPayment");
 			return (Criteria) this;
 		}
 
-		public Criteria andProjectUrlIn(List<String> values) {
-			addCriterion("project_url in", values, "projectUrl");
+		public Criteria andFirstPaymentIn(List<BigDecimal> values) {
+			addCriterion("first_payment in", values, "firstPayment");
 			return (Criteria) this;
 		}
 
-		public Criteria andProjectUrlNotIn(List<String> values) {
-			addCriterion("project_url not in", values, "projectUrl");
+		public Criteria andFirstPaymentNotIn(List<BigDecimal> values) {
+			addCriterion("first_payment not in", values, "firstPayment");
 			return (Criteria) this;
 		}
 
-		public Criteria andProjectUrlBetween(String value1, String value2) {
-			addCriterion("project_url between", value1, value2, "projectUrl");
+		public Criteria andFirstPaymentBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("first_payment between", value1, value2, "firstPayment");
 			return (Criteria) this;
 		}
 
-		public Criteria andProjectUrlNotBetween(String value1, String value2) {
-			addCriterion("project_url not between", value1, value2, "projectUrl");
+		public Criteria andFirstPaymentNotBetween(BigDecimal value1, BigDecimal value2) {
+			addCriterion("first_payment not between", value1, value2, "firstPayment");
 			return (Criteria) this;
 		}
 
-		public Criteria andFirstPaymentIsNull() {
-			addCriterion("first_payment is null");
+		public Criteria andTypeIsNull() {
+			addCriterion("type is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andFirstPaymentIsNotNull() {
-			addCriterion("first_payment is not null");
+		public Criteria andTypeIsNotNull() {
+			addCriterion("type is not null");
 			return (Criteria) this;
 		}
 
-		public Criteria andFirstPaymentEqualTo(BigDecimal value) {
-			addCriterion("first_payment =", value, "firstPayment");
+		public Criteria andTypeEqualTo(Integer value) {
+			addCriterion("type =", value, "type");
 			return (Criteria) this;
 		}
 
-		public Criteria andFirstPaymentNotEqualTo(BigDecimal value) {
-			addCriterion("first_payment <>", value, "firstPayment");
+		public Criteria andTypeNotEqualTo(Integer value) {
+			addCriterion("type <>", value, "type");
 			return (Criteria) this;
 		}
 
-		public Criteria andFirstPaymentGreaterThan(BigDecimal value) {
-			addCriterion("first_payment >", value, "firstPayment");
+		public Criteria andTypeGreaterThan(Integer value) {
+			addCriterion("type >", value, "type");
 			return (Criteria) this;
 		}
 
-		public Criteria andFirstPaymentGreaterThanOrEqualTo(BigDecimal value) {
-			addCriterion("first_payment >=", value, "firstPayment");
+		public Criteria andTypeGreaterThanOrEqualTo(Integer value) {
+			addCriterion("type >=", value, "type");
 			return (Criteria) this;
 		}
 
-		public Criteria andFirstPaymentLessThan(BigDecimal value) {
-			addCriterion("first_payment <", value, "firstPayment");
+		public Criteria andTypeLessThan(Integer value) {
+			addCriterion("type <", value, "type");
 			return (Criteria) this;
 		}
 
-		public Criteria andFirstPaymentLessThanOrEqualTo(BigDecimal value) {
-			addCriterion("first_payment <=", value, "firstPayment");
+		public Criteria andTypeLessThanOrEqualTo(Integer value) {
+			addCriterion("type <=", value, "type");
 			return (Criteria) this;
 		}
 
-		public Criteria andFirstPaymentIn(List<BigDecimal> values) {
-			addCriterion("first_payment in", values, "firstPayment");
+		public Criteria andTypeIn(List<Integer> values) {
+			addCriterion("type in", values, "type");
 			return (Criteria) this;
 		}
 
-		public Criteria andFirstPaymentNotIn(List<BigDecimal> values) {
-			addCriterion("first_payment not in", values, "firstPayment");
+		public Criteria andTypeNotIn(List<Integer> values) {
+			addCriterion("type not in", values, "type");
 			return (Criteria) this;
 		}
 
-		public Criteria andFirstPaymentBetween(BigDecimal value1, BigDecimal value2) {
-			addCriterion("first_payment between", value1, value2, "firstPayment");
+		public Criteria andTypeBetween(Integer value1, Integer value2) {
+			addCriterion("type between", value1, value2, "type");
 			return (Criteria) this;
 		}
 
-		public Criteria andFirstPaymentNotBetween(BigDecimal value1, BigDecimal value2) {
-			addCriterion("first_payment not between", value1, value2, "firstPayment");
+		public Criteria andTypeNotBetween(Integer value1, Integer value2) {
+			addCriterion("type not between", value1, value2, "type");
 			return (Criteria) this;
 		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table business_project
-	 * @mbg.generated  Sat Jan 20 14:53:04 CST 2018
+	 * @mbg.generated  Thu Dec 05 10:07:00 CST 2019
 	 */
 	public static class Criterion {
 		private String condition;

+ 11 - 1
src/main/java/com/goafanti/order/bo/OutNewOrderDunBo.java

@@ -5,7 +5,9 @@ import com.goafanti.order.enums.NewOrderDunType;
 
 public class OutNewOrderDunBo extends NewOrderDun {
 	private String dunTypeName;
-
+	
+	private String commodityName;
+	
 	public String getDunTypeName() {
 		if(super.getDunType()!=null&&super.getProjectType()!=null) {
 			return NewOrderDunType.getValueByCode(Integer.valueOf(""+super.getProjectType()+super.getDunType()));
@@ -17,4 +19,12 @@ public class OutNewOrderDunBo extends NewOrderDun {
 		this.dunTypeName = dunTypeName;
 	}
 
+	public String getCommodityName() {
+		return commodityName;
+	}
+
+	public void setCommodityName(String commodityName) {
+		this.commodityName = commodityName;
+	}
+
 }

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

@@ -8,6 +8,7 @@ public class TOrderTaskBo extends TOrderTask{
 	private String contacts;
 	private String contactsMobile;
 	private String cname;
+	private Integer cSort;
 	private String contractNo;
 
 	private String salesmanName;
@@ -90,5 +91,11 @@ public class TOrderTaskBo extends TOrderTask{
 	public void setPrice(BigDecimal price) {
 		this.price = price;
 	}
+	public Integer getcSort() {
+		return cSort;
+	}
+	public void setcSort(Integer cSort) {
+		this.cSort = cSort;
+	}
 	
 }

+ 2 - 2
src/main/java/com/goafanti/order/controller/AdminNewOrderDunApiController.java

@@ -92,9 +92,9 @@ public class AdminNewOrderDunApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/selectListNewOrderDun",method = RequestMethod.GET)
-	public Result selectListNewOrderDun(String OrderNo){
+	public Result selectListNewOrderDun(String orderNo){
 		Result res = new Result();
-		res.data(newOrderDunService.selectListNewOrderDun(OrderNo));
+		res.data(newOrderDunService.selectListNewOrderDun(orderNo));
 		return res;
 	}	
 }

+ 2 - 1
src/main/java/com/goafanti/order/enums/NewOrderDunType.java

@@ -21,7 +21,8 @@ public enum NewOrderDunType {
 	RJKF_SQ(71,"软件开发-首期"),
 	RJKF_WZ(72,"软件开发-完成"),
 	ZSCQ_SQ(81,"知识产权-首期"),
-	ZSCQ_GS(82,"知识产权-公示"),
+	ZSCQ_GS_SL_XZ(82,"知识产权-公示/专利受理/软著下证"),
+	ZSCQ_XZ(83,"知识产权-下证"),
 	INVALID(99,"未知");
 	
 	private NewOrderDunType(Integer code, String desc) {

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

@@ -13,7 +13,7 @@ public interface NewOrderDunService {
 	
 	int deleteDun(Integer id);
 	
-	List<OutNewOrderDunBo> selectListNewOrderDun(String OrderNo);
+	List<OutNewOrderDunBo> selectListNewOrderDun(String orderNo);
 
 	OutNewOrderDunBo selectDun(Integer id);
 

+ 4 - 2
src/main/java/com/goafanti/order/service/impl/NewOrderDunServiceImpl.java

@@ -4,6 +4,8 @@ import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
 import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.beanutils.ConvertUtils;
+import org.apache.commons.beanutils.converters.DateConverter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -35,13 +37,13 @@ public class NewOrderDunServiceImpl extends BaseMybatisDao<NewOrderDunMapper> im
 	}
 	@Override
 	public List<OutNewOrderDunBo> selectListNewOrderDun(String orderNo) {
-		String aid=TokenManager.getAdminId();
-		return newOrderDunMapper.selectListNewOrderDun(orderNo,aid,null);
+		return newOrderDunMapper.selectListNewOrderDun(orderNo,null,null);
 	}
 	@Override
 	public OutNewOrderDunBo selectDun(Integer id) {
 		OutNewOrderDunBo ob=new OutNewOrderDunBo();
 		try {
+			ConvertUtils.register(new DateConverter(null), java.util.Date.class);
 			BeanUtils.copyProperties(ob, newOrderDunMapper.selectByPrimaryKey(id));
 		} catch (IllegalAccessException | InvocationTargetException e) {
 			e.printStackTrace();

+ 36 - 9
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -27,6 +27,7 @@ import org.springframework.transaction.annotation.Transactional;
 import com.goafanti.common.bo.Error;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.AdminMapper;
+import com.goafanti.common.dao.BusinessProjectMapper;
 import com.goafanti.common.dao.NewOrderDunMapper;
 import com.goafanti.common.dao.OrganizationContactBookMapper;
 import com.goafanti.common.dao.OrganizationIdentityMapper;
@@ -43,6 +44,7 @@ import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.enums.OrderLogProcess;
 import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.Admin;
+import com.goafanti.common.model.BusinessProject;
 import com.goafanti.common.model.OrganizationContactBook;
 import com.goafanti.common.model.OrganizationIdentity;
 import com.goafanti.common.model.TOrderBonus;
@@ -102,6 +104,8 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	@Autowired
 	private AdminMapper	adminMapper;
 	@Autowired
+	private BusinessProjectMapper	businessProjectMapper;
+	@Autowired
 	private NewOrderDunMapper	newOrderDunMapper;
 	@Value(value = "${upload.path}")
 	private String 					uploadPath 			= null;
@@ -300,7 +304,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			}
 		}
 		//项目触发发催款
-		pushOrderDun(t);
+		pushOrderDun(t,task2);
 		
 		if (task2.getSuperId()!=null) {//是否有父项目
 			TOrderTask task3 =tOrderTaskMapper.selectBySuperId(task2.getSuperId());
@@ -315,17 +319,40 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		return 1;
 	}
 
-	private void pushOrderDun(TOrderTaskDetailBo t) {
+	private void pushOrderDun(TOrderTaskDetailBo t,TOrderTask task2) {
 		List<OutNewOrderDunBo> list=newOrderDunMapper.selectByTid(t.getId());
 		for (OutNewOrderDunBo ob : list) {
 			if (ob!=null) {
-				
-				if((ob.getProjectType()==OrderDunProjectType.CGZH.getCode()&&ob.getDunType()==2&&
-						t.getProjectStatus()==OrderProjectStatus.XMYS.getCode())||
-					(ob.getProjectType()==OrderDunProjectType.COMMON.getCode()&&ob.getDunType()==2&&
-						t.getProjectStatus()==OrderProjectStatus.XMGS.getCode())||
-					(ob.getProjectType()==OrderDunProjectType.COMMON.getCode()&&ob.getDunType()==3&&
-						t.getProjectStatus()==OrderProjectStatus.XMXZ.getCode())) {
+				boolean flag=false;
+				if((ob.getProjectType()==OrderDunProjectType.CGZH.getCode()&&ob.getDunType()==2&&//成果转化 验收
+						t.getProjectStatus()==OrderProjectStatus.XMYS.getCode()))flag=true;
+				if((ob.getProjectType()==OrderDunProjectType.COMMON.getCode()&&ob.getDunType()==2&&//通用 公示
+						t.getProjectStatus()==OrderProjectStatus.XMGS.getCode()))flag=true;
+				if((ob.getProjectType()==OrderDunProjectType.COMMON.getCode()&&ob.getDunType()==3&&//通用 下证
+						t.getProjectStatus()==OrderProjectStatus.XMXZ.getCode()))flag=true;
+				if((ob.getProjectType()==OrderDunProjectType.KJXM.getCode()&&ob.getDunType()==2&&//科技项目 立项或者公示
+						(t.getProjectStatus()==OrderProjectStatus.XMLX.getCode()||(t.getProjectStatus()==OrderProjectStatus.XMGS.getCode()))))flag=true;
+				if((ob.getProjectType()==OrderDunProjectType.KJXM.getCode()&&ob.getDunType()==3&&//科技项目 拨款
+						t.getProjectStatus()==OrderProjectStatus.XMBK.getCode()))flag=true;
+				if((ob.getProjectType()==OrderDunProjectType.KJJR.getCode()&&ob.getDunType()==2&&//科技金融 拨款
+						t.getProjectStatus()==OrderProjectStatus.XMBK.getCode()))flag=true;
+				if((ob.getProjectType()==OrderDunProjectType.RJKF.getCode()&&ob.getDunType()==2&&//软件开发 立项
+						t.getProjectStatus()==OrderProjectStatus.XMLX.getCode()))flag=true;
+				if((ob.getProjectType()==OrderDunProjectType.RJKF.getCode()&&ob.getDunType()==3&&//软件开发 验收
+						t.getProjectStatus()==OrderProjectStatus.XMYS.getCode()))flag=true;
+				if(ob.getProjectType()==OrderDunProjectType.ZSCQ.getCode()){//知识产权 公示 专利受理、转让(项目已提交),软著下证
+					if(ob.getDunType()==3&&t.getProjectStatus()==OrderProjectStatus.XMXZ.getCode()) {
+						flag=true;
+					}else if (ob.getDunType()==2) {
+						BusinessProject bp=businessProjectMapper.selectByPrimaryKey(task2.getCommodityId());
+						if (bp.getType()==1&&t.getProjectStatus()==OrderProjectStatus.XMYTJ.getCode()) {
+							flag=true;
+						}
+						
+					}
+				} 
+						
+					if(flag) {
 					TOrderNew tn=tOrderNewMapper.selectByPrimaryKey(t.getOrderNo());
 					orderNewService.addNewDunNoticAndSendEmail(tn,ob);
 					ob.setStatus(1);