Browse Source

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

anderx 6 years ago
parent
commit
80cb851301
62 changed files with 3751 additions and 3073 deletions
  1. 1 1
      GeneratorConfig.xml
  2. 4 0
      src/main/java/com/goafanti/admin/service/AdminService.java
  3. 8 1
      src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java
  4. 11 11
      src/main/java/com/goafanti/common/dao/NewOrderDunMapper.java
  5. 3 1
      src/main/java/com/goafanti/common/dao/PermissionMapper.java
  6. 14 12
      src/main/java/com/goafanti/common/dao/PersonnelDossierMapper.java
  7. 11 11
      src/main/java/com/goafanti/common/dao/TChangeDunMapper.java
  8. 21 18
      src/main/java/com/goafanti/common/dao/TOrderNewMapper.java
  9. 14 14
      src/main/java/com/goafanti/common/dao/TOrderTaskMapper.java
  10. 4 0
      src/main/java/com/goafanti/common/dao/UserLockReleaseMapper.java
  11. 1 1
      src/main/java/com/goafanti/common/enums/NoticeStatus.java
  12. 60 24
      src/main/java/com/goafanti/common/mapper/NewOrderDunMapper.xml
  13. 12 2
      src/main/java/com/goafanti/common/mapper/PermissionMapper.xml
  14. 58 56
      src/main/java/com/goafanti/common/mapper/PersonnelDossierMapper.xml
  15. 1 1
      src/main/java/com/goafanti/common/mapper/PersonnelMidMapper.xml
  16. 87 52
      src/main/java/com/goafanti/common/mapper/TChangeDunMapper.xml
  17. 1869 1853
      src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml
  18. 43 31
      src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml
  19. 5 0
      src/main/java/com/goafanti/common/mapper/UserLockReleaseMapper.xml
  20. 6 0
      src/main/java/com/goafanti/common/mapper/UserMapperExt.xml
  21. 85 39
      src/main/java/com/goafanti/common/model/NewOrderDun.java
  22. 146 16
      src/main/java/com/goafanti/common/model/NewOrderDunExample.java
  23. 124 147
      src/main/java/com/goafanti/common/model/PersonnelDossier.java
  24. 40 120
      src/main/java/com/goafanti/common/model/PersonnelDossierExample.java
  25. 127 71
      src/main/java/com/goafanti/common/model/TChangeDun.java
  26. 194 64
      src/main/java/com/goafanti/common/model/TChangeDunExample.java
  27. 182 137
      src/main/java/com/goafanti/common/model/TOrderNew.java
  28. 16 16
      src/main/java/com/goafanti/common/model/TOrderNewExample.java
  29. 3 0
      src/main/java/com/goafanti/common/model/TOrderNewWithBLOBs.java
  30. 155 134
      src/main/java/com/goafanti/common/model/TOrderTask.java
  31. 76 16
      src/main/java/com/goafanti/common/model/TOrderTaskExample.java
  32. 14 6
      src/main/java/com/goafanti/common/task/OrderDunTask.java
  33. 2 4
      src/main/java/com/goafanti/common/task/PatentTask.java
  34. 2 2
      src/main/java/com/goafanti/common/task/ReleaseUserTask.java
  35. 12 7
      src/main/java/com/goafanti/common/utils/DateUtils.java
  36. 12 0
      src/main/java/com/goafanti/customer/bo/CustomerListIn.java
  37. 13 0
      src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java
  38. 1 0
      src/main/java/com/goafanti/customer/service/CustomerService.java
  39. 18 0
      src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java
  40. 9 0
      src/main/java/com/goafanti/order/bo/InputNewOrderDunBo.java
  41. 9 1
      src/main/java/com/goafanti/order/bo/OutNewOrderDunBo.java
  42. 4 1
      src/main/java/com/goafanti/order/bo/TChangeDunOut.java
  43. 7 0
      src/main/java/com/goafanti/order/bo/TOrderTaskDetailBo.java
  44. 17 1
      src/main/java/com/goafanti/order/bo/outOrderDunListBo.java
  45. 2 1
      src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java
  46. 2 2
      src/main/java/com/goafanti/order/controller/AdminNewOrderDunApiController.java
  47. 1 1
      src/main/java/com/goafanti/order/controller/OrderProjectApiController.java
  48. 8 0
      src/main/java/com/goafanti/order/enums/NewOrderDunType.java
  49. 6 0
      src/main/java/com/goafanti/order/service/impl/NewOrderDunServiceImpl.java
  50. 19 5
      src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java
  51. 3 1
      src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java
  52. 2 5
      src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java
  53. 1 11
      src/main/java/com/goafanti/order/service/impl/OrderReceivablesServiceImpl.java
  54. 1 1
      src/main/java/com/goafanti/permission/controller/NewPermissionApiController.java
  55. 1 1
      src/main/java/com/goafanti/permission/service/PermissionService.java
  56. 5 5
      src/main/java/com/goafanti/permission/service/impl/PermissionServiceImpl.java
  57. 82 15
      src/main/java/com/goafanti/personnel/bo/OutPersonnelListBo.java
  58. 69 55
      src/main/java/com/goafanti/personnel/controller/AdminPersonnelApiController.java
  59. 3 1
      src/main/java/com/goafanti/personnel/service/PersonnelService.java
  60. 42 95
      src/main/java/com/goafanti/personnel/service/impl/PersonnelServiceImpl.java
  61. 2 2
      src/main/resources/props/config_local.properties
  62. 1 1
      src/main/resources/props/config_test.properties

+ 1 - 1
GeneratorConfig.xml

@@ -9,7 +9,7 @@
     <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="kede-server" />
     <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="kede-server" />
     <javaClientGenerator  targetPackage="com.goafanti.common.dao"  type="XMLMAPPER" targetProject="kede-server"  />
-    <table schema="aft" tableName="personnel_mid"/>
+    <table schema="aft" tableName="personnel_dossier"/>
     <!-- 如果改动 t_order_task表,记得修改修改接口,不然会导致服务器无法启动 -->
   </context>
 </generatorConfiguration>

+ 4 - 0
src/main/java/com/goafanti/admin/service/AdminService.java

@@ -7,6 +7,9 @@ import com.goafanti.admin.bo.AdminCustomerBo;
 import com.goafanti.admin.bo.AdminCustomerDetailBo;
 import com.goafanti.admin.bo.AdminDetail;
 import com.goafanti.admin.bo.AdminListBo;
+import com.goafanti.common.bo.AreaBo;
+import com.goafanti.common.bo.CityBo;
+import com.goafanti.common.bo.ProvinceBo;
 import com.goafanti.common.model.Admin;
 import com.goafanti.core.mybatis.page.Pagination;
 
@@ -85,4 +88,5 @@ public interface AdminService {
 
 	int updatePrivateBusinessTransfer(String inputId, String uid, String pid);
 
+
 }

+ 8 - 1
src/main/java/com/goafanti/admin/service/impl/AdminServiceImpl.java

@@ -19,9 +19,13 @@ import com.goafanti.admin.bo.AdminCustomerDetailBo;
 import com.goafanti.admin.bo.AdminDetail;
 import com.goafanti.admin.bo.AdminListBo;
 import com.goafanti.admin.service.AdminService;
+import com.goafanti.common.bo.AreaBo;
+import com.goafanti.common.bo.CityBo;
+import com.goafanti.common.bo.ProvinceBo;
 import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.AdminLocationMapper;
 import com.goafanti.common.dao.AdminMapper;
+import com.goafanti.common.dao.DistrictGlossoryMapper;
 import com.goafanti.common.dao.UserBusinessMapper;
 import com.goafanti.common.dao.UserLockReleaseMapper;
 import com.goafanti.common.dao.UserRoleMapper;
@@ -49,6 +53,9 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 	private UserBusinessMapper	userBusinessMapper;
 	@Resource(name = "passwordUtil")
 	private PasswordUtil					passwordUtil;
+	@Autowired
+	private DistrictGlossoryMapper	districtGlossoryMapper;
+	
 	@Override
 	public List<Admin> selectAllAdmin() {
 		return adminMapper.selectAllAdmin(null);
@@ -392,5 +399,5 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
 		}
 		return i;
 	}
-
+	
 }

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

@@ -10,67 +10,67 @@ import org.apache.ibatis.annotations.Param;
 public interface NewOrderDunMapper {
     /**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	long countByExample(NewOrderDunExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	int deleteByExample(NewOrderDunExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	int insert(NewOrderDun record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	int insertSelective(NewOrderDun record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	List<NewOrderDun> selectByExample(NewOrderDunExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	NewOrderDun selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	int updateByExampleSelective(@Param("record") NewOrderDun record, @Param("example") NewOrderDunExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	int updateByExample(@Param("record") NewOrderDun record, @Param("example") NewOrderDunExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	int updateByPrimaryKeySelective(NewOrderDun record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	int updateByPrimaryKey(NewOrderDun record);
 

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

@@ -62,9 +62,9 @@ public interface PermissionMapper {
 	String selectNameById(String id);
 	
 	List<PermissionBo> selectAllBySuperId (String superId);
-	
 	String selectAutNoByNamei(String name);
 	
+	
 	String selectIdByName(String name);
 	
 	int selectCountByid(String id);
@@ -74,4 +74,6 @@ public interface PermissionMapper {
 	List<SubMenu> selectMenuList(@Param("superId")String superId,@Param("aid")String aid);
 
 	String selectTopNavBySubUrl(@Param("subUrl")String subUrl);
+
+	int selectIdByNameCount(@Param("name")String name,@Param("id")String id);
 }

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

@@ -10,72 +10,74 @@ import org.apache.ibatis.annotations.Param;
 public interface PersonnelDossierMapper {
     /**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	long countByExample(PersonnelDossierExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	int deleteByExample(PersonnelDossierExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	int insert(PersonnelDossier record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	int insertSelective(PersonnelDossier record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	List<PersonnelDossier> selectByExample(PersonnelDossierExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	PersonnelDossier selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	int updateByExampleSelective(@Param("record") PersonnelDossier record,
 			@Param("example") PersonnelDossierExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	int updateByExample(@Param("record") PersonnelDossier record, @Param("example") PersonnelDossierExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	int updateByPrimaryKeySelective(PersonnelDossier record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	int updateByPrimaryKey(PersonnelDossier record);
 
-	int checkDoorId(Integer doorId);
+	int checkDoorId(@Param("doorId")Integer doorId, @Param("id")Integer id);
 
 	OutPersonnelBo selectBypdId(Integer id);
+
+	int checkEmployeeId(@Param("employeeId")Integer employeeId, @Param("id")Integer id);
 }

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

@@ -11,67 +11,67 @@ public interface TChangeDunMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	long countByExample(TChangeDunExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	int deleteByExample(TChangeDunExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	int insert(TChangeDun record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	int insertSelective(TChangeDun record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	List<TChangeDun> selectByExample(TChangeDunExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	TChangeDun selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	int updateByExampleSelective(@Param("record") TChangeDun record, @Param("example") TChangeDunExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	int updateByExample(@Param("record") TChangeDun record, @Param("example") TChangeDunExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	int updateByPrimaryKeySelective(TChangeDun record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	int updateByPrimaryKey(TChangeDun record);
 

+ 21 - 18
src/main/java/com/goafanti/common/dao/TOrderNewMapper.java

@@ -11,76 +11,79 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.ibatis.annotations.Param;
+import com.goafanti.common.model.TOrderNewWithBLOBs;
 
 public interface TOrderNewMapper {
     /**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	long countByExample(TOrderNewExample example);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	int deleteByExample(TOrderNewExample example);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	int deleteByPrimaryKey(String orderNo);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	int insert(TOrderNew record);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	int insertSelective(TOrderNew record);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
-	List<TOrderNew> selectByExampleWithBLOBs(TOrderNewExample example);
+	List<TOrderNewWithBLOBs> selectByExampleWithBLOBs(TOrderNewExample example);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	List<TOrderNew> selectByExample(TOrderNewExample example);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
-	TOrderNew selectByPrimaryKey(String orderNo);
+	TOrderNewWithBLOBs selectByPrimaryKey(String orderNo);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
-	int updateByExampleSelective(@Param("record") TOrderNew record, @Param("example") TOrderNewExample example);
+	int updateByExampleSelective(@Param("record") TOrderNew record,
+			@Param("example") TOrderNewExample example);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
-	int updateByExampleWithBLOBs(@Param("record") TOrderNew record, @Param("example") TOrderNewExample example);
+	int updateByExampleWithBLOBs(@Param("record") TOrderNew record,
+			@Param("example") TOrderNewExample example);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	int updateByExample(@Param("record") TOrderNew record, @Param("example") TOrderNewExample example);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	int updateByPrimaryKeySelective(TOrderNew record);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	int updateByPrimaryKeyWithBLOBs(TOrderNew record);
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	int updateByPrimaryKey(TOrderNew record);
 	TOrderNewBo getOrderNewDetail(String orderNo); 

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

@@ -12,85 +12,85 @@ import org.apache.ibatis.annotations.Param;
 public interface TOrderTaskMapper {
     /**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:15 CST 2020
 	 */
 	long countByExample(TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:15 CST 2020
 	 */
 	int deleteByExample(TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:15 CST 2020
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:15 CST 2020
 	 */
 	int insert(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:15 CST 2020
 	 */
 	int insertSelective(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:15 CST 2020
 	 */
 	List<TOrderTask> selectByExampleWithBLOBs(TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:15 CST 2020
 	 */
 	List<TOrderTask> selectByExample(TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:15 CST 2020
 	 */
 	TOrderTask selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:15 CST 2020
 	 */
 	int updateByExampleSelective(@Param("record") TOrderTask record, @Param("example") TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:15 CST 2020
 	 */
 	int updateByExampleWithBLOBs(@Param("record") TOrderTask record, @Param("example") TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:15 CST 2020
 	 */
 	int updateByExample(@Param("record") TOrderTask record, @Param("example") TOrderTaskExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:15 CST 2020
 	 */
 	int updateByPrimaryKeySelective(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:15 CST 2020
 	 */
 	int updateByPrimaryKeyWithBLOBs(TOrderTask record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:15 CST 2020
 	 */
 	int updateByPrimaryKey(TOrderTask record);
 

+ 4 - 0
src/main/java/com/goafanti/common/dao/UserLockReleaseMapper.java

@@ -4,6 +4,7 @@ import com.goafanti.common.model.UserLockRelease;
 import com.goafanti.common.model.UserLockReleaseExample;
 import com.goafanti.customer.bo.LockingReleaseBo;
 
+import java.util.Date;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
@@ -86,6 +87,9 @@ public interface UserLockReleaseMapper {
 	 * @return
 	 */
 	int updateUserLock(@Param("uid")String uid,@Param("aid")String aid,@Param("oldStatus")Integer oldStatus,@Param("newStatus")Integer newStatus);
+	
+	int updateUserTypeLock(@Param("uid")String uid,@Param("aid")String aid,@Param("type")Integer type,
+			@Param("newStatus")Integer newStatus,@Param("date") Date date);
 
 	List<LockingReleaseBo> selectWaitReleaseCustomer(String aid);
 

+ 1 - 1
src/main/java/com/goafanti/common/enums/NoticeStatus.java

@@ -47,7 +47,7 @@ public enum NoticeStatus {
 	PROJECT_OUTSOURCE_YES(38,"项目外包通过"),
 	PROJECT_OUTSOURCE_NO(39,"项目外包拒绝"),
 	ORDER_ARREARS_DUN(40,"欠款催款信息"),
-	TASK_PATENT_ERROR(41,"定时专利失败"),
+	TASK_PATENT_ERROR(41,"专利提醒失败"),
 	TASK_PATENT_REMIND(42,"专利缴费提醒"),
 	OTHER(0, "其他");
 

+ 60 - 24
src/main/java/com/goafanti/common/mapper/NewOrderDunMapper.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 Dec 19 11:46:22 CST 2019.
+      This element was generated on Fri May 15 09:46:56 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
@@ -20,12 +20,14 @@
     <result column="start_time" jdbcType="TIMESTAMP" property="startTime" />
     <result column="money" jdbcType="DECIMAL" property="money" />
     <result column="appropriation_ratio" jdbcType="DECIMAL" property="appropriationRatio" />
+    <result column="customize_name" jdbcType="VARCHAR" property="customizeName" />
+    <result column="customize_time" jdbcType="TIMESTAMP" property="customizeTime" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 19 11:46:22 CST 2019.
+      This element was generated on Fri May 15 09:46:56 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -59,7 +61,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 19 11:46:22 CST 2019.
+      This element was generated on Fri May 15 09:46:56 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -93,16 +95,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 19 11:46:22 CST 2019.
+      This element was generated on Fri May 15 09:46:56 CST 2020.
     -->
     id, order_no, tid, project_type, dun_type, wait_day, effective_count, aid, status, 
-    create_time, start_time, money, appropriation_ratio
+    create_time, start_time, money, appropriation_ratio, customize_name, customize_time
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.NewOrderDunExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 19 11:46:22 CST 2019.
+      This element was generated on Fri May 15 09:46:56 CST 2020.
     -->
     select
     <if test="distinct">
@@ -121,7 +123,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 19 11:46:22 CST 2019.
+      This element was generated on Fri May 15 09:46:56 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -132,7 +134,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 19 11:46:22 CST 2019.
+      This element was generated on Fri May 15 09:46:56 CST 2020.
     -->
     delete from new_order_dun
     where id = #{id,jdbcType=INTEGER}
@@ -141,7 +143,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 19 11:46:22 CST 2019.
+      This element was generated on Fri May 15 09:46:56 CST 2020.
     -->
     delete from new_order_dun
     <if test="_parameter != null">
@@ -152,24 +154,26 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 19 11:46:22 CST 2019.
+      This element was generated on Fri May 15 09:46:56 CST 2020.
     -->
     insert into new_order_dun (id, order_no, tid, 
       project_type, dun_type, wait_day, 
       effective_count, aid, status, 
       create_time, start_time, money, 
-      appropriation_ratio)
+      appropriation_ratio, customize_name, customize_time
+      )
     values (#{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{tid,jdbcType=INTEGER}, 
       #{projectType,jdbcType=INTEGER}, #{dunType,jdbcType=INTEGER}, #{waitDay,jdbcType=INTEGER}, 
       #{effectiveCount,jdbcType=INTEGER}, #{aid,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, 
       #{createTime,jdbcType=TIMESTAMP}, #{startTime,jdbcType=TIMESTAMP}, #{money,jdbcType=DECIMAL}, 
-      #{appropriationRatio,jdbcType=DECIMAL})
+      #{appropriationRatio,jdbcType=DECIMAL}, #{customizeName,jdbcType=VARCHAR}, #{customizeTime,jdbcType=TIMESTAMP}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.NewOrderDun">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 19 11:46:22 CST 2019.
+      This element was generated on Fri May 15 09:46:56 CST 2020.
     -->
     insert into new_order_dun
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -212,6 +216,12 @@
       <if test="appropriationRatio != null">
         appropriation_ratio,
       </if>
+      <if test="customizeName != null">
+        customize_name,
+      </if>
+      <if test="customizeTime != null">
+        customize_time,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -253,13 +263,19 @@
       <if test="appropriationRatio != null">
         #{appropriationRatio,jdbcType=DECIMAL},
       </if>
+      <if test="customizeName != null">
+        #{customizeName,jdbcType=VARCHAR},
+      </if>
+      <if test="customizeTime != null">
+        #{customizeTime,jdbcType=TIMESTAMP},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.NewOrderDunExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 19 11:46:22 CST 2019.
+      This element was generated on Fri May 15 09:46:56 CST 2020.
     -->
     select count(*) from new_order_dun
     <if test="_parameter != null">
@@ -270,7 +286,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 19 11:46:22 CST 2019.
+      This element was generated on Fri May 15 09:46:56 CST 2020.
     -->
     update new_order_dun
     <set>
@@ -313,6 +329,12 @@
       <if test="record.appropriationRatio != null">
         appropriation_ratio = #{record.appropriationRatio,jdbcType=DECIMAL},
       </if>
+      <if test="record.customizeName != null">
+        customize_name = #{record.customizeName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.customizeTime != null">
+        customize_time = #{record.customizeTime,jdbcType=TIMESTAMP},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -322,7 +344,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 19 11:46:22 CST 2019.
+      This element was generated on Fri May 15 09:46:56 CST 2020.
     -->
     update new_order_dun
     set id = #{record.id,jdbcType=INTEGER},
@@ -337,7 +359,9 @@
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       start_time = #{record.startTime,jdbcType=TIMESTAMP},
       money = #{record.money,jdbcType=DECIMAL},
-      appropriation_ratio = #{record.appropriationRatio,jdbcType=DECIMAL}
+      appropriation_ratio = #{record.appropriationRatio,jdbcType=DECIMAL},
+      customize_name = #{record.customizeName,jdbcType=VARCHAR},
+      customize_time = #{record.customizeTime,jdbcType=TIMESTAMP}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -346,7 +370,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 19 11:46:22 CST 2019.
+      This element was generated on Fri May 15 09:46:56 CST 2020.
     -->
     update new_order_dun
     <set>
@@ -386,6 +410,12 @@
       <if test="appropriationRatio != null">
         appropriation_ratio = #{appropriationRatio,jdbcType=DECIMAL},
       </if>
+      <if test="customizeName != null">
+        customize_name = #{customizeName,jdbcType=VARCHAR},
+      </if>
+      <if test="customizeTime != null">
+        customize_time = #{customizeTime,jdbcType=TIMESTAMP},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -393,7 +423,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Dec 19 11:46:22 CST 2019.
+      This element was generated on Fri May 15 09:46:56 CST 2020.
     -->
     update new_order_dun
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -407,7 +437,9 @@
       create_time = #{createTime,jdbcType=TIMESTAMP},
       start_time = #{startTime,jdbcType=TIMESTAMP},
       money = #{money,jdbcType=DECIMAL},
-      appropriation_ratio = #{appropriationRatio,jdbcType=DECIMAL}
+      appropriation_ratio = #{appropriationRatio,jdbcType=DECIMAL},
+      customize_name = #{customizeName,jdbcType=VARCHAR},
+      customize_time = #{customizeTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <delete id="deleteByTid" parameterType="java.lang.Integer">
@@ -417,8 +449,9 @@
   </delete>
   <select id="selectListNewOrderDun" resultType="com.goafanti.order.bo.OutNewOrderDunBo">
   select a.id,a.order_no orderNo, a.tid, a.project_type projectType, a.dun_type dunType, a.wait_day waitDay, b.set_up_amount setUpAmount,
-  a.effective_count effectiveCount, a.aid, a.create_time createTime ,b.commodity_name commodityName,a.money,a.status,
-  a.appropriation_ratio appropriationRatio from new_order_dun a left join t_order_task b on a.tid=b.id where 1=1
+  a.effective_count effectiveCount, a.aid, a.create_time createTime ,b.commodity_name commodityName,a.money,a.status,a.customize_time customizeTime,
+  a.appropriation_ratio appropriationRatio,date_format(a.customize_time,'%Y-%m-%d') customizeTimes, a.customize_name customizeName 
+  from new_order_dun a left join t_order_task b on a.tid=b.id where 1=1
   <if test="orderNo != null">
   and  a.order_no= #{orderNo}
   </if>
@@ -429,13 +462,16 @@
   </select>
   <select id="selectAllOrderDun" resultType="com.goafanti.order.bo.OutNewOrderDunBo"> 
   select a.id, a.order_no orderNo, a.tid, a.project_type projectType, a.dun_type dunType, a.wait_day waitDay, 
-  a.effective_count effectiveCount, a.aid, a.create_time createTime,b.approval
+  a.effective_count effectiveCount, a.aid, a.create_time createTime,b.approval,a.customize_time customizeTime
+  ,date_format(a.customize_time,'%Y-%m-%d') customizeTimes, a.customize_name customizeName
   from new_order_dun a left join  t_order_new b on a.order_no=b.order_no
   where 1=1 and a.status=0 and b.process_status &gt; 1
   </select>
   <select id="selectByTid" resultType="com.goafanti.order.bo.OutNewOrderDunBo">
     select a.id, a.order_no orderNo, a.tid, a.project_type projectType, a.dun_type dunType, a.wait_day waitDay, 
-  	a.effective_count effectiveCount, a.aid, a.money,a.create_time createTime from new_order_dun a
+  	a.effective_count effectiveCount, a.aid, a.money,a.create_time createTime 
+  	,date_format(a.customize_time,'%Y-%m-%d') customizeTimes, a.customize_name customizeName
+  	from new_order_dun a
     where tid = #{tid} and status=0
   </select>
 </mapper>

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

@@ -278,6 +278,13 @@
 		where
 		name=#{name,jdbcType=VARCHAR}
   </select>
+  
+  <select id="selectIdByNameCount" resultType="java.lang.Integer">
+		select count(*)
+		from permission
+		where
+		name=#{name,jdbcType=VARCHAR} and id != #{id,jdbcType=VARCHAR}
+  </select>
   <select id="selectCountByid" parameterType="java.lang.String" resultType="java.lang.Integer" >
   		select
   		count(0)
@@ -291,15 +298,17 @@
 				select
 					id,
 					name,
+					show_order,
 					url
 				from
 					permission
-				where type = 0
+				where type = 0	 
 			</when>
 			<otherwise>
 				select
 					d.id,
 					d.name,
+					show_order,
 					d.url
 				from
 					user_role a left join role b on
@@ -307,9 +316,9 @@
 					b.id = c.rid left join permission d on
 					c.pid = d.id
 				where d.type = 0 and a.uid = #{aid,jdbcType=VARCHAR}
-				order by d.show_order
 			</otherwise>
 		</choose>
+		order by show_order
   </select>
   <select id="selectMenuList" parameterType="java.lang.String" resultType="com.goafanti.permission.bo.SubMenu">
   		<choose>
@@ -340,6 +349,7 @@
 					and a.uid = #{aid,jdbcType=VARCHAR}
   			</otherwise>
   		</choose>
+  		order by show_order
   </select>
   <select id="selectTopNavBySubUrl" resultType="java.lang.String" parameterType="java.lang.String">
   	select super_id  from permission where id = (select super_id from permission where url = #{subUrl,jdbcType=VARCHAR})

+ 58 - 56
src/main/java/com/goafanti/common/mapper/PersonnelDossierMapper.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 Apr 30 08:54:23 CST 2020.
+      This element was generated on Wed May 20 08:47:14 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="aid" jdbcType="VARCHAR" property="aid" />
@@ -44,14 +44,13 @@
     <result column="star" jdbcType="INTEGER" property="star" />
     <result column="allowance" jdbcType="DECIMAL" property="allowance" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="welfare_annex_url" jdbcType="VARCHAR" property="welfareAnnexUrl" />
-    <result column="welfare_annex_name" jdbcType="VARCHAR" property="welfareAnnexName" />
+    <result column="employee_id" jdbcType="INTEGER" property="employeeId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:54:23 CST 2020.
+      This element was generated on Wed May 20 08:47:14 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -85,7 +84,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:54:23 CST 2020.
+      This element was generated on Wed May 20 08:47:14 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -119,20 +118,19 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:54:23 CST 2020.
+      This element was generated on Wed May 20 08:47:14 CST 2020.
     -->
     id, aid, door_id, name, birthday, sex, mobile, fixed_tel, nation, residence_province, 
     residence_city, residence_area, residence_address, native_place_province, native_place_city, 
     now_province, now_city, now_area, now_address, id_card, certification_authority, 
     marriage, political_outlook, son, girl, status, system, job_nature, job_nature_remarks, 
-    entry_time, promotion_time, company, lvl, jobs, star, allowance, create_time, welfare_annex_url, 
-    welfare_annex_name
+    entry_time, promotion_time, company, lvl, jobs, star, allowance, create_time, employee_id
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.PersonnelDossierExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:54:23 CST 2020.
+      This element was generated on Wed May 20 08:47:14 CST 2020.
     -->
     select
     <if test="distinct">
@@ -151,7 +149,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:54:23 CST 2020.
+      This element was generated on Wed May 20 08:47:14 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -162,7 +160,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:54:23 CST 2020.
+      This element was generated on Wed May 20 08:47:14 CST 2020.
     -->
     delete from personnel_dossier
     where id = #{id,jdbcType=INTEGER}
@@ -171,7 +169,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:54:23 CST 2020.
+      This element was generated on Wed May 20 08:47:14 CST 2020.
     -->
     delete from personnel_dossier
     <if test="_parameter != null">
@@ -182,7 +180,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:54:23 CST 2020.
+      This element was generated on Wed May 20 08:47:14 CST 2020.
     -->
     insert into personnel_dossier (id, aid, door_id, 
       name, birthday, sex, 
@@ -196,8 +194,7 @@
       system, job_nature, job_nature_remarks, 
       entry_time, promotion_time, company, 
       lvl, jobs, star, allowance, 
-      create_time, welfare_annex_url, welfare_annex_name
-      )
+      create_time, employee_id)
     values (#{id,jdbcType=INTEGER}, #{aid,jdbcType=VARCHAR}, #{doorId,jdbcType=INTEGER}, 
       #{name,jdbcType=VARCHAR}, #{birthday,jdbcType=TIMESTAMP}, #{sex,jdbcType=INTEGER}, 
       #{mobile,jdbcType=VARCHAR}, #{fixedTel,jdbcType=VARCHAR}, #{nation,jdbcType=VARCHAR}, 
@@ -210,14 +207,13 @@
       #{system,jdbcType=INTEGER}, #{jobNature,jdbcType=INTEGER}, #{jobNatureRemarks,jdbcType=VARCHAR}, 
       #{entryTime,jdbcType=TIMESTAMP}, #{promotionTime,jdbcType=TIMESTAMP}, #{company,jdbcType=VARCHAR}, 
       #{lvl,jdbcType=INTEGER}, #{jobs,jdbcType=INTEGER}, #{star,jdbcType=INTEGER}, #{allowance,jdbcType=DECIMAL}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{welfareAnnexUrl,jdbcType=VARCHAR}, #{welfareAnnexName,jdbcType=VARCHAR}
-      )
+      #{createTime,jdbcType=TIMESTAMP}, #{employeeId,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.PersonnelDossier">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:54:23 CST 2020.
+      This element was generated on Wed May 20 08:47:14 CST 2020.
     -->
     insert into personnel_dossier
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -332,11 +328,8 @@
       <if test="createTime != null">
         create_time,
       </if>
-      <if test="welfareAnnexUrl != null">
-        welfare_annex_url,
-      </if>
-      <if test="welfareAnnexName != null">
-        welfare_annex_name,
+      <if test="employeeId != null">
+        employee_id,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -451,11 +444,8 @@
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="welfareAnnexUrl != null">
-        #{welfareAnnexUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="welfareAnnexName != null">
-        #{welfareAnnexName,jdbcType=VARCHAR},
+      <if test="employeeId != null">
+        #{employeeId,jdbcType=INTEGER},
       </if>
     </trim>
   </insert>
@@ -463,7 +453,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:54:23 CST 2020.
+      This element was generated on Wed May 20 08:47:14 CST 2020.
     -->
     select count(*) from personnel_dossier
     <if test="_parameter != null">
@@ -474,7 +464,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:54:23 CST 2020.
+      This element was generated on Wed May 20 08:47:14 CST 2020.
     -->
     update personnel_dossier
     <set>
@@ -589,11 +579,8 @@
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="record.welfareAnnexUrl != null">
-        welfare_annex_url = #{record.welfareAnnexUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="record.welfareAnnexName != null">
-        welfare_annex_name = #{record.welfareAnnexName,jdbcType=VARCHAR},
+      <if test="record.employeeId != null">
+        employee_id = #{record.employeeId,jdbcType=INTEGER},
       </if>
     </set>
     <if test="_parameter != null">
@@ -604,7 +591,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:54:23 CST 2020.
+      This element was generated on Wed May 20 08:47:14 CST 2020.
     -->
     update personnel_dossier
     set id = #{record.id,jdbcType=INTEGER},
@@ -644,8 +631,7 @@
       star = #{record.star,jdbcType=INTEGER},
       allowance = #{record.allowance,jdbcType=DECIMAL},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      welfare_annex_url = #{record.welfareAnnexUrl,jdbcType=VARCHAR},
-      welfare_annex_name = #{record.welfareAnnexName,jdbcType=VARCHAR}
+      employee_id = #{record.employeeId,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -654,7 +640,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:54:23 CST 2020.
+      This element was generated on Wed May 20 08:47:14 CST 2020.
     -->
     update personnel_dossier
     <set>
@@ -766,11 +752,8 @@
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="welfareAnnexUrl != null">
-        welfare_annex_url = #{welfareAnnexUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="welfareAnnexName != null">
-        welfare_annex_name = #{welfareAnnexName,jdbcType=VARCHAR},
+      <if test="employeeId != null">
+        employee_id = #{employeeId,jdbcType=INTEGER},
       </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
@@ -779,7 +762,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Apr 30 08:54:23 CST 2020.
+      This element was generated on Wed May 20 08:47:14 CST 2020.
     -->
     update personnel_dossier
     set aid = #{aid,jdbcType=VARCHAR},
@@ -818,13 +801,22 @@
       star = #{star,jdbcType=INTEGER},
       allowance = #{allowance,jdbcType=DECIMAL},
       create_time = #{createTime,jdbcType=TIMESTAMP},
-      welfare_annex_url = #{welfareAnnexUrl,jdbcType=VARCHAR},
-      welfare_annex_name = #{welfareAnnexName,jdbcType=VARCHAR}
+      employee_id = #{employeeId,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   
   <select id="checkDoorId" resultType="java.lang.Integer">
   select count(*) from personnel_dossier where door_id= #{doorId,jdbcType=INTEGER}
+  <if test="id != null">
+  and id != #{id}
+  </if> 
+  </select>
+  
+  <select id="checkEmployeeId" resultType="java.lang.Integer">
+  select count(*) from personnel_dossier where employee_id= #{employeeId,jdbcType=INTEGER} 
+<if test="id != null">
+  and id != #{id}
+  </if>  
   </select>
   
   <select id="selectPersonnelByList" resultType="com.goafanti.personnel.bo.OutPersonnelListBo">
@@ -833,17 +825,22 @@
 	date_format(a.promotion_time,'%Y-%m-%d')promotionTimes,date_format(a.birthday,'%Y-%m-%d')birthdays,
 	a.entry_time entryTime, a.sex,a.son,a.girl,a.political_outlook politicalOutlook,d.education,
 	d.school,d.major,d.title,pm.promotion_remarks promotionRemarks,a.mobile,a.fixed_tel fixedTel,
-	date_format(pm.promotion_time,'%Y-%m-%d') promotionTime,a.id_card idCard,a.birthday,
+	date_format(pm.promotion_time,'%Y-%m-%d') promotionTime,a.id_card idCard,a.birthday,a.employee_id employeeId,
 	date_format(pm.contract_start_time, '%Y-%m-%d') contractStart,date_format(pm.contract_end_time,'%Y-%m-%d')contractEnd,
-	a.certification_authority certificationAuthority, a.residence_province residenceProvince,
-	a.residence_city residenceCity,a.residence_area residenceArea, a.residence_address residenceAddress,
-	a.native_place_province nativePlaceProvince, a.native_place_city nativePlaceCity,a.now_province nowProvince,
-	a.now_city nowCity,a.now_area nowArea, a.now_address nowAddress,date_format(pm.quit_time,'%Y-%m-%d') quitTime,
+	a.certification_authority certificationAuthority,  a.residence_address residenceAddress,a.now_address nowAddress,
+	a.residence_province residenceProvince, a.residence_city residenceCity,a.residence_area residenceArea,
+	da1.name rpName,da2.name rcName,da3.name raName,db1.name nppName,db2.name npcName,dc1.name npName,dc2.name ncName,
+	dc3.name naName,a.native_place_province nativePlaceProvince, a.native_place_city nativePlaceCity,
+	a.now_province nowProvince, a.now_city nowCity,a.now_area nowArea, date_format(pm.quit_time,'%Y-%m-%d') quitTime,
 	pm.emergency_contact emergencyContact,pm.emergency_mobile emergencyMobile,
 	date_format(pm.insurance_start_time,'%Y-%m-%d') insuranceStartTimes,date_format(pm.insurance_end_time,'%Y-%m-%d') insuranceEndTimes,
 	date_format(pm.fund_start_time,'%Y-%m-%d') fundStartTimes,date_format(pm.fund_end_time,'%Y-%m-%d') fundEndTimes
 	from personnel_dossier a left join  admin_level b  on a.jobs=b.jobs and a.star=b.lvl left join department dep on a.company = dep.id
-	left join personnel_entry d on a.id=d.id  	left join personnel_mid pm on a.id=pm.id
+	left join personnel_entry d on a.id=d.id  	left join personnel_mid pm on a.id=pm.id left join district_glossory da1 on a.residence_province=da1.id  
+	left join district_glossory da2 on a.residence_city=da2.id	left join district_glossory da3 on a.residence_area=da3.id
+	left join district_glossory db1 on a.native_place_province=db1.id	left join district_glossory db2 on a.native_place_city=db2.id
+ 	left join district_glossory dc1 on a.now_province=dc1.id left join district_glossory dc2 on a.now_city=dc2.id	
+ 	left join district_glossory dc3 on a.now_area=dc3.id
 	<if test="aid !=null">
 		left join admin ad on dep.id=ad.department_id
 	</if>
@@ -975,8 +972,9 @@
 	select a.id,a.door_id doorId,a.name,a.status,a.`system`,a.company,dep.name depName,a.nation,a.marriage,a.job_nature jobNature,
 	a.job_nature_remarks jobNatureRemarks, b.jobs_name jobsName,a.lvl,b.lvl_name starName,date_format(a.entry_time,'%Y-%m-%d')entryTimes,
 	date_format(a.promotion_time,'%Y-%m-%d')promotionTimes,date_format(a.birthday,'%Y-%m-%d')birthdays,a.star,a.jobs,
-	a.entry_time entryTime, a.sex,a.son,a.girl,a.political_outlook politicalOutlook,d.education,
-	d.school,d.major,d.title,m.promotion_remarks promotionRemarks,a.mobile,a.fixed_tel fixedTel,
+	a.entry_time entryTime, a.sex,a.son,a.girl,a.political_outlook politicalOutlook,d.education,a.employee_id employeeId,
+	d.school,d.major,d.title,m.promotion_remarks promotionRemarks,a.mobile,a.fixed_tel fixedTel,da1.name rpName,da2.name rcName,
+	da3.name raName,db1.name nppName,db2.name npcName,dc1.name npName,dc2.name ncName, dc3.name naName,
 	date_format(m.promotion_time,'%Y-%m-%d') promotionTime,a.id_card idCard,a.birthday,a.allowance,m.welfare_remarks welfareRemarks,
 	a.certification_authority certificationAuthority, a.residence_province residenceProvince,m.welfare_annex_name welfareAnnexName,
 	a.residence_city residenceCity,a.residence_area residenceArea, a.residence_address residenceAddress,
@@ -984,7 +982,11 @@
 	a.now_city nowCity,a.now_area nowArea, a.now_address nowAddress,m.welfare_annex_url welfareAnnexUrl
 	from personnel_dossier a left join  admin_level b  on a.jobs=b.jobs and a.star=b.lvl 
 	left join department dep on a.company = dep.id left join personnel_mid m on a.id=m.id
-	left join personnel_entry d on a.id=d.id  
+	left join personnel_entry d on a.id=d.id  left join district_glossory da1 on a.residence_province=da1.id  
+	left join district_glossory da2 on a.residence_city=da2.id	left join district_glossory da3 on a.residence_area=da3.id
+	left join district_glossory db1 on a.native_place_province=db1.id	left join district_glossory db2 on a.native_place_city=db2.id
+ 	left join district_glossory dc1 on a.now_province=dc1.id left join district_glossory dc2 on a.now_city=dc2.id	
+ 	left join district_glossory dc3 on a.now_area=dc3.id
 	where 1=1
 	and a.id= #{id}
   </select>

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

@@ -504,7 +504,7 @@
         welfare_annex_name = #{m.welfareAnnexName,jdbcType=VARCHAR},
       </if>
        <if test="m.welfareRemarks != null">
-        welfare_remarks = #{welfareRemarks,jdbcType=VARCHAR},
+        welfare_remarks = #{m.welfareRemarks,jdbcType=VARCHAR},
       </if>
     	</if>
       <if test="type==0">

+ 87 - 52
src/main/java/com/goafanti/common/mapper/TChangeDunMapper.xml

@@ -5,31 +5,33 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+      This element was generated on Mon May 18 15:26:46 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="did" jdbcType="INTEGER" property="did" />
     <result column="cid" jdbcType="INTEGER" property="cid" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
     <result column="tid" jdbcType="INTEGER" property="tid" />
+    <result column="ctid" jdbcType="INTEGER" property="ctid" />
     <result column="project_type" jdbcType="INTEGER" property="projectType" />
     <result column="dun_type" jdbcType="INTEGER" property="dunType" />
     <result column="wait_day" jdbcType="INTEGER" property="waitDay" />
     <result column="effective_count" jdbcType="INTEGER" property="effectiveCount" />
     <result column="aid" jdbcType="VARCHAR" property="aid" />
     <result column="status" jdbcType="INTEGER" property="status" />
+    <result column="type" jdbcType="INTEGER" property="type" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="start_time" jdbcType="TIMESTAMP" property="startTime" />
     <result column="money" jdbcType="DECIMAL" property="money" />
     <result column="appropriation_ratio" jdbcType="DECIMAL" property="appropriationRatio" />
-    <result column="type" jdbcType="INTEGER" property="type" />
-    <result column="ctid" jdbcType="INTEGER" property="ctid" />
+    <result column="customize_name" jdbcType="VARCHAR" property="customizeName" />
+    <result column="customize_time" jdbcType="TIMESTAMP" property="customizeTime" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+      This element was generated on Mon May 18 15:26:46 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -63,7 +65,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+      This element was generated on Mon May 18 15:26:46 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -97,16 +99,17 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+      This element was generated on Mon May 18 15:26:46 CST 2020.
     -->
-    id, did, cid, order_no, tid, project_type, dun_type, wait_day, effective_count, aid, 
-    status, create_time, start_time, money, appropriation_ratio, type, ctid
+    id, did, cid, order_no, tid, ctid, project_type, dun_type, wait_day, effective_count, 
+    aid, status, type, create_time, start_time, money, appropriation_ratio, customize_name, 
+    customize_time
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.TChangeDunExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+      This element was generated on Mon May 18 15:26:46 CST 2020.
     -->
     select
     <if test="distinct">
@@ -125,7 +128,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+      This element was generated on Mon May 18 15:26:46 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -136,7 +139,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+      This element was generated on Mon May 18 15:26:46 CST 2020.
     -->
     delete from t_change_dun
     where id = #{id,jdbcType=INTEGER}
@@ -145,7 +148,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+      This element was generated on Mon May 18 15:26:46 CST 2020.
     -->
     delete from t_change_dun
     <if test="_parameter != null">
@@ -156,26 +159,28 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+      This element was generated on Mon May 18 15:26:46 CST 2020.
     -->
     insert into t_change_dun (id, did, cid, 
-      order_no, tid, project_type, 
-      dun_type, wait_day, effective_count, 
-      aid, status, create_time, 
-      start_time, money, appropriation_ratio, 
-      type, ctid)
+      order_no, tid, ctid, 
+      project_type, dun_type, wait_day, 
+      effective_count, aid, status, 
+      type, create_time, start_time, 
+      money, appropriation_ratio, customize_name, 
+      customize_time)
     values (#{id,jdbcType=INTEGER}, #{did,jdbcType=INTEGER}, #{cid,jdbcType=INTEGER}, 
-      #{orderNo,jdbcType=VARCHAR}, #{tid,jdbcType=INTEGER}, #{projectType,jdbcType=INTEGER}, 
-      #{dunType,jdbcType=INTEGER}, #{waitDay,jdbcType=INTEGER}, #{effectiveCount,jdbcType=INTEGER}, 
-      #{aid,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{startTime,jdbcType=TIMESTAMP}, #{money,jdbcType=DECIMAL}, #{appropriationRatio,jdbcType=DECIMAL}, 
-      #{type,jdbcType=INTEGER}, #{ctid,jdbcType=INTEGER})
+      #{orderNo,jdbcType=VARCHAR}, #{tid,jdbcType=INTEGER}, #{ctid,jdbcType=INTEGER}, 
+      #{projectType,jdbcType=INTEGER}, #{dunType,jdbcType=INTEGER}, #{waitDay,jdbcType=INTEGER}, 
+      #{effectiveCount,jdbcType=INTEGER}, #{aid,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, 
+      #{type,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{startTime,jdbcType=TIMESTAMP}, 
+      #{money,jdbcType=DECIMAL}, #{appropriationRatio,jdbcType=DECIMAL}, #{customizeName,jdbcType=VARCHAR}, 
+      #{customizeTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.TChangeDun">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+      This element was generated on Mon May 18 15:26:46 CST 2020.
     -->
     insert into t_change_dun
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -194,6 +199,9 @@
       <if test="tid != null">
         tid,
       </if>
+      <if test="ctid != null">
+        ctid,
+      </if>
       <if test="projectType != null">
         project_type,
       </if>
@@ -212,6 +220,9 @@
       <if test="status != null">
         status,
       </if>
+      <if test="type != null">
+        type,
+      </if>
       <if test="createTime != null">
         create_time,
       </if>
@@ -224,11 +235,11 @@
       <if test="appropriationRatio != null">
         appropriation_ratio,
       </if>
-      <if test="type != null">
-        type,
+      <if test="customizeName != null">
+        customize_name,
       </if>
-      <if test="ctid != null">
-        ctid,
+      <if test="customizeTime != null">
+        customize_time,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -247,6 +258,9 @@
       <if test="tid != null">
         #{tid,jdbcType=INTEGER},
       </if>
+      <if test="ctid != null">
+        #{ctid,jdbcType=INTEGER},
+      </if>
       <if test="projectType != null">
         #{projectType,jdbcType=INTEGER},
       </if>
@@ -265,6 +279,9 @@
       <if test="status != null">
         #{status,jdbcType=INTEGER},
       </if>
+      <if test="type != null">
+        #{type,jdbcType=INTEGER},
+      </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -277,11 +294,11 @@
       <if test="appropriationRatio != null">
         #{appropriationRatio,jdbcType=DECIMAL},
       </if>
-      <if test="type != null">
-        #{type,jdbcType=INTEGER},
+      <if test="customizeName != null">
+        #{customizeName,jdbcType=VARCHAR},
       </if>
-      <if test="ctid != null">
-        #{ctid,jdbcType=INTEGER},
+      <if test="customizeTime != null">
+        #{customizeTime,jdbcType=TIMESTAMP},
       </if>
     </trim>
   </insert>
@@ -289,7 +306,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+      This element was generated on Mon May 18 15:26:46 CST 2020.
     -->
     select count(*) from t_change_dun
     <if test="_parameter != null">
@@ -300,7 +317,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+      This element was generated on Mon May 18 15:26:46 CST 2020.
     -->
     update t_change_dun
     <set>
@@ -319,6 +336,9 @@
       <if test="record.tid != null">
         tid = #{record.tid,jdbcType=INTEGER},
       </if>
+      <if test="record.ctid != null">
+        ctid = #{record.ctid,jdbcType=INTEGER},
+      </if>
       <if test="record.projectType != null">
         project_type = #{record.projectType,jdbcType=INTEGER},
       </if>
@@ -337,6 +357,9 @@
       <if test="record.status != null">
         status = #{record.status,jdbcType=INTEGER},
       </if>
+      <if test="record.type != null">
+        type = #{record.type,jdbcType=INTEGER},
+      </if>
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
@@ -349,11 +372,11 @@
       <if test="record.appropriationRatio != null">
         appropriation_ratio = #{record.appropriationRatio,jdbcType=DECIMAL},
       </if>
-      <if test="record.type != null">
-        type = #{record.type,jdbcType=INTEGER},
+      <if test="record.customizeName != null">
+        customize_name = #{record.customizeName,jdbcType=VARCHAR},
       </if>
-      <if test="record.ctid != null">
-        ctid = #{record.ctid,jdbcType=INTEGER},
+      <if test="record.customizeTime != null">
+        customize_time = #{record.customizeTime,jdbcType=TIMESTAMP},
       </if>
     </set>
     <if test="_parameter != null">
@@ -364,7 +387,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+      This element was generated on Mon May 18 15:26:46 CST 2020.
     -->
     update t_change_dun
     set id = #{record.id,jdbcType=INTEGER},
@@ -372,18 +395,20 @@
       cid = #{record.cid,jdbcType=INTEGER},
       order_no = #{record.orderNo,jdbcType=VARCHAR},
       tid = #{record.tid,jdbcType=INTEGER},
+      ctid = #{record.ctid,jdbcType=INTEGER},
       project_type = #{record.projectType,jdbcType=INTEGER},
       dun_type = #{record.dunType,jdbcType=INTEGER},
       wait_day = #{record.waitDay,jdbcType=INTEGER},
       effective_count = #{record.effectiveCount,jdbcType=INTEGER},
       aid = #{record.aid,jdbcType=VARCHAR},
       status = #{record.status,jdbcType=INTEGER},
+      type = #{record.type,jdbcType=INTEGER},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       start_time = #{record.startTime,jdbcType=TIMESTAMP},
       money = #{record.money,jdbcType=DECIMAL},
       appropriation_ratio = #{record.appropriationRatio,jdbcType=DECIMAL},
-      type = #{record.type,jdbcType=INTEGER},
-      ctid = #{record.ctid,jdbcType=INTEGER}
+      customize_name = #{record.customizeName,jdbcType=VARCHAR},
+      customize_time = #{record.customizeTime,jdbcType=TIMESTAMP}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -392,7 +417,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+      This element was generated on Mon May 18 15:26:46 CST 2020.
     -->
     update t_change_dun
     <set>
@@ -408,6 +433,9 @@
       <if test="tid != null">
         tid = #{tid,jdbcType=INTEGER},
       </if>
+      <if test="ctid != null">
+        ctid = #{ctid,jdbcType=INTEGER},
+      </if>
       <if test="projectType != null">
         project_type = #{projectType,jdbcType=INTEGER},
       </if>
@@ -426,6 +454,9 @@
       <if test="status != null">
         status = #{status,jdbcType=INTEGER},
       </if>
+      <if test="type != null">
+        type = #{type,jdbcType=INTEGER},
+      </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
@@ -438,11 +469,11 @@
       <if test="appropriationRatio != null">
         appropriation_ratio = #{appropriationRatio,jdbcType=DECIMAL},
       </if>
-      <if test="type != null">
-        type = #{type,jdbcType=INTEGER},
+      <if test="customizeName != null">
+        customize_name = #{customizeName,jdbcType=VARCHAR},
       </if>
-      <if test="ctid != null">
-        ctid = #{ctid,jdbcType=INTEGER},
+      <if test="customizeTime != null">
+        customize_time = #{customizeTime,jdbcType=TIMESTAMP},
       </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
@@ -451,25 +482,27 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jan 13 11:34:14 CST 2020.
+      This element was generated on Mon May 18 15:26:46 CST 2020.
     -->
     update t_change_dun
     set did = #{did,jdbcType=INTEGER},
       cid = #{cid,jdbcType=INTEGER},
       order_no = #{orderNo,jdbcType=VARCHAR},
       tid = #{tid,jdbcType=INTEGER},
+      ctid = #{ctid,jdbcType=INTEGER},
       project_type = #{projectType,jdbcType=INTEGER},
       dun_type = #{dunType,jdbcType=INTEGER},
       wait_day = #{waitDay,jdbcType=INTEGER},
       effective_count = #{effectiveCount,jdbcType=INTEGER},
       aid = #{aid,jdbcType=VARCHAR},
       status = #{status,jdbcType=INTEGER},
+      type = #{type,jdbcType=INTEGER},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       start_time = #{startTime,jdbcType=TIMESTAMP},
       money = #{money,jdbcType=DECIMAL},
       appropriation_ratio = #{appropriationRatio,jdbcType=DECIMAL},
-      type = #{type,jdbcType=INTEGER},
-      ctid = #{ctid,jdbcType=INTEGER}
+      customize_name = #{customizeName,jdbcType=VARCHAR},
+      customize_time = #{customizeTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
   
@@ -478,14 +511,16 @@
       order_no, tid, project_type, 
       dun_type, wait_day, effective_count, 
       aid, status, create_time, 
-      start_time, money, appropriation_ratio
+      start_time, money, appropriation_ratio,
+      customize_name,customize_time
       )values
       <foreach collection="list" index="index" item="item" separator=",">
       ( #{item.did,jdbcType=INTEGER}, #{item.cid,jdbcType=INTEGER}, 
       #{item.orderNo,jdbcType=VARCHAR}, #{item.tid,jdbcType=INTEGER}, #{item.projectType,jdbcType=INTEGER}, 
       #{item.dunType,jdbcType=INTEGER}, #{item.waitDay,jdbcType=INTEGER}, #{item.effectiveCount,jdbcType=INTEGER}, 
       #{item.aid,jdbcType=VARCHAR}, #{item.status,jdbcType=INTEGER}, now(), 
-      #{item.startTime,jdbcType=TIMESTAMP}, #{item.money,jdbcType=DECIMAL}, #{item.appropriationRatio,jdbcType=DECIMAL}
+      #{item.startTime,jdbcType=TIMESTAMP}, #{item.money,jdbcType=DECIMAL}, #{item.appropriationRatio,jdbcType=DECIMAL},
+      #{item.customizeName,jdbcType=VARCHAR},#{item.customizeTime,jdbcType=TIMESTAMP}
       )
     </foreach>
   </insert>
@@ -494,6 +529,7 @@
 	select a.id,a.order_no orderNo,ifnull(a.tid,c.tid)tid, a.project_type projectType, a.dun_type dunType, a.wait_day waitDay, 
   	  b.set_up_amount setUpAmount, a.effective_count effectiveCount, a.aid, a.create_time createTime,a.type,a.ctid,a.did,
   	  ifnull(b.commodity_name,c.commodity_name) commodityName,a.money,a.status, a.appropriation_ratio appropriationRatio
+  	  ,date_format(a.customize_time,'%Y-%m-%d') customizeTimes, a.customize_name customizeName,a.customize_time customizeTime
   	  from t_change_dun a left join t_order_task b on a.tid=b.id left join t_change_task c on a.ctid=c.id
     	where a.cid= #{id} order by a.id
   </select>
@@ -517,7 +553,6 @@
   		</if>
   </update>
     <delete id="deleteByCtid" parameterType="java.lang.Integer">
-    
     delete from t_change_dun
     where ctid = #{id,jdbcType=INTEGER}
   </delete>

File diff suppressed because it is too large
+ 1869 - 1853
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml


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

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 31 14:23:56 CST 2020.
+      This element was generated on Fri May 15 16:05:15 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
@@ -50,12 +50,13 @@
     <result column="split_time" jdbcType="TIMESTAMP" property="splitTime" />
     <result column="cname" jdbcType="VARCHAR" property="cname" />
     <result column="receiver_name" jdbcType="VARCHAR" property="receiverName" />
+    <result column="declaration_batch" jdbcType="INTEGER" property="declarationBatch" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.goafanti.common.model.TOrderTask">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 31 14:23:56 CST 2020.
+      This element was generated on Fri May 15 16:05:15 CST 2020.
     -->
     <result column="attachment_url" jdbcType="LONGVARCHAR" property="attachmentUrl" />
   </resultMap>
@@ -63,7 +64,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 31 14:23:56 CST 2020.
+      This element was generated on Fri May 15 16:05:15 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -97,7 +98,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 31 14:23:56 CST 2020.
+      This element was generated on Fri May 15 16:05:15 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -131,7 +132,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 31 14:23:56 CST 2020.
+      This element was generated on Fri May 15 16:05:15 CST 2020.
     -->
     id, order_no, main, super_id, commodity_id, commodity_name, commodity_quantity, commodity_mode, 
     commodity_price, task_status, task_distribution_time, task_allocator, task_receiver, 
@@ -139,13 +140,13 @@
     publicity_time, licence_time, certificate_number, status, form_retrieve, task_refund, 
     refund_content, retrieve_content, declare_user, declare_pwd, set_up_amount, arrival_money, 
     outsource_name, outsource_price, consultant_id, manager_id, outsource, split_super, 
-    split_status, split_id, split_aid, split_time, cname, receiver_name
+    split_status, split_id, split_aid, split_time, cname, receiver_name, declaration_batch
   </sql>
   <sql id="Blob_Column_List">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 31 14:23:56 CST 2020.
+      This element was generated on Fri May 15 16:05:15 CST 2020.
     -->
     attachment_url
   </sql>
@@ -153,7 +154,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 31 14:23:56 CST 2020.
+      This element was generated on Fri May 15 16:05:15 CST 2020.
     -->
     select
     <if test="distinct">
@@ -174,7 +175,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 31 14:23:56 CST 2020.
+      This element was generated on Fri May 15 16:05:15 CST 2020.
     -->
     select
     <if test="distinct">
@@ -193,7 +194,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 31 14:23:56 CST 2020.
+      This element was generated on Fri May 15 16:05:15 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -206,7 +207,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 31 14:23:56 CST 2020.
+      This element was generated on Fri May 15 16:05:15 CST 2020.
     -->
     delete from t_order_task
     where id = #{id,jdbcType=INTEGER}
@@ -215,7 +216,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 31 14:23:56 CST 2020.
+      This element was generated on Fri May 15 16:05:15 CST 2020.
     -->
     delete from t_order_task
     <if test="_parameter != null">
@@ -226,7 +227,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 31 14:23:56 CST 2020.
+      This element was generated on Fri May 15 16:05:15 CST 2020.
     -->
     insert into t_order_task (id, order_no, main, 
       super_id, commodity_id, commodity_name, 
@@ -242,7 +243,8 @@
       consultant_id, manager_id, outsource, 
       split_super, split_status, split_id, 
       split_aid, split_time, cname, 
-      receiver_name, attachment_url)
+      receiver_name, declaration_batch, attachment_url
+      )
     values (#{id,jdbcType=INTEGER}, #{orderNo,jdbcType=VARCHAR}, #{main,jdbcType=INTEGER}, 
       #{superId,jdbcType=VARCHAR}, #{commodityId,jdbcType=VARCHAR}, #{commodityName,jdbcType=VARCHAR}, 
       #{commodityQuantity,jdbcType=INTEGER}, #{commodityMode,jdbcType=VARCHAR}, #{commodityPrice,jdbcType=DECIMAL}, 
@@ -257,14 +259,14 @@
       #{consultantId,jdbcType=VARCHAR}, #{managerId,jdbcType=VARCHAR}, #{outsource,jdbcType=INTEGER}, 
       #{splitSuper,jdbcType=INTEGER}, #{splitStatus,jdbcType=INTEGER}, #{splitId,jdbcType=INTEGER}, 
       #{splitAid,jdbcType=VARCHAR}, #{splitTime,jdbcType=TIMESTAMP}, #{cname,jdbcType=VARCHAR}, 
-      #{receiverName,jdbcType=VARCHAR}, #{attachmentUrl,jdbcType=LONGVARCHAR})
+      #{receiverName,jdbcType=VARCHAR}, #{declarationBatch,jdbcType=INTEGER}, #{attachmentUrl,jdbcType=LONGVARCHAR}
+      )
   </insert>
-  
   <select id="countByExample" parameterType="com.goafanti.common.model.TOrderTaskExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 31 14:23:56 CST 2020.
+      This element was generated on Fri May 15 16:05:15 CST 2020.
     -->
     select count(*) from t_order_task
     <if test="_parameter != null">
@@ -275,7 +277,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 31 14:23:56 CST 2020.
+      This element was generated on Fri May 15 16:05:15 CST 2020.
     -->
     update t_order_task
     <set>
@@ -408,6 +410,9 @@
       <if test="record.receiverName != null">
         receiver_name = #{record.receiverName,jdbcType=VARCHAR},
       </if>
+      <if test="record.declarationBatch != null">
+        declaration_batch = #{record.declarationBatch,jdbcType=INTEGER},
+      </if>
       <if test="record.attachmentUrl != null">
         attachment_url = #{record.attachmentUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -420,7 +425,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 31 14:23:56 CST 2020.
+      This element was generated on Fri May 15 16:05:15 CST 2020.
     -->
     update t_order_task
     set id = #{record.id,jdbcType=INTEGER},
@@ -466,6 +471,7 @@
       split_time = #{record.splitTime,jdbcType=TIMESTAMP},
       cname = #{record.cname,jdbcType=VARCHAR},
       receiver_name = #{record.receiverName,jdbcType=VARCHAR},
+      declaration_batch = #{record.declarationBatch,jdbcType=INTEGER},
       attachment_url = #{record.attachmentUrl,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -475,7 +481,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 31 14:23:56 CST 2020.
+      This element was generated on Fri May 15 16:05:15 CST 2020.
     -->
     update t_order_task
     set id = #{record.id,jdbcType=INTEGER},
@@ -520,7 +526,8 @@
       split_aid = #{record.splitAid,jdbcType=VARCHAR},
       split_time = #{record.splitTime,jdbcType=TIMESTAMP},
       cname = #{record.cname,jdbcType=VARCHAR},
-      receiver_name = #{record.receiverName,jdbcType=VARCHAR}
+      receiver_name = #{record.receiverName,jdbcType=VARCHAR},
+      declaration_batch = #{record.declarationBatch,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -529,7 +536,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 31 14:23:56 CST 2020.
+      This element was generated on Fri May 15 16:05:15 CST 2020.
     -->
     update t_order_task
     <set>
@@ -659,6 +666,9 @@
       <if test="receiverName != null">
         receiver_name = #{receiverName,jdbcType=VARCHAR},
       </if>
+      <if test="declarationBatch != null">
+        declaration_batch = #{declarationBatch,jdbcType=INTEGER},
+      </if>
       <if test="attachmentUrl != null">
         attachment_url = #{attachmentUrl,jdbcType=LONGVARCHAR},
       </if>
@@ -669,7 +679,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 31 14:23:56 CST 2020.
+      This element was generated on Fri May 15 16:05:15 CST 2020.
     -->
     update t_order_task
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -714,6 +724,7 @@
       split_time = #{splitTime,jdbcType=TIMESTAMP},
       cname = #{cname,jdbcType=VARCHAR},
       receiver_name = #{receiverName,jdbcType=VARCHAR},
+      declaration_batch = #{declarationBatch,jdbcType=INTEGER},
       attachment_url = #{attachmentUrl,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -721,7 +732,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Mar 31 14:23:56 CST 2020.
+      This element was generated on Fri May 15 16:05:15 CST 2020.
     -->
     update t_order_task
     set order_no = #{orderNo,jdbcType=VARCHAR},
@@ -765,14 +776,15 @@
       split_aid = #{splitAid,jdbcType=VARCHAR},
       split_time = #{splitTime,jdbcType=TIMESTAMP},
       cname = #{cname,jdbcType=VARCHAR},
-      receiver_name = #{receiverName,jdbcType=VARCHAR}
+      receiver_name = #{receiverName,jdbcType=VARCHAR},
+      declaration_batch = #{declarationBatch,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <!-- 记得返回id -->
-  <!-- &lt;insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TOrderTask" useGeneratedKeys="true"&gt;
-  		&lt;selectKey keyProperty="id" order="AFTER" resultType="int"&gt;
+  <!-- &amp;lt;insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TOrderTask" useGeneratedKeys="true"&amp;gt;
+  		&amp;lt;selectKey keyProperty="id" order="AFTER" resultType="int"&amp;gt;
         SELECT LAST_INSERT_ID()
-    &lt;/selectKey&gt; -->
+    &amp;lt;/selectKey&amp;gt; -->
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TOrderTask" useGeneratedKeys="true">
     insert into t_order_task
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -1198,7 +1210,7 @@ select
 	date_format(a.task_end_time,'%Y-%m-%d') as endDate,date_format(a.accept_time,'%Y-%m-%d') as acceptDate,h.name as depName,e.contact_mobile as contactMobile ,
 	date_format(a.review_time,'%Y-%m-%d') as reviewDate,date_format(a.publicity_time,'%Y-%m-%d') as publicityDate,a.outsource_price outsourcePrice,
 	date_format(a.licence_time,'%Y-%m-%d') as licenceDate,date_format(a.task_distribution_time,'%Y-%m-%d') as taskDate,e.legal_person as legalPerson,
-	e.legal_person_tel as legalPersonTel, a.split_status splitStatus, a.split_super splitSuper, a.split_id splitId
+	e.legal_person_tel as legalPersonTel, a.split_status splitStatus, a.split_super splitSuper, a.split_id splitId,a.declaration_batch declarationBatch
 	from t_order_task a left join business_project b on a.commodity_id=b.id left join business_category c on b.cid=c.id
     left join admin d on a.task_receiver=d.id left join t_order_new e on a.order_no=e.order_no
     left join department h on e.order_dep=h.id left join user f on e.buyer_id=f.id
@@ -1219,7 +1231,7 @@ select
   	from t_order_task a left join business_project b on a.commodity_id=b.id left join business_category c on b.cid=c.id
     left join admin d on a.task_receiver=d.id left join t_order_new e on a.order_no=e.order_no left join department dep on e.order_dep=dep.id  
     left join user f on e.buyer_id=f.id left join (select task_id,sum(hours) as hours from t_task_hours group by task_id) g on a.id=g.task_id
-    left join t_order_mid tm on a.order_no=tm.order_no where e.delete_sign !=1 and a.super_id is null and a.split_status !=1
+    left join t_order_mid tm on a.order_no=tm.order_no where e.delete_sign =0 and a.super_id is null and a.split_status in(0,2)
   	<if test="shiroType == 1 and aid !=null">
   	  	and tm.finance_id= #{aid,jdbcType=VARCHAR}
   	</if>
@@ -1259,7 +1271,7 @@ select
    <select id="selectTaskHoursListCount" resultType="java.lang.Integer">
   	select  count(*) from t_order_task a left join business_project b on a.commodity_id=b.id left join business_category c on b.cid=c.id 
   	left join admin d on a.task_receiver=d.id left join t_order_new e on a.order_no=e.order_no left join user f on e.buyer_id=f.id
-    left join t_order_mid tm on a.order_no=tm.order_no where e.delete_sign !=1 and a.super_id is null and a.split_status !=1
+    left join t_order_mid tm on a.order_no=tm.order_no where e.delete_sign =0 and a.super_id is null and a.split_status in(0,2)
   <if test="shiroType == 1 and aid !=null">
   	  	and tm.finance_id= #{aid,jdbcType=VARCHAR}
   	</if>

+ 5 - 0
src/main/java/com/goafanti/common/mapper/UserLockReleaseMapper.xml

@@ -354,6 +354,11 @@
   	update user_lock_release set status = #{newStatus} where uid = #{uid} and aid = #{aid} and type = 0 and status = #{oldStatus}
   </update>
   
+  <update id="updateUserTypeLock">
+  	update user_lock_release set status = #{newStatus} , release_time= #{date}
+  	where uid = #{uid} and aid = #{aid} and type = 0 and type = #{type}
+  </update>
+  
   <select id="selectWaitReleaseCustomer" resultType="com.goafanti.customer.bo.LockingReleaseBo">
 	select 
 		t0.id,

+ 6 - 0
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -541,6 +541,12 @@
 		<if test="area != null">
 			and b.location_area = #{area,jdbcType=INTEGER}
 		</if>
+		<if test="sort == 1">
+		order by a.transfer_time desc
+		</if>
+		<if test="sort == 2">
+		order by a.transfer_time 
+		</if>
 		 <if test="page_sql != null">
     		${page_sql}
    		 </if>

+ 85 - 39
src/main/java/com/goafanti/common/model/NewOrderDun.java

@@ -7,74 +7,84 @@ public class NewOrderDun {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.id
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	private Integer id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.order_no
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	private String orderNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.tid
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	private Integer tid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.project_type
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	private Integer projectType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.dun_type
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	private Integer dunType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.wait_day
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	private Integer waitDay;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.effective_count
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	private Integer effectiveCount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.aid
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	private String aid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.status
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	private Integer status;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.create_time
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.start_time
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	private Date startTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.money
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	private BigDecimal money;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.appropriation_ratio
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	private BigDecimal appropriationRatio;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.customize_name
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
+	 */
+	private String customizeName;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column new_order_dun.customize_time
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
+	 */
+	private Date customizeTime;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.id
 	 * @return  the value of new_order_dun.id
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public Integer getId() {
 		return id;
@@ -83,7 +93,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.id
 	 * @param id  the value for new_order_dun.id
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -92,7 +102,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.order_no
 	 * @return  the value of new_order_dun.order_no
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -101,7 +111,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.order_no
 	 * @param orderNo  the value for new_order_dun.order_no
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -110,7 +120,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.tid
 	 * @return  the value of new_order_dun.tid
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public Integer getTid() {
 		return tid;
@@ -119,7 +129,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.tid
 	 * @param tid  the value for new_order_dun.tid
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public void setTid(Integer tid) {
 		this.tid = tid;
@@ -128,7 +138,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.project_type
 	 * @return  the value of new_order_dun.project_type
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public Integer getProjectType() {
 		return projectType;
@@ -137,7 +147,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.project_type
 	 * @param projectType  the value for new_order_dun.project_type
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public void setProjectType(Integer projectType) {
 		this.projectType = projectType;
@@ -146,7 +156,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.dun_type
 	 * @return  the value of new_order_dun.dun_type
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public Integer getDunType() {
 		return dunType;
@@ -155,7 +165,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.dun_type
 	 * @param dunType  the value for new_order_dun.dun_type
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public void setDunType(Integer dunType) {
 		this.dunType = dunType;
@@ -164,7 +174,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.wait_day
 	 * @return  the value of new_order_dun.wait_day
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public Integer getWaitDay() {
 		return waitDay;
@@ -173,7 +183,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.wait_day
 	 * @param waitDay  the value for new_order_dun.wait_day
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public void setWaitDay(Integer waitDay) {
 		this.waitDay = waitDay;
@@ -182,7 +192,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.effective_count
 	 * @return  the value of new_order_dun.effective_count
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public Integer getEffectiveCount() {
 		return effectiveCount;
@@ -191,7 +201,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.effective_count
 	 * @param effectiveCount  the value for new_order_dun.effective_count
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public void setEffectiveCount(Integer effectiveCount) {
 		this.effectiveCount = effectiveCount;
@@ -200,7 +210,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.aid
 	 * @return  the value of new_order_dun.aid
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public String getAid() {
 		return aid;
@@ -209,7 +219,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.aid
 	 * @param aid  the value for new_order_dun.aid
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public void setAid(String aid) {
 		this.aid = aid;
@@ -218,7 +228,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.status
 	 * @return  the value of new_order_dun.status
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public Integer getStatus() {
 		return status;
@@ -227,7 +237,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.status
 	 * @param status  the value for new_order_dun.status
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public void setStatus(Integer status) {
 		this.status = status;
@@ -236,7 +246,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.create_time
 	 * @return  the value of new_order_dun.create_time
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -245,7 +255,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.create_time
 	 * @param createTime  the value for new_order_dun.create_time
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -254,7 +264,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.start_time
 	 * @return  the value of new_order_dun.start_time
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public Date getStartTime() {
 		return startTime;
@@ -263,7 +273,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.start_time
 	 * @param startTime  the value for new_order_dun.start_time
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public void setStartTime(Date startTime) {
 		this.startTime = startTime;
@@ -272,7 +282,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.money
 	 * @return  the value of new_order_dun.money
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public BigDecimal getMoney() {
 		return money;
@@ -281,7 +291,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.money
 	 * @param money  the value for new_order_dun.money
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public void setMoney(BigDecimal money) {
 		this.money = money;
@@ -290,7 +300,7 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.appropriation_ratio
 	 * @return  the value of new_order_dun.appropriation_ratio
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public BigDecimal getAppropriationRatio() {
 		return appropriationRatio;
@@ -299,9 +309,45 @@ public class NewOrderDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.appropriation_ratio
 	 * @param appropriationRatio  the value for new_order_dun.appropriation_ratio
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public void setAppropriationRatio(BigDecimal appropriationRatio) {
 		this.appropriationRatio = appropriationRatio;
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.customize_name
+	 * @return  the value of new_order_dun.customize_name
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
+	 */
+	public String getCustomizeName() {
+		return customizeName;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.customize_name
+	 * @param customizeName  the value for new_order_dun.customize_name
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
+	 */
+	public void setCustomizeName(String customizeName) {
+		this.customizeName = customizeName;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column new_order_dun.customize_time
+	 * @return  the value of new_order_dun.customize_time
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
+	 */
+	public Date getCustomizeTime() {
+		return customizeTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column new_order_dun.customize_time
+	 * @param customizeTime  the value for new_order_dun.customize_time
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
+	 */
+	public void setCustomizeTime(Date customizeTime) {
+		this.customizeTime = customizeTime;
+	}
 }

+ 146 - 16
src/main/java/com/goafanti/common/model/NewOrderDunExample.java

@@ -8,23 +8,23 @@ import java.math.BigDecimal;
 public class NewOrderDunExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public NewOrderDunExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -32,7 +32,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -40,7 +40,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -48,7 +48,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -56,7 +56,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -64,7 +64,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -72,7 +72,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -80,7 +80,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -90,7 +90,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -102,7 +102,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -111,7 +111,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -121,7 +121,7 @@ public class NewOrderDunExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -963,11 +963,141 @@ public class NewOrderDunExample {
 			addCriterion("appropriation_ratio not between", value1, value2, "appropriationRatio");
 			return (Criteria) this;
 		}
+
+		public Criteria andCustomizeNameIsNull() {
+			addCriterion("customize_name is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeNameIsNotNull() {
+			addCriterion("customize_name is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeNameEqualTo(String value) {
+			addCriterion("customize_name =", value, "customizeName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeNameNotEqualTo(String value) {
+			addCriterion("customize_name <>", value, "customizeName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeNameGreaterThan(String value) {
+			addCriterion("customize_name >", value, "customizeName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeNameGreaterThanOrEqualTo(String value) {
+			addCriterion("customize_name >=", value, "customizeName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeNameLessThan(String value) {
+			addCriterion("customize_name <", value, "customizeName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeNameLessThanOrEqualTo(String value) {
+			addCriterion("customize_name <=", value, "customizeName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeNameLike(String value) {
+			addCriterion("customize_name like", value, "customizeName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeNameNotLike(String value) {
+			addCriterion("customize_name not like", value, "customizeName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeNameIn(List<String> values) {
+			addCriterion("customize_name in", values, "customizeName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeNameNotIn(List<String> values) {
+			addCriterion("customize_name not in", values, "customizeName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeNameBetween(String value1, String value2) {
+			addCriterion("customize_name between", value1, value2, "customizeName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeNameNotBetween(String value1, String value2) {
+			addCriterion("customize_name not between", value1, value2, "customizeName");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeTimeIsNull() {
+			addCriterion("customize_time is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeTimeIsNotNull() {
+			addCriterion("customize_time is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeTimeEqualTo(Date value) {
+			addCriterion("customize_time =", value, "customizeTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeTimeNotEqualTo(Date value) {
+			addCriterion("customize_time <>", value, "customizeTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeTimeGreaterThan(Date value) {
+			addCriterion("customize_time >", value, "customizeTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeTimeGreaterThanOrEqualTo(Date value) {
+			addCriterion("customize_time >=", value, "customizeTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeTimeLessThan(Date value) {
+			addCriterion("customize_time <", value, "customizeTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeTimeLessThanOrEqualTo(Date value) {
+			addCriterion("customize_time <=", value, "customizeTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeTimeIn(List<Date> values) {
+			addCriterion("customize_time in", values, "customizeTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeTimeNotIn(List<Date> values) {
+			addCriterion("customize_time not in", values, "customizeTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeTimeBetween(Date value1, Date value2) {
+			addCriterion("customize_time between", value1, value2, "customizeTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeTimeNotBetween(Date value1, Date value2) {
+			addCriterion("customize_time not between", value1, value2, "customizeTime");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table new_order_dun
-	 * @mbg.generated  Thu Dec 19 11:46:22 CST 2019
+	 * @mbg.generated  Fri May 15 09:46:56 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

+ 124 - 147
src/main/java/com/goafanti/common/model/PersonnelDossier.java

@@ -7,204 +7,199 @@ public class PersonnelDossier {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.id
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Integer id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.aid
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private String aid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.door_id
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Integer doorId;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.name
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private String name;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.birthday
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Date birthday;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.sex
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Integer sex;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.mobile
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private String mobile;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.fixed_tel
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private String fixedTel;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.nation
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private String nation;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.residence_province
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Integer residenceProvince;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.residence_city
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Integer residenceCity;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.residence_area
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Integer residenceArea;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.residence_address
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private String residenceAddress;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.native_place_province
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Integer nativePlaceProvince;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.native_place_city
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Integer nativePlaceCity;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.now_province
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Integer nowProvince;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.now_city
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Integer nowCity;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.now_area
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Integer nowArea;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.now_address
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private String nowAddress;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.id_card
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private String idCard;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.certification_authority
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private String certificationAuthority;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.marriage
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Integer marriage;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.political_outlook
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Integer politicalOutlook;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.son
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Integer son;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.girl
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Integer girl;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.status
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Integer status;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.system
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Integer system;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.job_nature
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Integer jobNature;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.job_nature_remarks
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private String jobNatureRemarks;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.entry_time
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Date entryTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.promotion_time
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Date promotionTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.company
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private String company;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.lvl
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Integer lvl;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.jobs
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Integer jobs;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.star
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Integer star;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.allowance
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private BigDecimal allowance;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.create_time
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	private Date createTime;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.welfare_annex_url
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.employee_id
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
-	private String welfareAnnexUrl;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column personnel_dossier.welfare_annex_name
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
-	 */
-	private String welfareAnnexName;
+	private Integer employeeId;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.id
 	 * @return  the value of personnel_dossier.id
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Integer getId() {
 		return id;
@@ -213,7 +208,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.id
 	 * @param id  the value for personnel_dossier.id
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -222,7 +217,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.aid
 	 * @return  the value of personnel_dossier.aid
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public String getAid() {
 		return aid;
@@ -231,7 +226,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.aid
 	 * @param aid  the value for personnel_dossier.aid
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setAid(String aid) {
 		this.aid = aid;
@@ -240,7 +235,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.door_id
 	 * @return  the value of personnel_dossier.door_id
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Integer getDoorId() {
 		return doorId;
@@ -249,7 +244,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.door_id
 	 * @param doorId  the value for personnel_dossier.door_id
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setDoorId(Integer doorId) {
 		this.doorId = doorId;
@@ -258,7 +253,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.name
 	 * @return  the value of personnel_dossier.name
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public String getName() {
 		return name;
@@ -267,7 +262,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.name
 	 * @param name  the value for personnel_dossier.name
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setName(String name) {
 		this.name = name;
@@ -276,7 +271,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.birthday
 	 * @return  the value of personnel_dossier.birthday
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Date getBirthday() {
 		return birthday;
@@ -285,7 +280,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.birthday
 	 * @param birthday  the value for personnel_dossier.birthday
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setBirthday(Date birthday) {
 		this.birthday = birthday;
@@ -294,7 +289,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.sex
 	 * @return  the value of personnel_dossier.sex
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Integer getSex() {
 		return sex;
@@ -303,7 +298,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.sex
 	 * @param sex  the value for personnel_dossier.sex
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setSex(Integer sex) {
 		this.sex = sex;
@@ -312,7 +307,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.mobile
 	 * @return  the value of personnel_dossier.mobile
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public String getMobile() {
 		return mobile;
@@ -321,7 +316,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.mobile
 	 * @param mobile  the value for personnel_dossier.mobile
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setMobile(String mobile) {
 		this.mobile = mobile;
@@ -330,7 +325,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.fixed_tel
 	 * @return  the value of personnel_dossier.fixed_tel
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public String getFixedTel() {
 		return fixedTel;
@@ -339,7 +334,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.fixed_tel
 	 * @param fixedTel  the value for personnel_dossier.fixed_tel
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setFixedTel(String fixedTel) {
 		this.fixedTel = fixedTel;
@@ -348,7 +343,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.nation
 	 * @return  the value of personnel_dossier.nation
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public String getNation() {
 		return nation;
@@ -357,7 +352,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.nation
 	 * @param nation  the value for personnel_dossier.nation
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setNation(String nation) {
 		this.nation = nation;
@@ -366,7 +361,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.residence_province
 	 * @return  the value of personnel_dossier.residence_province
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Integer getResidenceProvince() {
 		return residenceProvince;
@@ -375,7 +370,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.residence_province
 	 * @param residenceProvince  the value for personnel_dossier.residence_province
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setResidenceProvince(Integer residenceProvince) {
 		this.residenceProvince = residenceProvince;
@@ -384,7 +379,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.residence_city
 	 * @return  the value of personnel_dossier.residence_city
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Integer getResidenceCity() {
 		return residenceCity;
@@ -393,7 +388,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.residence_city
 	 * @param residenceCity  the value for personnel_dossier.residence_city
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setResidenceCity(Integer residenceCity) {
 		this.residenceCity = residenceCity;
@@ -402,7 +397,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.residence_area
 	 * @return  the value of personnel_dossier.residence_area
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Integer getResidenceArea() {
 		return residenceArea;
@@ -411,7 +406,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.residence_area
 	 * @param residenceArea  the value for personnel_dossier.residence_area
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setResidenceArea(Integer residenceArea) {
 		this.residenceArea = residenceArea;
@@ -420,7 +415,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.residence_address
 	 * @return  the value of personnel_dossier.residence_address
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public String getResidenceAddress() {
 		return residenceAddress;
@@ -429,7 +424,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.residence_address
 	 * @param residenceAddress  the value for personnel_dossier.residence_address
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setResidenceAddress(String residenceAddress) {
 		this.residenceAddress = residenceAddress;
@@ -438,7 +433,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.native_place_province
 	 * @return  the value of personnel_dossier.native_place_province
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Integer getNativePlaceProvince() {
 		return nativePlaceProvince;
@@ -447,7 +442,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.native_place_province
 	 * @param nativePlaceProvince  the value for personnel_dossier.native_place_province
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setNativePlaceProvince(Integer nativePlaceProvince) {
 		this.nativePlaceProvince = nativePlaceProvince;
@@ -456,7 +451,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.native_place_city
 	 * @return  the value of personnel_dossier.native_place_city
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Integer getNativePlaceCity() {
 		return nativePlaceCity;
@@ -465,7 +460,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.native_place_city
 	 * @param nativePlaceCity  the value for personnel_dossier.native_place_city
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setNativePlaceCity(Integer nativePlaceCity) {
 		this.nativePlaceCity = nativePlaceCity;
@@ -474,7 +469,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.now_province
 	 * @return  the value of personnel_dossier.now_province
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Integer getNowProvince() {
 		return nowProvince;
@@ -483,7 +478,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.now_province
 	 * @param nowProvince  the value for personnel_dossier.now_province
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setNowProvince(Integer nowProvince) {
 		this.nowProvince = nowProvince;
@@ -492,7 +487,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.now_city
 	 * @return  the value of personnel_dossier.now_city
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Integer getNowCity() {
 		return nowCity;
@@ -501,7 +496,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.now_city
 	 * @param nowCity  the value for personnel_dossier.now_city
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setNowCity(Integer nowCity) {
 		this.nowCity = nowCity;
@@ -510,7 +505,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.now_area
 	 * @return  the value of personnel_dossier.now_area
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Integer getNowArea() {
 		return nowArea;
@@ -519,7 +514,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.now_area
 	 * @param nowArea  the value for personnel_dossier.now_area
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setNowArea(Integer nowArea) {
 		this.nowArea = nowArea;
@@ -528,7 +523,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.now_address
 	 * @return  the value of personnel_dossier.now_address
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public String getNowAddress() {
 		return nowAddress;
@@ -537,7 +532,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.now_address
 	 * @param nowAddress  the value for personnel_dossier.now_address
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setNowAddress(String nowAddress) {
 		this.nowAddress = nowAddress;
@@ -546,7 +541,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.id_card
 	 * @return  the value of personnel_dossier.id_card
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public String getIdCard() {
 		return idCard;
@@ -555,7 +550,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.id_card
 	 * @param idCard  the value for personnel_dossier.id_card
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setIdCard(String idCard) {
 		this.idCard = idCard;
@@ -564,7 +559,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.certification_authority
 	 * @return  the value of personnel_dossier.certification_authority
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public String getCertificationAuthority() {
 		return certificationAuthority;
@@ -573,7 +568,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.certification_authority
 	 * @param certificationAuthority  the value for personnel_dossier.certification_authority
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setCertificationAuthority(String certificationAuthority) {
 		this.certificationAuthority = certificationAuthority;
@@ -582,7 +577,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.marriage
 	 * @return  the value of personnel_dossier.marriage
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Integer getMarriage() {
 		return marriage;
@@ -591,7 +586,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.marriage
 	 * @param marriage  the value for personnel_dossier.marriage
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setMarriage(Integer marriage) {
 		this.marriage = marriage;
@@ -600,7 +595,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.political_outlook
 	 * @return  the value of personnel_dossier.political_outlook
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Integer getPoliticalOutlook() {
 		return politicalOutlook;
@@ -609,7 +604,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.political_outlook
 	 * @param politicalOutlook  the value for personnel_dossier.political_outlook
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setPoliticalOutlook(Integer politicalOutlook) {
 		this.politicalOutlook = politicalOutlook;
@@ -618,7 +613,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.son
 	 * @return  the value of personnel_dossier.son
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Integer getSon() {
 		return son;
@@ -627,7 +622,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.son
 	 * @param son  the value for personnel_dossier.son
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setSon(Integer son) {
 		this.son = son;
@@ -636,7 +631,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.girl
 	 * @return  the value of personnel_dossier.girl
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Integer getGirl() {
 		return girl;
@@ -645,7 +640,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.girl
 	 * @param girl  the value for personnel_dossier.girl
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setGirl(Integer girl) {
 		this.girl = girl;
@@ -654,7 +649,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.status
 	 * @return  the value of personnel_dossier.status
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Integer getStatus() {
 		return status;
@@ -663,7 +658,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.status
 	 * @param status  the value for personnel_dossier.status
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setStatus(Integer status) {
 		this.status = status;
@@ -672,7 +667,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.system
 	 * @return  the value of personnel_dossier.system
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Integer getSystem() {
 		return system;
@@ -681,7 +676,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.system
 	 * @param system  the value for personnel_dossier.system
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setSystem(Integer system) {
 		this.system = system;
@@ -690,7 +685,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.job_nature
 	 * @return  the value of personnel_dossier.job_nature
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Integer getJobNature() {
 		return jobNature;
@@ -699,7 +694,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.job_nature
 	 * @param jobNature  the value for personnel_dossier.job_nature
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setJobNature(Integer jobNature) {
 		this.jobNature = jobNature;
@@ -708,7 +703,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.job_nature_remarks
 	 * @return  the value of personnel_dossier.job_nature_remarks
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public String getJobNatureRemarks() {
 		return jobNatureRemarks;
@@ -717,7 +712,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.job_nature_remarks
 	 * @param jobNatureRemarks  the value for personnel_dossier.job_nature_remarks
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setJobNatureRemarks(String jobNatureRemarks) {
 		this.jobNatureRemarks = jobNatureRemarks;
@@ -726,7 +721,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.entry_time
 	 * @return  the value of personnel_dossier.entry_time
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Date getEntryTime() {
 		return entryTime;
@@ -735,7 +730,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.entry_time
 	 * @param entryTime  the value for personnel_dossier.entry_time
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setEntryTime(Date entryTime) {
 		this.entryTime = entryTime;
@@ -744,7 +739,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.promotion_time
 	 * @return  the value of personnel_dossier.promotion_time
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Date getPromotionTime() {
 		return promotionTime;
@@ -753,7 +748,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.promotion_time
 	 * @param promotionTime  the value for personnel_dossier.promotion_time
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setPromotionTime(Date promotionTime) {
 		this.promotionTime = promotionTime;
@@ -762,7 +757,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.company
 	 * @return  the value of personnel_dossier.company
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public String getCompany() {
 		return company;
@@ -771,7 +766,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.company
 	 * @param company  the value for personnel_dossier.company
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setCompany(String company) {
 		this.company = company;
@@ -780,7 +775,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.lvl
 	 * @return  the value of personnel_dossier.lvl
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Integer getLvl() {
 		return lvl;
@@ -789,7 +784,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.lvl
 	 * @param lvl  the value for personnel_dossier.lvl
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setLvl(Integer lvl) {
 		this.lvl = lvl;
@@ -798,7 +793,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.jobs
 	 * @return  the value of personnel_dossier.jobs
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Integer getJobs() {
 		return jobs;
@@ -807,7 +802,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.jobs
 	 * @param jobs  the value for personnel_dossier.jobs
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setJobs(Integer jobs) {
 		this.jobs = jobs;
@@ -816,7 +811,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.star
 	 * @return  the value of personnel_dossier.star
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Integer getStar() {
 		return star;
@@ -825,7 +820,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.star
 	 * @param star  the value for personnel_dossier.star
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setStar(Integer star) {
 		this.star = star;
@@ -834,7 +829,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.allowance
 	 * @return  the value of personnel_dossier.allowance
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public BigDecimal getAllowance() {
 		return allowance;
@@ -843,7 +838,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.allowance
 	 * @param allowance  the value for personnel_dossier.allowance
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setAllowance(BigDecimal allowance) {
 		this.allowance = allowance;
@@ -852,7 +847,7 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.create_time
 	 * @return  the value of personnel_dossier.create_time
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -861,45 +856,27 @@ public class PersonnelDossier {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.create_time
 	 * @param createTime  the value for personnel_dossier.create_time
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.welfare_annex_url
-	 * @return  the value of personnel_dossier.welfare_annex_url
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
-	 */
-	public String getWelfareAnnexUrl() {
-		return welfareAnnexUrl;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.welfare_annex_url
-	 * @param welfareAnnexUrl  the value for personnel_dossier.welfare_annex_url
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
-	 */
-	public void setWelfareAnnexUrl(String welfareAnnexUrl) {
-		this.welfareAnnexUrl = welfareAnnexUrl;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.welfare_annex_name
-	 * @return  the value of personnel_dossier.welfare_annex_name
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column personnel_dossier.employee_id
+	 * @return  the value of personnel_dossier.employee_id
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
-	public String getWelfareAnnexName() {
-		return welfareAnnexName;
+	public Integer getEmployeeId() {
+		return employeeId;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.welfare_annex_name
-	 * @param welfareAnnexName  the value for personnel_dossier.welfare_annex_name
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column personnel_dossier.employee_id
+	 * @param employeeId  the value for personnel_dossier.employee_id
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
-	public void setWelfareAnnexName(String welfareAnnexName) {
-		this.welfareAnnexName = welfareAnnexName;
+	public void setEmployeeId(Integer employeeId) {
+		this.employeeId = employeeId;
 	}
 }

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

@@ -8,23 +8,23 @@ import java.util.List;
 public class PersonnelDossierExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public PersonnelDossierExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -32,7 +32,7 @@ public class PersonnelDossierExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -40,7 +40,7 @@ public class PersonnelDossierExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -48,7 +48,7 @@ public class PersonnelDossierExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -56,7 +56,7 @@ public class PersonnelDossierExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -64,7 +64,7 @@ public class PersonnelDossierExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -72,7 +72,7 @@ public class PersonnelDossierExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -80,7 +80,7 @@ public class PersonnelDossierExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -90,7 +90,7 @@ public class PersonnelDossierExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -102,7 +102,7 @@ public class PersonnelDossierExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -111,7 +111,7 @@ public class PersonnelDossierExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -121,7 +121,7 @@ public class PersonnelDossierExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -2494,150 +2494,70 @@ public class PersonnelDossierExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andWelfareAnnexUrlIsNull() {
-			addCriterion("welfare_annex_url is null");
+		public Criteria andEmployeeIdIsNull() {
+			addCriterion("employee_id is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andWelfareAnnexUrlIsNotNull() {
-			addCriterion("welfare_annex_url is not null");
+		public Criteria andEmployeeIdIsNotNull() {
+			addCriterion("employee_id is not null");
 			return (Criteria) this;
 		}
 
-		public Criteria andWelfareAnnexUrlEqualTo(String value) {
-			addCriterion("welfare_annex_url =", value, "welfareAnnexUrl");
+		public Criteria andEmployeeIdEqualTo(Integer value) {
+			addCriterion("employee_id =", value, "employeeId");
 			return (Criteria) this;
 		}
 
-		public Criteria andWelfareAnnexUrlNotEqualTo(String value) {
-			addCriterion("welfare_annex_url <>", value, "welfareAnnexUrl");
+		public Criteria andEmployeeIdNotEqualTo(Integer value) {
+			addCriterion("employee_id <>", value, "employeeId");
 			return (Criteria) this;
 		}
 
-		public Criteria andWelfareAnnexUrlGreaterThan(String value) {
-			addCriterion("welfare_annex_url >", value, "welfareAnnexUrl");
+		public Criteria andEmployeeIdGreaterThan(Integer value) {
+			addCriterion("employee_id >", value, "employeeId");
 			return (Criteria) this;
 		}
 
-		public Criteria andWelfareAnnexUrlGreaterThanOrEqualTo(String value) {
-			addCriterion("welfare_annex_url >=", value, "welfareAnnexUrl");
+		public Criteria andEmployeeIdGreaterThanOrEqualTo(Integer value) {
+			addCriterion("employee_id >=", value, "employeeId");
 			return (Criteria) this;
 		}
 
-		public Criteria andWelfareAnnexUrlLessThan(String value) {
-			addCriterion("welfare_annex_url <", value, "welfareAnnexUrl");
+		public Criteria andEmployeeIdLessThan(Integer value) {
+			addCriterion("employee_id <", value, "employeeId");
 			return (Criteria) this;
 		}
 
-		public Criteria andWelfareAnnexUrlLessThanOrEqualTo(String value) {
-			addCriterion("welfare_annex_url <=", value, "welfareAnnexUrl");
+		public Criteria andEmployeeIdLessThanOrEqualTo(Integer value) {
+			addCriterion("employee_id <=", value, "employeeId");
 			return (Criteria) this;
 		}
 
-		public Criteria andWelfareAnnexUrlLike(String value) {
-			addCriterion("welfare_annex_url like", value, "welfareAnnexUrl");
+		public Criteria andEmployeeIdIn(List<Integer> values) {
+			addCriterion("employee_id in", values, "employeeId");
 			return (Criteria) this;
 		}
 
-		public Criteria andWelfareAnnexUrlNotLike(String value) {
-			addCriterion("welfare_annex_url not like", value, "welfareAnnexUrl");
+		public Criteria andEmployeeIdNotIn(List<Integer> values) {
+			addCriterion("employee_id not in", values, "employeeId");
 			return (Criteria) this;
 		}
 
-		public Criteria andWelfareAnnexUrlIn(List<String> values) {
-			addCriterion("welfare_annex_url in", values, "welfareAnnexUrl");
+		public Criteria andEmployeeIdBetween(Integer value1, Integer value2) {
+			addCriterion("employee_id between", value1, value2, "employeeId");
 			return (Criteria) this;
 		}
 
-		public Criteria andWelfareAnnexUrlNotIn(List<String> values) {
-			addCriterion("welfare_annex_url not in", values, "welfareAnnexUrl");
-			return (Criteria) this;
-		}
-
-		public Criteria andWelfareAnnexUrlBetween(String value1, String value2) {
-			addCriterion("welfare_annex_url between", value1, value2, "welfareAnnexUrl");
-			return (Criteria) this;
-		}
-
-		public Criteria andWelfareAnnexUrlNotBetween(String value1, String value2) {
-			addCriterion("welfare_annex_url not between", value1, value2, "welfareAnnexUrl");
-			return (Criteria) this;
-		}
-
-		public Criteria andWelfareAnnexNameIsNull() {
-			addCriterion("welfare_annex_name is null");
-			return (Criteria) this;
-		}
-
-		public Criteria andWelfareAnnexNameIsNotNull() {
-			addCriterion("welfare_annex_name is not null");
-			return (Criteria) this;
-		}
-
-		public Criteria andWelfareAnnexNameEqualTo(String value) {
-			addCriterion("welfare_annex_name =", value, "welfareAnnexName");
-			return (Criteria) this;
-		}
-
-		public Criteria andWelfareAnnexNameNotEqualTo(String value) {
-			addCriterion("welfare_annex_name <>", value, "welfareAnnexName");
-			return (Criteria) this;
-		}
-
-		public Criteria andWelfareAnnexNameGreaterThan(String value) {
-			addCriterion("welfare_annex_name >", value, "welfareAnnexName");
-			return (Criteria) this;
-		}
-
-		public Criteria andWelfareAnnexNameGreaterThanOrEqualTo(String value) {
-			addCriterion("welfare_annex_name >=", value, "welfareAnnexName");
-			return (Criteria) this;
-		}
-
-		public Criteria andWelfareAnnexNameLessThan(String value) {
-			addCriterion("welfare_annex_name <", value, "welfareAnnexName");
-			return (Criteria) this;
-		}
-
-		public Criteria andWelfareAnnexNameLessThanOrEqualTo(String value) {
-			addCriterion("welfare_annex_name <=", value, "welfareAnnexName");
-			return (Criteria) this;
-		}
-
-		public Criteria andWelfareAnnexNameLike(String value) {
-			addCriterion("welfare_annex_name like", value, "welfareAnnexName");
-			return (Criteria) this;
-		}
-
-		public Criteria andWelfareAnnexNameNotLike(String value) {
-			addCriterion("welfare_annex_name not like", value, "welfareAnnexName");
-			return (Criteria) this;
-		}
-
-		public Criteria andWelfareAnnexNameIn(List<String> values) {
-			addCriterion("welfare_annex_name in", values, "welfareAnnexName");
-			return (Criteria) this;
-		}
-
-		public Criteria andWelfareAnnexNameNotIn(List<String> values) {
-			addCriterion("welfare_annex_name not in", values, "welfareAnnexName");
-			return (Criteria) this;
-		}
-
-		public Criteria andWelfareAnnexNameBetween(String value1, String value2) {
-			addCriterion("welfare_annex_name between", value1, value2, "welfareAnnexName");
-			return (Criteria) this;
-		}
-
-		public Criteria andWelfareAnnexNameNotBetween(String value1, String value2) {
-			addCriterion("welfare_annex_name not between", value1, value2, "welfareAnnexName");
+		public Criteria andEmployeeIdNotBetween(Integer value1, Integer value2) {
+			addCriterion("employee_id not between", value1, value2, "employeeId");
 			return (Criteria) this;
 		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table personnel_dossier
-	 * @mbg.generated  Thu Apr 30 08:54:23 CST 2020
+	 * @mbg.generated  Wed May 20 08:47:14 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

+ 127 - 71
src/main/java/com/goafanti/common/model/TChangeDun.java

@@ -7,94 +7,104 @@ public class TChangeDun {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.id
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	private Integer id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.did
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	private Integer did;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.cid
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	private Integer cid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.order_no
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	private String orderNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.tid
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	private Integer tid;
 	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.ctid
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
+	 */
+	private Integer ctid;
+	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.project_type
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	private Integer projectType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.dun_type
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	private Integer dunType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.wait_day
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	private Integer waitDay;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.effective_count
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	private Integer effectiveCount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.aid
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	private String aid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.status
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	private Integer status;
 	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.type
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
+	 */
+	private Integer type;
+	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.create_time
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.start_time
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	private Date startTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.money
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	private BigDecimal money;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.appropriation_ratio
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	private BigDecimal appropriationRatio;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.type
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.customize_name
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
-	private Integer type;
+	private String customizeName;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.ctid
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_change_dun.customize_time
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
-	private Integer ctid;
+	private Date customizeTime;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.id
 	 * @return  the value of t_change_dun.id
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public Integer getId() {
 		return id;
@@ -103,7 +113,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.id
 	 * @param id  the value for t_change_dun.id
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -112,7 +122,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.did
 	 * @return  the value of t_change_dun.did
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public Integer getDid() {
 		return did;
@@ -121,7 +131,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.did
 	 * @param did  the value for t_change_dun.did
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public void setDid(Integer did) {
 		this.did = did;
@@ -130,7 +140,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.cid
 	 * @return  the value of t_change_dun.cid
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public Integer getCid() {
 		return cid;
@@ -139,7 +149,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.cid
 	 * @param cid  the value for t_change_dun.cid
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public void setCid(Integer cid) {
 		this.cid = cid;
@@ -148,7 +158,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.order_no
 	 * @return  the value of t_change_dun.order_no
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -157,7 +167,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.order_no
 	 * @param orderNo  the value for t_change_dun.order_no
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
@@ -166,7 +176,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.tid
 	 * @return  the value of t_change_dun.tid
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public Integer getTid() {
 		return tid;
@@ -175,16 +185,34 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.tid
 	 * @param tid  the value for t_change_dun.tid
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public void setTid(Integer tid) {
 		this.tid = tid;
 	}
 
 	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.ctid
+	 * @return  the value of t_change_dun.ctid
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
+	 */
+	public Integer getCtid() {
+		return ctid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.ctid
+	 * @param ctid  the value for t_change_dun.ctid
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
+	 */
+	public void setCtid(Integer ctid) {
+		this.ctid = ctid;
+	}
+
+	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.project_type
 	 * @return  the value of t_change_dun.project_type
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public Integer getProjectType() {
 		return projectType;
@@ -193,7 +221,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.project_type
 	 * @param projectType  the value for t_change_dun.project_type
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public void setProjectType(Integer projectType) {
 		this.projectType = projectType;
@@ -202,7 +230,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.dun_type
 	 * @return  the value of t_change_dun.dun_type
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public Integer getDunType() {
 		return dunType;
@@ -211,7 +239,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.dun_type
 	 * @param dunType  the value for t_change_dun.dun_type
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public void setDunType(Integer dunType) {
 		this.dunType = dunType;
@@ -220,7 +248,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.wait_day
 	 * @return  the value of t_change_dun.wait_day
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public Integer getWaitDay() {
 		return waitDay;
@@ -229,7 +257,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.wait_day
 	 * @param waitDay  the value for t_change_dun.wait_day
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public void setWaitDay(Integer waitDay) {
 		this.waitDay = waitDay;
@@ -238,7 +266,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.effective_count
 	 * @return  the value of t_change_dun.effective_count
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public Integer getEffectiveCount() {
 		return effectiveCount;
@@ -247,7 +275,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.effective_count
 	 * @param effectiveCount  the value for t_change_dun.effective_count
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public void setEffectiveCount(Integer effectiveCount) {
 		this.effectiveCount = effectiveCount;
@@ -256,7 +284,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.aid
 	 * @return  the value of t_change_dun.aid
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public String getAid() {
 		return aid;
@@ -265,7 +293,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.aid
 	 * @param aid  the value for t_change_dun.aid
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public void setAid(String aid) {
 		this.aid = aid;
@@ -274,7 +302,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.status
 	 * @return  the value of t_change_dun.status
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public Integer getStatus() {
 		return status;
@@ -283,16 +311,34 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.status
 	 * @param status  the value for t_change_dun.status
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public void setStatus(Integer status) {
 		this.status = status;
 	}
 
 	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.type
+	 * @return  the value of t_change_dun.type
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
+	 */
+	public Integer getType() {
+		return type;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.type
+	 * @param type  the value for t_change_dun.type
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
+	 */
+	public void setType(Integer type) {
+		this.type = type;
+	}
+
+	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.create_time
 	 * @return  the value of t_change_dun.create_time
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -301,7 +347,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.create_time
 	 * @param createTime  the value for t_change_dun.create_time
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -310,7 +356,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.start_time
 	 * @return  the value of t_change_dun.start_time
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public Date getStartTime() {
 		return startTime;
@@ -319,7 +365,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.start_time
 	 * @param startTime  the value for t_change_dun.start_time
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public void setStartTime(Date startTime) {
 		this.startTime = startTime;
@@ -328,7 +374,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.money
 	 * @return  the value of t_change_dun.money
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public BigDecimal getMoney() {
 		return money;
@@ -337,7 +383,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.money
 	 * @param money  the value for t_change_dun.money
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public void setMoney(BigDecimal money) {
 		this.money = money;
@@ -346,7 +392,7 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.appropriation_ratio
 	 * @return  the value of t_change_dun.appropriation_ratio
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public BigDecimal getAppropriationRatio() {
 		return appropriationRatio;
@@ -355,45 +401,55 @@ public class TChangeDun {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.appropriation_ratio
 	 * @param appropriationRatio  the value for t_change_dun.appropriation_ratio
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public void setAppropriationRatio(BigDecimal appropriationRatio) {
 		this.appropriationRatio = appropriationRatio;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.type
-	 * @return  the value of t_change_dun.type
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.customize_name
+	 * @return  the value of t_change_dun.customize_name
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
-	public Integer getType() {
-		return type;
+	public String getCustomizeName() {
+		return customizeName;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.type
-	 * @param type  the value for t_change_dun.type
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.customize_name
+	 * @param customizeName  the value for t_change_dun.customize_name
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
-	public void setType(Integer type) {
-		this.type = type;
+	public void setCustomizeName(String customizeName) {
+		this.customizeName = customizeName;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.ctid
-	 * @return  the value of t_change_dun.ctid
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_change_dun.customize_time
+	 * @return  the value of t_change_dun.customize_time
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
-	public Integer getCtid() {
-		return ctid;
+	public Date getCustomizeTime() {
+		return customizeTime;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.ctid
-	 * @param ctid  the value for t_change_dun.ctid
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_change_dun.customize_time
+	 * @param customizeTime  the value for t_change_dun.customize_time
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
-	public void setCtid(Integer ctid) {
-		this.ctid = ctid;
+	public void setCustomizeTime(Date customizeTime) {
+		this.customizeTime = customizeTime;
+	}
+
+	private String customizeTimes;
+
+	public String getCustomizeTimes() {
+		return customizeTimes;
+	}
+
+	public void setCustomizeTimes(String customizeTimes) {
+		this.customizeTimes = customizeTimes;
 	}
 }

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

@@ -8,23 +8,23 @@ import java.util.List;
 public class TChangeDunExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_change_dun
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_change_dun
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_change_dun
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public TChangeDunExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -32,7 +32,7 @@ public class TChangeDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -40,7 +40,7 @@ public class TChangeDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -48,7 +48,7 @@ public class TChangeDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -56,7 +56,7 @@ public class TChangeDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -64,7 +64,7 @@ public class TChangeDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -72,7 +72,7 @@ public class TChangeDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -80,7 +80,7 @@ public class TChangeDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -90,7 +90,7 @@ public class TChangeDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -102,7 +102,7 @@ public class TChangeDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -111,7 +111,7 @@ public class TChangeDunExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_change_dun
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -121,7 +121,7 @@ public class TChangeDunExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_change_dun
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -474,6 +474,66 @@ public class TChangeDunExample {
 			return (Criteria) this;
 		}
 
+		public Criteria andCtidIsNull() {
+			addCriterion("ctid is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCtidIsNotNull() {
+			addCriterion("ctid is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCtidEqualTo(Integer value) {
+			addCriterion("ctid =", value, "ctid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCtidNotEqualTo(Integer value) {
+			addCriterion("ctid <>", value, "ctid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCtidGreaterThan(Integer value) {
+			addCriterion("ctid >", value, "ctid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCtidGreaterThanOrEqualTo(Integer value) {
+			addCriterion("ctid >=", value, "ctid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCtidLessThan(Integer value) {
+			addCriterion("ctid <", value, "ctid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCtidLessThanOrEqualTo(Integer value) {
+			addCriterion("ctid <=", value, "ctid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCtidIn(List<Integer> values) {
+			addCriterion("ctid in", values, "ctid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCtidNotIn(List<Integer> values) {
+			addCriterion("ctid not in", values, "ctid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCtidBetween(Integer value1, Integer value2) {
+			addCriterion("ctid between", value1, value2, "ctid");
+			return (Criteria) this;
+		}
+
+		public Criteria andCtidNotBetween(Integer value1, Integer value2) {
+			addCriterion("ctid not between", value1, value2, "ctid");
+			return (Criteria) this;
+		}
+
 		public Criteria andProjectTypeIsNull() {
 			addCriterion("project_type is null");
 			return (Criteria) this;
@@ -844,6 +904,66 @@ public class TChangeDunExample {
 			return (Criteria) this;
 		}
 
+		public Criteria andTypeIsNull() {
+			addCriterion("type is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andTypeIsNotNull() {
+			addCriterion("type is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andTypeEqualTo(Integer value) {
+			addCriterion("type =", value, "type");
+			return (Criteria) this;
+		}
+
+		public Criteria andTypeNotEqualTo(Integer value) {
+			addCriterion("type <>", value, "type");
+			return (Criteria) this;
+		}
+
+		public Criteria andTypeGreaterThan(Integer value) {
+			addCriterion("type >", value, "type");
+			return (Criteria) this;
+		}
+
+		public Criteria andTypeGreaterThanOrEqualTo(Integer value) {
+			addCriterion("type >=", value, "type");
+			return (Criteria) this;
+		}
+
+		public Criteria andTypeLessThan(Integer value) {
+			addCriterion("type <", value, "type");
+			return (Criteria) this;
+		}
+
+		public Criteria andTypeLessThanOrEqualTo(Integer value) {
+			addCriterion("type <=", value, "type");
+			return (Criteria) this;
+		}
+
+		public Criteria andTypeIn(List<Integer> values) {
+			addCriterion("type in", values, "type");
+			return (Criteria) this;
+		}
+
+		public Criteria andTypeNotIn(List<Integer> values) {
+			addCriterion("type not in", values, "type");
+			return (Criteria) this;
+		}
+
+		public Criteria andTypeBetween(Integer value1, Integer value2) {
+			addCriterion("type between", value1, value2, "type");
+			return (Criteria) this;
+		}
+
+		public Criteria andTypeNotBetween(Integer value1, Integer value2) {
+			addCriterion("type not between", value1, value2, "type");
+			return (Criteria) this;
+		}
+
 		public Criteria andCreateTimeIsNull() {
 			addCriterion("create_time is null");
 			return (Criteria) this;
@@ -1084,130 +1204,140 @@ public class TChangeDunExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeIsNull() {
-			addCriterion("type is null");
+		public Criteria andCustomizeNameIsNull() {
+			addCriterion("customize_name is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeIsNotNull() {
-			addCriterion("type is not null");
+		public Criteria andCustomizeNameIsNotNull() {
+			addCriterion("customize_name is not null");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeEqualTo(Integer value) {
-			addCriterion("type =", value, "type");
+		public Criteria andCustomizeNameEqualTo(String value) {
+			addCriterion("customize_name =", value, "customizeName");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeNotEqualTo(Integer value) {
-			addCriterion("type <>", value, "type");
+		public Criteria andCustomizeNameNotEqualTo(String value) {
+			addCriterion("customize_name <>", value, "customizeName");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeGreaterThan(Integer value) {
-			addCriterion("type >", value, "type");
+		public Criteria andCustomizeNameGreaterThan(String value) {
+			addCriterion("customize_name >", value, "customizeName");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeGreaterThanOrEqualTo(Integer value) {
-			addCriterion("type >=", value, "type");
+		public Criteria andCustomizeNameGreaterThanOrEqualTo(String value) {
+			addCriterion("customize_name >=", value, "customizeName");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeLessThan(Integer value) {
-			addCriterion("type <", value, "type");
+		public Criteria andCustomizeNameLessThan(String value) {
+			addCriterion("customize_name <", value, "customizeName");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeLessThanOrEqualTo(Integer value) {
-			addCriterion("type <=", value, "type");
+		public Criteria andCustomizeNameLessThanOrEqualTo(String value) {
+			addCriterion("customize_name <=", value, "customizeName");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeIn(List<Integer> values) {
-			addCriterion("type in", values, "type");
+		public Criteria andCustomizeNameLike(String value) {
+			addCriterion("customize_name like", value, "customizeName");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeNotIn(List<Integer> values) {
-			addCriterion("type not in", values, "type");
+		public Criteria andCustomizeNameNotLike(String value) {
+			addCriterion("customize_name not like", value, "customizeName");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeBetween(Integer value1, Integer value2) {
-			addCriterion("type between", value1, value2, "type");
+		public Criteria andCustomizeNameIn(List<String> values) {
+			addCriterion("customize_name in", values, "customizeName");
 			return (Criteria) this;
 		}
 
-		public Criteria andTypeNotBetween(Integer value1, Integer value2) {
-			addCriterion("type not between", value1, value2, "type");
+		public Criteria andCustomizeNameNotIn(List<String> values) {
+			addCriterion("customize_name not in", values, "customizeName");
 			return (Criteria) this;
 		}
 
-		public Criteria andCtidIsNull() {
-			addCriterion("ctid is null");
+		public Criteria andCustomizeNameBetween(String value1, String value2) {
+			addCriterion("customize_name between", value1, value2, "customizeName");
 			return (Criteria) this;
 		}
 
-		public Criteria andCtidIsNotNull() {
-			addCriterion("ctid is not null");
+		public Criteria andCustomizeNameNotBetween(String value1, String value2) {
+			addCriterion("customize_name not between", value1, value2, "customizeName");
 			return (Criteria) this;
 		}
 
-		public Criteria andCtidEqualTo(Integer value) {
-			addCriterion("ctid =", value, "ctid");
+		public Criteria andCustomizeTimeIsNull() {
+			addCriterion("customize_time is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andCtidNotEqualTo(Integer value) {
-			addCriterion("ctid <>", value, "ctid");
+		public Criteria andCustomizeTimeIsNotNull() {
+			addCriterion("customize_time is not null");
 			return (Criteria) this;
 		}
 
-		public Criteria andCtidGreaterThan(Integer value) {
-			addCriterion("ctid >", value, "ctid");
+		public Criteria andCustomizeTimeEqualTo(Date value) {
+			addCriterion("customize_time =", value, "customizeTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andCtidGreaterThanOrEqualTo(Integer value) {
-			addCriterion("ctid >=", value, "ctid");
+		public Criteria andCustomizeTimeNotEqualTo(Date value) {
+			addCriterion("customize_time <>", value, "customizeTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andCtidLessThan(Integer value) {
-			addCriterion("ctid <", value, "ctid");
+		public Criteria andCustomizeTimeGreaterThan(Date value) {
+			addCriterion("customize_time >", value, "customizeTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andCtidLessThanOrEqualTo(Integer value) {
-			addCriterion("ctid <=", value, "ctid");
+		public Criteria andCustomizeTimeGreaterThanOrEqualTo(Date value) {
+			addCriterion("customize_time >=", value, "customizeTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andCtidIn(List<Integer> values) {
-			addCriterion("ctid in", values, "ctid");
+		public Criteria andCustomizeTimeLessThan(Date value) {
+			addCriterion("customize_time <", value, "customizeTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andCtidNotIn(List<Integer> values) {
-			addCriterion("ctid not in", values, "ctid");
+		public Criteria andCustomizeTimeLessThanOrEqualTo(Date value) {
+			addCriterion("customize_time <=", value, "customizeTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andCtidBetween(Integer value1, Integer value2) {
-			addCriterion("ctid between", value1, value2, "ctid");
+		public Criteria andCustomizeTimeIn(List<Date> values) {
+			addCriterion("customize_time in", values, "customizeTime");
 			return (Criteria) this;
 		}
 
-		public Criteria andCtidNotBetween(Integer value1, Integer value2) {
-			addCriterion("ctid not between", value1, value2, "ctid");
+		public Criteria andCustomizeTimeNotIn(List<Date> values) {
+			addCriterion("customize_time not in", values, "customizeTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeTimeBetween(Date value1, Date value2) {
+			addCriterion("customize_time between", value1, value2, "customizeTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCustomizeTimeNotBetween(Date value1, Date value2) {
+			addCriterion("customize_time not between", value1, value2, "customizeTime");
 			return (Criteria) this;
 		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_change_dun
-	 * @mbg.generated  Mon Jan 13 11:34:14 CST 2020
+	 * @mbg.generated  Mon May 18 15:26:46 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

File diff suppressed because it is too large
+ 182 - 137
src/main/java/com/goafanti/common/model/TOrderNew.java


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

@@ -9,23 +9,23 @@ import java.util.List;
 public class TOrderNewExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	public TOrderNewExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -33,7 +33,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -41,7 +41,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -49,7 +49,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -57,7 +57,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -65,7 +65,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -73,7 +73,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -81,7 +81,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -91,7 +91,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -103,7 +103,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -112,7 +112,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -122,7 +122,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -2654,7 +2654,7 @@ public class TOrderNewExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_new
-	 * @mbg.generated  Thu Feb 27 14:10:55 CST 2020
+	 * @mbg.generated  Fri May 15 10:33:54 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

+ 3 - 0
src/main/java/com/goafanti/common/model/TOrderNewWithBLOBs.java

@@ -0,0 +1,3 @@
+package com.goafanti.common.model;
+
+public class TOrderNewWithBLOBs extends TOrderNew {}

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


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

@@ -9,23 +9,23 @@ import java.util.List;
 public class TOrderTaskExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:14 CST 2020
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:14 CST 2020
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:14 CST 2020
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:14 CST 2020
 	 */
 	public TOrderTaskExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -33,7 +33,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:14 CST 2020
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -41,7 +41,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:14 CST 2020
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -49,7 +49,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:14 CST 2020
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -57,7 +57,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:14 CST 2020
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -65,7 +65,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:14 CST 2020
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -73,7 +73,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:14 CST 2020
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -81,7 +81,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:14 CST 2020
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -91,7 +91,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:14 CST 2020
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -103,7 +103,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:14 CST 2020
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -112,7 +112,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:14 CST 2020
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -122,7 +122,7 @@ public class TOrderTaskExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:14 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -2960,11 +2960,71 @@ public class TOrderTaskExample {
 			addCriterion("receiver_name not between", value1, value2, "receiverName");
 			return (Criteria) this;
 		}
+
+		public Criteria andDeclarationBatchIsNull() {
+			addCriterion("declaration_batch is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarationBatchIsNotNull() {
+			addCriterion("declaration_batch is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarationBatchEqualTo(Integer value) {
+			addCriterion("declaration_batch =", value, "declarationBatch");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarationBatchNotEqualTo(Integer value) {
+			addCriterion("declaration_batch <>", value, "declarationBatch");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarationBatchGreaterThan(Integer value) {
+			addCriterion("declaration_batch >", value, "declarationBatch");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarationBatchGreaterThanOrEqualTo(Integer value) {
+			addCriterion("declaration_batch >=", value, "declarationBatch");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarationBatchLessThan(Integer value) {
+			addCriterion("declaration_batch <", value, "declarationBatch");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarationBatchLessThanOrEqualTo(Integer value) {
+			addCriterion("declaration_batch <=", value, "declarationBatch");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarationBatchIn(List<Integer> values) {
+			addCriterion("declaration_batch in", values, "declarationBatch");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarationBatchNotIn(List<Integer> values) {
+			addCriterion("declaration_batch not in", values, "declarationBatch");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarationBatchBetween(Integer value1, Integer value2) {
+			addCriterion("declaration_batch between", value1, value2, "declarationBatch");
+			return (Criteria) this;
+		}
+
+		public Criteria andDeclarationBatchNotBetween(Integer value1, Integer value2) {
+			addCriterion("declaration_batch not between", value1, value2, "declarationBatch");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table t_order_task
-	 * @mbg.generated  Tue Mar 31 14:23:56 CST 2020
+	 * @mbg.generated  Fri May 15 16:05:15 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

+ 14 - 6
src/main/java/com/goafanti/common/task/OrderDunTask.java

@@ -21,6 +21,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.goafanti.admin.bo.AdminListBo;
 import com.goafanti.common.bo.EmailBo;
@@ -50,7 +51,7 @@ import com.goafanti.order.service.NewOrderDunService;
 import com.goafanti.order.service.OrderNewService;
 
 @Component
-//@Controller
+@Controller
 public class OrderDunTask {
 	@Autowired
 	private OrderNewService orderNewService;
@@ -71,8 +72,8 @@ public class OrderDunTask {
 	/**
 	 * 每天凌晨3点轮询处理需要新催款的信息
 	 */
-//	@RequestMapping(value = "/open/updateNewOrderDun", method = RequestMethod.GET)
-//	@ResponseBody
+	@RequestMapping(value = "/open/updateNewOrderDun", method = RequestMethod.GET)
+	@ResponseBody
 	@Scheduled(cron = "0 0 3  * * ?")
 //	@Scheduled(cron = "0 50 16  * * ?")
 	@Transactional(rollbackFor=Exception.class)
@@ -96,7 +97,6 @@ public class OrderDunTask {
   			if(o.getProjectType()==OrderDunProjectType.HY.getCode()&&o.getDunType()==2) {
   				calendar2.add(Calendar.DATE, o.getEffectiveCount()*180);
   				CalendarTimeCleared(calendar2);
-  				System.out.println(DateUtils.formatDate(calendar2.getTime(), AFTConstants.YYYYMMDDHHMMSS));
   				if (calendar.getTimeInMillis() > calendar2.getTimeInMillis()) {//当前时间大于计算后时间则触发
   	  	  			updateOrderDun(o);
   	  	  			Thread.sleep(2000);
@@ -116,7 +116,15 @@ public class OrderDunTask {
   	  	  			Thread.sleep(2000);
   				}
   			}
-  	  		
+  	  		if (o.getDunType()==0) {
+  	  		calendar2.setTime(o.getCustomizeTime());
+  	  		CalendarTimeCleared(calendar);
+  	  			if (calendar.equals(calendar2)) {
+  	  				updateOrderDun(o);
+	  	  			Thread.sleep(2000);
+				}
+				
+			}
 		}
   		LoggerUtils.debug(logger, "======================新催款任务轮询结束===================");
   		} catch (Exception e) {
@@ -153,7 +161,7 @@ public class OrderDunTask {
 	}
 	
 	/**
-	 * 每天凌晨4点轮询处理需要欠款催款的信息
+	* 	每月1号凌晨4点轮询处理需要欠款催款的信息
 	*
 	*/
 	@Scheduled(cron = "0 0 4 1 * ?") 

+ 2 - 4
src/main/java/com/goafanti/common/task/PatentTask.java

@@ -30,7 +30,6 @@ import com.goafanti.common.model.PatentNew;
 import com.goafanti.common.model.PatentNewLog;
 import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.common.utils.SendEmailUtil;
-import com.goafanti.customer.bo.LockingReleaseBo;
 import com.goafanti.patent.service.PatentNewService;
 
 
@@ -62,7 +61,6 @@ public class PatentTask {
 	
 	
 	
-	
 	@Scheduled(cron = "0 0 0  * * ?") 
 	@RequestMapping(value = "/open/patentRemind", method = RequestMethod.GET)
 	public void patentRemind() {
@@ -93,7 +91,7 @@ public class PatentTask {
 			 if (count>=0&&count<=90) {
 					 Admin a=adminService.selectByPrimaryKey(p.getAid());
 					 //设置如果找不到用户则提醒管理员
-					 String str2="名称="+p.getName()+",email="+p.getEmail();;
+					 String str2="专利编号="+p.getPatentNo()+"名称="+p.getName()+",email="+p.getEmail();;
 					 n.setContent(str2);
 					 if(a==null) {
 						n.setContent(str2+",aid="+p.getAid());
@@ -107,7 +105,7 @@ public class PatentTask {
 						n2.setId(UUID.randomUUID().toString());
 						n2.setCreateTime(new Date());
 						n2.setReaded(0);//未读
-						n2.setAid("1");
+						n2.setContent(str2);
 						n2.setNoticeType(NoticeStatus.TASK_PATENT_ERROR.getCode());
 						n2.setAid(a.getId());
 						nlist.add(n2);

+ 2 - 2
src/main/java/com/goafanti/common/task/ReleaseUserTask.java

@@ -70,7 +70,7 @@ public class ReleaseUserTask {
 				
 			}
 		List<LockingReleaseBo> newList=new ArrayList<LockingReleaseBo>();
-			  if (lockUserList.size()>0) {
+			  if (lockUserList!=null&&lockUserList.size()>0) {
 				  for(int i=0;i<lockUserList.size();i++){
 					  newList.add(lockUserList.get(i));
 					  if(pointsDataLimit == newList.size()||i == lockUserList.size()-1){
@@ -80,7 +80,7 @@ public class ReleaseUserTask {
 					  }  
 				  }
 			}
-			  if (lockBusinessList.size()>0) {
+			  if (lockBusinessList!=null&&lockBusinessList.size()>0) {
 				  for(int i=0;i<lockBusinessList.size();i++){
 					  newList.add(lockBusinessList.get(i));
 					  if(pointsDataLimit == newList.size()||i == lockBusinessList.size()-1){

+ 12 - 7
src/main/java/com/goafanti/common/utils/DateUtils.java

@@ -5,6 +5,8 @@ import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 
+import org.apache.ibatis.builder.BuilderException;
+
 public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 
 	public static final String	YEAR_SPAN		= "yearSpan";
@@ -463,13 +465,16 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
 	 * @return
 	 * @throws ParseException
 	 */
-	public static Date StringToDate(String date,String ymd) throws ParseException
-	{
-	SimpleDateFormat dateFormat=new SimpleDateFormat(ymd);
-	
-	Date parse = dateFormat.parse(date);
-	return parse;
-
+	public static Date StringToDate(String date,String ymd) {
+		Date parse=null;
+		SimpleDateFormat dateFormat=new SimpleDateFormat(ymd);
+		try {
+			parse = dateFormat.parse(date);
+		} catch (ParseException e) {
+			e.printStackTrace();
+			throw new BuilderException("时间转换失败");
+		}
+		return parse;
 	}
 	
 

+ 12 - 0
src/main/java/com/goafanti/customer/bo/CustomerListIn.java

@@ -63,6 +63,10 @@ public class CustomerListIn {
 	
 	private String iname;
 	
+	/**
+	 * 	排序 0否 1转换倒序 2转换正序
+	 */
+	private Integer sort;
 	
 	
 	
@@ -242,4 +246,12 @@ public class CustomerListIn {
 	public void setLevel(Integer level) {
 		this.level = level;
 	}
+
+	public Integer getSort() {
+		return sort;
+	}
+
+	public void setSort(Integer sort) {
+		this.sort = sort;
+	}
 }

+ 13 - 0
src/main/java/com/goafanti/customer/controller/AdminCustomerApiController.java

@@ -1091,6 +1091,19 @@ public class AdminCustomerApiController extends BaseApiController{
 		return res;
 	}
 	
+	/** 释放客户 **/
+	@RequestMapping(value = "/pushReleaseUser", method = RequestMethod.GET)
+	public Result pushReleaseUser(String id){
+		Result res = new Result();
+		if(StringUtils.isBlank(id)){
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"用户ID错误","用户ID"));
+			return res;
+		}
+		
+		res.data(customerService.pushReleaseUser(id));
+		return res;
+	}
+	
 	/**
 	 * 企业项目申报材料上传
 	 * 

+ 1 - 0
src/main/java/com/goafanti/customer/service/CustomerService.java

@@ -511,6 +511,7 @@ public interface CustomerService {
 	
 	List<transferListBo> transferList(String uid);
 	int updatePrivateBusinessTransfer(String inputId, String uid, String pid);
+	int pushReleaseUser(String id);
 	
 	
 }

+ 18 - 0
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -15,6 +15,7 @@ import javax.annotation.Resource;
 
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.ibatis.builder.BuilderException;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -234,6 +235,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		if(StringUtils.isNotBlank(cli.getEndDate())) params.put("endDate", cli.getEndDate()+" 23:59:59");
 		if(null!=cli.getDataGrade()) params.put("dataGrade", cli.getDataGrade());
 		if(null!=cli.getLevel())params.put("level", cli.getLevel());
+		if(null!=cli.getSort())params.put("sort", cli.getSort());
 		return params;
 	}
 
@@ -1555,5 +1557,21 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		return userTransferLogMapper.selectByUidGetList(uid);
 	}
 
+	@Override
+	public int pushReleaseUser(String id) {
+		Date date =new Date();
+		User u=userMapper.selectByPrimaryKey(id);
+		System.out.println(u.getAid());
+		System.out.println(TokenManager.getAdminId());
+		if (!u.getAid().equals(TokenManager.getAdminId())) {
+			throw new BuilderException("客户归属错误!");
+		}
+		u.setTransferTime(date);
+		u.setShareType(1);
+		userMapper.updateByPrimaryKeySelective(u);
+		userLockReleaseMapper.updateUserTypeLock(u.getId(), TokenManager.getAdminId(), 0, 2,date);
+		return 1;
+	}
+
 
 }

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

@@ -3,5 +3,14 @@ package com.goafanti.order.bo;
 import com.goafanti.common.model.NewOrderDun;
 
 public class InputNewOrderDunBo extends NewOrderDun {
+	private String customizeTimes;
+
+	public String getCustomizeTimes() {
+		return customizeTimes;
+	}
+
+	public void setCustomizeTimes(String customizeTimes) {
+		this.customizeTimes = customizeTimes;
+	}
 
 }

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

@@ -14,7 +14,7 @@ public class OutNewOrderDunBo extends NewOrderDun {
 	private String commodityName;
 	private String startDate;
 	private BigDecimal setUpAmount;
-	
+	private String customizeTimes;
 	
 	public String getDunTypeName() {
 		if(super.getDunType()!=null&&super.getProjectType()!=null) {
@@ -88,4 +88,12 @@ public class OutNewOrderDunBo extends NewOrderDun {
 		return super.getMoney();
 	}
 
+	public String getCustomizeTimes() {
+		return customizeTimes;
+	}
+
+	public void setCustomizeTimes(String customizeTimes) {
+		this.customizeTimes = customizeTimes;
+	}
+
 }

+ 4 - 1
src/main/java/com/goafanti/order/bo/TChangeDunOut.java

@@ -14,9 +14,12 @@ public class TChangeDunOut extends TChangeDun{
 	private String startDate;
 	private BigDecimal setUpAmount;
 	public String getDunTypeName() {
-		if(super.getDunType()!=null&&super.getProjectType()!=null) {
+		if(super.getDunType()!=null&&super.getProjectType()!=null&&super.getDunType()!=0) {
 			return NewOrderDunType.getValueByCode(Integer.valueOf(""+super.getProjectType()+super.getDunType()));
 		}
+		if(super.getDunType()!=null&&super.getProjectType()!=null&&super.getDunType()==0) {
+			return NewOrderDunType.getValueByCode(Integer.valueOf(""+super.getProjectType()+super.getDunType()))+getCustomizeName();
+		}
 		return dunTypeName;
 	}
 	public String getCommodityName() {

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

@@ -35,6 +35,7 @@ public class TOrderTaskDetailBo {
 	private Integer locationCity;
 	private Integer locationArea;
 	private String postalAddress;
+	private Integer declarationBatch;
 	/**
 	 * 任务状态
 	 */
@@ -345,6 +346,12 @@ public class TOrderTaskDetailBo {
 	public void setTaskReceiver(String taskReceiver) {
 		this.taskReceiver = taskReceiver;
 	}
+	public Integer getDeclarationBatch() {
+		return declarationBatch;
+	}
+	public void setDeclarationBatch(Integer declarationBatch) {
+		this.declarationBatch = declarationBatch;
+	}
 	
 	
 }

+ 17 - 1
src/main/java/com/goafanti/order/bo/outOrderDunListBo.java

@@ -27,12 +27,16 @@ public class outOrderDunListBo {
 	private String dunSubject;
 	private BigDecimal appropriationRatio;
 	private BigDecimal setUpAmount;
+	private String customizeName;
+	private String customizeTimes;
+	
 	public String getId() {
 		return id;
 	}
 	public String getDunSubject() {
 		if(dunSubject!=null)return OrderDunSubject.getValueByCode(Integer.valueOf(dunSubject));
-		if(getDunType()!=null&&getProjectType()!=null)return NewOrderDunType.getValueByCode(Integer.valueOf(""+getProjectType()+getDunType()));
+		if(getDunType()!=null&&getDunType()!=0&&getProjectType()!=null)return NewOrderDunType.getValueByCode(Integer.valueOf(""+getProjectType()+getDunType()));
+		if(getDunType()!=null&&getDunType()==0&&getProjectType()!=null)return NewOrderDunType.getValueByCode(Integer.valueOf(""+getProjectType()+getDunType()))+getCustomizeName();
 		return dunSubject;
 	}
 	public void setId(String id) {
@@ -156,6 +160,18 @@ public class outOrderDunListBo {
 	public void setOrderStatus(Integer orderStatus) {
 		this.orderStatus = orderStatus;
 	}
+	public String getCustomizeTimes() {
+		return customizeTimes;
+	}
+	public void setCustomizeTimes(String customizeTimes) {
+		this.customizeTimes = customizeTimes;
+	}
+	public String getCustomizeName() {
+		return customizeName;
+	}
+	public void setCustomizeName(String customizeName) {
+		this.customizeName = customizeName;
+	}
 	
 
 }

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

@@ -19,6 +19,7 @@ import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.common.model.TOrderNew;
+import com.goafanti.common.model.TOrderNewWithBLOBs;
 import com.goafanti.common.model.TOrderRefundWithBLOBs;
 import com.goafanti.common.model.TOrderTask;
 import com.goafanti.order.bo.InputArrearsDunListBo;
@@ -150,7 +151,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	 * @return
 	 */
 	@RequestMapping(value = "/updateServiceOrderNew",method = RequestMethod.POST)
-	public Result updateServiceOrder(TOrderNew t,String isSubmit,String signDate){
+	public Result updateServiceOrder(TOrderNewWithBLOBs t,String isSubmit,String signDate){
 		Result res = new Result();
 		if(StringUtils.isBlank(t.getOrderNo())){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "订单编号"));

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

@@ -74,7 +74,7 @@ public class AdminNewOrderDunApiController extends CertifyApiController {
 		return res;
 	}	
 	/**
-	 * 查看催款信息
+	 * 	查看催款信息
 	 * @return
 	 */
 	@RequestMapping(value = "/selectDun",method = RequestMethod.GET)
@@ -88,7 +88,7 @@ public class AdminNewOrderDunApiController extends CertifyApiController {
 		return res;
 	}	
 	/**
-	 * 催款信息列表
+	 * 	催款信息列表
 	 * @return
 	 */
 	@RequestMapping(value = "/selectListNewOrderDun",method = RequestMethod.GET)

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

@@ -81,7 +81,7 @@ public class OrderProjectApiController extends CertifyApiController {
 		return res;
 	}
 	/**
-	 * 任务修改
+	 * 任务修改(咨询师)
 	 */
 	@RequestMapping(value="/updateOrderTask" ,method = RequestMethod.POST)
 	public Result updateOrderTask(TOrderTaskDetailBo t){

+ 8 - 0
src/main/java/com/goafanti/order/enums/NewOrderDunType.java

@@ -4,23 +4,31 @@ import java.util.HashMap;
 import java.util.Map;
 
 public enum NewOrderDunType {
+	CGZH_ZDY(10,"成果转化-"),
 	CGZH_SQ(11,"成果转化-首期"),
 	CGZH_WC(12,"成果转化-完成"),
+	COMMON_ZDY(20,"通用-"),
 	COMMON_SQ(21,"通用-首期"),
 	COMMON_NGS(22,"通用-拟公示"),
 	COMMON_XZ(23,"通用-下证"),
+	KJXM_ZDY(30,"科技项目-"),
 	KJXM_SQ(31,"科技项目-首期"),
 	KJXM_LX(32,"科技项目-立项(公示)"),
 	KJXM_BK(33,"科技项目-拨款"),
+	KJJR_ZDY(40,"科技金融-"),
 	KJJR_SQ(41,"科技金融-首期"),
 	KJJR_BK(42,"科技金融-拨款"),
+	CS_ZDY(50,"财税-"),
 	CS_SQ(51,"财税-首期"),
 	CS_DQ(52,"财税-期限"),
+	HY_ZDY(60,"会员-"),
 	HY_SQ(61,"会员-首期"),
 	HY_DQ(62,"会员-期限"),
+	RJKF_ZDY(70,"软件开发-"),
 	RJKF_SQ(71,"软件开发-首期"),
 	RJKF_LX(72,"软件开发-立项"),
 	RJKF_WZ(73,"软件开发-完成"),
+	ZSCQ_ZDY(80,"知识产权-"),
 	ZSCQ_SQ(81,"知识产权-首期"),
 	ZSCQ_GS_SL_XZ(82,"知识产权-公示/专利受理/软著下证"),
 	ZSCQ_XZ(83,"知识产权-专利下证"),

+ 6 - 0
src/main/java/com/goafanti/order/service/impl/NewOrderDunServiceImpl.java

@@ -1,15 +1,19 @@
 package com.goafanti.order.service.impl;
 
 import java.lang.reflect.InvocationTargetException;
+import java.text.ParseException;
 import java.util.List;
 
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.beanutils.ConvertUtils;
 import org.apache.commons.beanutils.converters.DateConverter;
+import org.apache.ibatis.builder.BuilderException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.dao.NewOrderDunMapper;
+import com.goafanti.common.utils.DateUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.order.bo.InputNewOrderDunBo;
@@ -26,6 +30,7 @@ public class NewOrderDunServiceImpl extends BaseMybatisDao<NewOrderDunMapper> im
 	@Override
 	public int createDun(InputNewOrderDunBo ib) {
 		ib.setAid(TokenManager.getAdminId());
+		if(ib.getCustomizeTimes()!=null)ib.setCustomizeTime(DateUtils.StringToDate(ib.getCustomizeTimes(), AFTConstants.YYYYMMDD));
 		if (ib.getAppropriationRatio()!=null)ib.setMoney(null);
 		if (ib.getProjectType()==OrderDunProjectType.HY.getCode()&&ib.getDunType()==2&&ib.getEffectiveCount()>1) {
 			for (int i = 1; i <= ib.getEffectiveCount(); i++) {
@@ -42,6 +47,7 @@ public class NewOrderDunServiceImpl extends BaseMybatisDao<NewOrderDunMapper> im
 	@Override
 	public int updateDun(InputNewOrderDunBo ib) {
 		if (ib.getAppropriationRatio()!=null)ib.setMoney(null);
+		if(ib.getCustomizeTimes()!=null)ib.setCustomizeTime(DateUtils.StringToDate(ib.getCustomizeTimes(), AFTConstants.YYYYMMDD));
 		return newOrderDunMapper.updateByPrimaryKeySelective(ib);
 	}
 	@Override

+ 19 - 5
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -2,6 +2,7 @@ package com.goafanti.order.service.impl;
 
 import java.io.IOException;
 import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -12,16 +13,20 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
+import javax.mail.MessagingException;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.poi.xssf.usermodel.XSSFCell;
 import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.goafanti.admin.bo.AdminListBo;
+import com.goafanti.common.bo.EmailBo;
 import com.goafanti.common.bo.Error;
 import com.goafanti.common.bo.OrderExamineBo;
 import com.goafanti.common.constant.AFTConstants;
@@ -57,6 +62,8 @@ import com.goafanti.common.model.NewOrderChange;
 import com.goafanti.common.model.NewOrderDun;
 import com.goafanti.common.utils.DateUtils;
 import com.goafanti.common.utils.ExportExcelUtil;
+import com.goafanti.common.utils.LoggerUtils;
+import com.goafanti.common.utils.SendEmailUtil;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.mybatis.BaseMybatisDao;
 import com.goafanti.core.mybatis.JDBCIdGenerator;
@@ -76,6 +83,7 @@ import com.goafanti.order.bo.TChangeTaskOut;
 import com.goafanti.order.bo.TOrderLogBo;
 import com.goafanti.order.bo.TOrderNewBo;
 import com.goafanti.order.bo.TOrderTaskBo;
+import com.goafanti.order.enums.NewOrderDunType;
 import com.goafanti.order.enums.OrderChangeType;
 import com.goafanti.order.enums.OrderNewState;
 import com.goafanti.order.enums.OrderType;
@@ -129,6 +137,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	@Autowired
 	private TOrderBillNewMapper tOrderBillNewMapper;
 	
+	Logger							logger	= LoggerFactory.getLogger(OrderChangeServiceImpl.class);
+	
 	@Override
 	public int addOrderChange(NewOrderChangeBo t,String startRemarks) {
 		TOrderNew ton=new TOrderNew();
@@ -164,6 +174,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 					cd.setWaitDay(d.getWaitDay());
 					cd.setStartTime(d.getStartTime());
 					cd.setEffectiveCount(d.getEffectiveCount());
+					cd.setCustomizeTime(d.getCustomizeTime());
+					cd.setCustomizeName(d.getCustomizeName());
 					listcd.add(cd);
 				}
 				tChangeDunMapper.insertSelectiveList(listcd);
@@ -715,6 +727,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			nd.setWaitDay(cd.getWaitDay());
 			nd.setStartTime(cd.getStartTime());
 			nd.setEffectiveCount(cd.getEffectiveCount());
+			nd.setCustomizeTime(cd.getCustomizeTime());
+			nd.setCustomizeName(cd.getCustomizeName());
 			if (cd.getDunType()==1) {
 				nd.setStatus(1);
 				nd.setStartTime(new Date());
@@ -730,6 +744,8 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		}
 	}
 
+	
+	
 	@Override
 	public Map<String, Object> listOrderInvoiceAndBill(String orderNo) {
 		Map<String, Object> map=new HashMap<>();
@@ -856,6 +872,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			public int addChangeDun(TChangeDun d) {
 				d.setAid(TokenManager.getAdminId());
 				d.setType(1);
+				if(d.getCustomizeTimes()!=null)d.setCustomizeTime(DateUtils.StringToDate(d.getCustomizeTimes(), AFTConstants.YYYYMMDD));
 				return tChangeDunMapper.insertSelective(d);
 			}
 
@@ -933,6 +950,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 
 			@Override
 			public int updateChangeDun(TChangeDun t) {
+				if(t.getCustomizeTimes()!=null)t.setCustomizeTime(DateUtils.StringToDate(t.getCustomizeTimes(), AFTConstants.YYYYMMDD));
 				if (t.getType()==1||t.getType()==2) {
 					return tChangeDunMapper.updateByPrimaryKeySelective(t);
 				}else if(t.getType()==3){
@@ -967,11 +985,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 
 			@Override
 			public int addOrderRefund(InputNewOrderRefund or) {
-				try {
-					or.setRefundTime(DateUtils.StringToDate(or.getRefundDate(), AFTConstants.YYYYMMDD));
-				} catch (ParseException e) {
-					e.printStackTrace();
-				}
+				or.setRefundTime(DateUtils.StringToDate(or.getRefundDate(), AFTConstants.YYYYMMDD));
 				return newOrderRefundMapper.insertSelective(or);
 			}
 

+ 3 - 1
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -646,8 +646,10 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		NewOrderDun ob=newOrderDunMapper.selectByPrimaryKey(dunId);
 		AdminListBo a2 = adminMapper.getDeptNameByAid(b.getSalesmanId());
 		String dunTypeName="";
-		if(ob.getDunType()!=null&&ob.getProjectType()!=null) {
+		if(ob.getDunType()!=null&&ob.getProjectType()!=null&&ob.getDunType()!=0) {
 			dunTypeName= NewOrderDunType.getValueByCode(Integer.valueOf(""+ob.getProjectType()+ob.getDunType()));
+		}else if(ob.getDunType()!=null&&ob.getProjectType()!=null&&ob.getDunType()==0){
+			dunTypeName= NewOrderDunType.getValueByCode(Integer.valueOf(""+ob.getProjectType()+ob.getDunType()))+ob.getCustomizeName();
 		}
 			//发送驳回邮件
 		if(SendEmailUtil.isEmail(b.getEmail())) {

+ 2 - 5
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -269,6 +269,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		task.setArrivalMoney(t.getArrivalMoney());
 		task.setSetUpAmount(t.getSetUpAmount());
 		task.setOutsourceName(t.getOutsourceName());
+		task.setDeclarationBatch(t.getDeclarationBatch());
 		if(StringUtils.isNotBlank(t.getOutsourcePrice()))task.setOutsourcePrice(new BigDecimal(t.getOutsourcePrice()));
 		//根据修改的修改订单法人与联系人
 		if(StringUtils.isNotEmpty(t.getContacts()))tn.setContacts(t.getContacts());
@@ -586,11 +587,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		count +=t.getAlreadyNumber();
 		if(tt.getCommodityQuantity()<count)throw new BusinessException(new Error( "数量不能大于总量!" ,"数量不能大于总量!"));
 		tp.setAlreadyNumber(t.getAlreadyNumber());
-		try {
-			tp.setLicenceTime(DateUtils.StringToDate(t.getLicenceTimes(), AFTConstants.YYYYMMDD));
-		} catch (ParseException e) {
-			 throw new BusinessException(new Error( "日期错误" ,"日期错误"));
-		}
+		tp.setLicenceTime(DateUtils.StringToDate(t.getLicenceTimes(), AFTConstants.YYYYMMDD));
 		tp.setTaskId(t.getTaskId());
 		return taskProgressMapper.insertSelective(tp);
 	}

+ 1 - 11
src/main/java/com/goafanti/order/service/impl/OrderReceivablesServiceImpl.java

@@ -103,13 +103,7 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 		if(t.getCorporateName()==null)t.setCorporateName("");
 		t.setCreateTime(new Date());
 		t.setStatus(0);
-		if(t.getReceivablesTimes()!=null) {
-			try {
-				t.setReceivablesTime(DateUtils.StringToDate(t.getReceivablesTimes(), AFTConstants.YYYYMMDD));
-			} catch (ParseException e) {
-				throw new BusinessException("时间转换错误");
-			}
-		}
+		if(t.getReceivablesTimes()!=null) t.setReceivablesTime(DateUtils.StringToDate(t.getReceivablesTimes(), AFTConstants.YYYYMMDD));
 		return temporaryReceivablesMapper.insertSelective(t);
 	}
 	@Override
@@ -117,11 +111,7 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 		t.setOrderNo(t.getOrderNo().trim());
 		t.setStatus(ReceivablesStatus.ZC.getCode());
 		if(t.getReceivablesTimes()!=null) {
-			try {
 				t.setReceivablesTime(DateUtils.StringToDate(t.getReceivablesTimes(), AFTConstants.YYYYMMDD));
-			} catch (ParseException e) {
-				throw new BusinessException("时间转换错误");
-			}
 		}
 		return temporaryReceivablesMapper.updateByPrimaryKeySelective(t);
 	}

+ 1 - 1
src/main/java/com/goafanti/permission/controller/NewPermissionApiController.java

@@ -155,7 +155,7 @@ public class NewPermissionApiController extends BaseApiController {
 			res.getError().add(buildError("","名称、路径、上级不能为空"));
 			return res;
 		}
-		if(permissionService.checkName(record.getName())){
+		if(permissionService.checkName(record.getName(),record.getId())){
 			res.getError().add(buildError(ErrorConstants.PARAM_BEING_ERROR,"名称"));
 			return res;
 		}

+ 1 - 1
src/main/java/com/goafanti/permission/service/PermissionService.java

@@ -42,5 +42,5 @@ public interface PermissionService {
 	/** 查询 一级菜单通过三级菜单 **/
 	String selectTopNavBySubUrl(String subUrl);
 
-	boolean checkName(String name);
+	boolean checkName(String name, String string);
 }

+ 5 - 5
src/main/java/com/goafanti/permission/service/impl/PermissionServiceImpl.java

@@ -289,12 +289,12 @@ public class PermissionServiceImpl extends BaseMybatisDao<PermissionMapper> impl
 	}
 
 	@Override
-	public boolean checkName(String name) {
-		String str=permissionMapper.selectIdByName(name);
-		if (org.apache.commons.lang3.StringUtils.isNotBlank(str)) {
-			return false;
+	public boolean checkName(String name,String id) {
+		int i=permissionMapper.selectIdByNameCount(name,id);
+		if (i>0) {
+			return true;
 		}
-		return true;
+		return false;
 	}
 
 }

+ 82 - 15
src/main/java/com/goafanti/personnel/bo/OutPersonnelListBo.java

@@ -54,15 +54,69 @@ public class OutPersonnelListBo {
 	private Integer workingYear;
 	private Integer age;
 	private Integer month;
-	private String residenceName;
-	private String nativePlaceName;
-	private String nowName;
 	private String insuranceStartTimes;
 	private String insuranceEndTimes;
 	private String fundStartTimes;
 	private String fundEndTimes;
+	private Integer employeeId;
+	private String rpName;
+	private String rcName;
+	private String raName;
+	private String nppName;
+	private String npcName;
+	private String npName;
+	private String ncName;
+	private String  naName;
 	
 	
+	public String getRpName() {
+		return rpName;
+	}
+	public void setRpName(String rpName) {
+		this.rpName = rpName;
+	}
+	public String getRcName() {
+		return rcName;
+	}
+	public void setRcName(String rcName) {
+		this.rcName = rcName;
+	}
+	public String getRaName() {
+		return raName;
+	}
+	public void setRaName(String raName) {
+		this.raName = raName;
+	}
+	public String getNppName() {
+		return nppName;
+	}
+	public void setNppName(String nppName) {
+		this.nppName = nppName;
+	}
+	public String getNpcName() {
+		return npcName;
+	}
+	public void setNpcName(String npcName) {
+		this.npcName = npcName;
+	}
+	public String getNpName() {
+		return npName;
+	}
+	public void setNpName(String npName) {
+		this.npName = npName;
+	}
+	public String getNcName() {
+		return ncName;
+	}
+	public void setNcName(String ncName) {
+		this.ncName = ncName;
+	}
+	public String getNaName() {
+		return naName;
+	}
+	public void setNaName(String naName) {
+		this.naName = naName;
+	}
 	public String getInsuranceStartTimes() {
 		return insuranceStartTimes;
 	}
@@ -506,23 +560,30 @@ public class OutPersonnelListBo {
 		this.emergencyMobile = emergencyMobile;
 	}
 	public String getResidenceName() {
-		return residenceName;
-	}
-	public void setResidenceName(String residenceName) {
-		this.residenceName = residenceName;
+		String str="";
+		if(rpName!=null)str=str+rpName.trim()+"省";
+		if(rcName!=null)str=str+rcName.trim();
+		if(raName!=null)str=str+raName.trim();
+		if (residenceAddress!=null)str=str+residenceAddress; 
+		return str;
 	}
+	
 	public String getNativePlaceName() {
-		return nativePlaceName;
-	}
-	public void setNativePlaceName(String nativePlaceName) {
-		this.nativePlaceName = nativePlaceName;
+		String str="";
+		if(nppName!=null)str=str+nppName.trim()+"省";
+		if(npcName!=null)str=str+npcName.trim();
+		return str;
 	}
+	
 	public String getNowName() {
-		return nowName;
-	}
-	public void setNowName(String nowName) {
-		this.nowName = nowName;
+		String str="";
+		if(npName!=null)str=str+npName.trim()+"省";
+		if(ncName!=null)str=str+ncName.trim();
+		if(naName!=null)str=str+naName.trim();
+		if (nowAddress!=null)str=str+nowAddress; 
+		return str;
 	}
+	
 	public String getJobNature() {
 		return jobNature;
 	}
@@ -535,6 +596,12 @@ public class OutPersonnelListBo {
 	public void setJobNatureRemarks(String jobNatureRemarks) {
 		this.jobNatureRemarks = jobNatureRemarks;
 	}
+	public Integer getEmployeeId() {
+		return employeeId;
+	}
+	public void setEmployeeId(Integer employeeId) {
+		this.employeeId = employeeId;
+	}
 	
 	
 }

+ 69 - 55
src/main/java/com/goafanti/personnel/controller/AdminPersonnelApiController.java

@@ -1,6 +1,5 @@
 package com.goafanti.personnel.controller;
 
-import java.text.ParseException;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -47,18 +46,27 @@ public class AdminPersonnelApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "姓名", "姓名"));
 			return res;
 		}
-		int x=personnelService.checkDoorId(i.getDoorId());
-		if (x>0) {
+		if (i.getDoorId()==null) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "门禁", "门禁"));
+			return res;
+		}
+		if (i.getEmployeeId()==null) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "员工编号", "员工编号"));
+			return res;
+		}
+		int x=personnelService.checkDoorId(i.getDoorId(),i.getId());
+		if(x>0) {
 			res.getError().add(buildError(ErrorConstants.PARAM_BEING_ERROR, "门禁", "门禁"));
 			return res;
 		}
+		int y=personnelService.checkEmployeeId(i.getEmployeeId(),i.getId());
+		if (y>0) {
+			res.getError().add(buildError(ErrorConstants.PARAM_BEING_ERROR, "员工编号", "员工编号"));
+			return res;
+		}
 		if ( !StringUtils.isBlank(i.getBirthdays())) {
-			try {
 				i.setBirthday(DateUtils.StringToDate(i.getBirthdays(), AFTConstants.YYYYMMDD));
-			} catch (ParseException e) {
-				res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "出生日期", "出生日期"));
-				return res;
-			}
+			
 		}
 		return res.data(personnelService.addPersonnel(i));
 	}
@@ -67,13 +75,13 @@ public class AdminPersonnelApiController extends CertifyApiController {
 	 * 门禁检测
 	 */
 	@RequestMapping(value ="/checkDoorId", method =RequestMethod.GET)
-	public Result checkDoorId(Integer doorId) {
+	public Result checkDoorId(Integer doorId,Integer id) {
 		Result res = new Result();
 		if (null==doorId) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "门禁", "门禁"));
 			return res;
 		}
-		int i=personnelService.checkDoorId(doorId);
+		int i=personnelService.checkDoorId(doorId,id);
 		if (i>0) {
 			res.getError().add(buildError(ErrorConstants.PARAM_BEING_ERROR, "门禁", "门禁"));
 			return res;
@@ -82,19 +90,50 @@ public class AdminPersonnelApiController extends CertifyApiController {
 	}
 	
 	/**
+	 * 员工编号检测
+	 */
+	@RequestMapping(value ="/checkEmployeeId", method =RequestMethod.GET)
+	public Result checkEmployeeId(Integer employeeId,Integer id) {
+		Result res = new Result();
+		if (null==employeeId) {
+			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "员工编号", "员工编号"));
+			return res;
+		}
+		int i=personnelService.checkEmployeeId(employeeId,id);
+		if (i>0) {
+			res.getError().add(buildError(ErrorConstants.PARAM_BEING_ERROR, "员工编号", "员工编号"));
+			return res;
+		}
+		return res.data(i);
+	}
+	
+	/**
 	 * 修改人事档案
 	 */
 	@RequestMapping(value = "/update", method = RequestMethod.POST)
 	public Result updatePersonnel(InputPersonnelBo i){
 		Result res = new Result();
-		try {
-				if ( !StringUtils.isBlank(i.getBirthdays()))i.setBirthday(DateUtils.StringToDate(i.getBirthdays(), AFTConstants.YYYYMMDD));
-				if ( !StringUtils.isBlank(i.getEntryTimes()))i.setEntryTime(DateUtils.StringToDate(i.getEntryTimes(), AFTConstants.YYYYMMDD));
-				if ( !StringUtils.isBlank(i.getPromotionTimes()))i.setPromotionTime(DateUtils.StringToDate(i.getPromotionTimes(), AFTConstants.YYYYMMDD));
-			} catch (ParseException e) {
-				res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "日期", "日期"));
+		if (i.getDoorId()!=null) {
+			int x=personnelService.checkDoorId(i.getDoorId(),i.getId());
+			if(x>0) {
+				res.getError().add(buildError(ErrorConstants.PARAM_BEING_ERROR, "门禁", "门禁"));
 				return res;
 			}
+		}
+		if (i.getEmployeeId()!=null) {
+			int y=personnelService.checkEmployeeId(i.getEmployeeId(),i.getId());
+			if (y>0) {
+				res.getError().add(buildError(ErrorConstants.PARAM_BEING_ERROR, "员工编号", "员工编号"));
+				return res;
+			}
+		}
+		if ( !StringUtils.isBlank(i.getBirthdays())) {
+				i.setBirthday(DateUtils.StringToDate(i.getBirthdays(), AFTConstants.YYYYMMDD));
+			
+		}
+		if ( !StringUtils.isBlank(i.getBirthdays()))i.setBirthday(DateUtils.StringToDate(i.getBirthdays(), AFTConstants.YYYYMMDD));
+		if ( !StringUtils.isBlank(i.getEntryTimes()))i.setEntryTime(DateUtils.StringToDate(i.getEntryTimes(), AFTConstants.YYYYMMDD));
+		if ( !StringUtils.isBlank(i.getPromotionTimes()))i.setPromotionTime(DateUtils.StringToDate(i.getPromotionTimes(), AFTConstants.YYYYMMDD));
 		return res.data(personnelService.updatePersonnel(i));
 	}
 	
@@ -126,12 +165,7 @@ public class AdminPersonnelApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "编号", "编号"));
 			return res;
 		}
-		try {
-			if ( !StringUtils.isBlank(i.getPromotionTimes()))i.setPromotionTime(DateUtils.StringToDate(i.getPromotionTimes(), AFTConstants.YYYYMMDD));
-		} catch (ParseException e) {
-			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "日期", "日期"));
-			return res;
-		}
+		if ( !StringUtils.isBlank(i.getPromotionTimes()))i.setPromotionTime(DateUtils.StringToDate(i.getPromotionTimes(), AFTConstants.YYYYMMDD));
 		return res.data(personnelService.updatePromotion(i));
 	}
 	
@@ -145,13 +179,8 @@ public class AdminPersonnelApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "编号", "编号"));
 			return res;
 		}
-		try {
-			if ( !StringUtils.isBlank(i.getStartTimes()))i.setStartTime(DateUtils.StringToDate(i.getStartTimes(), AFTConstants.YYYYMMDD));
-			if ( !StringUtils.isBlank(i.getEndTimes()))i.setEndTime(DateUtils.StringToDate(i.getEndTimes(), AFTConstants.YYYYMMDD));
-		} catch (ParseException e) {
-			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "日期", "日期"));
-			return res;
-		}
+		if ( !StringUtils.isBlank(i.getStartTimes()))i.setStartTime(DateUtils.StringToDate(i.getStartTimes(), AFTConstants.YYYYMMDD));
+		if ( !StringUtils.isBlank(i.getEndTimes()))i.setEndTime(DateUtils.StringToDate(i.getEndTimes(), AFTConstants.YYYYMMDD));
 		return res.data(personnelService.updateContract(i));
 	}
 	
@@ -165,12 +194,7 @@ public class AdminPersonnelApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "编号", "编号"));
 			return res;
 		}
-		try {
-			if ( !StringUtils.isBlank(i.getEffectTimes()))i.setEffectTime(DateUtils.StringToDate(i.getEffectTimes(), AFTConstants.YYYYMMDD));
-		} catch (ParseException e) {
-			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "日期", "日期"));
-			return res;
-		}
+		if ( !StringUtils.isBlank(i.getEffectTimes()))i.setEffectTime(DateUtils.StringToDate(i.getEffectTimes(), AFTConstants.YYYYMMDD));
 		return res.data(personnelService.updateChoose(i));
 	}
 	
@@ -184,12 +208,7 @@ public class AdminPersonnelApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "编号", "编号"));
 			return res;
 		}
-		try {
-			if ( !StringUtils.isBlank(i.getEffectTimes()))i.setEffectTime(DateUtils.StringToDate(i.getEffectTimes(), AFTConstants.YYYYMMDD));
-		} catch (ParseException e) {
-			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "日期", "日期"));
-			return res;
-		}
+		if ( !StringUtils.isBlank(i.getEffectTimes()))i.setEffectTime(DateUtils.StringToDate(i.getEffectTimes(), AFTConstants.YYYYMMDD));
 		return res.data(personnelService.updateQuit(i));
 	}
 	
@@ -222,20 +241,15 @@ public class AdminPersonnelApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "编号", "编号"));
 			return res;
 		}
-		try {
-			if ( !StringUtils.isBlank(i.getStartTimes())) {
-				i.setStartTime(DateUtils.StringToDate(i.getStartTimes(), AFTConstants.YYYYMMDD));
-			}else {
-				i.setStartTime(null);
-			}
-			if ( !StringUtils.isBlank(i.getEndTimes())) {
-				i.setEndTime(DateUtils.StringToDate(i.getEndTimes(), AFTConstants.YYYYMMDD));
-			}else {
-				i.setEndTime(null);
-			}
-		} catch (ParseException e) {
-			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "日期", "日期"));
-			return res;
+		if ( !StringUtils.isBlank(i.getStartTimes())) {
+			i.setStartTime(DateUtils.StringToDate(i.getStartTimes(), AFTConstants.YYYYMMDD));
+		}else {
+			i.setStartTime(null);
+		}
+		if ( !StringUtils.isBlank(i.getEndTimes())) {
+			i.setEndTime(DateUtils.StringToDate(i.getEndTimes(), AFTConstants.YYYYMMDD));
+		}else {
+			i.setEndTime(null);
 		}
 		return res.data(personnelService.updateWelfare(i));
 	}

+ 3 - 1
src/main/java/com/goafanti/personnel/service/PersonnelService.java

@@ -32,7 +32,7 @@ public interface PersonnelService {
 
 	int updatePromotion(InputPersonnelPromotionBo i);
 
-	int checkDoorId(Integer doorId);
+	int checkDoorId(Integer doorId, Integer id);
 
 	int updateContract(InputPersonnelContractBo i);
 
@@ -53,5 +53,7 @@ public interface PersonnelService {
 
 	int updateWelfare(IntpersonnelWelfareBo i);
 
+	int checkEmployeeId(Integer employeeId, Integer id);
+
 
 }

+ 42 - 95
src/main/java/com/goafanti/personnel/service/impl/PersonnelServiceImpl.java

@@ -20,12 +20,9 @@ import org.springframework.stereotype.Service;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.goafanti.common.bo.AreaBo;
-import com.goafanti.common.bo.CityBo;
 import com.goafanti.common.bo.Error;
-import com.goafanti.common.bo.ProvinceBo;
 import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.dao.DistrictGlossoryMapper;
+import com.goafanti.common.dao.AdminMapper;
 import com.goafanti.common.dao.PersonnelChooseMapper;
 import com.goafanti.common.dao.PersonnelContactMapper;
 import com.goafanti.common.dao.PersonnelContractMapper;
@@ -37,6 +34,7 @@ import com.goafanti.common.dao.PersonnelPromotionMapper;
 import com.goafanti.common.dao.PersonnelQuitMapper;
 import com.goafanti.common.dao.PersonnelWelfareMapper;
 import com.goafanti.common.error.BusinessException;
+import com.goafanti.common.model.Admin;
 import com.goafanti.common.model.PersonnelContact;
 import com.goafanti.common.model.PersonnelDossier;
 import com.goafanti.common.model.PersonnelEntry;
@@ -84,10 +82,16 @@ public class PersonnelServiceImpl  extends BaseMybatisDao<PersonnelDossierMapper
 	@Autowired
 	private PersonnelMidMapper	personnelMidMapper;
 	@Autowired
-	private DistrictGlossoryMapper	districtGlossoryMapper;
+	private AdminMapper	adminMapper;
 	
 	@Override
 	public int addPersonnel(InputPersonnelBo i) {
+		if (TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)) {
+			Admin a=adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
+			if (a!=null) {
+				i.setCompany(a.getDepartmentId());
+			}
+		}
 		return personnelDossierMapper.insertSelective(i);
 	}
 
@@ -169,8 +173,13 @@ public class PersonnelServiceImpl  extends BaseMybatisDao<PersonnelDossierMapper
 	}
 
 	@Override
-	public int checkDoorId(Integer doorId) {
-		int i=personnelDossierMapper.checkDoorId(doorId);
+	public int checkDoorId(Integer doorId,Integer id) {
+		int i=personnelDossierMapper.checkDoorId(doorId,id);
+		return i;
+	}
+	@Override
+	public int checkEmployeeId(Integer employeeId,Integer id) {
+		int i=personnelDossierMapper.checkEmployeeId(employeeId,id);
 		return i;
 	}
 
@@ -237,32 +246,12 @@ public class PersonnelServiceImpl  extends BaseMybatisDao<PersonnelDossierMapper
 		}
 		Pagination<OutPersonnelListBo>p=(Pagination<OutPersonnelListBo>) findPage("selectPersonnelByList", "selectPersonnelByCount",
 				params, i.getPageNo(), i.getPageSize());
-		//处理省市区的转换
-		for (OutPersonnelListBo ob : (List<OutPersonnelListBo>)p.getList()) {
-			String residenceName=districtTransformation(ob.getResidenceProvince(),ob.getResidenceCity(),ob.getResidenceArea(),
-					ob.getResidenceAddress());
-			String nativePlaceName =districtTransformation(ob.getNativePlaceProvince(),ob.getNativePlaceCity(),null,null);
-			String nowName=districtTransformation(ob.getNowProvince(),ob.getNowCity(),ob.getNowArea(),
-					ob.getNowAddress());
-			ob.setResidenceName(residenceName);
-			ob.setNativePlaceName(nativePlaceName);
-			ob.setNowName(nowName);
-		}
-			
 		return p;
 	}
 
 	@Override
 	public OutPersonnelBo selectBypdId(Integer id) {
 		OutPersonnelBo op=	personnelDossierMapper.selectBypdId(id);
-		String residenceName=districtTransformation(op.getResidenceProvince(),op.getResidenceCity(),op.getResidenceArea(),
-				op.getResidenceAddress());
-		String nativePlaceName =districtTransformation(op.getNativePlaceProvince(),op.getNativePlaceCity(),null,null);
-		String nowName=districtTransformation(op.getNowProvince(),op.getNowCity(),op.getNowArea(),
-				op.getNowAddress());
-		op.setResidenceName(residenceName);
-		op.setNativePlaceName(nativePlaceName);
-		op.setNowName(nowName);
 		op.setContactList(personnelContactMapper.selectBypdId(id));
 		PersonnelEntry pe=personnelEntryMapper.selectByPrimaryKey(id);
 		op.setPersonnelEntry(pe);
@@ -281,9 +270,10 @@ public class PersonnelServiceImpl  extends BaseMybatisDao<PersonnelDossierMapper
 		try {
 			List<OutPersonnelListBo>list=(List<OutPersonnelListBo>) selectList(in).getList();
 			
-    		String[] comment = {"序号","姓名","员工状态","系统","员工编号","门禁号","所属公司","职位","级别","星级","入职时间","转正时间","年龄","性别"
-    				,"婚否","子女","政治面貌","学历","毕业学校","所学专业","职称/证书","晋升明细","最近晋升时间","合同","联系电话","办公室电话","出生日期",
-    				"出生月份","身份证号码","身份证发证地","户籍所在地","现住址","紧急联系人","紧急联系人电话"};
+    		String[] comment = {"员工编号","门禁编号","姓名","员工状态","所属系统","所属公司","职位名称","等级名称","星级","入职时间","转正时间","出生日期","性别"
+    				,"婚否","子女","政治面貌","学历","毕业学校","所学专业","职称/证书","晋升明细","最近晋升时间","合同","联系电话","办公室电话",
+    				"身份证号码","身份证发证地","户籍所在地","现住址","紧急联系人","紧急联系人电话","离职时间","工作年限","年龄","出生月份","参保时间","停保时间",
+    				"入公积金时间","停公积金时间"};
     		String fileName ="人事档案表" + new SimpleDateFormat("yyyy-MM-dd HH:mm").format(new Date()) + ".xls";
     		//type 0 变更
     		XSSFWorkbook wb =ExportExcelUtil.exportTemplateInfoS(comment,"人事档案表");
@@ -297,28 +287,22 @@ public class PersonnelServiceImpl  extends BaseMybatisDao<PersonnelDossierMapper
     				//当前列的只
     				String o = "";
     				switch (comment[i]) {
-//    				{"序号","姓名","员工状态","系统","员工编号","门禁号","所属公司","职位",
-//    				"级别","星级","入职时间","转正时间","年龄","性别","婚否","子女",
-    				case "序号": o = String.valueOf(sheet.getLastRowNum()-2); break;
+//    				"员工编号","门禁编号","姓名","员工状态","所属系统","所属公司","职位名称","等级名称","星级","入职时间","转正时间","出生日期","性别"
+    				case "员工编号": o = ob.getEmployeeId()==null?"":ob.getEmployeeId().toString(); break;
+    				case "门禁编号": o = ob.getDoorId().toString(); break;
     				case "姓名": o = ob.getName(); break;
     				case "员工状态": o = ob.getStatusName(); break;
-    				case "系统": o = ob.getSystemName(); break;
-    				case "员工编号": o = ob.getId().toString(); break;
-    				case "门禁号": o = ob.getDoorId().toString(); break;
+    				case "所属系统": o = ob.getSystemName(); break;
     				case "所属公司": o = ob.getDepName(); break;
-    				case "职位": o = ob.getJobsName(); break;
-    				case "级别": o = ob.getLvlName(); break;
-    				case "星级": o = ob.getStarName(); break;
+    				case "职位名称": o = ob.getJobsName(); break;
+    				case "等级名称": o = ob.getStarName(); break;
+    				case "星级": o = ob.getLvlName(); break;
     				case "入职时间": o = ob.getEntryTimes(); break;
-    				case "转正时间": o = ob.getPromotionTimes(); break;
-    				case "年龄": o = ob.getAge()==null?"":ob.getAge().toString(); break;
+    				case "转正时间": o = ob.getPromotionTimes()==null?"":ob.getPromotionTimes(); break;
+    				case "出生日期": o = ob.getBirthdays(); break;
     				case "性别": o = ob.getSex()==0?"男":"女"; break;
     				case "婚否": o = ob.getMarriageName(); break;
     				case "子女": o = ob.getSon().toString()+"/"+ob.getGirl().toString(); break;
-//    				"","","","","职称/证书","晋升明细",
-//    				"最近晋升时间","合同","联系电话","办公室电话","出生日期",
-//    				"出生月份","身份证号码","身份证发证地","户籍所在地","现住址",
-//    				"紧急联系人","紧急联系人电话"};
     				case "政治面貌": o = ob.getPoliticalOutlookName(); break;
     				case "学历": o = ob.getEducationName(); break;
     				case "毕业学校": o = ob.getSchool(); break;
@@ -327,24 +311,25 @@ public class PersonnelServiceImpl  extends BaseMybatisDao<PersonnelDossierMapper
     				case "晋升明细": o = ob.getPromotionRemarks(); break;
     				case "最近晋升时间": o = ob.getPromotionTimes(); break;
     				case "合同": if (ob.getContractStart()!=null&&ob.getContractEnd()!=null) {
-    									o = ob.getContractStart()+" ~ "+ob.getContractEnd();
-    								}
-    				 				break;
+    					o = ob.getContractStart()+" ~ "+ob.getContractEnd();
+    				}
+    				break;
     				case "联系电话": o = ob.getMobile(); break;
     				case "办公室电话": o = ob.getFixedTel(); break;
-    				case "出生日期": o = ob.getBirthdays(); break;
-    				case "出生月份": o = ob.getMonth()==null?"":ob.getMonth().toString(); break;
     				case "身份证号码": o = ob.getIdCard(); break;
     				case "身份证发证地": o = ob.getCertificationAuthority(); break;
     				case "户籍所在地": o = ob.getResidenceName(); break;
     				case "现住址": o = ob.getNowName(); break;
     				case "紧急联系人": o = ob.getEmergencyContact(); break;
     				case "紧急联系人电话": o = ob.getEmergencyMobile(); break;
-    				case "入社保时间": o = ob.getInsuranceStartTimes(); break;
-    				case "停社保时间": o = ob.getInsuranceEndTimes(); break;
+    				case "离职时间": o = ob.getQuitTime(); break;
+    				case "工作年限": o = ob.getWorkingYear()==null?"":ob.getWorkingYear().toString(); break;
+    				case "年龄": o = ob.getAge()==null?"":ob.getAge().toString(); break;
+    				case "出生月份": o = ob.getMonth()==null?"":ob.getMonth().toString(); break;
+    				case "参保时间": o = ob.getInsuranceStartTimes(); break;
+    				case "停保时间": o = ob.getInsuranceEndTimes(); break;
     				case "入公积金时间": o = ob.getFundStartTimes(); break;
     				case "停公积金时间": o = ob.getFundEndTimes(); break;
-    				case "离职时间": o = ob.getQuitTime(); break;
     				default: o = ""; break;
     				}
     				XSSFCell c = r.createCell(i);
@@ -359,6 +344,7 @@ public class PersonnelServiceImpl  extends BaseMybatisDao<PersonnelDossierMapper
 			 out.flush();
 			 out.close();
 		} catch (Exception e) {
+			logger.error(e.getLocalizedMessage());
 			throw new BusinessException(new Error("表格生成错误。"));
 		}finally {
 			out.flush(); 
@@ -366,48 +352,7 @@ public class PersonnelServiceImpl  extends BaseMybatisDao<PersonnelDossierMapper
 		}
 	}
 	
-	/**
-	 * 省市区转换
-	 * @param p 省
-	 * @param c 市
-	 * @param a 区
-	 * @param address 地址
-	 * @param residenceName 
-	 * @return
-	 */
-	private String districtTransformation(Integer p,Integer c,Integer a,String address) {
-		List<ProvinceBo> plist= districtGlossoryMapper.getProvince();
-		List<CityBo>  clist= districtGlossoryMapper.getCity();
-		List<AreaBo>  alist= districtGlossoryMapper.getArea();
-		String residenceName="" ;
-		if (p!=null) {
-			for (ProvinceBo pb : plist) {
-				if (pb.getId().equals(p)) {
-					residenceName+=pb.getName().trim()+"省";
-					break;
-				}
-			}
-		}
-			if (c!=null) {
-			for (CityBo cb : clist) {
-				if (cb.getId().equals(c)) {
-					residenceName+=cb.getName().trim();
-					break;
-				}
-			}
-		}
-			if (a!=null) {
-			for (AreaBo ab : alist) {
-				if (ab.getId().equals(a)) {
-					residenceName+=ab.getName().replace(" ", "");
-					break;
-				}
-			}
-		}
-		if (address!=null) residenceName+=address;
-			
-		return residenceName;
-	}
+	
 
 	@Override
 	public List<OutPersonnelLvlBo> selectLvlList() {
@@ -460,4 +405,6 @@ public class PersonnelServiceImpl  extends BaseMybatisDao<PersonnelDossierMapper
 		}
 		return 1;
 	}
+
+
 }

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

@@ -60,12 +60,12 @@ template.cacheable=false
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload
 #连接开发
-#static.host=//sb.jishutao.com/1.1.42
+#static.host=//sb.jishutao.com/1.1.43
 #avatar.host=//sb.jishutao.com
 
 #连测试
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.1.42
+static.host=//static.jishutao.com/1.1.43
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload

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

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