Просмотр исходного кода

Merge remote-tracking branch 'origin/test'

anderx лет назад: 8
Родитель
Сommit
f86c8767f9
34 измененных файлов с 1168 добавлено и 545 удалено
  1. 3 2
      GeneratorConfig.xml
  2. 11 11
      src/main/java/com/goafanti/common/dao/ContractMapper.java
  3. 14 14
      src/main/java/com/goafanti/common/dao/ContractTaskMapper.java
  4. 16 2
      src/main/java/com/goafanti/common/dao/DailySalesReportMapper.java
  5. 14 14
      src/main/java/com/goafanti/common/dao/TOrderMapper.java
  6. 1 1
      src/main/java/com/goafanti/common/dao/TechProjectMapper.java
  7. 23 23
      src/main/java/com/goafanti/common/mapper/ContractMapper.xml
  8. 36 36
      src/main/java/com/goafanti/common/mapper/ContractTaskMapper.xml
  9. 85 6
      src/main/java/com/goafanti/common/mapper/DailySalesReportMapper.xml
  10. 87 35
      src/main/java/com/goafanti/common/mapper/TOrderMapper.xml
  11. 83 33
      src/main/java/com/goafanti/common/mapper/TechProjectMapper.xml
  12. 57 57
      src/main/java/com/goafanti/common/model/Contract.java
  13. 36 26
      src/main/java/com/goafanti/common/model/ContractExample.java
  14. 58 58
      src/main/java/com/goafanti/common/model/ContractTask.java
  15. 40 40
      src/main/java/com/goafanti/common/model/ContractTaskExample.java
  16. 2 2
      src/main/java/com/goafanti/common/model/DailySalesReport.java
  17. 148 102
      src/main/java/com/goafanti/common/model/TOrder.java
  18. 156 16
      src/main/java/com/goafanti/common/model/TOrderExample.java
  19. 1 1
      src/main/java/com/goafanti/common/task/OrderReportTask.java
  20. 8 0
      src/main/java/com/goafanti/order/bo/CommodityDetailBo.java
  21. 8 0
      src/main/java/com/goafanti/order/bo/OrderListBo.java
  22. 8 0
      src/main/java/com/goafanti/order/bo/ServiceOrderDetailBo.java
  23. 48 13
      src/main/java/com/goafanti/order/controller/AdminOrderApiController.java
  24. 15 5
      src/main/java/com/goafanti/order/service/OrderService.java
  25. 29 11
      src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java
  26. 43 2
      src/main/java/com/goafanti/report/controller/ReportApiController.java
  27. 45 9
      src/main/java/com/goafanti/report/service/SalesReportServiceImpl.java
  28. 9 0
      src/main/java/com/goafanti/techproject/bo/ProjectDetailBo.java
  29. 24 8
      src/main/java/com/goafanti/techproject/bo/ProjectListBo.java
  30. 48 6
      src/main/java/com/goafanti/techproject/controller/AdminTechProjectApiController.java
  31. 2 2
      src/main/java/com/goafanti/techproject/service/TechProjectService.java
  32. 9 8
      src/main/java/com/goafanti/techproject/service/impl/TechProjectServiceImpl.java
  33. 0 1
      src/main/resources/shiro_base_auth.ini
  34. 1 1
      src/main/webapp/WEB-INF/views/common.html

+ 3 - 2
GeneratorConfig.xml

@@ -3,13 +3,14 @@
 <generatorConfiguration>
 
   <!-- <classPathEntry location="E:/mysql-connector-java-5.1.40.jar" /> -->
-  <classPathEntry location="C:/Users/Administrator/.m2/repository/mysql/mysql-connector-java/5.1.40/mysql-connector-java-5.1.40.jar" />
+  <classPathEntry location="E:/mysql-connector-java-5.1.40.jar" />
   <context id="context1">	
     <jdbcConnection connectionURL="jdbc:mysql://192.168.1.213:3306/aft" 
     	driverClass="com.mysql.jdbc.Driver" password="123456" userId="dev" />
     <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="AFT" />
     <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="AFT" />
     <javaClientGenerator targetPackage="com.goafanti.common.dao" targetProject="AFT" type="XMLMAPPER" />
-    <table schema="aft" tableName="contract_task"/> 
+    <table schema="aft" tableName="t_order"/> 
+    <table schema="aft" tableName="contract"/> 
   </context>
 </generatorConfiguration>

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

@@ -12,67 +12,67 @@ import com.goafanti.common.model.ContractTask;
 public interface ContractMapper {
     /**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	long countByExample(ContractExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	int deleteByExample(ContractExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	int deleteByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	int insert(Contract record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	int insertSelective(Contract record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	List<Contract> selectByExample(ContractExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	Contract selectByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	int updateByExampleSelective(@Param("record") Contract record, @Param("example") ContractExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	int updateByExample(@Param("record") Contract record, @Param("example") ContractExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	int updateByPrimaryKeySelective(Contract record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	int updateByPrimaryKey(Contract record);
 

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

@@ -11,85 +11,85 @@ public interface ContractTaskMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	long countByExample(ContractTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	int deleteByExample(ContractTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	int deleteByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	int insert(ContractTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	int insertSelective(ContractTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	List<ContractTask> selectByExampleWithBLOBs(ContractTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	List<ContractTask> selectByExample(ContractTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	ContractTask selectByPrimaryKey(String id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	int updateByExampleSelective(@Param("record") ContractTask record, @Param("example") ContractTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	int updateByExampleWithBLOBs(@Param("record") ContractTask record, @Param("example") ContractTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	int updateByExample(@Param("record") ContractTask record, @Param("example") ContractTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	int updateByPrimaryKeySelective(ContractTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	int updateByPrimaryKeyWithBLOBs(ContractTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	int updateByPrimaryKey(ContractTask record);
 

+ 16 - 2
src/main/java/com/goafanti/common/dao/DailySalesReportMapper.java

@@ -14,7 +14,13 @@ public interface DailySalesReportMapper {
 
 	DailySalesReport selectByPrimaryKey(Long id);
 
-	int insertSalesReports(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+	List<DailySalesReport> selectAdmins();
+
+	List<DailySalesReport> selectDailySalesReports(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+
+	int insertBatch(List<DailySalesReport> list);
+
+	int deleteByDate(@Param("createTime") Date createTime);
 
 	List<PersonalSalesReportBO> selectSalesPersonalReports(@Param("startTime") Date startTime,
 			@Param("endTime") Date endTime, @Param("pageNo") Integer pageNo, @Param("pageSize") Integer pageSize,
@@ -22,10 +28,18 @@ public interface DailySalesReportMapper {
 			@Param("countField") String countField, @Param("amountField") String amountField,
 			@Param("depName") String depName, @Param("name") String name, @Param("position") String position);
 
+	List<PersonalSalesReportBO> selectPersonalByPage(@Param("pageNo") Integer pageNo,
+			@Param("pageSize") Integer pageSize, @Param("depName") String depName, @Param("name") String name,
+			@Param("position") String position);
+
+	Long selectSalesPersonalReportsCount(@Param("startTime") Date startTime, @Param("endTime") Date endTime,
+			@Param("depName") String depName, @Param("name") String name, @Param("position") String position);
+
 	List<ModelMap> selectSalesPersonalExtraReports(@Param("startTime") Date startTime, @Param("endTime") Date endTime,
 			@Param("ids") List<String> ids);
 
-	ModelMap selectTotalReports(@Param("startTime") Date startTime, @Param("endTime") Date endTime);
+	ModelMap selectTotalReports(@Param("startTime") Date startTime, @Param("endTime") Date endTime,
+			@Param("depName") String depName, @Param("name") String name, @Param("position") String position);
 
 	List<DepartmentSalesReportBO> selectSalesDepartmentReports();
 

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

@@ -15,85 +15,85 @@ public interface TOrderMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	long countByExample(TOrderExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	int deleteByExample(TOrderExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	int deleteByPrimaryKey(String orderNo);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	int insert(TOrder record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	int insertSelective(TOrder record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	List<TOrder> selectByExampleWithBLOBs(TOrderExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	List<TOrder> selectByExample(TOrderExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	TOrder selectByPrimaryKey(String orderNo);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	int updateByExampleSelective(@Param("record") TOrder record, @Param("example") TOrderExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	int updateByExampleWithBLOBs(@Param("record") TOrder record, @Param("example") TOrderExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	int updateByExample(@Param("record") TOrder record, @Param("example") TOrderExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	int updateByPrimaryKeySelective(TOrder record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	int updateByPrimaryKeyWithBLOBs(TOrder record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	int updateByPrimaryKey(TOrder record);
 

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

@@ -42,7 +42,7 @@ public interface TechProjectMapper {
 
 	int batchDeleteByContractId(List<String> id);
 
-	ProjectDetailBo selectTechProjectDetail(String contractId);
+	ProjectDetailBo selectTechProjectDetail(@Param("contractId")String contractId,@Param("buyerType")Integer buyerType);
 
 	List<TaskListBo> selectProjectTask(String contractId);
 }

+ 23 - 23
src/main/java/com/goafanti/common/mapper/ContractMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jan 25 20:45:00 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="serial_number" jdbcType="INTEGER" property="serialNumber" />
@@ -13,7 +13,7 @@
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="creater" jdbcType="VARCHAR" property="creater" />
     <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="type" jdbcType="INTEGER" property="type" />
+    <result column="type" jdbcType="VARCHAR" property="type" />
     <result column="principal" jdbcType="VARCHAR" property="principal" />
     <result column="uid" jdbcType="VARCHAR" property="uid" />
     <result column="sign_date" jdbcType="TIMESTAMP" property="signDate" />
@@ -30,7 +30,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jan 25 20:45:00 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -64,7 +64,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jan 25 20:45:00 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -98,7 +98,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jan 25 20:45:00 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     id, serial_number, create_time, update_time, creater, name, type, principal, uid, 
     sign_date, sign_comment, complete_date, complete_comment, deleted_sign, order_no, 
@@ -108,7 +108,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jan 25 20:45:00 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     select
     <if test="distinct">
@@ -127,7 +127,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jan 25 20:45:00 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -138,7 +138,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jan 25 20:45:00 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     delete from contract
     where id = #{id,jdbcType=VARCHAR}
@@ -147,7 +147,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jan 25 20:45:00 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     delete from contract
     <if test="_parameter != null">
@@ -158,7 +158,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jan 25 20:45:00 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     insert into contract (id, serial_number, create_time, 
       update_time, creater, name, 
@@ -169,7 +169,7 @@
       )
     values (#{id,jdbcType=VARCHAR}, #{serialNumber,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
       #{updateTime,jdbcType=TIMESTAMP}, #{creater,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
-      #{type,jdbcType=INTEGER}, #{principal,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, 
+      #{type,jdbcType=VARCHAR}, #{principal,jdbcType=VARCHAR}, #{uid,jdbcType=VARCHAR}, 
       #{signDate,jdbcType=TIMESTAMP}, #{signComment,jdbcType=VARCHAR}, #{completeDate,jdbcType=TIMESTAMP}, 
       #{completeComment,jdbcType=VARCHAR}, #{deletedSign,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, 
       #{status,jdbcType=INTEGER}, #{contacts,jdbcType=VARCHAR}, #{contactMobile,jdbcType=VARCHAR}
@@ -179,7 +179,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jan 25 20:45:00 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     insert into contract
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -258,7 +258,7 @@
         #{name,jdbcType=VARCHAR},
       </if>
       <if test="type != null">
-        #{type,jdbcType=INTEGER},
+        #{type,jdbcType=VARCHAR},
       </if>
       <if test="principal != null">
         #{principal,jdbcType=VARCHAR},
@@ -299,7 +299,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jan 25 20:45:00 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     select count(*) from contract
     <if test="_parameter != null">
@@ -310,7 +310,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jan 25 20:45:00 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     update contract
     <set>
@@ -333,7 +333,7 @@
         name = #{record.name,jdbcType=VARCHAR},
       </if>
       <if test="record.type != null">
-        type = #{record.type,jdbcType=INTEGER},
+        type = #{record.type,jdbcType=VARCHAR},
       </if>
       <if test="record.principal != null">
         principal = #{record.principal,jdbcType=VARCHAR},
@@ -377,7 +377,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jan 25 20:45:00 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     update contract
     set id = #{record.id,jdbcType=VARCHAR},
@@ -386,7 +386,7 @@
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       creater = #{record.creater,jdbcType=VARCHAR},
       name = #{record.name,jdbcType=VARCHAR},
-      type = #{record.type,jdbcType=INTEGER},
+      type = #{record.type,jdbcType=VARCHAR},
       principal = #{record.principal,jdbcType=VARCHAR},
       uid = #{record.uid,jdbcType=VARCHAR},
       sign_date = #{record.signDate,jdbcType=TIMESTAMP},
@@ -406,7 +406,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jan 25 20:45:00 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     update contract
     <set>
@@ -426,7 +426,7 @@
         name = #{name,jdbcType=VARCHAR},
       </if>
       <if test="type != null">
-        type = #{type,jdbcType=INTEGER},
+        type = #{type,jdbcType=VARCHAR},
       </if>
       <if test="principal != null">
         principal = #{principal,jdbcType=VARCHAR},
@@ -468,7 +468,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Jan 25 20:45:00 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     update contract
     set serial_number = #{serialNumber,jdbcType=INTEGER},
@@ -476,7 +476,7 @@
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       creater = #{creater,jdbcType=VARCHAR},
       name = #{name,jdbcType=VARCHAR},
-      type = #{type,jdbcType=INTEGER},
+      type = #{type,jdbcType=VARCHAR},
       principal = #{principal,jdbcType=VARCHAR},
       uid = #{uid,jdbcType=VARCHAR},
       sign_date = #{signDate,jdbcType=TIMESTAMP},
@@ -733,7 +733,7 @@
 			create_time
 		)
 	values
-    <foreach item="item" index="index" collection="list" separator=",">
+    <foreach collection="list" index="index" item="item" separator=",">
       (
       	#{item.id,jdbcType=VARCHAR}, 
       	#{item.contractId,jdbcType=VARCHAR},

+ 36 - 36
src/main/java/com/goafanti/common/mapper/ContractTaskMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Feb 01 15:10:35 CST 2018.
+      This element was generated on Fri Mar 02 15:45:51 CST 2018.
     -->
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="contract_id" jdbcType="VARCHAR" property="contractId" />
@@ -20,14 +20,14 @@
     <result column="task_distribution_time" jdbcType="TIMESTAMP" property="taskDistributionTime" />
     <result column="task_allocator" jdbcType="VARCHAR" property="taskAllocator" />
     <result column="task_receiver" jdbcType="VARCHAR" property="taskReceiver" />
-    <result column="delete_sign" jdbcType="INTEGER" property="deleteSign" />
+    <result column="deleted_sign" jdbcType="INTEGER" property="deletedSign" />
     <result column="serial_number" jdbcType="INTEGER" property="serialNumber" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.goafanti.common.model.ContractTask">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Feb 01 15:10:35 CST 2018.
+      This element was generated on Fri Mar 02 15:45:51 CST 2018.
     -->
     <result column="attachment_url" jdbcType="LONGVARCHAR" property="attachmentUrl" />
   </resultMap>
@@ -35,7 +35,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Feb 01 15:10:35 CST 2018.
+      This element was generated on Fri Mar 02 15:45:51 CST 2018.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -69,7 +69,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Feb 01 15:10:35 CST 2018.
+      This element was generated on Fri Mar 02 15:45:51 CST 2018.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -103,17 +103,17 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Feb 01 15:10:35 CST 2018.
+      This element was generated on Fri Mar 02 15:45:51 CST 2018.
     -->
     id, contract_id, commodity_id, commodity_name, commodity_quantity, commodity_type, 
     commodity_mode, create_time, task_comment, task_status, task_distribution_time, task_allocator, 
-    task_receiver, delete_sign, serial_number
+    task_receiver, deleted_sign, serial_number
   </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 Thu Feb 01 15:10:35 CST 2018.
+      This element was generated on Fri Mar 02 15:45:51 CST 2018.
     -->
     attachment_url
   </sql>
@@ -121,7 +121,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Feb 01 15:10:35 CST 2018.
+      This element was generated on Fri Mar 02 15:45:51 CST 2018.
     -->
     select
     <if test="distinct">
@@ -142,7 +142,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Feb 01 15:10:35 CST 2018.
+      This element was generated on Fri Mar 02 15:45:51 CST 2018.
     -->
     select
     <if test="distinct">
@@ -161,7 +161,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Feb 01 15:10:35 CST 2018.
+      This element was generated on Fri Mar 02 15:45:51 CST 2018.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -174,7 +174,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Feb 01 15:10:35 CST 2018.
+      This element was generated on Fri Mar 02 15:45:51 CST 2018.
     -->
     delete from contract_task
     where id = #{id,jdbcType=VARCHAR}
@@ -183,7 +183,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Feb 01 15:10:35 CST 2018.
+      This element was generated on Fri Mar 02 15:45:51 CST 2018.
     -->
     delete from contract_task
     <if test="_parameter != null">
@@ -194,26 +194,26 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Feb 01 15:10:35 CST 2018.
+      This element was generated on Fri Mar 02 15:45:51 CST 2018.
     -->
     insert into contract_task (id, contract_id, commodity_id, 
       commodity_name, commodity_quantity, commodity_type, 
       commodity_mode, create_time, task_comment, 
       task_status, task_distribution_time, task_allocator, 
-      task_receiver, delete_sign, serial_number, 
+      task_receiver, deleted_sign, serial_number, 
       attachment_url)
     values (#{id,jdbcType=VARCHAR}, #{contractId,jdbcType=VARCHAR}, #{commodityId,jdbcType=VARCHAR}, 
       #{commodityName,jdbcType=VARCHAR}, #{commodityQuantity,jdbcType=INTEGER}, #{commodityType,jdbcType=INTEGER}, 
       #{commodityMode,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{taskComment,jdbcType=VARCHAR}, 
       #{taskStatus,jdbcType=INTEGER}, #{taskDistributionTime,jdbcType=TIMESTAMP}, #{taskAllocator,jdbcType=VARCHAR}, 
-      #{taskReceiver,jdbcType=VARCHAR}, #{deleteSign,jdbcType=INTEGER}, #{serialNumber,jdbcType=INTEGER}, 
+      #{taskReceiver,jdbcType=VARCHAR}, #{deletedSign,jdbcType=INTEGER}, #{serialNumber,jdbcType=INTEGER}, 
       #{attachmentUrl,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.ContractTask">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Feb 01 15:10:35 CST 2018.
+      This element was generated on Fri Mar 02 15:45:51 CST 2018.
     -->
     insert into contract_task
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -256,8 +256,8 @@
       <if test="taskReceiver != null">
         task_receiver,
       </if>
-      <if test="deleteSign != null">
-        delete_sign,
+      <if test="deletedSign != null">
+        deleted_sign,
       </if>
       <if test="serialNumber != null">
         serial_number,
@@ -306,8 +306,8 @@
       <if test="taskReceiver != null">
         #{taskReceiver,jdbcType=VARCHAR},
       </if>
-      <if test="deleteSign != null">
-        #{deleteSign,jdbcType=INTEGER},
+      <if test="deletedSign != null">
+        #{deletedSign,jdbcType=INTEGER},
       </if>
       <if test="serialNumber != null">
         #{serialNumber,jdbcType=INTEGER},
@@ -321,7 +321,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Feb 01 15:10:35 CST 2018.
+      This element was generated on Fri Mar 02 15:45:51 CST 2018.
     -->
     select count(*) from contract_task
     <if test="_parameter != null">
@@ -332,7 +332,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Feb 01 15:10:35 CST 2018.
+      This element was generated on Fri Mar 02 15:45:51 CST 2018.
     -->
     update contract_task
     <set>
@@ -375,8 +375,8 @@
       <if test="record.taskReceiver != null">
         task_receiver = #{record.taskReceiver,jdbcType=VARCHAR},
       </if>
-      <if test="record.deleteSign != null">
-        delete_sign = #{record.deleteSign,jdbcType=INTEGER},
+      <if test="record.deletedSign != null">
+        deleted_sign = #{record.deletedSign,jdbcType=INTEGER},
       </if>
       <if test="record.serialNumber != null">
         serial_number = #{record.serialNumber,jdbcType=INTEGER},
@@ -393,7 +393,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Feb 01 15:10:35 CST 2018.
+      This element was generated on Fri Mar 02 15:45:51 CST 2018.
     -->
     update contract_task
     set id = #{record.id,jdbcType=VARCHAR},
@@ -409,7 +409,7 @@
       task_distribution_time = #{record.taskDistributionTime,jdbcType=TIMESTAMP},
       task_allocator = #{record.taskAllocator,jdbcType=VARCHAR},
       task_receiver = #{record.taskReceiver,jdbcType=VARCHAR},
-      delete_sign = #{record.deleteSign,jdbcType=INTEGER},
+      deleted_sign = #{record.deletedSign,jdbcType=INTEGER},
       serial_number = #{record.serialNumber,jdbcType=INTEGER},
       attachment_url = #{record.attachmentUrl,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
@@ -420,7 +420,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Feb 01 15:10:35 CST 2018.
+      This element was generated on Fri Mar 02 15:45:51 CST 2018.
     -->
     update contract_task
     set id = #{record.id,jdbcType=VARCHAR},
@@ -436,7 +436,7 @@
       task_distribution_time = #{record.taskDistributionTime,jdbcType=TIMESTAMP},
       task_allocator = #{record.taskAllocator,jdbcType=VARCHAR},
       task_receiver = #{record.taskReceiver,jdbcType=VARCHAR},
-      delete_sign = #{record.deleteSign,jdbcType=INTEGER},
+      deleted_sign = #{record.deletedSign,jdbcType=INTEGER},
       serial_number = #{record.serialNumber,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -446,7 +446,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Feb 01 15:10:35 CST 2018.
+      This element was generated on Fri Mar 02 15:45:51 CST 2018.
     -->
     update contract_task
     <set>
@@ -486,8 +486,8 @@
       <if test="taskReceiver != null">
         task_receiver = #{taskReceiver,jdbcType=VARCHAR},
       </if>
-      <if test="deleteSign != null">
-        delete_sign = #{deleteSign,jdbcType=INTEGER},
+      <if test="deletedSign != null">
+        deleted_sign = #{deletedSign,jdbcType=INTEGER},
       </if>
       <if test="serialNumber != null">
         serial_number = #{serialNumber,jdbcType=INTEGER},
@@ -502,7 +502,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Feb 01 15:10:35 CST 2018.
+      This element was generated on Fri Mar 02 15:45:51 CST 2018.
     -->
     update contract_task
     set contract_id = #{contractId,jdbcType=VARCHAR},
@@ -517,7 +517,7 @@
       task_distribution_time = #{taskDistributionTime,jdbcType=TIMESTAMP},
       task_allocator = #{taskAllocator,jdbcType=VARCHAR},
       task_receiver = #{taskReceiver,jdbcType=VARCHAR},
-      delete_sign = #{deleteSign,jdbcType=INTEGER},
+      deleted_sign = #{deletedSign,jdbcType=INTEGER},
       serial_number = #{serialNumber,jdbcType=INTEGER},
       attachment_url = #{attachmentUrl,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=VARCHAR}
@@ -526,7 +526,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Feb 01 15:10:35 CST 2018.
+      This element was generated on Fri Mar 02 15:45:51 CST 2018.
     -->
     update contract_task
     set contract_id = #{contractId,jdbcType=VARCHAR},
@@ -541,7 +541,7 @@
       task_distribution_time = #{taskDistributionTime,jdbcType=TIMESTAMP},
       task_allocator = #{taskAllocator,jdbcType=VARCHAR},
       task_receiver = #{taskReceiver,jdbcType=VARCHAR},
-      delete_sign = #{deleteSign,jdbcType=INTEGER},
+      deleted_sign = #{deletedSign,jdbcType=INTEGER},
       serial_number = #{serialNumber,jdbcType=INTEGER}
     where id = #{id,jdbcType=VARCHAR}
   </update>

+ 85 - 6
src/main/java/com/goafanti/common/mapper/DailySalesReportMapper.xml

@@ -18,15 +18,57 @@
     from daily_sales_report
     where id = #{id,jdbcType=INTEGER}
   </select>
-  <insert id="insertSalesReports">
-    insert into daily_sales_report 
-    (admin_id, dep_id, order_count, order_amount) 
+  
+  <select id="selectAdmins" resultMap="BaseResultMap">
+    select a.id as admin_id, dm.id as dep_id
+    from admin a
+    left join department_management dm on dm.id = a.department_id 
+  </select>
+  
+  <select id="selectPersonalByPage" resultType="com.goafanti.report.bo.PersonalSalesReportBO">
+    SELECT a.id, a.name, dm.name as departmentName, a.position, a.create_time as enrollTime
+	FROM admin a
+	left join department_management dm on dm.id = a.department_id 
+	where 1=1
+	<if test="depName != null">
+		and dm.name like concat(#{depName,jdbcType=VARCHAR},'%')
+	</if>
+	<if test="name != null">
+		and a.name like concat(#{name,jdbcType=VARCHAR},'%')
+	</if>
+	<if test="position != null">
+		and a.position like concat(#{position,jdbcType=VARCHAR},'%')
+	</if>
+	order by a.name asc
+	<if test="pageNo != null and pageSize != null">
+		limit #{pageNo,jdbcType=INTEGER}, #{pageSize,jdbcType=INTEGER}
+    </if>
+  </select>
+  
+  <select id="selectDailySalesReports" resultMap="BaseResultMap">
     SELECT o.salesman_id as admin_id, a.department_id as dep_id,
-	count(o.order_no) as order_count, sum(o.order_amount) as order_amount
+	count(o.order_no) as order_count, sum(o.sign_total_amount) as order_amount
 	FROM aft.t_order o
 	left join aft.admin a on o.salesman_id=a.id
 	where o.order_status=3 and o.sign_time &gt;= #{startTime,jdbcType=TIMESTAMP} and o.sign_time &lt; #{endTime,jdbcType=TIMESTAMP}
 	group by o.salesman_id, a.department_id;
+  </select>
+  
+  <delete id="deleteByDate">
+    delete from daily_sales_report
+    where create_time = #{createTime,jdbcType=TIMESTAMP}
+  </delete>
+  
+  <insert id="insertBatch" parameterType="com.goafanti.common.model.DailySalesReport" >
+    insert into daily_sales_report (admin_id, dep_id, order_count, order_amount, create_time)
+    values 
+    <foreach item="item" index="index" collection="list" separator=",">
+        (#{item.adminId,jdbcType=VARCHAR},
+        #{item.depId,jdbcType=VARCHAR},
+        #{item.orderCount,jdbcType=INTEGER},
+        #{item.orderAmount,jdbcType=DECIMAL},
+        #{item.createTime,jdbcType=TIMESTAMP})
+    </foreach>
   </insert>
   
   <select id="selectSalesPersonalReports" resultType="com.goafanti.report.bo.PersonalSalesReportBO">
@@ -35,7 +77,7 @@
 	FROM admin a
 	left join daily_sales_report dsr on dsr.admin_id = a.id 
 	left join department_management dm on dm.id = dsr.dep_id 
-	where (dsr.create_time is null or (dsr.create_time &gt;= #{startTime,jdbcType=TIMESTAMP} and dsr.create_time &lt; #{endTime,jdbcType=TIMESTAMP}))
+	where dsr.create_time &gt;= #{startTime,jdbcType=TIMESTAMP} and dsr.create_time &lt; #{endTime,jdbcType=TIMESTAMP}
 	<if test="depName != null">
 		and dm.name like concat(#{depName,jdbcType=VARCHAR},'%')
 	</if>
@@ -52,6 +94,30 @@
     </if>
   </select>
   
+  <select id="selectSalesPersonalReportsCount" resultType="java.lang.Long">
+    SELECT count(distinct(a.id))
+	FROM admin a
+	<if test="startTime != null and endTime != null"> 
+	left join daily_sales_report dsr on dsr.admin_id = a.id
+	</if>
+	<if test="depName != null"> 
+	left join department_management dm on dm.id = a.department_id 
+	</if>
+	where 1=1
+	<if test="startTime != null and endTime != null"> 
+		and dsr.create_time &gt;= #{startTime,jdbcType=TIMESTAMP} and dsr.create_time &lt; #{endTime,jdbcType=TIMESTAMP}
+	</if>
+	<if test="depName != null">
+		and dm.name like concat(#{depName,jdbcType=VARCHAR},'%')
+	</if>
+	<if test="name != null">
+		and a.name like concat(#{name,jdbcType=VARCHAR},'%')
+	</if>
+	<if test="position != null">
+		and a.position like concat(#{position,jdbcType=VARCHAR},'%')
+	</if>
+  </select>
+  
   <select id="selectSalesPersonalExtraReports" resultType="org.springframework.ui.ModelMap">
     SELECT dsr.admin_id as id, sum(dsr.order_count) as order_count, sum(dsr.order_amount) as order_amount
 	FROM daily_sales_report dsr 
@@ -83,7 +149,20 @@
   
   <select id="selectTotalReports" resultType="org.springframework.ui.ModelMap">
     SELECT sum(dsr.order_count) as totalCount, sum(dsr.order_amount) as totalAmount
-	FROM daily_sales_report dsr 
+	FROM admin a
+	left join daily_sales_report dsr on dsr.admin_id = a.id
+	<if test="depName != null"> 
+	left join department_management dm on dm.id = a.department_id 
+	</if>
 	where dsr.create_time &gt;= #{startTime,jdbcType=TIMESTAMP} and dsr.create_time &lt; #{endTime,jdbcType=TIMESTAMP}
+	<if test="depName != null">
+		and dm.name like concat(#{depName,jdbcType=VARCHAR},'%')
+	</if>
+	<if test="name != null">
+		and a.name like concat(#{name,jdbcType=VARCHAR},'%')
+	</if>
+	<if test="position != null">
+		and a.position like concat(#{position,jdbcType=VARCHAR},'%')
+	</if>
   </select>
 </mapper>

+ 87 - 35
src/main/java/com/goafanti/common/mapper/TOrderMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 22 19:15:05 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     <id column="order_no" jdbcType="VARCHAR" property="orderNo" />
     <result column="order_type" jdbcType="INTEGER" property="orderType" />
@@ -40,12 +40,14 @@
     <result column="sign_time" jdbcType="TIMESTAMP" property="signTime" />
     <result column="set_up_time" jdbcType="TIMESTAMP" property="setUpTime" />
     <result column="settlement_time" jdbcType="TIMESTAMP" property="settlementTime" />
+    <result column="contract_no" jdbcType="VARCHAR" property="contractNo" />
+    <result column="contract_type" jdbcType="VARCHAR" property="contractType" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.goafanti.common.model.TOrder">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 22 19:15:05 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     <result column="contract_picture_url" jdbcType="LONGVARCHAR" property="contractPictureUrl" />
   </resultMap>
@@ -53,7 +55,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 22 19:15:05 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -87,7 +89,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 22 19:15:05 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -121,20 +123,20 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 22 19:15:05 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     order_no, order_type, creater, create_time, update_time, buyer_id, seller_id, first_payment, 
     order_amount, brokerage_amount, sign_first_payment, actually_first_payment, sign_total_amount, 
     actually_total_amount, sign_brokerage_amount, actually_brokerage_amount, sign_withdraw_amount, 
     actually_withdraw_amount, order_stage, project_stage, order_status, liquidation_status, 
     order_channel, approval, order_remarks, delete_sign, salesman_id, finance_id, technician_id, 
-    confirm_time, sign_time, set_up_time, settlement_time
+    confirm_time, sign_time, set_up_time, settlement_time, contract_no, contract_type
   </sql>
   <sql id="Blob_Column_List">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 22 19:15:05 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     contract_picture_url
   </sql>
@@ -142,7 +144,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 22 19:15:05 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     select
     <if test="distinct">
@@ -163,7 +165,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 22 19:15:05 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     select
     <if test="distinct">
@@ -182,7 +184,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 22 19:15:05 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -195,7 +197,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 22 19:15:05 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     delete from t_order
     where order_no = #{orderNo,jdbcType=VARCHAR}
@@ -204,7 +206,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 22 19:15:05 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     delete from t_order
     <if test="_parameter != null">
@@ -215,7 +217,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 22 19:15:05 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     insert into t_order (order_no, order_type, creater, 
       create_time, update_time, buyer_id, 
@@ -228,8 +230,8 @@
       approval, order_remarks, delete_sign, 
       salesman_id, finance_id, technician_id, 
       confirm_time, sign_time, set_up_time, 
-      settlement_time, contract_picture_url
-      )
+      settlement_time, contract_no, contract_type, 
+      contract_picture_url)
     values (#{orderNo,jdbcType=VARCHAR}, #{orderType,jdbcType=INTEGER}, #{creater,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{buyerId,jdbcType=VARCHAR}, 
       #{sellerId,jdbcType=VARCHAR}, #{firstPayment,jdbcType=DECIMAL}, #{orderAmount,jdbcType=DECIMAL}, 
@@ -241,14 +243,14 @@
       #{approval,jdbcType=INTEGER}, #{orderRemarks,jdbcType=VARCHAR}, #{deleteSign,jdbcType=INTEGER}, 
       #{salesmanId,jdbcType=VARCHAR}, #{financeId,jdbcType=VARCHAR}, #{technicianId,jdbcType=VARCHAR}, 
       #{confirmTime,jdbcType=TIMESTAMP}, #{signTime,jdbcType=TIMESTAMP}, #{setUpTime,jdbcType=TIMESTAMP}, 
-      #{settlementTime,jdbcType=TIMESTAMP}, #{contractPictureUrl,jdbcType=LONGVARCHAR}
-      )
+      #{settlementTime,jdbcType=TIMESTAMP}, #{contractNo,jdbcType=VARCHAR}, #{contractType,jdbcType=VARCHAR}, 
+      #{contractPictureUrl,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TOrder">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 22 19:15:05 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     insert into t_order
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -351,6 +353,12 @@
       <if test="settlementTime != null">
         settlement_time,
       </if>
+      <if test="contractNo != null">
+        contract_no,
+      </if>
+      <if test="contractType != null">
+        contract_type,
+      </if>
       <if test="contractPictureUrl != null">
         contract_picture_url,
       </if>
@@ -455,6 +463,12 @@
       <if test="settlementTime != null">
         #{settlementTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="contractNo != null">
+        #{contractNo,jdbcType=VARCHAR},
+      </if>
+      <if test="contractType != null">
+        #{contractType,jdbcType=VARCHAR},
+      </if>
       <if test="contractPictureUrl != null">
         #{contractPictureUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -464,7 +478,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 22 19:15:05 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     select count(*) from t_order
     <if test="_parameter != null">
@@ -475,7 +489,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 22 19:15:05 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     update t_order
     <set>
@@ -578,6 +592,12 @@
       <if test="record.settlementTime != null">
         settlement_time = #{record.settlementTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.contractNo != null">
+        contract_no = #{record.contractNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.contractType != null">
+        contract_type = #{record.contractType,jdbcType=VARCHAR},
+      </if>
       <if test="record.contractPictureUrl != null">
         contract_picture_url = #{record.contractPictureUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -590,7 +610,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 22 19:15:05 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     update t_order
     set order_no = #{record.orderNo,jdbcType=VARCHAR},
@@ -626,6 +646,8 @@
       sign_time = #{record.signTime,jdbcType=TIMESTAMP},
       set_up_time = #{record.setUpTime,jdbcType=TIMESTAMP},
       settlement_time = #{record.settlementTime,jdbcType=TIMESTAMP},
+      contract_no = #{record.contractNo,jdbcType=VARCHAR},
+      contract_type = #{record.contractType,jdbcType=VARCHAR},
       contract_picture_url = #{record.contractPictureUrl,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -635,7 +657,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 22 19:15:05 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     update t_order
     set order_no = #{record.orderNo,jdbcType=VARCHAR},
@@ -670,7 +692,9 @@
       confirm_time = #{record.confirmTime,jdbcType=TIMESTAMP},
       sign_time = #{record.signTime,jdbcType=TIMESTAMP},
       set_up_time = #{record.setUpTime,jdbcType=TIMESTAMP},
-      settlement_time = #{record.settlementTime,jdbcType=TIMESTAMP}
+      settlement_time = #{record.settlementTime,jdbcType=TIMESTAMP},
+      contract_no = #{record.contractNo,jdbcType=VARCHAR},
+      contract_type = #{record.contractType,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -679,7 +703,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 22 19:15:05 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     update t_order
     <set>
@@ -779,6 +803,12 @@
       <if test="settlementTime != null">
         settlement_time = #{settlementTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="contractNo != null">
+        contract_no = #{contractNo,jdbcType=VARCHAR},
+      </if>
+      <if test="contractType != null">
+        contract_type = #{contractType,jdbcType=VARCHAR},
+      </if>
       <if test="contractPictureUrl != null">
         contract_picture_url = #{contractPictureUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -789,7 +819,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 22 19:15:05 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     update t_order
     set order_type = #{orderType,jdbcType=INTEGER},
@@ -824,6 +854,8 @@
       sign_time = #{signTime,jdbcType=TIMESTAMP},
       set_up_time = #{setUpTime,jdbcType=TIMESTAMP},
       settlement_time = #{settlementTime,jdbcType=TIMESTAMP},
+      contract_no = #{contractNo,jdbcType=VARCHAR},
+      contract_type = #{contractType,jdbcType=VARCHAR},
       contract_picture_url = #{contractPictureUrl,jdbcType=LONGVARCHAR}
     where order_no = #{orderNo,jdbcType=VARCHAR}
   </update>
@@ -831,7 +863,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 22 19:15:05 CST 2018.
+      This element was generated on Fri Mar 02 16:57:09 CST 2018.
     -->
     update t_order
     set order_type = #{orderType,jdbcType=INTEGER},
@@ -865,14 +897,16 @@
       confirm_time = #{confirmTime,jdbcType=TIMESTAMP},
       sign_time = #{signTime,jdbcType=TIMESTAMP},
       set_up_time = #{setUpTime,jdbcType=TIMESTAMP},
-      settlement_time = #{settlementTime,jdbcType=TIMESTAMP}
+      settlement_time = #{settlementTime,jdbcType=TIMESTAMP},
+      contract_no = #{contractNo,jdbcType=VARCHAR},
+      contract_type = #{contractType,jdbcType=VARCHAR}
     where order_no = #{orderNo,jdbcType=VARCHAR}
   </update>
   
   <select id="selectCommodityDetail" resultType="com.goafanti.order.bo.CommodityDetailBo">
   	<choose>
   		<when test="commodityType == 0">
-  			select id as commodityId,bname as commodityName,ifnull(price,0) as commodityPrice,ifnull(first_payment,0) as commodityFirstPayment from business_project where id = #{commodityId,jdbcType=VARCHAR}
+  			select id as commodityId,bname as commodityName,,cid as commodityClassify,ifnull(price,0) as commodityPrice,ifnull(first_payment,0) as commodityFirstPayment from business_project where id = #{commodityId,jdbcType=VARCHAR}
   		</when>
   		<when test="commodityType == 1">
   			select id as commodityId,name as commodityName,introduction,ifnull(transfer_price,0) as commodityPrice,owner_id as sellerId from achievement where id = #{commodityId,jdbcType=VARCHAR}
@@ -1170,13 +1204,16 @@
 			d.name as financeName,
 			a.technician_id as technicianId,
 			e.name as technicianName,
-			a.delete_sign as deleteSign
+			a.delete_sign as deleteSign,
+			a.contract_no as contractNo,
+			f.cname as projectType
 		from
 			t_order a left join user b on
 			a.buyer_id = b.id left join admin c on
 			a.salesman_id = c.id left join admin d on
 			a.finance_id = d.id left join admin e on
-			a.technician_id = e.id
+			a.technician_id = e.id left join business_varieties f on
+			a.contract_type = f.id
 		where a.order_no = #{orderNo,jdbcType=VARCHAR}
   </select>
   
@@ -1290,6 +1327,12 @@
 		<if test="approval != null">
 			and a.approval = #{approval,jdbcType=INTEGER}
 		</if>
+		<if test="isDistributionFinance == 0">
+			and a.finance_id is null
+		</if>
+		<if test="isDistributionFinance == 1">
+			and a.finance_id is  not null
+		</if>
 		<if test="buyerName != null and buyerName != ''">
 			and b.nickname = #{buyerName,jdbcType=VARCHAR}
 		</if>
@@ -1338,6 +1381,12 @@
 		<if test="approval != null">
 			and a.approval = #{approval,jdbcType=INTEGER}
 		</if>
+		<if test="isDistributionFinance == 0">
+			and a.finance_id is null
+		</if>
+		<if test="isDistributionFinance == 1">
+			and a.finance_id is not null
+		</if>
 		<if test="buyerName != null and buyerName != ''">
 			and b.nickname = #{buyerName,jdbcType=VARCHAR}
 		</if>
@@ -1398,7 +1447,7 @@
 		and a.confirm_sign = #{confirmSign,jdbcType=INTEGER}
 	</if>
 	<if test="deleteSign != null">
-		and a.delete_sign = #{deleteSign,jdbcType=VARCHAR}
+		and a.delete_sign = #{deleteSign,jdbcType=INTEGER}
 	</if>
 	<if test="depId != null and depId != ''">
 		and f.department_id = #{depId,jdbcType=VARCHAR}
@@ -1449,7 +1498,7 @@
 		and a.confirm_sign = #{confirmSign,jdbcType=INTEGER}
 	</if>
 	<if test="deleteSign != null">
-		and a.delete_sign = #{deleteSign,jdbcType=VARCHAR}
+		and a.delete_sign = #{deleteSign,jdbcType=INTEGER}
 	</if>
 	<if test="depId != null and depId != ''">
 		and f.department_id = #{depId,jdbcType=VARCHAR}
@@ -1514,14 +1563,16 @@
 			c.name as salesmanName,
 			d.name as financeName,
 			e.name as technicianName,
-			f.name as departmentName
+			f.name as departmentName,
+			g.cname as projectName
 		from
 			t_order a left join user b on
 			a.buyer_id = b.id left join admin c on
 			a.salesman_id = c.id left join admin d on
 			a.finance_id = d.id left join admin e on
 			a.technician_id = e.id left join department_management f on 
-			d.department_id = f.id
+			d.department_id = f.id left join business_varieties g on
+			a.contract_type = g.id
 		where a.order_type = 0 and a.order_status = 3 
 			and (a.liquidation_status = 1 or a.liquidation_status = 2 or a.approval = 2) <!-- 已首付 or 已付清 or 已特批 -->
 		<if test="salesmanId != null">
@@ -1568,7 +1619,8 @@
 			a.salesman_id = c.id left join admin d on
 			a.finance_id = d.id left join admin e on
 			a.technician_id = e.id left join department_management f on 
-			d.department_id = f.id
+			d.department_id = f.id left join business_varieties g on
+			a.contract_type = g.id
 		where a.order_type = 0 and a.order_status = 3 
 			and (a.liquidation_status = 1 or a.liquidation_status = 2 or a.approval = 2) <!-- 已首付 or 已付清 or 已特批 -->
 		<if test="salesmanId != null">

+ 83 - 33
src/main/java/com/goafanti/common/mapper/TechProjectMapper.xml

@@ -571,27 +571,35 @@
 		date_format(a.create_time,'%Y-%m-%d %H:%i:%S') as projectTime,
 		a.uid,
 		a.status as projectStatus,
-		a.deleted_sign as deleteSign,
+		a.deleted_sign as deletedSign,
 		a.order_no as orderNo,
 		a.type as projectType,
 		b.nickname as buyerName,
+		b.type as buyerType,
+		f.cname as buyerType,
 		c.create_time as orderTime,
 		c.order_status as orderStatus,
 		c.liquidation_status as liquidationStatus,
 		c.approval,
-		d.name as salesmanName
+		d.name as salesmanName,
+		e.name as departmentName
 	from
 		contract a left join user b on
 		a.uid = b.id left join t_order c on
 		a.order_no = c.order_no left join admin d on
-		c.salesman_id = d.id
+		c.salesman_id = d.id left join department_management e on
+		d.department_id = e.id left join business_varieties f on
+		a.type = f.id
 	where 1=1
-	<if test="deleteSign != null">
-		and a.delete_sign = #{deleteSign,jdbcType=INTEGER}
+	<if test="deletedSign != null">
+		and a.deleted_sign = #{deletedSign,jdbcType=INTEGER}
 	</if>
 	<if test="orderNo != null and orderNo != ''">
 		and a.order_no = #{orderNo,jdbcType=VARCHAR}
 	</if>
+	<if test="serialNumber != null and serialNumber != ''">
+		and a.serial_number = #{serialNumber,jdbcType=VARCHAR}
+	</if>
 	<if test="setUpStartDate != null and setUpStartDate != ''">
 		and a.create_time &gt; #{setUpStartDate,jdbcType=TIMESTAMP}
 	</if>
@@ -624,14 +632,19 @@
 		contract a left join user b on
 		a.uid = b.id left join t_order c on
 		a.order_no = c.order_no left join admin d on
-		c.salesman_id = d.id
+		c.salesman_id = d.id left join department_management e on
+		d.department_id = e.id left join business_varieties f on
+		a.type = f.id
 	where 1=1
-	<if test="deleteSign != null">
-		and a.delete_sign = #{deleteSign,jdbcType=INTEGER}
+	<if test="deletedSign != null">
+		and a.deleted_sign = #{deletedSign,jdbcType=INTEGER}
 	</if>
 	<if test="orderNo != null and orderNo != ''">
 		and a.order_no = #{orderNo,jdbcType=VARCHAR}
 	</if>
+	<if test="serialNumber != null and serialNumber != ''">
+		and a.serial_number = #{serialNumber,jdbcType=VARCHAR}
+	</if>
 	<if test="setUpStartDate != null and setUpStartDate != ''">
 		and a.create_time &gt; #{setUpStartDate,jdbcType=TIMESTAMP}
 	</if>
@@ -656,27 +669,64 @@
   </select>
   
   <select id="selectTechProjectDetail" resultType="com.goafanti.techproject.bo.ProjectDetailBo">
-  	select
-		a.id,
-		a.serial_number as serialNumber,
-		a.sign_date as signDate,
-		a.sign_comment as signComment,
-		a.complete_date as completeDate,
-		a.complete_comment as completeComment,
-		a.uid,
-		a.status as projectStatus,
-		a.deleted_sign as deleteSign,
-		a.order_no as orderNo,
-		a.type as projectType,
-		b.nickname as buyerName,
-		c.name as technicianName,
-		d.name as principalName
-	from
-		contract a left join user b on
-		a.uid = b.id left join admin c on
-		a.uid = c.id left join admin d on
-		a.principal = d.id
-	where a.id = #{contractId,jdbcType=VARCHAR}
+	  <choose>
+	  	<when test="buyerType == 0">
+	  		 select
+				a.id,
+				a.serial_number as serialNumber,
+				a.sign_date as signDate,
+				a.sign_comment as signComment,
+				a.complete_date as completeDate,
+				a.complete_comment as completeComment,
+				a.uid,
+				a.status as projectStatus,
+				a.deleted_sign as deletedSign,
+				a.order_no as orderNo,
+				a.type as projectType,
+				b.nickname as buyerName,
+				c.name as technicianName,
+				d.name as principalName,
+				f.name as buyerProvince,
+				g.cname as projectType
+			from
+				contract a left join user b on
+				a.uid = b.id left join admin c on
+				a.uid = c.id left join admin d on
+				a.principal = d.id left join user_identity e on
+				a.uid = e.uid left join district_glossory f on
+				e.province  = f.id left join business_varieties g on
+				a.type = g.id
+			where a.id = #{contractId,jdbcType=VARCHAR}
+	  	</when>
+	  		<when test="buyerType == 1">
+	  		 select
+				a.id,
+				a.serial_number as serialNumber,
+				a.sign_date as signDate,
+				a.sign_comment as signComment,
+				a.complete_date as completeDate,
+				a.complete_comment as completeComment,
+				a.uid,
+				a.status as projectStatus,
+				a.deleted_sign as deletedSign,
+				a.order_no as orderNo,
+				a.type as projectType,
+				b.nickname as buyerName,
+				c.name as technicianName,
+				d.name as principalName,
+				f.name as buyerProvince,
+				g.cname as projectType
+			from
+				contract a left join user b on
+				a.uid = b.id left join admin c on
+				a.uid = c.id left join admin d on
+				a.principal = d.id left join organization_identity e on
+				a.uid = e.uid left join district_glossory f on
+				e.location_province  = f.id left join business_varieties g on
+				a.type = g.id
+			where a.id = #{contractId,jdbcType=VARCHAR}
+	  	</when>
+	  </choose>
   </select>
   
   <select id="selectProjectTask" resultType="com.goafanti.techproject.bo.TaskListBo">
@@ -685,7 +735,7 @@
 		a.commodity_name as commodityName,
 		a.commodity_quantity as commodityQuantity,
 		a.task_status as taskStatus,
-		a.delete_sign as deleteSign,
+		a.deleted_sign as deletedSign,
 		a.task_comment as taskComment,
 		b.name as technicianName
 	from
@@ -699,7 +749,7 @@
 			a.commodity_id as commodityId,
 			a.serial_number as taskNo,
 			a.task_status as taskStatus,
-			a.delete_sign as deleteSign,
+			a.deleted_sign as deletedSign,
 			date_format(a.task_distribution_time,'%Y-%m-%d %H:%i:%S') as taskDistributionTimes,
 			a.task_comment as taskComment,
 			b.bname as commodityName ,
@@ -734,7 +784,7 @@
 			and d.serial_number = #{projectNo,jdbcType=VARCHAR}
 		</if>
 		<if test="buyerName != null and buyerName != ''">
-			and e.name = #{buyerName,jdbcType=VARCHAR}
+			and e.nickname = #{buyerName,jdbcType=VARCHAR}
 		</if>
 		<if test="taskReceiverName != null and taskReceiverName != ''">
 			and f.name = #{taskReceiverName,jdbcType=VARCHAR}
@@ -774,7 +824,7 @@
 			and d.serial_number = #{projectNo,jdbcType=VARCHAR}
 		</if>
 		<if test="buyerName != null and buyerName != ''">
-			and e.name = #{buyerName,jdbcType=VARCHAR}
+			and e.nickname = #{buyerName,jdbcType=VARCHAR}
 		</if>
 		<if test="taskReceiverName != null and taskReceiverName != ''">
 			and f.name = #{taskReceiverName,jdbcType=VARCHAR}

+ 57 - 57
src/main/java/com/goafanti/common/model/Contract.java

@@ -6,99 +6,99 @@ public class Contract {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract.id
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private String id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract.serial_number
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private Integer serialNumber;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract.create_time
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract.update_time
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private Date updateTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract.creater
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private String creater;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract.name
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private String name;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract.type
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
-	private Integer type;
+	private String type;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract.principal
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private String principal;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract.uid
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private String uid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract.sign_date
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private Date signDate;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract.sign_comment
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private String signComment;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract.complete_date
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private Date completeDate;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract.complete_comment
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private String completeComment;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract.deleted_sign
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private Integer deletedSign;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract.order_no
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private String orderNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract.status
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private Integer status;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract.contacts
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private String contacts;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract.contact_mobile
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private String contactMobile;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract.id
 	 * @return  the value of contract.id
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public String getId() {
 		return id;
@@ -107,7 +107,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract.id
 	 * @param id  the value for contract.id
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setId(String id) {
 		this.id = id;
@@ -116,7 +116,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract.serial_number
 	 * @return  the value of contract.serial_number
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Integer getSerialNumber() {
 		return serialNumber;
@@ -125,7 +125,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract.serial_number
 	 * @param serialNumber  the value for contract.serial_number
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setSerialNumber(Integer serialNumber) {
 		this.serialNumber = serialNumber;
@@ -134,7 +134,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract.create_time
 	 * @return  the value of contract.create_time
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -143,7 +143,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract.create_time
 	 * @param createTime  the value for contract.create_time
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -152,7 +152,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract.update_time
 	 * @return  the value of contract.update_time
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Date getUpdateTime() {
 		return updateTime;
@@ -161,7 +161,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract.update_time
 	 * @param updateTime  the value for contract.update_time
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setUpdateTime(Date updateTime) {
 		this.updateTime = updateTime;
@@ -170,7 +170,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract.creater
 	 * @return  the value of contract.creater
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public String getCreater() {
 		return creater;
@@ -179,7 +179,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract.creater
 	 * @param creater  the value for contract.creater
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setCreater(String creater) {
 		this.creater = creater;
@@ -188,7 +188,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract.name
 	 * @return  the value of contract.name
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public String getName() {
 		return name;
@@ -197,7 +197,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract.name
 	 * @param name  the value for contract.name
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setName(String name) {
 		this.name = name;
@@ -206,25 +206,25 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract.type
 	 * @return  the value of contract.type
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
-	public Integer getType() {
+	public String getType() {
 		return type;
 	}
 
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract.type
 	 * @param type  the value for contract.type
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
-	public void setType(Integer type) {
+	public void setType(String type) {
 		this.type = type;
 	}
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract.principal
 	 * @return  the value of contract.principal
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public String getPrincipal() {
 		return principal;
@@ -233,7 +233,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract.principal
 	 * @param principal  the value for contract.principal
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setPrincipal(String principal) {
 		this.principal = principal;
@@ -242,7 +242,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract.uid
 	 * @return  the value of contract.uid
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public String getUid() {
 		return uid;
@@ -251,7 +251,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract.uid
 	 * @param uid  the value for contract.uid
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setUid(String uid) {
 		this.uid = uid;
@@ -260,7 +260,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract.sign_date
 	 * @return  the value of contract.sign_date
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Date getSignDate() {
 		return signDate;
@@ -269,7 +269,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract.sign_date
 	 * @param signDate  the value for contract.sign_date
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setSignDate(Date signDate) {
 		this.signDate = signDate;
@@ -278,7 +278,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract.sign_comment
 	 * @return  the value of contract.sign_comment
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public String getSignComment() {
 		return signComment;
@@ -287,7 +287,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract.sign_comment
 	 * @param signComment  the value for contract.sign_comment
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setSignComment(String signComment) {
 		this.signComment = signComment;
@@ -296,7 +296,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract.complete_date
 	 * @return  the value of contract.complete_date
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Date getCompleteDate() {
 		return completeDate;
@@ -305,7 +305,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract.complete_date
 	 * @param completeDate  the value for contract.complete_date
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setCompleteDate(Date completeDate) {
 		this.completeDate = completeDate;
@@ -314,7 +314,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract.complete_comment
 	 * @return  the value of contract.complete_comment
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public String getCompleteComment() {
 		return completeComment;
@@ -323,7 +323,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract.complete_comment
 	 * @param completeComment  the value for contract.complete_comment
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setCompleteComment(String completeComment) {
 		this.completeComment = completeComment;
@@ -332,7 +332,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract.deleted_sign
 	 * @return  the value of contract.deleted_sign
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Integer getDeletedSign() {
 		return deletedSign;
@@ -341,7 +341,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract.deleted_sign
 	 * @param deletedSign  the value for contract.deleted_sign
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setDeletedSign(Integer deletedSign) {
 		this.deletedSign = deletedSign;
@@ -350,7 +350,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract.order_no
 	 * @return  the value of contract.order_no
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -359,7 +359,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract.order_no
 	 * @param orderNo  the value for contract.order_no
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -368,7 +368,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract.status
 	 * @return  the value of contract.status
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Integer getStatus() {
 		return status;
@@ -377,7 +377,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract.status
 	 * @param status  the value for contract.status
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setStatus(Integer status) {
 		this.status = status;
@@ -386,7 +386,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract.contacts
 	 * @return  the value of contract.contacts
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public String getContacts() {
 		return contacts;
@@ -395,7 +395,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract.contacts
 	 * @param contacts  the value for contract.contacts
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setContacts(String contacts) {
 		this.contacts = contacts;
@@ -404,7 +404,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract.contact_mobile
 	 * @return  the value of contract.contact_mobile
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public String getContactMobile() {
 		return contactMobile;
@@ -413,7 +413,7 @@ public class Contract {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract.contact_mobile
 	 * @param contactMobile  the value for contract.contact_mobile
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setContactMobile(String contactMobile) {
 		this.contactMobile = contactMobile;

+ 36 - 26
src/main/java/com/goafanti/common/model/ContractExample.java

@@ -7,23 +7,23 @@ import java.util.List;
 public class ContractExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table contract
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table contract
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table contract
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public ContractExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -31,7 +31,7 @@ public class ContractExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -39,7 +39,7 @@ public class ContractExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -47,7 +47,7 @@ public class ContractExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -55,7 +55,7 @@ public class ContractExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -63,7 +63,7 @@ public class ContractExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -71,7 +71,7 @@ public class ContractExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -79,7 +79,7 @@ public class ContractExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -89,7 +89,7 @@ public class ContractExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -101,7 +101,7 @@ public class ContractExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -110,7 +110,7 @@ public class ContractExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -120,7 +120,7 @@ public class ContractExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table contract
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -563,52 +563,62 @@ public class ContractExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeEqualTo(Integer value) {
+		public Criteria andTypeEqualTo(String value) {
 			addCriterion("type =", value, "type");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeNotEqualTo(Integer value) {
+		public Criteria andTypeNotEqualTo(String value) {
 			addCriterion("type <>", value, "type");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeGreaterThan(Integer value) {
+		public Criteria andTypeGreaterThan(String value) {
 			addCriterion("type >", value, "type");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeGreaterThanOrEqualTo(Integer value) {
+		public Criteria andTypeGreaterThanOrEqualTo(String value) {
 			addCriterion("type >=", value, "type");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeLessThan(Integer value) {
+		public Criteria andTypeLessThan(String value) {
 			addCriterion("type <", value, "type");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeLessThanOrEqualTo(Integer value) {
+		public Criteria andTypeLessThanOrEqualTo(String value) {
 			addCriterion("type <=", value, "type");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeIn(List<Integer> values) {
+		public Criteria andTypeLike(String value) {
+			addCriterion("type like", value, "type");
+			return (Criteria) this;
+		}
+
+		public Criteria andTypeNotLike(String value) {
+			addCriterion("type not like", value, "type");
+			return (Criteria) this;
+		}
+
+		public Criteria andTypeIn(List<String> values) {
 			addCriterion("type in", values, "type");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeNotIn(List<Integer> values) {
+		public Criteria andTypeNotIn(List<String> values) {
 			addCriterion("type not in", values, "type");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeBetween(Integer value1, Integer value2) {
+		public Criteria andTypeBetween(String value1, String value2) {
 			addCriterion("type between", value1, value2, "type");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeNotBetween(Integer value1, Integer value2) {
+		public Criteria andTypeNotBetween(String value1, String value2) {
 			addCriterion("type not between", value1, value2, "type");
 			return (Criteria) this;
 		}
@@ -1346,7 +1356,7 @@ public class ContractExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table contract
-	 * @mbg.generated  Thu Jan 25 20:45:00 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public static class Criterion {
 		private String condition;

+ 58 - 58
src/main/java/com/goafanti/common/model/ContractTask.java

@@ -6,89 +6,89 @@ public class ContractTask {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract_task.id
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	private String id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract_task.contract_id
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	private String contractId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract_task.commodity_id
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	private String commodityId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract_task.commodity_name
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	private String commodityName;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract_task.commodity_quantity
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	private Integer commodityQuantity;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract_task.commodity_type
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	private Integer commodityType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract_task.commodity_mode
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	private String commodityMode;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract_task.create_time
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract_task.task_comment
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	private String taskComment;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract_task.task_status
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	private Integer taskStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract_task.task_distribution_time
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	private Date taskDistributionTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract_task.task_allocator
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	private String taskAllocator;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract_task.task_receiver
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	private String taskReceiver;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract_task.delete_sign
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract_task.deleted_sign
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
-	private Integer deleteSign;
+	private Integer deletedSign;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract_task.serial_number
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	private Integer serialNumber;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column contract_task.attachment_url
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	private String attachmentUrl;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract_task.id
 	 * @return  the value of contract_task.id
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	public String getId() {
 		return id;
@@ -97,7 +97,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract_task.id
 	 * @param id  the value for contract_task.id
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	public void setId(String id) {
 		this.id = id;
@@ -106,7 +106,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract_task.contract_id
 	 * @return  the value of contract_task.contract_id
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	public String getContractId() {
 		return contractId;
@@ -115,7 +115,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract_task.contract_id
 	 * @param contractId  the value for contract_task.contract_id
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	public void setContractId(String contractId) {
 		this.contractId = contractId;
@@ -124,7 +124,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract_task.commodity_id
 	 * @return  the value of contract_task.commodity_id
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	public String getCommodityId() {
 		return commodityId;
@@ -133,7 +133,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract_task.commodity_id
 	 * @param commodityId  the value for contract_task.commodity_id
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	public void setCommodityId(String commodityId) {
 		this.commodityId = commodityId;
@@ -142,7 +142,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract_task.commodity_name
 	 * @return  the value of contract_task.commodity_name
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	public String getCommodityName() {
 		return commodityName;
@@ -151,7 +151,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract_task.commodity_name
 	 * @param commodityName  the value for contract_task.commodity_name
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	public void setCommodityName(String commodityName) {
 		this.commodityName = commodityName;
@@ -160,7 +160,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract_task.commodity_quantity
 	 * @return  the value of contract_task.commodity_quantity
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	public Integer getCommodityQuantity() {
 		return commodityQuantity;
@@ -169,7 +169,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract_task.commodity_quantity
 	 * @param commodityQuantity  the value for contract_task.commodity_quantity
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	public void setCommodityQuantity(Integer commodityQuantity) {
 		this.commodityQuantity = commodityQuantity;
@@ -178,7 +178,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract_task.commodity_type
 	 * @return  the value of contract_task.commodity_type
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	public Integer getCommodityType() {
 		return commodityType;
@@ -187,7 +187,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract_task.commodity_type
 	 * @param commodityType  the value for contract_task.commodity_type
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	public void setCommodityType(Integer commodityType) {
 		this.commodityType = commodityType;
@@ -196,7 +196,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract_task.commodity_mode
 	 * @return  the value of contract_task.commodity_mode
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	public String getCommodityMode() {
 		return commodityMode;
@@ -205,7 +205,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract_task.commodity_mode
 	 * @param commodityMode  the value for contract_task.commodity_mode
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	public void setCommodityMode(String commodityMode) {
 		this.commodityMode = commodityMode;
@@ -214,7 +214,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract_task.create_time
 	 * @return  the value of contract_task.create_time
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -223,7 +223,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract_task.create_time
 	 * @param createTime  the value for contract_task.create_time
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -232,7 +232,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract_task.task_comment
 	 * @return  the value of contract_task.task_comment
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	public String getTaskComment() {
 		return taskComment;
@@ -241,7 +241,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract_task.task_comment
 	 * @param taskComment  the value for contract_task.task_comment
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	public void setTaskComment(String taskComment) {
 		this.taskComment = taskComment;
@@ -250,7 +250,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract_task.task_status
 	 * @return  the value of contract_task.task_status
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	public Integer getTaskStatus() {
 		return taskStatus;
@@ -259,7 +259,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract_task.task_status
 	 * @param taskStatus  the value for contract_task.task_status
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	public void setTaskStatus(Integer taskStatus) {
 		this.taskStatus = taskStatus;
@@ -268,7 +268,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract_task.task_distribution_time
 	 * @return  the value of contract_task.task_distribution_time
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	public Date getTaskDistributionTime() {
 		return taskDistributionTime;
@@ -277,7 +277,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract_task.task_distribution_time
 	 * @param taskDistributionTime  the value for contract_task.task_distribution_time
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	public void setTaskDistributionTime(Date taskDistributionTime) {
 		this.taskDistributionTime = taskDistributionTime;
@@ -286,7 +286,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract_task.task_allocator
 	 * @return  the value of contract_task.task_allocator
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	public String getTaskAllocator() {
 		return taskAllocator;
@@ -295,7 +295,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract_task.task_allocator
 	 * @param taskAllocator  the value for contract_task.task_allocator
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	public void setTaskAllocator(String taskAllocator) {
 		this.taskAllocator = taskAllocator;
@@ -304,7 +304,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract_task.task_receiver
 	 * @return  the value of contract_task.task_receiver
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	public String getTaskReceiver() {
 		return taskReceiver;
@@ -313,34 +313,34 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract_task.task_receiver
 	 * @param taskReceiver  the value for contract_task.task_receiver
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	public void setTaskReceiver(String taskReceiver) {
 		this.taskReceiver = taskReceiver;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract_task.delete_sign
-	 * @return  the value of contract_task.delete_sign
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract_task.deleted_sign
+	 * @return  the value of contract_task.deleted_sign
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
-	public Integer getDeleteSign() {
-		return deleteSign;
+	public Integer getDeletedSign() {
+		return deletedSign;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract_task.delete_sign
-	 * @param deleteSign  the value for contract_task.delete_sign
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract_task.deleted_sign
+	 * @param deletedSign  the value for contract_task.deleted_sign
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
-	public void setDeleteSign(Integer deleteSign) {
-		this.deleteSign = deleteSign;
+	public void setDeletedSign(Integer deletedSign) {
+		this.deletedSign = deletedSign;
 	}
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract_task.serial_number
 	 * @return  the value of contract_task.serial_number
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	public Integer getSerialNumber() {
 		return serialNumber;
@@ -349,7 +349,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract_task.serial_number
 	 * @param serialNumber  the value for contract_task.serial_number
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	public void setSerialNumber(Integer serialNumber) {
 		this.serialNumber = serialNumber;
@@ -358,7 +358,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column contract_task.attachment_url
 	 * @return  the value of contract_task.attachment_url
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	public String getAttachmentUrl() {
 		return attachmentUrl;
@@ -367,7 +367,7 @@ public class ContractTask {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column contract_task.attachment_url
 	 * @param attachmentUrl  the value for contract_task.attachment_url
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	public void setAttachmentUrl(String attachmentUrl) {
 		this.attachmentUrl = attachmentUrl;

+ 40 - 40
src/main/java/com/goafanti/common/model/ContractTaskExample.java

@@ -7,23 +7,23 @@ import java.util.List;
 public class ContractTaskExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table contract_task
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table contract_task
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table contract_task
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	public ContractTaskExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -31,7 +31,7 @@ public class ContractTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -39,7 +39,7 @@ public class ContractTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -47,7 +47,7 @@ public class ContractTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -55,7 +55,7 @@ public class ContractTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -63,7 +63,7 @@ public class ContractTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -71,7 +71,7 @@ public class ContractTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -79,7 +79,7 @@ public class ContractTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -89,7 +89,7 @@ public class ContractTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -101,7 +101,7 @@ public class ContractTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -110,7 +110,7 @@ public class ContractTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table contract_task
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -120,7 +120,7 @@ public class ContractTaskExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table contract_task
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -1023,63 +1023,63 @@ public class ContractTaskExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andDeleteSignIsNull() {
-			addCriterion("delete_sign is null");
+		public Criteria andDeletedSignIsNull() {
+			addCriterion("deleted_sign is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andDeleteSignIsNotNull() {
-			addCriterion("delete_sign is not null");
+		public Criteria andDeletedSignIsNotNull() {
+			addCriterion("deleted_sign is not null");
 			return (Criteria) this;
 		}
 
-		public Criteria andDeleteSignEqualTo(Integer value) {
-			addCriterion("delete_sign =", value, "deleteSign");
+		public Criteria andDeletedSignEqualTo(Integer value) {
+			addCriterion("deleted_sign =", value, "deletedSign");
 			return (Criteria) this;
 		}
 
-		public Criteria andDeleteSignNotEqualTo(Integer value) {
-			addCriterion("delete_sign <>", value, "deleteSign");
+		public Criteria andDeletedSignNotEqualTo(Integer value) {
+			addCriterion("deleted_sign <>", value, "deletedSign");
 			return (Criteria) this;
 		}
 
-		public Criteria andDeleteSignGreaterThan(Integer value) {
-			addCriterion("delete_sign >", value, "deleteSign");
+		public Criteria andDeletedSignGreaterThan(Integer value) {
+			addCriterion("deleted_sign >", value, "deletedSign");
 			return (Criteria) this;
 		}
 
-		public Criteria andDeleteSignGreaterThanOrEqualTo(Integer value) {
-			addCriterion("delete_sign >=", value, "deleteSign");
+		public Criteria andDeletedSignGreaterThanOrEqualTo(Integer value) {
+			addCriterion("deleted_sign >=", value, "deletedSign");
 			return (Criteria) this;
 		}
 
-		public Criteria andDeleteSignLessThan(Integer value) {
-			addCriterion("delete_sign <", value, "deleteSign");
+		public Criteria andDeletedSignLessThan(Integer value) {
+			addCriterion("deleted_sign <", value, "deletedSign");
 			return (Criteria) this;
 		}
 
-		public Criteria andDeleteSignLessThanOrEqualTo(Integer value) {
-			addCriterion("delete_sign <=", value, "deleteSign");
+		public Criteria andDeletedSignLessThanOrEqualTo(Integer value) {
+			addCriterion("deleted_sign <=", value, "deletedSign");
 			return (Criteria) this;
 		}
 
-		public Criteria andDeleteSignIn(List<Integer> values) {
-			addCriterion("delete_sign in", values, "deleteSign");
+		public Criteria andDeletedSignIn(List<Integer> values) {
+			addCriterion("deleted_sign in", values, "deletedSign");
 			return (Criteria) this;
 		}
 
-		public Criteria andDeleteSignNotIn(List<Integer> values) {
-			addCriterion("delete_sign not in", values, "deleteSign");
+		public Criteria andDeletedSignNotIn(List<Integer> values) {
+			addCriterion("deleted_sign not in", values, "deletedSign");
 			return (Criteria) this;
 		}
 
-		public Criteria andDeleteSignBetween(Integer value1, Integer value2) {
-			addCriterion("delete_sign between", value1, value2, "deleteSign");
+		public Criteria andDeletedSignBetween(Integer value1, Integer value2) {
+			addCriterion("deleted_sign between", value1, value2, "deletedSign");
 			return (Criteria) this;
 		}
 
-		public Criteria andDeleteSignNotBetween(Integer value1, Integer value2) {
-			addCriterion("delete_sign not between", value1, value2, "deleteSign");
+		public Criteria andDeletedSignNotBetween(Integer value1, Integer value2) {
+			addCriterion("deleted_sign not between", value1, value2, "deletedSign");
 			return (Criteria) this;
 		}
 
@@ -1146,7 +1146,7 @@ public class ContractTaskExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table contract_task
-	 * @mbg.generated  Thu Feb 01 15:10:35 CST 2018
+	 * @mbg.generated  Fri Mar 02 15:45:51 CST 2018
 	 */
 	public static class Criterion {
 		private String condition;

+ 2 - 2
src/main/java/com/goafanti/common/model/DailySalesReport.java

@@ -24,12 +24,12 @@ public class DailySalesReport {
 	/**
 	* 销售签单数量
 	*/
-	private Integer		orderCount;
+	private Integer		orderCount	= 0;
 
 	/**
 	* 销售签单总额
 	*/
-	private BigDecimal	orderAmount;
+	private BigDecimal	orderAmount	= BigDecimal.ZERO;
 
 	public Integer getId() {
 		return id;

+ 148 - 102
src/main/java/com/goafanti/common/model/TOrder.java

@@ -7,179 +7,189 @@ public class TOrder {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.order_no
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private String orderNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.order_type
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private Integer orderType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.creater
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private String creater;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.create_time
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.update_time
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private Date updateTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.buyer_id
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private String buyerId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.seller_id
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private String sellerId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.first_payment
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private BigDecimal firstPayment;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.order_amount
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private BigDecimal orderAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.brokerage_amount
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private BigDecimal brokerageAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.sign_first_payment
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private BigDecimal signFirstPayment;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.actually_first_payment
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private BigDecimal actuallyFirstPayment;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.sign_total_amount
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private BigDecimal signTotalAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.actually_total_amount
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private BigDecimal actuallyTotalAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.sign_brokerage_amount
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private BigDecimal signBrokerageAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.actually_brokerage_amount
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private BigDecimal actuallyBrokerageAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.sign_withdraw_amount
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private BigDecimal signWithdrawAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.actually_withdraw_amount
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private BigDecimal actuallyWithdrawAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.order_stage
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private Integer orderStage;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.project_stage
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private Integer projectStage;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.order_status
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private Integer orderStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.liquidation_status
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private Integer liquidationStatus;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.order_channel
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private Integer orderChannel;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.approval
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private Integer approval;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.order_remarks
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private String orderRemarks;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.delete_sign
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private Integer deleteSign;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.salesman_id
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private String salesmanId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.finance_id
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private String financeId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.technician_id
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private String technicianId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.confirm_time
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private Date confirmTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.sign_time
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private Date signTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.set_up_time
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private Date setUpTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.settlement_time
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private Date settlementTime;
 	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.contract_no
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 */
+	private String contractNo;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.contract_type
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 */
+	private String contractType;
+	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order.contract_picture_url
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	private String contractPictureUrl;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.order_no
 	 * @return  the value of t_order.order_no
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -188,7 +198,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.order_no
 	 * @param orderNo  the value for t_order.order_no
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -197,7 +207,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.order_type
 	 * @return  the value of t_order.order_type
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Integer getOrderType() {
 		return orderType;
@@ -206,7 +216,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.order_type
 	 * @param orderType  the value for t_order.order_type
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setOrderType(Integer orderType) {
 		this.orderType = orderType;
@@ -215,7 +225,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.creater
 	 * @return  the value of t_order.creater
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public String getCreater() {
 		return creater;
@@ -224,7 +234,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.creater
 	 * @param creater  the value for t_order.creater
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setCreater(String creater) {
 		this.creater = creater;
@@ -233,7 +243,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.create_time
 	 * @return  the value of t_order.create_time
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -242,7 +252,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.create_time
 	 * @param createTime  the value for t_order.create_time
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -251,7 +261,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.update_time
 	 * @return  the value of t_order.update_time
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Date getUpdateTime() {
 		return updateTime;
@@ -260,7 +270,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.update_time
 	 * @param updateTime  the value for t_order.update_time
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setUpdateTime(Date updateTime) {
 		this.updateTime = updateTime;
@@ -269,7 +279,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.buyer_id
 	 * @return  the value of t_order.buyer_id
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public String getBuyerId() {
 		return buyerId;
@@ -278,7 +288,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.buyer_id
 	 * @param buyerId  the value for t_order.buyer_id
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setBuyerId(String buyerId) {
 		this.buyerId = buyerId;
@@ -287,7 +297,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.seller_id
 	 * @return  the value of t_order.seller_id
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public String getSellerId() {
 		return sellerId;
@@ -296,7 +306,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.seller_id
 	 * @param sellerId  the value for t_order.seller_id
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setSellerId(String sellerId) {
 		this.sellerId = sellerId;
@@ -305,7 +315,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.first_payment
 	 * @return  the value of t_order.first_payment
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public BigDecimal getFirstPayment() {
 		return firstPayment;
@@ -314,7 +324,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.first_payment
 	 * @param firstPayment  the value for t_order.first_payment
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setFirstPayment(BigDecimal firstPayment) {
 		this.firstPayment = firstPayment;
@@ -323,7 +333,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.order_amount
 	 * @return  the value of t_order.order_amount
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public BigDecimal getOrderAmount() {
 		return orderAmount;
@@ -332,7 +342,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.order_amount
 	 * @param orderAmount  the value for t_order.order_amount
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setOrderAmount(BigDecimal orderAmount) {
 		this.orderAmount = orderAmount;
@@ -341,7 +351,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.brokerage_amount
 	 * @return  the value of t_order.brokerage_amount
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public BigDecimal getBrokerageAmount() {
 		return brokerageAmount;
@@ -350,7 +360,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.brokerage_amount
 	 * @param brokerageAmount  the value for t_order.brokerage_amount
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setBrokerageAmount(BigDecimal brokerageAmount) {
 		this.brokerageAmount = brokerageAmount;
@@ -359,7 +369,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.sign_first_payment
 	 * @return  the value of t_order.sign_first_payment
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public BigDecimal getSignFirstPayment() {
 		return signFirstPayment;
@@ -368,7 +378,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.sign_first_payment
 	 * @param signFirstPayment  the value for t_order.sign_first_payment
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setSignFirstPayment(BigDecimal signFirstPayment) {
 		this.signFirstPayment = signFirstPayment;
@@ -377,7 +387,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.actually_first_payment
 	 * @return  the value of t_order.actually_first_payment
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public BigDecimal getActuallyFirstPayment() {
 		return actuallyFirstPayment;
@@ -386,7 +396,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.actually_first_payment
 	 * @param actuallyFirstPayment  the value for t_order.actually_first_payment
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setActuallyFirstPayment(BigDecimal actuallyFirstPayment) {
 		this.actuallyFirstPayment = actuallyFirstPayment;
@@ -395,7 +405,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.sign_total_amount
 	 * @return  the value of t_order.sign_total_amount
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public BigDecimal getSignTotalAmount() {
 		return signTotalAmount;
@@ -404,7 +414,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.sign_total_amount
 	 * @param signTotalAmount  the value for t_order.sign_total_amount
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setSignTotalAmount(BigDecimal signTotalAmount) {
 		this.signTotalAmount = signTotalAmount;
@@ -413,7 +423,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.actually_total_amount
 	 * @return  the value of t_order.actually_total_amount
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public BigDecimal getActuallyTotalAmount() {
 		return actuallyTotalAmount;
@@ -422,7 +432,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.actually_total_amount
 	 * @param actuallyTotalAmount  the value for t_order.actually_total_amount
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setActuallyTotalAmount(BigDecimal actuallyTotalAmount) {
 		this.actuallyTotalAmount = actuallyTotalAmount;
@@ -431,7 +441,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.sign_brokerage_amount
 	 * @return  the value of t_order.sign_brokerage_amount
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public BigDecimal getSignBrokerageAmount() {
 		return signBrokerageAmount;
@@ -440,7 +450,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.sign_brokerage_amount
 	 * @param signBrokerageAmount  the value for t_order.sign_brokerage_amount
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setSignBrokerageAmount(BigDecimal signBrokerageAmount) {
 		this.signBrokerageAmount = signBrokerageAmount;
@@ -449,7 +459,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.actually_brokerage_amount
 	 * @return  the value of t_order.actually_brokerage_amount
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public BigDecimal getActuallyBrokerageAmount() {
 		return actuallyBrokerageAmount;
@@ -458,7 +468,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.actually_brokerage_amount
 	 * @param actuallyBrokerageAmount  the value for t_order.actually_brokerage_amount
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setActuallyBrokerageAmount(BigDecimal actuallyBrokerageAmount) {
 		this.actuallyBrokerageAmount = actuallyBrokerageAmount;
@@ -467,7 +477,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.sign_withdraw_amount
 	 * @return  the value of t_order.sign_withdraw_amount
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public BigDecimal getSignWithdrawAmount() {
 		return signWithdrawAmount;
@@ -476,7 +486,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.sign_withdraw_amount
 	 * @param signWithdrawAmount  the value for t_order.sign_withdraw_amount
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setSignWithdrawAmount(BigDecimal signWithdrawAmount) {
 		this.signWithdrawAmount = signWithdrawAmount;
@@ -485,7 +495,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.actually_withdraw_amount
 	 * @return  the value of t_order.actually_withdraw_amount
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public BigDecimal getActuallyWithdrawAmount() {
 		return actuallyWithdrawAmount;
@@ -494,7 +504,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.actually_withdraw_amount
 	 * @param actuallyWithdrawAmount  the value for t_order.actually_withdraw_amount
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setActuallyWithdrawAmount(BigDecimal actuallyWithdrawAmount) {
 		this.actuallyWithdrawAmount = actuallyWithdrawAmount;
@@ -503,7 +513,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.order_stage
 	 * @return  the value of t_order.order_stage
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Integer getOrderStage() {
 		return orderStage;
@@ -512,7 +522,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.order_stage
 	 * @param orderStage  the value for t_order.order_stage
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setOrderStage(Integer orderStage) {
 		this.orderStage = orderStage;
@@ -521,7 +531,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.project_stage
 	 * @return  the value of t_order.project_stage
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Integer getProjectStage() {
 		return projectStage;
@@ -530,7 +540,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.project_stage
 	 * @param projectStage  the value for t_order.project_stage
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setProjectStage(Integer projectStage) {
 		this.projectStage = projectStage;
@@ -539,7 +549,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.order_status
 	 * @return  the value of t_order.order_status
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Integer getOrderStatus() {
 		return orderStatus;
@@ -548,7 +558,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.order_status
 	 * @param orderStatus  the value for t_order.order_status
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setOrderStatus(Integer orderStatus) {
 		this.orderStatus = orderStatus;
@@ -557,7 +567,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.liquidation_status
 	 * @return  the value of t_order.liquidation_status
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Integer getLiquidationStatus() {
 		return liquidationStatus;
@@ -566,7 +576,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.liquidation_status
 	 * @param liquidationStatus  the value for t_order.liquidation_status
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setLiquidationStatus(Integer liquidationStatus) {
 		this.liquidationStatus = liquidationStatus;
@@ -575,7 +585,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.order_channel
 	 * @return  the value of t_order.order_channel
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Integer getOrderChannel() {
 		return orderChannel;
@@ -584,7 +594,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.order_channel
 	 * @param orderChannel  the value for t_order.order_channel
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setOrderChannel(Integer orderChannel) {
 		this.orderChannel = orderChannel;
@@ -593,7 +603,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.approval
 	 * @return  the value of t_order.approval
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Integer getApproval() {
 		return approval;
@@ -602,7 +612,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.approval
 	 * @param approval  the value for t_order.approval
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setApproval(Integer approval) {
 		this.approval = approval;
@@ -611,7 +621,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.order_remarks
 	 * @return  the value of t_order.order_remarks
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public String getOrderRemarks() {
 		return orderRemarks;
@@ -620,7 +630,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.order_remarks
 	 * @param orderRemarks  the value for t_order.order_remarks
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setOrderRemarks(String orderRemarks) {
 		this.orderRemarks = orderRemarks;
@@ -629,7 +639,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.delete_sign
 	 * @return  the value of t_order.delete_sign
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Integer getDeleteSign() {
 		return deleteSign;
@@ -638,7 +648,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.delete_sign
 	 * @param deleteSign  the value for t_order.delete_sign
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setDeleteSign(Integer deleteSign) {
 		this.deleteSign = deleteSign;
@@ -647,7 +657,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.salesman_id
 	 * @return  the value of t_order.salesman_id
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public String getSalesmanId() {
 		return salesmanId;
@@ -656,7 +666,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.salesman_id
 	 * @param salesmanId  the value for t_order.salesman_id
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setSalesmanId(String salesmanId) {
 		this.salesmanId = salesmanId;
@@ -665,7 +675,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.finance_id
 	 * @return  the value of t_order.finance_id
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public String getFinanceId() {
 		return financeId;
@@ -674,7 +684,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.finance_id
 	 * @param financeId  the value for t_order.finance_id
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setFinanceId(String financeId) {
 		this.financeId = financeId;
@@ -683,7 +693,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.technician_id
 	 * @return  the value of t_order.technician_id
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public String getTechnicianId() {
 		return technicianId;
@@ -692,7 +702,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.technician_id
 	 * @param technicianId  the value for t_order.technician_id
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setTechnicianId(String technicianId) {
 		this.technicianId = technicianId;
@@ -701,7 +711,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.confirm_time
 	 * @return  the value of t_order.confirm_time
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Date getConfirmTime() {
 		return confirmTime;
@@ -710,7 +720,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.confirm_time
 	 * @param confirmTime  the value for t_order.confirm_time
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setConfirmTime(Date confirmTime) {
 		this.confirmTime = confirmTime;
@@ -719,7 +729,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.sign_time
 	 * @return  the value of t_order.sign_time
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Date getSignTime() {
 		return signTime;
@@ -728,7 +738,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.sign_time
 	 * @param signTime  the value for t_order.sign_time
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setSignTime(Date signTime) {
 		this.signTime = signTime;
@@ -737,7 +747,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.set_up_time
 	 * @return  the value of t_order.set_up_time
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Date getSetUpTime() {
 		return setUpTime;
@@ -746,7 +756,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.set_up_time
 	 * @param setUpTime  the value for t_order.set_up_time
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setSetUpTime(Date setUpTime) {
 		this.setUpTime = setUpTime;
@@ -755,7 +765,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.settlement_time
 	 * @return  the value of t_order.settlement_time
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Date getSettlementTime() {
 		return settlementTime;
@@ -764,16 +774,52 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.settlement_time
 	 * @param settlementTime  the value for t_order.settlement_time
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setSettlementTime(Date settlementTime) {
 		this.settlementTime = settlementTime;
 	}
 
 	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.contract_no
+	 * @return  the value of t_order.contract_no
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 */
+	public String getContractNo() {
+		return contractNo;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.contract_no
+	 * @param contractNo  the value for t_order.contract_no
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 */
+	public void setContractNo(String contractNo) {
+		this.contractNo = contractNo;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.contract_type
+	 * @return  the value of t_order.contract_type
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 */
+	public String getContractType() {
+		return contractType;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.contract_type
+	 * @param contractType  the value for t_order.contract_type
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
+	 */
+	public void setContractType(String contractType) {
+		this.contractType = contractType;
+	}
+
+	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order.contract_picture_url
 	 * @return  the value of t_order.contract_picture_url
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public String getContractPictureUrl() {
 		return contractPictureUrl;
@@ -782,7 +828,7 @@ public class TOrder {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order.contract_picture_url
 	 * @param contractPictureUrl  the value for t_order.contract_picture_url
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setContractPictureUrl(String contractPictureUrl) {
 		this.contractPictureUrl = contractPictureUrl;

+ 156 - 16
src/main/java/com/goafanti/common/model/TOrderExample.java

@@ -8,23 +8,23 @@ import java.util.List;
 public class TOrderExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public TOrderExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -32,7 +32,7 @@ public class TOrderExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -40,7 +40,7 @@ public class TOrderExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -48,7 +48,7 @@ public class TOrderExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -56,7 +56,7 @@ public class TOrderExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -64,7 +64,7 @@ public class TOrderExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -72,7 +72,7 @@ public class TOrderExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -80,7 +80,7 @@ public class TOrderExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -90,7 +90,7 @@ public class TOrderExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -102,7 +102,7 @@ public class TOrderExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -111,7 +111,7 @@ public class TOrderExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -121,7 +121,7 @@ public class TOrderExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -2223,11 +2223,151 @@ public class TOrderExample {
 			addCriterion("settlement_time not between", value1, value2, "settlementTime");
 			return (Criteria) this;
 		}
+
+		public Criteria andContractNoIsNull() {
+			addCriterion("contract_no is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andContractNoIsNotNull() {
+			addCriterion("contract_no is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andContractNoEqualTo(String value) {
+			addCriterion("contract_no =", value, "contractNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andContractNoNotEqualTo(String value) {
+			addCriterion("contract_no <>", value, "contractNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andContractNoGreaterThan(String value) {
+			addCriterion("contract_no >", value, "contractNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andContractNoGreaterThanOrEqualTo(String value) {
+			addCriterion("contract_no >=", value, "contractNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andContractNoLessThan(String value) {
+			addCriterion("contract_no <", value, "contractNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andContractNoLessThanOrEqualTo(String value) {
+			addCriterion("contract_no <=", value, "contractNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andContractNoLike(String value) {
+			addCriterion("contract_no like", value, "contractNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andContractNoNotLike(String value) {
+			addCriterion("contract_no not like", value, "contractNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andContractNoIn(List<String> values) {
+			addCriterion("contract_no in", values, "contractNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andContractNoNotIn(List<String> values) {
+			addCriterion("contract_no not in", values, "contractNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andContractNoBetween(String value1, String value2) {
+			addCriterion("contract_no between", value1, value2, "contractNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andContractNoNotBetween(String value1, String value2) {
+			addCriterion("contract_no not between", value1, value2, "contractNo");
+			return (Criteria) this;
+		}
+
+		public Criteria andContractTypeIsNull() {
+			addCriterion("contract_type is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andContractTypeIsNotNull() {
+			addCriterion("contract_type is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andContractTypeEqualTo(String value) {
+			addCriterion("contract_type =", value, "contractType");
+			return (Criteria) this;
+		}
+
+		public Criteria andContractTypeNotEqualTo(String value) {
+			addCriterion("contract_type <>", value, "contractType");
+			return (Criteria) this;
+		}
+
+		public Criteria andContractTypeGreaterThan(String value) {
+			addCriterion("contract_type >", value, "contractType");
+			return (Criteria) this;
+		}
+
+		public Criteria andContractTypeGreaterThanOrEqualTo(String value) {
+			addCriterion("contract_type >=", value, "contractType");
+			return (Criteria) this;
+		}
+
+		public Criteria andContractTypeLessThan(String value) {
+			addCriterion("contract_type <", value, "contractType");
+			return (Criteria) this;
+		}
+
+		public Criteria andContractTypeLessThanOrEqualTo(String value) {
+			addCriterion("contract_type <=", value, "contractType");
+			return (Criteria) this;
+		}
+
+		public Criteria andContractTypeLike(String value) {
+			addCriterion("contract_type like", value, "contractType");
+			return (Criteria) this;
+		}
+
+		public Criteria andContractTypeNotLike(String value) {
+			addCriterion("contract_type not like", value, "contractType");
+			return (Criteria) this;
+		}
+
+		public Criteria andContractTypeIn(List<String> values) {
+			addCriterion("contract_type in", values, "contractType");
+			return (Criteria) this;
+		}
+
+		public Criteria andContractTypeNotIn(List<String> values) {
+			addCriterion("contract_type not in", values, "contractType");
+			return (Criteria) this;
+		}
+
+		public Criteria andContractTypeBetween(String value1, String value2) {
+			addCriterion("contract_type between", value1, value2, "contractType");
+			return (Criteria) this;
+		}
+
+		public Criteria andContractTypeNotBetween(String value1, String value2) {
+			addCriterion("contract_type not between", value1, value2, "contractType");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order
-	 * @mbg.generated  Mon Jan 22 19:15:05 CST 2018
+	 * @mbg.generated  Fri Mar 02 16:57:09 CST 2018
 	 */
 	public static class Criterion {
 		private String condition;

+ 1 - 1
src/main/java/com/goafanti/common/task/OrderReportTask.java

@@ -25,7 +25,7 @@ public class OrderReportTask {
 	 * "0 0 17 * * ?" 每天17点触发一次
 	 */
 	@Scheduled(cron = "0 0 17 * * ?")
-	public void exprireRun() {
+	public void runStatistics() {
 		LoggerUtils.debug(logger, "统计订单报表任务开始");
 		Calendar now = Calendar.getInstance();
 		now.set(Calendar.MILLISECOND, 0);

+ 8 - 0
src/main/java/com/goafanti/order/bo/CommodityDetailBo.java

@@ -15,6 +15,8 @@ public class CommodityDetailBo {
 	private String commodityMode;
 	/** 商品类型 **/
 	private Integer commodityType;
+	/** 业务品类 **/
+	private String commodityClassify;
 	/** 商品实价 **/
 	private String discountPrice;
 	/** 实际首付价格 **/
@@ -63,6 +65,12 @@ public class CommodityDetailBo {
 	public void setCommodityType(Integer commodityType) {
 		this.commodityType = commodityType;
 	}
+	public String getCommodityClassify() {
+		return commodityClassify;
+	}
+	public void setCommodityClassify(String commodityClassify) {
+		this.commodityClassify = commodityClassify;
+	}
 	public String getDiscountPrice() {
 		return discountPrice;
 	}

+ 8 - 0
src/main/java/com/goafanti/order/bo/OrderListBo.java

@@ -10,6 +10,8 @@ public class OrderListBo {
 	private String orderNo;
 	/** 订单类型 **/
 	private Integer orderType;
+	/** 业务品类 **/
+	private String projectType;
 	/** 订单创建时间 **/
 	private String createTime;
 	/** 合同首付金额 **/
@@ -62,6 +64,12 @@ public class OrderListBo {
 	public void setOrderType(Integer orderType) {
 		this.orderType = orderType;
 	}
+	public String getProjectType() {
+		return projectType;
+	}
+	public void setProjectType(String projectType) {
+		this.projectType = projectType;
+	}
 	public String getCreateTime() {
 		return createTime;
 	}

+ 8 - 0
src/main/java/com/goafanti/order/bo/ServiceOrderDetailBo.java

@@ -23,6 +23,8 @@ public class ServiceOrderDetailBo extends OrderListBo{
 	private String financeId;
 	/** 技术人员 **/
 	private String technicianId;
+	/** 合同编号 **/
+	private String contractNo;
 	/** 可操作内容 **/
 	private OperatorActive operatorActive;
 	public String getSignTime() {
@@ -91,6 +93,12 @@ public class ServiceOrderDetailBo extends OrderListBo{
 	public void setTechnicianId(String technicianId) {
 		this.technicianId = technicianId;
 	}
+	public String getContractNo() {
+		return contractNo;
+	}
+	public void setContractNo(String contractNo) {
+		this.contractNo = contractNo;
+	}
 	public OperatorActive getOperatorActive() {
 		return operatorActive;
 	}

+ 48 - 13
src/main/java/com/goafanti/order/controller/AdminOrderApiController.java

@@ -66,7 +66,7 @@ public class AdminOrderApiController extends CertifyApiController {
 	 */
 	@RequestMapping(value = "/updateServiceOrder",method = RequestMethod.POST)
 	public Result updateServiceOrder(String orderNo,String signFirstPayment,String signTotalAmount,
-			String orderRemarks){
+			String contractNo,String orderRemarks){
 		Result res = new Result();
 		if(StringUtils.isBlank(orderNo)){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "订单编号"));
@@ -76,7 +76,7 @@ public class AdminOrderApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "订单金额 和 首付金额"));
 			return res;
 		}
-		orderServiceImpl.updateServiceOrder(orderNo,signFirstPayment,signTotalAmount,
+		orderServiceImpl.updateServiceOrder(orderNo,signFirstPayment,signTotalAmount,contractNo,
 				orderRemarks);
 		return res;
 	}
@@ -91,13 +91,17 @@ public class AdminOrderApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/signServiceOrder", method = RequestMethod.POST)
-	public Result signServiceOrder(String orderNo,String signFirstPayment,String signTotalAmount,
+	public Result signServiceOrder(String orderNo,String contractNo,String signFirstPayment,String signTotalAmount,
 			String approval,String orderRemarks){
 		Result res = new Result();
 		if(StringUtils.isBlank(orderNo)){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "订单编号"));
 			return res;
 		}
+		if(StringUtils.isBlank(contractNo)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "合同编号"));
+			return res;
+		}
 		if(StringUtils.isBlank(signFirstPayment) || StringUtils.isBlank(signTotalAmount)){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "订单金额 和 首付金额"));
 			return res;
@@ -106,7 +110,7 @@ public class AdminOrderApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "特批状态"));
 			return res;
 		}
-		orderServiceImpl.updateSignServiceOrder(orderNo,signFirstPayment,signTotalAmount,approval,orderRemarks);
+		orderServiceImpl.updateSignServiceOrder(orderNo,contractNo,signFirstPayment,signTotalAmount,approval,orderRemarks);
 		return res;
 	}
 	
@@ -326,7 +330,7 @@ public class AdminOrderApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/createOrder",method = RequestMethod.POST)
-	public Result createOrder(String uid,Integer orderType){
+	public Result createOrder(String uid,Integer orderType,String contractType){
 		Result res = new Result();
 		if(StringUtils.isBlank(uid)){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","客户编号"));
@@ -339,8 +343,13 @@ public class AdminOrderApiController extends CertifyApiController {
 		if(orderType != CommodityType.SERVICE.getTypeCode()){
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"","暂不支持创建该类型订单"));
 			return res;
+		}else {
+			if(StringUtils.isBlank(contractType)) {
+				res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","业务品类"));
+				return res;
+			}
 		}
-		orderServiceImpl.createServiceOrder(uid,orderType);
+		orderServiceImpl.createServiceOrder(uid,orderType,contractType);
 		return res;
 	}
 	
@@ -384,18 +393,18 @@ public class AdminOrderApiController extends CertifyApiController {
 			String endDate,Integer pageNo, Integer pageSize){
 		Result res = new Result();
 		res.setData(orderServiceImpl.selectSettlementList(orderNo, depId, buyerName, salesmanName,
-				TokenManager.getAdminId(), financeName, orderStatus, liquidationStatus, approval,startDate,endDate, pageNo, pageSize));
+				TokenManager.getAdminId(), financeName, orderStatus, liquidationStatus, approval,null,startDate,endDate, pageNo, pageSize));
 		return res;
 	}
 	
 	/** 结算订单管理 **/
 	@RequestMapping(value = "/listAllSettlement", method = RequestMethod.POST)
 	public Result listAllSettlement(String orderNo, String depId,String buyerName,String salesmanName, String financeName,
-			Integer orderStatus,Integer liquidationStatus,Integer approval,String startDate,String endDate,
+			Integer orderStatus,Integer liquidationStatus,Integer approval,Integer isDistributionFinance,String startDate,String endDate,
 			Integer pageNo, Integer pageSize){
 		Result res = new Result();
 		res.setData(orderServiceImpl.selectSettlementList(orderNo, depId, buyerName, salesmanName,
-				"", financeName, orderStatus, liquidationStatus, approval, startDate,endDate, pageNo, pageSize));
+				"", financeName, orderStatus, liquidationStatus, approval,isDistributionFinance, startDate,endDate, pageNo, pageSize));
 		return res;
 	}
 	
@@ -424,9 +433,9 @@ public class AdminOrderApiController extends CertifyApiController {
 	/** 所有订单流水查询 **/
 	@RequestMapping(value = "/queryAllBill", method = RequestMethod.POST)
 	public Result queryAllBill(String payeeName, String payerName, String depId,
-			String salesmanName,String financeName,String orderNo, Integer pageNo, Integer pageSize){
+			String salesmanName,String financeName,String orderNo, Integer confirmSign,Integer deleteSign, Integer pageNo, Integer pageSize){
 		Result res = new Result();
-		res.setData(orderServiceImpl.queryAllBillList(payeeName, payerName, depId, salesmanName,financeName, orderNo, pageNo, pageSize));
+		res.setData(orderServiceImpl.queryAllBillList(payeeName, payerName, depId, salesmanName,financeName, orderNo,confirmSign,deleteSign, pageNo, pageSize));
 		return res;
 	}
 	
@@ -467,8 +476,8 @@ public class AdminOrderApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","确认状态"));
 			return res;
 		}else if(confirm  == AuditState.AUDIT_SUCCESS.getCode()){
-			if(StringUtils.isBlank(financialPayNo) || StringUtils.isBlank(financialPayTime)){
-				res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","财务流水号和财务流水时间"));
+			if(StringUtils.isBlank(financialPayTime)){
+				res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","财务流水时间"));
 				return res;
 			}
 		}
@@ -580,4 +589,30 @@ public class AdminOrderApiController extends CertifyApiController {
 		orderServiceImpl.updateConfirmRefund(orderNo,confirm);
 		return res;
 	}
+	
+	/**
+	 * 转交订单
+	 * @param orderNo
+	 * @param aid
+	 * @param targetType
+	 * @return
+	 */
+	@RequestMapping(value = "/transferOrder", method = RequestMethod.POST)
+	public Result transferOrder(String orderNo,String aid,Integer targetType){
+		Result res = new Result();
+		if(StringUtils.isBlank(orderNo)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号"));
+			return res;
+		}
+		if(StringUtils.isBlank(aid)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","转交人 ID"));
+			return res;
+		}
+		if(null == targetType){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","转交类型"));
+			return res;
+		}
+		orderServiceImpl.updateTransferOrder(orderNo, aid, targetType);
+		return res;
+	}
 }

+ 15 - 5
src/main/java/com/goafanti/order/service/OrderService.java

@@ -134,7 +134,7 @@ public interface OrderService {
 	 * @return
 	 */
 	int updateServiceOrder(String orderNo, String signFirstPayment,
-			String signTotalAmount, String orderRemarks);
+			String signTotalAmount, String contractNo,String orderRemarks);
 	
 	/**
 	 * 签单
@@ -147,7 +147,7 @@ public interface OrderService {
 	 * @param orderRemarks
 	 * @return
 	 */
-	int updateSignServiceOrder(String orderNo,String signFirstPayment, String signTotalAmount,
+	int updateSignServiceOrder(String orderNo,String contractNo,String signFirstPayment, String signTotalAmount,
 			String approval,String orderRemarks);
 
 	/**
@@ -229,9 +229,10 @@ public interface OrderService {
 	 * 创建订单
 	 * @param uid
 	 * @param orderType
+	 * @param contractType 合同类型
 	 * @return
 	 */
-	int createServiceOrder(String uid, Integer orderType);
+	int createServiceOrder(String uid, Integer orderType,String contractType);
 
 	/**
 	 * 查询公共订单
@@ -260,7 +261,7 @@ public interface OrderService {
 	 * @return
 	 */
 	Pagination<OrderListBo> selectSettlementList(String orderNo, String depId,String buyerName,String salesmanName,  
-			String financeId,String financeName,Integer orderStatus,Integer liquidationStatus,Integer approval,
+			String financeId,String financeName,Integer orderStatus,Integer liquidationStatus,Integer approval,Integer isDistributionFinance,
 			String startDate,String endDate,Integer pageNo, Integer pageSize);
 	
 	/**
@@ -305,7 +306,7 @@ public interface OrderService {
 	 * @return
 	 */
 	Pagination<BillListBo> queryAllBillList(String payeeName,String payerName,String depId,String salesmanName,String financeName,String orderNo,
-			Integer pageNo,Integer pageSize);
+			 Integer confirmSign,Integer deleteSign,Integer pageNo,Integer pageSize);
 	
 	/**
 	 * 查看流水详情
@@ -413,4 +414,13 @@ public interface OrderService {
 	 * @return
 	 */
 	int updateConfirmRefund(String orderNo,boolean confirm);
+	
+	/**
+	 * 转交订单
+	 * @param orderNo
+	 * @param aid
+	 * @param targetType
+	 * @return
+	 */
+	int updateTransferOrder(String orderNo,String aid,Integer targetType);
 }

+ 29 - 11
src/main/java/com/goafanti/order/service/impl/OrderServiceImpl.java

@@ -154,6 +154,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		tOrder.setApproval(ApprovalState.NORMAL.getCode());
 		tOrder.setSalesmanId(getSalesmanIdByUid(TokenManager.getAdminId()));
 		tOrder.setOrderRemarks(remarks);
+		tOrder.setContractType(bo.getCommodityClassify());
 		setOrderState(OrderAction.ADD_INTENTION, new BigDecimal(0), tOrder, false);
 		
 		TOrderDetail tOrderDetail = new TOrderDetail();
@@ -844,7 +845,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 
 	@Override
 	public int updateServiceOrder(String orderNo,  String signFirstPayment,
-			String signTotalAmount, String orderRemarks) {
+			String signTotalAmount,String contractNo, String orderRemarks) {
 		TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
 		checkOrder(tOrder);
 		boolean flag = false;
@@ -859,12 +860,13 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		tOrder.setSignTotalAmount(new BigDecimal(signTotalAmount));
 		tOrder.setOrderRemarks(orderRemarks);
 		tOrder.setUpdateTime(new Date());
+		tOrder.setContractNo(contractNo);
 		tOrderMapper.updateByPrimaryKeySelective(tOrder);
 		return 1;
 	}
 
 	@Override
-	public int updateSignServiceOrder(String orderNo, String signFirstPayment, String signTotalAmount,
+	public int updateSignServiceOrder(String orderNo,String contractNo, String signFirstPayment, String signTotalAmount,
 			String approval,String orderRemarks) {
 		TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
 		checkOrder(tOrder);
@@ -881,6 +883,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 			tOrder.setUpdateTime(signTime);
 			tOrder.setSignTime(signTime);
 			tOrder.setOrderRemarks(orderRemarks);
+			tOrder.setContractNo(contractNo);
 			tOrderMapper.updateByPrimaryKeySelective(tOrder);
 		}
 		return 1;
@@ -1112,7 +1115,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 	}
 
 	@Override
-	public int createServiceOrder(String uid, Integer orderType) {
+	public int createServiceOrder(String uid, Integer orderType,String contractType) {
 		BigDecimal initial = new BigDecimal(0);
 		TOrder tOrder = new TOrder();
 		tOrder.setOrderType(orderType);
@@ -1132,6 +1135,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		tOrder.setOrderChannel(OrderChannel.PORTAL.getCode());	
 		tOrder.setDeleteSign(ActiveState.NORMAL.getCode());
 		tOrder.setApproval(ApprovalState.NORMAL.getCode());
+		tOrder.setContractType(contractType);
 		setOrderState(OrderAction.ADD_INTENTION, new BigDecimal(0), tOrder, false);
 		return tOrderMapper.insert(tOrder);
 	}
@@ -1162,7 +1166,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<OrderListBo> selectSettlementList(String orderNo, String depId,String buyerName,String salesmanName,  
-			String financeId,String financeName,Integer orderStatus,Integer liquidationStatus,Integer approval,
+			String financeId,String financeName,Integer orderStatus,Integer liquidationStatus,Integer approval,Integer isDistributionFinance,
 			String startDate,String endDate,Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		if(StringUtils.isNotBlank(orderNo)) params.put("orderNo", orderNo);
@@ -1171,9 +1175,10 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		if(StringUtils.isNotBlank(salesmanName)) params.put("salesmanName", salesmanName);
 		if(StringUtils.isNotBlank(financeId)) params.put("financeId", financeId);
 		if(StringUtils.isNotBlank(financeName)) params.put("financeName", financeName);
-		if(orderStatus != null) params.put("orderStatus", OrderStage.SIGNED.getCode()); //已签单
+		if(orderStatus != null) params.put("orderStatus", orderStatus);
 		if(liquidationStatus != null) params.put("liquidationStatus", liquidationStatus);
 		if(approval != null) params.put("approval", approval);
+		if(isDistributionFinance != null) params.put("isDistributionFinance", isDistributionFinance);
 		if(StringUtils.isNotBlank(startDate)) params.put("startDate", startDate);
 		if(StringUtils.isNotBlank(endDate)) params.put("endDate", endDate);
 		return (Pagination<OrderListBo>)findPage("selectSettlementByPage","selectSettlementCount", params, pageNo, pageSize);
@@ -1206,13 +1211,13 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 	public Pagination<BillListBo> queryMyBillList(String payeeName, String payerName, String depId,
 			String salesmanName,String orderNo, Integer confirmSign,Integer deleteSign, Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<String, Object>();
-		if(StringUtils.isNotBlank(payerName)) params.put("payeeName", payeeName);
+		if(StringUtils.isNotBlank(payeeName)) params.put("payeeName", payeeName);
 		if(StringUtils.isNotBlank(payerName)) params.put("payerName", payerName);
 		if(StringUtils.isNotBlank(depId)) params.put("depId", depId);
 		if(StringUtils.isNotBlank(salesmanName)) params.put("salesmanName", salesmanName);
 		if(StringUtils.isNotBlank(orderNo)) params.put("orderNo", orderNo);
 		if(confirmSign != null) params.put("confirmSign", confirmSign);
-		if(confirmSign != null) params.put("deleteSign", deleteSign);
+		if(deleteSign != null) params.put("deleteSign", deleteSign);
 		/** 特殊处理字段开始 **/
 		if(!TokenManager.hasRole(AFTConstants.SUPERADMIN)){
 			params.put("isFinance", 0);
@@ -1225,14 +1230,16 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<BillListBo> queryAllBillList(String payeeName, String payerName, String depId,
-			String salesmanName ,String financeName, String orderNo, Integer pageNo, Integer pageSize) {
+			String salesmanName ,String financeName, String orderNo, Integer confirmSign,Integer deleteSign,Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<String, Object>();
-		if(StringUtils.isNotBlank(payerName)) params.put("payeeName", payeeName);
+		if(StringUtils.isNotBlank(payeeName)) params.put("payeeName", payeeName);
 		if(StringUtils.isNotBlank(payerName)) params.put("payerName", payerName);
 		if(StringUtils.isNotBlank(depId)) params.put("depId", depId);
 		if(StringUtils.isNotBlank(salesmanName)) params.put("salesmanName", salesmanName);
 		if(StringUtils.isNotBlank(financeName)) params.put("financeName", financeName);
 		if(orderNo != null) params.put("orderNo", orderNo);
+		if(confirmSign != null) params.put("confirmSign", confirmSign);
+		if(deleteSign != null) params.put("deleteSign", deleteSign);
 		Pagination<BillListBo> data = (Pagination<BillListBo>)findPage("selectBillByPage","selectBillCount", params, pageNo, pageSize);
 		List<BillListBo> list = (List<BillListBo>)data.getList();
 		if(list.size()>0){
@@ -1377,7 +1384,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		String contractId = UUID.randomUUID().toString().replace("-", "");
 		contract.setId(contractId);
 		contract.setCreateTime(createTime);
-		contract.setType(tOrder.getOrderType());
+		contract.setType(tOrder.getContractType());
 		contract.setSignDate(createTime);
 		contract.setOrderNo(orderNo);
 		contract.setStatus(ProjectStage.ALREADY_SET_UP.getCode());
@@ -1398,7 +1405,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 				task.setCreateTime(createTime);
 				task.setContractId(contractId);
 				task.setTaskStatus(TaskState.UN_DISTRIBUTION.getCode());
-				task.setDeleteSign(DeleteStatus.UNDELETE.getCode());
+				task.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 				taskList.add(task);
 			}
 		}
@@ -1515,4 +1522,15 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 		}
 		return tOrderMapper.updateByPrimaryKey(tOrder);
 	}
+
+	@Override
+	public int updateTransferOrder(String orderNo, String aid, Integer targetType) {
+		TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
+		checkOrder(tOrder);
+		if(targetType == 0) tOrder.setSalesmanId(aid);
+		else if(targetType == 1) tOrder.setFinanceId(aid);
+		else if(targetType == 2) tOrder.setTechnicianId(aid);
+		tOrder.setUpdateTime(new Date());
+		return tOrderMapper.updateByPrimaryKeySelective(tOrder);
+	}
 }

+ 43 - 2
src/main/java/com/goafanti/report/controller/ReportApiController.java

@@ -1,5 +1,6 @@
 package com.goafanti.report.controller;
 
+import java.util.Calendar;
 import java.util.Date;
 
 import org.apache.commons.lang3.StringUtils;
@@ -36,6 +37,15 @@ public class ReportApiController extends BaseApiController {
 		} catch (Exception e) {
 			startTime = new Date();
 		}
+		if (StringUtils.isBlank(depName)) {
+			depName = null;
+		}
+		if (StringUtils.isBlank(name)) {
+			name = null;
+		}
+		if (StringUtils.isBlank(position)) {
+			position = null;
+		}
 		Integer pageSize = StringUtils.isBlank(pSize) ? null : handlePageSize(pSize);
 		Integer pageNo = StringUtils.isBlank(pNo) ? null : handlePageNo(pNo);
 		if (pageSize != null && pageNo != null) {
@@ -46,14 +56,24 @@ public class ReportApiController extends BaseApiController {
 	}
 
 	@RequestMapping(value = "/sales/total", method = RequestMethod.GET)
-	public Result total(String date) {
+	public Result total(String date, @RequestParam(required = false) String depName,
+			@RequestParam(required = false) String name, @RequestParam(required = false) String position) {
 		Date startTime = null;
 		try {
 			startTime = DateUtils.parseDate(date, AFTConstants.YYYYMMDDHHMMSS);
 		} catch (Exception e) {
 			startTime = new Date();
 		}
-		return res().data(reportService.getReportTotal(startTime));
+		if (StringUtils.isBlank(depName)) {
+			depName = null;
+		}
+		if (StringUtils.isBlank(name)) {
+			name = null;
+		}
+		if (StringUtils.isBlank(position)) {
+			position = null;
+		}
+		return res().data(reportService.getReportTotal(startTime, depName, name, position));
 	}
 
 	@RequestMapping(value = "/sales/department", method = RequestMethod.GET)
@@ -67,4 +87,25 @@ public class ReportApiController extends BaseApiController {
 		return res().data(reportService.getDepartmentSalesReports(startTime));
 	}
 
+	@RequestMapping(value = "/sales/doStatistics", method = RequestMethod.GET)
+	public Result doStatistics(String date) {
+		Date dateTime = null;
+		try {
+			dateTime = DateUtils.parseDate(date, AFTConstants.YYYYMMDDHHMMSS);
+		} catch (Exception e) {
+			dateTime = new Date();
+		}
+		Calendar now = Calendar.getInstance();
+		now.setTime(dateTime);
+		now.set(Calendar.MILLISECOND, 0);
+		now.set(Calendar.SECOND, 0);
+		now.set(Calendar.MINUTE, 0);
+		now.set(Calendar.HOUR_OF_DAY, 17);
+		Date start = new Calendar.Builder()
+				.setDate(now.get(Calendar.YEAR), now.get(Calendar.MONTH), now.get(Calendar.DAY_OF_MONTH) - 1)
+				.setTimeOfDay(17, 0, 0, 0).build().getTime();
+		// 统计从指定日期前一天的17点到指定日期17点的数据,算作改日期数据
+		return res().data(reportService.insertDailyReports(start, now.getTime()));
+	}
+
 }

+ 45 - 9
src/main/java/com/goafanti/report/service/SalesReportServiceImpl.java

@@ -17,6 +17,7 @@ import org.springframework.ui.ModelMap;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.DailySalesReportMapper;
 import com.goafanti.common.error.BusinessException;
+import com.goafanti.common.model.DailySalesReport;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.report.bo.DepartmentSalesReportBO;
 import com.goafanti.report.bo.PersonalSalesReportBO;
@@ -32,22 +33,49 @@ public class SalesReportServiceImpl extends BaseMybatisDao<DailySalesReportMappe
 	DailySalesReportMapper salesReportMapper;
 
 	public int insertDailyReports(Date startTime, Date endTime) {
-		return salesReportMapper.insertSalesReports(startTime, endTime);
+		List<DailySalesReport> list = salesReportMapper.selectAdmins();
+		Map<String, DailySalesReport> map = new HashMap<>();
+		for (DailySalesReport dsr : list) {
+			dsr.setCreateTime(endTime);
+			map.put(dsr.getAdminId(), dsr);
+		}
+		List<DailySalesReport> reports = salesReportMapper.selectDailySalesReports(startTime, endTime);
+		for (DailySalesReport dsr : reports) {
+			DailySalesReport item = map.get(dsr.getAdminId());
+			if (item != null) {
+				item.setOrderAmount(item.getOrderAmount().add(dsr.getOrderAmount()));
+				item.setOrderCount(item.getOrderCount() + dsr.getOrderCount());
+			}
+		}
+		salesReportMapper.deleteByDate(endTime);
+		return salesReportMapper.insertBatch(list);
 	}
 
-	public ModelMap getReportTotal(Date startTime) {
+	public ModelMap getReportTotal(Date startTime, String depName, String name, String position) {
 		ReportDate rd = new ReportDate(startTime);
 		ModelMap mm = new ModelMap();
-		putField(mm, "dailyTotalCount", "dailyTotalAmount", rd.getDailyStart(), rd.getDailyEnd());
-		putField(mm, "weeklyTotalCount", "weeklyTotalAmount", rd.getWeeklyStart(), rd.getWeeklyEnd());
-		putField(mm, "monthlyTotalCount", "monthlyTotalAmount", rd.getMonthStart(), rd.getMonthEnd());
-		putField(mm, "quarterlyTotalCount", "quarterlyTotalAmount", rd.getQuarterStart(), rd.getQuarterEnd());
-		putField(mm, "annuallyTotalCount", "annuallyTotalAmount", rd.getYearStart(), rd.getYearEnd());
+		putField(mm, "dailyTotalCount", "dailyTotalAmount", rd.getDailyStart(), rd.getDailyEnd(), depName, name,
+				position);
+		putField(mm, "weeklyTotalCount", "weeklyTotalAmount", rd.getWeeklyStart(), rd.getWeeklyEnd(), depName, name,
+				position);
+		putField(mm, "monthlyTotalCount", "monthlyTotalAmount", rd.getMonthStart(), rd.getMonthEnd(), depName, name,
+				position);
+		putField(mm, "quarterlyTotalCount", "quarterlyTotalAmount", rd.getQuarterStart(), rd.getQuarterEnd(), depName,
+				name, position);
+		putField(mm, "annuallyTotalCount", "annuallyTotalAmount", rd.getYearStart(), rd.getYearEnd(), depName, name,
+				position);
+		long totalCount = salesReportMapper.selectSalesPersonalReportsCount(rd.getDailyStart(), rd.getDailyEnd(),
+				depName, name, position);
+		if (totalCount == 0) {
+			totalCount = salesReportMapper.selectSalesPersonalReportsCount(null, null, depName, name, position);
+		}
+		mm.put("totalRecordCount", totalCount);
 		return mm;
 	}
 
-	private void putField(ModelMap mm, String count, String amount, Date start, Date end) {
-		ModelMap res = salesReportMapper.selectTotalReports(start, end);
+	private void putField(ModelMap mm, String count, String amount, Date start, Date end, String depName, String name,
+			String position) {
+		ModelMap res = salesReportMapper.selectTotalReports(start, end, depName, name, position);
 		mm.put(count, res == null ? 0 : res.get("totalCount"));
 		mm.put(amount, res == null ? 0 : res.get("totalAmount"));
 	}
@@ -89,6 +117,14 @@ public class SalesReportServiceImpl extends BaseMybatisDao<DailySalesReportMappe
 					SalesReportOrderField.AnnuallyOrderAmount.getCode(), depName, name, position);
 			break;
 		}
+
+		if (list.isEmpty()) {
+			list = salesReportMapper.selectPersonalByPage(pageNo, pageSize, depName, name, position);
+		}
+		if (list.isEmpty()) {
+			return list;
+		}
+
 		Map<String, PersonalSalesReportBO> map = new HashMap<>();
 		List<String> ids = list.stream().map(item -> {
 			map.put(item.getId(), item);

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

@@ -5,6 +5,7 @@ public class ProjectDetailBo extends ProjectListBo{
 	private String signComment;
 	private String completeComment;
 	private String uid;
+	private String buyerProvince;
 	public String getSignComment() {
 		return signComment;
 	}
@@ -28,4 +29,12 @@ public class ProjectDetailBo extends ProjectListBo{
 	public void setUid(String uid) {
 		this.uid = uid;
 	}
+
+	public String getBuyerProvince() {
+		return buyerProvince;
+	}
+
+	public void setBuyerProvince(String buyerProvince) {
+		this.buyerProvince = buyerProvince;
+	}
 }

+ 24 - 8
src/main/java/com/goafanti/techproject/bo/ProjectListBo.java

@@ -13,15 +13,17 @@ public class ProjectListBo {
 	/** 结算状态 **/
 	private Integer liquidationStatus;
 	/** 项目类型 **/
-	private Integer projectType;
+	private String projectType;
 	/** 项目状态 **/
 	private Integer projectStatus;
 	/** 删除标示**/
-	private Integer deleteSign; 
+	private Integer deletedSign; 
 	/** 是否特批 **/
 	private Integer approval;
 	/** 客户名 **/
 	private String buyerName;
+	/** 客户省份 **/
+	private Integer buyerType;
 	/** 营销员 **/
 	private String salesmanName;
 	/** 财务负责人 **/
@@ -30,6 +32,8 @@ public class ProjectListBo {
 	private String technicianName;
 	/** 项目负责人 **/
 	private String principalName;
+	/** 订单部门 **/
+	private String departmentName;
 	/** 立项时间 **/
 	private String signDate;
 	/** 结项时间 **/
@@ -70,10 +74,10 @@ public class ProjectListBo {
 	public void setLiquidationStatus(Integer liquidationStatus) {
 		this.liquidationStatus = liquidationStatus;
 	}
-	public Integer getProjectType() {
+	public String getProjectType() {
 		return projectType;
 	}
-	public void setProjectType(Integer projectType) {
+	public void setProjectType(String projectType) {
 		this.projectType = projectType;
 	}
 	public Integer getProjectStatus() {
@@ -82,11 +86,11 @@ public class ProjectListBo {
 	public void setProjectStatus(Integer projectStatus) {
 		this.projectStatus = projectStatus;
 	}
-	public Integer getDeleteSign() {
-		return deleteSign;
+	public Integer getDeletedSign() {
+		return deletedSign;
 	}
-	public void setDeleteSign(Integer deleteSign) {
-		this.deleteSign = deleteSign;
+	public void setDeletedSign(Integer deletedSign) {
+		this.deletedSign = deletedSign;
 	}
 	public String getBuyerName() {
 		return buyerName;
@@ -94,6 +98,12 @@ public class ProjectListBo {
 	public void setBuyerName(String buyerName) {
 		this.buyerName = buyerName;
 	}
+	public Integer getBuyerType() {
+		return buyerType;
+	}
+	public void setBuyerType(Integer buyerType) {
+		this.buyerType = buyerType;
+	}
 	public Integer getApproval() {
 		return approval;
 	}
@@ -124,6 +134,12 @@ public class ProjectListBo {
 	public void setPrincipalName(String principalName) {
 		this.principalName = principalName;
 	}
+	public String getDepartmentName() {
+		return departmentName;
+	}
+	public void setDepartmentName(String departmentName) {
+		this.departmentName = departmentName;
+	}
 	public String getSignDate() {
 		return signDate;
 	}

+ 48 - 6
src/main/java/com/goafanti/techproject/controller/AdminTechProjectApiController.java

@@ -28,6 +28,7 @@ import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.common.enums.AttachmentType;
+import com.goafanti.common.enums.DeleteStatus;
 import com.goafanti.common.enums.TechProjectFields;
 import com.goafanti.common.enums.TechProjectStatus;
 import com.goafanti.common.model.Admin;
@@ -623,13 +624,13 @@ public class AdminTechProjectApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/createProject",method = RequestMethod.POST)
-	public Result createProject(String uid,String aid,Integer projectType,String signComment){
+	public Result createProject(String uid,String aid,String contractType,String signComment){
 		Result res = new Result();
-		if(StringUtils.isBlank(uid) || StringUtils.isBlank(aid) || projectType==null){
+		if(StringUtils.isBlank(uid) || StringUtils.isBlank(aid) || contractType == null){
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "客户和项目负责人"));
 			return res;
 		} 
-		techProjectService.createProject(uid, aid, signComment);
+		techProjectService.createProject(uid, aid, signComment,contractType);
 		return res;
 	}
 	
@@ -639,13 +640,17 @@ public class AdminTechProjectApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/getProjectDetail",method = RequestMethod.GET)
-	public Result getProjectDetail(String contractId){
+	public Result getProjectDetail(String contractId,Integer buyerType){
 		Result res = new Result();
 		if(StringUtils.isBlank(contractId)){
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "项目ID"));
 			return res;
 		}
-		res.setData(techProjectService.selectTechProjectDetail(contractId));
+		if(buyerType == null){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "客户类型"));
+			return res;
+		}
+		res.setData(techProjectService.selectTechProjectDetail(contractId,buyerType));
 		return res;
 	}
 	
@@ -758,7 +763,11 @@ public class AdminTechProjectApiController extends CertifyApiController {
 		}
 		ContractTask task = techProjectService.selectTaskById(taskId);
 		if(task != null){
-			if(task.getTaskStatus() != TaskState.UN_DISTRIBUTION.getCode()){
+			if(task.getTaskStatus() != TaskState.UN_DISTRIBUTION.getCode()){ //未派单
+				res.getError().add(buildError(ErrorConstants.NOT_ACCORD_WITH_NEXT, ""));
+				return res;
+			} 
+			if(task.getDeletedSign() != DeleteStatus.UNDELETE.getCode()){ //政策
 				res.getError().add(buildError(ErrorConstants.NOT_ACCORD_WITH_NEXT, ""));
 				return res;
 			}
@@ -832,6 +841,10 @@ public class AdminTechProjectApiController extends CertifyApiController {
 				res.getError().add(buildError(ErrorConstants.NOT_ACCORD_WITH_NEXT, ""));
 				return res;
 			}
+			if(task.getDeletedSign() != DeleteStatus.UNDELETE.getCode()){
+				res.getError().add(buildError(ErrorConstants.NOT_ACCORD_WITH_NEXT, ""));
+				return res;
+			}
 			task.setTaskStatus(TaskState.STARTED.getCode());
 			techProjectService.updateProjectTask(task);
 		}
@@ -856,6 +869,10 @@ public class AdminTechProjectApiController extends CertifyApiController {
 				res.getError().add(buildError(ErrorConstants.NOT_ACCORD_WITH_NEXT, ""));
 				return res;
 			}
+			if(task.getDeletedSign() != DeleteStatus.UNDELETE.getCode()){
+				res.getError().add(buildError(ErrorConstants.NOT_ACCORD_WITH_NEXT, ""));
+				return res;
+			}
 			task.setTaskStatus(TaskState.COMPLETE.getCode());
 			techProjectService.updateProjectTask(task);
 		}
@@ -898,4 +915,29 @@ public class AdminTechProjectApiController extends CertifyApiController {
 		techProjectService.updateRevokeOrComplete(contractId,operatorType,completeComment);
 		return res;
 	}
+	
+	/**
+	 * 锁定、解锁、废除任务
+	 * @param taskId
+	 * @param operatorType
+	 * @return
+	 */
+	@RequestMapping(value = "/lockOrRevokeOrder", method = RequestMethod.GET)
+	public Result lockOrRevokeOrder(String taskId,Integer operatorType){
+		Result res = new Result();
+		if(StringUtils.isBlank(taskId) || operatorType == null){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,"","订单编号和操作类型"));
+			return res;
+		}
+		ContractTask task = techProjectService.selectTaskById(taskId);
+		if(task.getDeletedSign() == DeleteStatus.UNDELETE.getCode() && operatorType == 2){ //锁定
+			task.setDeletedSign(DeleteStatus.LOCKING.getCode());
+		}else if(task.getDeletedSign() == DeleteStatus.LOCKING.getCode() && operatorType == 0){ //解锁
+			task.setDeletedSign(DeleteStatus.UNDELETE.getCode());
+		}else if(task.getDeletedSign() == DeleteStatus.UNDELETE.getCode() && operatorType == 1){ //废除
+			task.setDeletedSign(DeleteStatus.DELETED.getCode());
+		}
+		techProjectService.updateProjectTask(task);
+		return res;
+	}
 }

+ 2 - 2
src/main/java/com/goafanti/techproject/service/TechProjectService.java

@@ -63,14 +63,14 @@ public interface TechProjectService {
 	 * @param signComment
 	 * @return
 	 */
-	int createProject(String uid,String aid,String signComment) ;
+	int createProject(String uid,String aid,String signComment,String contractType) ;
 
 	/**
 	 * 查询项目详情
 	 * @param contractId
 	 * @return
 	 */
-	ProjectDetailBo selectTechProjectDetail(String contractId);
+	ProjectDetailBo selectTechProjectDetail(String contractId,Integer buyerType);
 
 	/**
 	 * 项目管理任务列表

+ 9 - 8
src/main/java/com/goafanti/techproject/service/impl/TechProjectServiceImpl.java

@@ -308,9 +308,10 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 			String orderEndDate, String setUpStartDate, String setUpEndDate,Integer pageNo,Integer pageSize) {
 		Map<String, Object> params = new HashMap<>();
 		if(StringUtils.isNotBlank(bo.getBuyerName())) params.put("buyerName", bo.getBuyerName());
-		if(bo.getDeleteSign() != null) params.put("deleteSign", bo.getDeleteSign());
-		if(bo.getOrderNo() != null) params.put("orderNo", bo.getOrderNo());
-		if(bo.getSalesmanName() != null) params.put("salesmanName", bo.getSalesmanName());
+		if(bo.getDeletedSign() != null) params.put("deletedSign", bo.getDeletedSign());
+		if(StringUtils.isNotBlank(bo.getOrderNo())) params.put("orderNo", bo.getOrderNo());
+		if(StringUtils.isNotBlank(bo.getSalesmanName())) params.put("salesmanName", bo.getSalesmanName());
+		if(StringUtils.isNotBlank(bo.getSerialNumber())) params.put("serialNumber", bo.getSerialNumber());
 		if(StringUtils.isNotBlank(depId)) params.put("depId", depId);
 		try {
 			if(StringUtils.isNotBlank(setUpStartDate))
@@ -328,7 +329,7 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 	}
 
 	@Override
-	public int createProject(String uid, String aid, String signComment) {
+	public int createProject(String uid, String aid, String signComment,String contractType) {
 		Contract contract = new Contract();
 		Date signDate = new Date();
 		contract.setId(UUID.randomUUID().toString());
@@ -336,7 +337,7 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 		contract.setSignComment(signComment);
 		contract.setCreateTime(signDate);
 		contract.setSignDate(signDate);
-		contract.setType(CommodityType.SERVICE.getTypeCode());
+		contract.setType(contractType);
 		contract.setUid(uid);
 		contract.setCreater(TokenManager.getAdminId());
 		contract.setPrincipal(aid);
@@ -344,9 +345,9 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 	}
 
 	@Override
-	public ProjectDetailBo selectTechProjectDetail(String contractId) {
+	public ProjectDetailBo selectTechProjectDetail(String contractId,Integer buyerType) {
 		
-		return techProjectMapper.selectTechProjectDetail(contractId);
+		return techProjectMapper.selectTechProjectDetail(contractId,buyerType);
 	}
 
 	@Override
@@ -369,8 +370,8 @@ public class TechProjectServiceImpl extends BaseMybatisDao<TechProjectMapper> im
 			task.setCreateTime(new Date());
 			task.setContractId(contractId);
 			task.setTaskStatus(TaskState.UN_DISTRIBUTION.getCode());
-			task.setDeleteSign(DeleteStatus.LOCKING.getCode());
 			task.setTaskComment(taskComment);
+			task.setDeletedSign(DeleteStatus.UNDELETE.getCode());
 			contractTaskMapper.insert(task);
 		}
 		return 1;

+ 0 - 1
src/main/resources/shiro_base_auth.ini

@@ -19,7 +19,6 @@
 /portal/**=anon
 /api/portal/**=anon
 /api/admin/**=admin
-/api/user/partner/**=anon
 /api/user/**=login
 /admin/**=admin
 /role/**=admin,permission

+ 1 - 1
src/main/webapp/WEB-INF/views/common.html

@@ -142,7 +142,7 @@
 							<p>合作电话:400-8800-962</p>
 						</div>
 						<div class="cont_guanli">
-							<a href="http://www.jishutao.com/admin/login">
+							<a th:href="${basePath + '/admin/login'}">
 								<img th:src="${portalHost+'/img/guanli.png'}" alt="" />
 								<p>管理员入口</p>
 							</a>