From 36cf2ee34c0f25a17375c38da499b3264243e17a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E6=96=B0=E5=85=83?= <xxy554518704176@gmail.com>
Date: Thu, 30 May 2019 16:19:27 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E7=A4=BE=E4=BF=9D=E5=85=AC=E7=A7=AF?=
 =?UTF-8?q?=E9=87=91=E5=A4=A7=E8=A1=A8=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/wages/dao/WagesSocialFunDao.java  |   1 +
 .../modules/wages/entity/WagesSocialFun.java  |  62 +-
 .../wages/service/WagesSocialFunService.java  |  10 +-
 .../wages/web/WagesSocialFunController.java   |  33 +-
 .../src/main/resources/db/sys/jsite_sys.erm   | 690 ++++++++++--------
 .../main/resources/db/sys/jsite_sys_mysql.sql |   4 +-
 .../modules/wages/WagesSocialFunDao.xml       |  42 +-
 .../modules/wages/wagesSocialFunForm.html     |  17 +-
 .../modules/wages/wagesSocialFunList.html     | 110 ++-
 9 files changed, 591 insertions(+), 378 deletions(-)

diff --git a/jsite-web/src/main/java/com/jsite/modules/wages/dao/WagesSocialFunDao.java b/jsite-web/src/main/java/com/jsite/modules/wages/dao/WagesSocialFunDao.java
index 2f1bd922..c8ddf177 100644
--- a/jsite-web/src/main/java/com/jsite/modules/wages/dao/WagesSocialFunDao.java
+++ b/jsite-web/src/main/java/com/jsite/modules/wages/dao/WagesSocialFunDao.java
@@ -15,4 +15,5 @@ import com.jsite.modules.wages.entity.WagesSocialFun;
 @MyBatisDao
 public interface WagesSocialFunDao extends CrudDao<WagesSocialFun> {
     WagesSocialFun getByEntity(WagesSocialFun wagesSocialFun);
+    WagesSocialFun getByNameYearMonth(WagesSocialFun wagesSocialFun);
 }
\ No newline at end of file
diff --git a/jsite-web/src/main/java/com/jsite/modules/wages/entity/WagesSocialFun.java b/jsite-web/src/main/java/com/jsite/modules/wages/entity/WagesSocialFun.java
index f1364989..7103066a 100644
--- a/jsite-web/src/main/java/com/jsite/modules/wages/entity/WagesSocialFun.java
+++ b/jsite-web/src/main/java/com/jsite/modules/wages/entity/WagesSocialFun.java
@@ -23,7 +23,8 @@ public class WagesSocialFun extends DataEntity<WagesSocialFun> {
 	private User user;		// 用户
 	private String personNum;		// 个人编号
 	private String fundNum;		// 公积金编号
-	private Date month;		// 月份
+	private Integer year;		// 年份
+	private Integer month;		// 月份
 	private Double pensionBase;		// 养老缴费基数
 	private Double pensionCompany;		// 养老单位本金
 	private Double pensionPersonal;		// 养老个人本金
@@ -54,6 +55,11 @@ public class WagesSocialFun extends DataEntity<WagesSocialFun> {
 		super();
 	}
 
+	public WagesSocialFun(String year, String month) {
+		this.year = Integer.parseInt(year);
+		this.month = Integer.parseInt(month);
+	}
+
 	public WagesSocialFun(String id){
 		super(id);
 	}
@@ -87,14 +93,20 @@ public class WagesSocialFun extends DataEntity<WagesSocialFun> {
 	public void setFundNum(String fundNum) {
 		this.fundNum = fundNum;
 	}
-	
-	@JsonFormat(pattern = "yyyy-MM")
-	@ExcelField(title="月份", align=2, sort=40)
-	public Date getMonth() {
+
+	public Integer getYear() {
+		return year;
+	}
+
+	public void setYear(Integer year) {
+		this.year = year;
+	}
+
+	public Integer getMonth() {
 		return month;
 	}
 
-	public void setMonth(Date month) {
+	public void setMonth(Integer month) {
 		this.month = month;
 	}
 
@@ -106,7 +118,7 @@ public class WagesSocialFun extends DataEntity<WagesSocialFun> {
 		this.pensionBase = pensionBase;
 	}
 
-	@ExcelField(title="养老单位本金", align=2, sort=50)
+	@ExcelField(title="养老单位本金", align=2, sort=40)
 	public Double getPensionCompany() {
 		return pensionCompany;
 	}
@@ -115,7 +127,7 @@ public class WagesSocialFun extends DataEntity<WagesSocialFun> {
 		this.pensionCompany = pensionCompany;
 	}
 
-	@ExcelField(title="养老个人本金", align=2, sort=60)
+	@ExcelField(title="养老个人本金", align=2, sort=50)
 	public Double getPensionPersonal() {
 		return pensionPersonal;
 	}
@@ -132,7 +144,7 @@ public class WagesSocialFun extends DataEntity<WagesSocialFun> {
 		this.unemploymentBase = unemploymentBase;
 	}
 
-	@ExcelField(title="失业单位本金", align=2, sort=70)
+	@ExcelField(title="失业单位本金", align=2, sort=60)
 	public Double getUnemploymentCompany() {
 		return unemploymentCompany;
 	}
@@ -145,7 +157,7 @@ public class WagesSocialFun extends DataEntity<WagesSocialFun> {
 		return unemploymentPersonal;
 	}
 
-	@ExcelField(title="失业个人本金", align=2, sort=80)
+	@ExcelField(title="失业个人本金", align=2, sort=70)
 	public void setUnemploymentPersonal(Double unemploymentPersonal) {
 		this.unemploymentPersonal = unemploymentPersonal;
 	}
@@ -158,7 +170,7 @@ public class WagesSocialFun extends DataEntity<WagesSocialFun> {
 		this.medicalBase = medicalBase;
 	}
 
-	@ExcelField(title="医疗单位本金", align=2, sort=90)
+	@ExcelField(title="医疗单位本金", align=2, sort=80)
 	public Double getMedicalCompany() {
 		return medicalCompany;
 	}
@@ -167,7 +179,7 @@ public class WagesSocialFun extends DataEntity<WagesSocialFun> {
 		this.medicalCompany = medicalCompany;
 	}
 
-	@ExcelField(title="医疗个人本金", align=2, sort=100)
+	@ExcelField(title="医疗个人本金", align=2, sort=90)
 	public Double getMedicalPersonal() {
 		return medicalPersonal;
 	}
@@ -176,7 +188,7 @@ public class WagesSocialFun extends DataEntity<WagesSocialFun> {
 		this.medicalPersonal = medicalPersonal;
 	}
 
-	@ExcelField(title="大额医疗单位本金", align=2, sort=110)
+	@ExcelField(title="大额医疗单位本金", align=2, sort=100)
 	public Double getBigMedicalCompany() {
 		return bigMedicalCompany;
 	}
@@ -185,7 +197,7 @@ public class WagesSocialFun extends DataEntity<WagesSocialFun> {
 		this.bigMedicalCompany = bigMedicalCompany;
 	}
 
-	@ExcelField(title="大额医疗个人本金", align=2, sort=120)
+	@ExcelField(title="大额医疗个人本金", align=2, sort=110)
 	public Double getBigMedicalPersonal() {
 		return bigMedicalPersonal;
 	}
@@ -202,7 +214,7 @@ public class WagesSocialFun extends DataEntity<WagesSocialFun> {
 		this.injuryBase = injuryBase;
 	}
 
-	@ExcelField(title="工伤单位本金", align=2, sort=130)
+	@ExcelField(title="工伤单位本金", align=2, sort=120)
 	public Double getInjuryCompany() {
 		return injuryCompany;
 	}
@@ -219,7 +231,7 @@ public class WagesSocialFun extends DataEntity<WagesSocialFun> {
 		this.birthBase = birthBase;
 	}
 
-	@ExcelField(title="生育单位本金", align=2, sort=140)
+	@ExcelField(title="生育单位本金", align=2, sort=130)
 	public Double getBirthCompany() {
 		return birthCompany;
 	}
@@ -228,7 +240,7 @@ public class WagesSocialFun extends DataEntity<WagesSocialFun> {
 		this.birthCompany = birthCompany;
 	}
 
-	@ExcelField(title="社保单位缴费", align=2, sort=150)
+	@ExcelField(title="社保单位缴费", align=2, sort=140)
 	public Double getSocialUnitPay() {
 		return socialUnitPay;
 	}
@@ -237,7 +249,7 @@ public class WagesSocialFun extends DataEntity<WagesSocialFun> {
 		this.socialUnitPay = socialUnitPay;
 	}
 
-	@ExcelField(title="社保个人缴费", align=2, sort=160)
+	@ExcelField(title="社保个人缴费", align=2, sort=150)
 	public Double getSocialPersonalPay() {
 		return socialPersonalPay;
 	}
@@ -254,7 +266,7 @@ public class WagesSocialFun extends DataEntity<WagesSocialFun> {
 		this.fundPayBase = fundPayBase;
 	}
 
-	@ExcelField(title="单位缴费", align=2, sort=170)
+	@ExcelField(title="公积金单位缴费", align=2, sort=160)
 	public Double getFundCompanyPay() {
 		return fundCompanyPay;
 	}
@@ -263,7 +275,7 @@ public class WagesSocialFun extends DataEntity<WagesSocialFun> {
 		this.fundCompanyPay = fundCompanyPay;
 	}
 
-	@ExcelField(title="个人缴费", align=2, sort=180)
+	@ExcelField(title="公积金个人缴费", align=2, sort=170)
 	public Double getFundPersonalPay() {
 		return fundPersonalPay;
 	}
@@ -272,7 +284,7 @@ public class WagesSocialFun extends DataEntity<WagesSocialFun> {
 		this.fundPersonalPay = fundPersonalPay;
 	}
 
-	@ExcelField(title="服务费", align=2, sort=190)
+	@ExcelField(title="服务费", align=2, sort=180)
 	public Double getServiceCost() {
 		return serviceCost;
 	}
@@ -282,7 +294,7 @@ public class WagesSocialFun extends DataEntity<WagesSocialFun> {
 	}
 	
 	@Length(min=0, max=64, message="委托单位长度必须介于 0 和 64 之间")
-	@ExcelField(title="委托单位", align=2, sort=200)
+	@ExcelField(title="委托单位", align=2, sort=190)
 	public String getDelegatedCompany() {
 		return delegatedCompany;
 	}
@@ -292,7 +304,7 @@ public class WagesSocialFun extends DataEntity<WagesSocialFun> {
 	}
 	
 	@JsonFormat(pattern = "yyyy-MM-dd")
-	@ExcelField(title="社保增员时间", align=2, sort=210)
+	@ExcelField(title="社保增员时间", align=2, sort=200)
 	public Date getSocialAddTime() {
 		return socialAddTime;
 	}
@@ -302,7 +314,7 @@ public class WagesSocialFun extends DataEntity<WagesSocialFun> {
 	}
 	
 	@JsonFormat(pattern = "yyyy-MM-dd")
-	@ExcelField(title="社保减员时间", align=2, sort=220)
+	@ExcelField(title="社保减员时间", align=2, sort=210)
 	public Date getFundAddTime() {
 		return fundAddTime;
 	}
@@ -311,7 +323,7 @@ public class WagesSocialFun extends DataEntity<WagesSocialFun> {
 		this.fundAddTime = fundAddTime;
 	}
 
-	@ExcelField(title="社保公积金状态", align=2, sort=230, dictType = "social_fund_status")
+	@ExcelField(title="社保公积金状态", align=2, sort=220, dictType = "social_fund_status")
 	public String getSocialFundStatus() {
 		return socialFundStatus;
 	}
diff --git a/jsite-web/src/main/java/com/jsite/modules/wages/service/WagesSocialFunService.java b/jsite-web/src/main/java/com/jsite/modules/wages/service/WagesSocialFunService.java
index 32c71421..1fbef109 100644
--- a/jsite-web/src/main/java/com/jsite/modules/wages/service/WagesSocialFunService.java
+++ b/jsite-web/src/main/java/com/jsite/modules/wages/service/WagesSocialFunService.java
@@ -5,6 +5,7 @@ package com.jsite.modules.wages.service;
 
 import java.util.List;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -22,6 +23,9 @@ import com.jsite.modules.wages.dao.WagesSocialFunDao;
 @Transactional(readOnly = true)
 public class WagesSocialFunService extends CrudService<WagesSocialFunDao, WagesSocialFun> {
 
+	@Autowired
+	private WagesSocialFunDao wagesSocialFunDao;
+
 	public WagesSocialFun get(String id) {
 		return super.get(id);
 	}
@@ -37,7 +41,11 @@ public class WagesSocialFunService extends CrudService<WagesSocialFunDao, WagesS
 	public Page<WagesSocialFun> findPage(Page<WagesSocialFun> page, WagesSocialFun wagesSocialFun) {
 		return super.findPage(page, wagesSocialFun);
 	}
-	
+
+	public WagesSocialFun getByNameYearMonth(WagesSocialFun wagesSocialFun) {
+		return wagesSocialFunDao.getByNameYearMonth(wagesSocialFun);
+	}
+
 	@Transactional(readOnly = false)
 	public void save(WagesSocialFun wagesSocialFun) {
 		super.save(wagesSocialFun);
diff --git a/jsite-web/src/main/java/com/jsite/modules/wages/web/WagesSocialFunController.java b/jsite-web/src/main/java/com/jsite/modules/wages/web/WagesSocialFunController.java
index cee58fcc..481f92cf 100644
--- a/jsite-web/src/main/java/com/jsite/modules/wages/web/WagesSocialFunController.java
+++ b/jsite-web/src/main/java/com/jsite/modules/wages/web/WagesSocialFunController.java
@@ -145,12 +145,25 @@ public class WagesSocialFunController extends BaseController {
 		return renderResult(Global.TRUE, "社保公积金清零成功");
 	}
 
+	@RequiresPermissions("wages:wagesSocialFun:view")
+	@RequestMapping(value = "exportCheck")
+	@ResponseBody
+	public String exportCheck(String year, String month) {
+		List<WagesSocialFun> wagesSocialFuns = wagesSocialFunService.findList(new WagesSocialFun(year, month));
+		if (wagesSocialFuns.size() > 0) {
+			return renderResult(Global.TRUE, "导出检查成功");
+		}
+
+		return renderResult(Global.FALSE, "导出月份的公积金数据不存在，请检查！");
+	}
+
 	@RequiresPermissions("wages:wagesSocialFun:view")
 	@RequestMapping(value = "export")
-	public String export(HttpServletResponse response) {
+	public String export(String year, String month,HttpServletResponse response) {
 		try {
-			List<WagesSocialFun> wagesBaseInfos = wagesSocialFunService.findList(new WagesSocialFun());
-			new ExportExcel("社保公积金基础信息汇总", WagesSocialFun.class).setDataList(wagesBaseInfos).write(response, "社保公积金基础信息数据.xlsx").dispose();
+			List<WagesSocialFun> wagesSocialFuns = wagesSocialFunService.findList(new WagesSocialFun(year,month));
+			String fileName = year+"年"+month+"月"+"_员工公积金基础数据.xlsx";
+			new ExportExcel(year+"年"+month+"月"+"社保公积金基础信息汇总", WagesSocialFun.class).setDataList(wagesSocialFuns).write(response, fileName).dispose();
 			return null;
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -163,7 +176,7 @@ public class WagesSocialFunController extends BaseController {
 	public String importFileTemplate(HttpServletResponse response) {
 		try {
 			String fileName = "社保公积金基础信息数据导入模板.xlsx";
-			new ExportExcel("员工基础工资信息", WagesSocialFun.class, 2).write(response, fileName).dispose();
+			new ExportExcel("社保公积金基础信息", WagesSocialFun.class, 2).write(response, fileName).dispose();
 			return null;
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -185,12 +198,22 @@ public class WagesSocialFunController extends BaseController {
 			int failureNum = 0;
 			StringBuilder failureMsg = new StringBuilder();
 			Map<String, Object> fieldsMap = UploadUtils4.getInstance().initFields(request);
+			Map<String, String> fields = (Map<String, String>) fieldsMap.get(UploadUtils4.FORM_FIELDS);
+
 			FileItem fileItem = ((List<FileItem>) fieldsMap.get(UploadUtils4.FILE_FIELDS)).get(0);
 			ImportExcel ei = new ImportExcel(fileItem, 1, 0);
 			List<WagesSocialFun> list = ei.getDataList(WagesSocialFun.class);
 			for (WagesSocialFun wagesSocialFun : list) {
+				if (StringUtils.isBlank(wagesSocialFun.getUser().getId())) {
+					failureNum++;
+					failureMsg.append("<br/>姓名 " + wagesSocialFun.getUser().getName() + " 导入失败：用户不存在！");
+					continue;
+				}
 				try {
-					WagesSocialFun temp = wagesSocialFunService.getByEntity(wagesSocialFun);
+					wagesSocialFun.setYear(Integer.parseInt(fields.get("year")));
+					wagesSocialFun.setMonth(Integer.parseInt(fields.get("month")));
+
+					WagesSocialFun temp = wagesSocialFunService.getByNameYearMonth(wagesSocialFun);
 					if (temp != null) {
 						wagesSocialFun.setId(temp.getId());//存在则更新
 					}
diff --git a/jsite-web/src/main/resources/db/sys/jsite_sys.erm b/jsite-web/src/main/resources/db/sys/jsite_sys.erm
index acb93646..17703ff0 100644
--- a/jsite-web/src/main/resources/db/sys/jsite_sys.erm
+++ b/jsite-web/src/main/resources/db/sys/jsite_sys.erm
@@ -22,8 +22,8 @@
 	</page_setting>
 	<category_index>0</category_index>
 	<zoom>0.8</zoom>
-	<x>1012</x>
-	<y>-613</y>
+	<x>995</x>
+	<y>-544</y>
 	<default_color>
 		<r>128</r>
 		<g>128</g>
@@ -146,7 +146,7 @@
 			</connections>
 			<display>false</display>
 			<creation_date>2013-04-23 21:13:37</creation_date>
-			<updated_date>2019-05-27 12:04:50</updated_date>
+			<updated_date>2019-05-30 14:06:00</updated_date>
 			<model_property>
 				<name>Project Name</name>
 				<value>JeeSite</value>
@@ -1477,7 +1477,7 @@
 			<description>月份</description>
 			<logical_name>月份</logical_name>
 			<physical_name>month</physical_name>
-			<type>datetime</type>
+			<type>integer</type>
 		</word>
 		<word>
 			<id>81</id>
@@ -1897,6 +1897,22 @@
 		</word>
 		<word>
 			<id>107</id>
+			<length>64</length>
+			<decimal>null</decimal>
+			<array>false</array>
+			<array_dimension>null</array_dimension>
+			<unsigned>false</unsigned>
+			<zerofill>false</zerofill>
+			<binary>false</binary>
+			<args></args>
+			<char_semantics>false</char_semantics>
+			<description>所属项目编号</description>
+			<logical_name>所属项目编号</logical_name>
+			<physical_name>pro_id</physical_name>
+			<type>varchar(n)</type>
+		</word>
+		<word>
+			<id>108</id>
 			<length>255</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1912,7 +1928,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>108</id>
+			<id>109</id>
 			<length>255</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1928,7 +1944,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>109</id>
+			<id>110</id>
 			<length>1</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1944,7 +1960,7 @@
 			<type>character(n)</type>
 		</word>
 		<word>
-			<id>110</id>
+			<id>111</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1960,7 +1976,7 @@
 			<type>datetime</type>
 		</word>
 		<word>
-			<id>111</id>
+			<id>112</id>
 			<length>4</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -1976,7 +1992,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>112</id>
+			<id>113</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1992,7 +2008,7 @@
 			<type>char</type>
 		</word>
 		<word>
-			<id>113</id>
+			<id>114</id>
 			<length>255</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2008,7 +2024,7 @@
 			<type>nvarchar(n)</type>
 		</word>
 		<word>
-			<id>114</id>
+			<id>115</id>
 			<length>255</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2024,7 +2040,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>115</id>
+			<id>116</id>
 			<length>255</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2040,7 +2056,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>116</id>
+			<id>117</id>
 			<length>255</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2056,7 +2072,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>117</id>
+			<id>118</id>
 			<length>1</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2072,7 +2088,7 @@
 			<type>character(n)</type>
 		</word>
 		<word>
-			<id>118</id>
+			<id>119</id>
 			<length>255</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2088,7 +2104,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>119</id>
+			<id>120</id>
 			<length>6</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -2104,7 +2120,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>120</id>
+			<id>121</id>
 			<length>1</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2120,7 +2136,7 @@
 			<type>character(n)</type>
 		</word>
 		<word>
-			<id>121</id>
+			<id>122</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2136,7 +2152,7 @@
 			<type>datetime</type>
 		</word>
 		<word>
-			<id>122</id>
+			<id>123</id>
 			<length>1</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2152,7 +2168,7 @@
 			<type>character(n)</type>
 		</word>
 		<word>
-			<id>123</id>
+			<id>124</id>
 			<length>6</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -2168,7 +2184,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>124</id>
+			<id>125</id>
 			<length>8</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -2184,7 +2200,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>125</id>
+			<id>126</id>
 			<length>6</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -2200,7 +2216,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>126</id>
+			<id>127</id>
 			<length>10</length>
 			<decimal>0</decimal>
 			<array>false</array>
@@ -2216,7 +2232,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>127</id>
+			<id>128</id>
 			<length>10</length>
 			<decimal>0</decimal>
 			<array>false</array>
@@ -2232,7 +2248,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>128</id>
+			<id>129</id>
 			<length>20</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2248,7 +2264,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>129</id>
+			<id>130</id>
 			<length>500</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2264,7 +2280,7 @@
 			<type>nvarchar(n)</type>
 		</word>
 		<word>
-			<id>130</id>
+			<id>131</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2280,7 +2296,7 @@
 			<type>char</type>
 		</word>
 		<word>
-			<id>131</id>
+			<id>132</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2296,7 +2312,7 @@
 			<type>integer</type>
 		</word>
 		<word>
-			<id>132</id>
+			<id>133</id>
 			<length>1</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2312,7 +2328,7 @@
 			<type>character(n)</type>
 		</word>
 		<word>
-			<id>133</id>
+			<id>134</id>
 			<length>1</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2328,7 +2344,7 @@
 			<type>character(n)</type>
 		</word>
 		<word>
-			<id>134</id>
+			<id>135</id>
 			<length>1</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2344,7 +2360,7 @@
 			<type>character(n)</type>
 		</word>
 		<word>
-			<id>135</id>
+			<id>136</id>
 			<length>100</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2360,7 +2376,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>136</id>
+			<id>137</id>
 			<length>6</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -2376,7 +2392,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>137</id>
+			<id>138</id>
 			<length>6</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -2392,7 +2408,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>138</id>
+			<id>139</id>
 			<length>6</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -2408,7 +2424,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>139</id>
+			<id>140</id>
 			<length>255</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2424,7 +2440,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>140</id>
+			<id>141</id>
 			<length>64</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2440,7 +2456,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>141</id>
+			<id>142</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2456,7 +2472,7 @@
 			<type>datetime</type>
 		</word>
 		<word>
-			<id>142</id>
+			<id>143</id>
 			<length>32</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2472,7 +2488,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>143</id>
+			<id>144</id>
 			<length>64</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2488,7 +2504,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>144</id>
+			<id>145</id>
 			<length>64</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2504,7 +2520,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>145</id>
+			<id>146</id>
 			<length>255</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2520,7 +2536,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>146</id>
+			<id>147</id>
 			<length>64</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2536,7 +2552,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>147</id>
+			<id>148</id>
 			<length>1</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2552,7 +2568,7 @@
 			<type>character(n)</type>
 		</word>
 		<word>
-			<id>148</id>
+			<id>149</id>
 			<length>100</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2568,7 +2584,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>149</id>
+			<id>150</id>
 			<length>8</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -2584,7 +2600,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>150</id>
+			<id>151</id>
 			<length>8</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -2600,7 +2616,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>151</id>
+			<id>152</id>
 			<length>8</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -2616,7 +2632,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>152</id>
+			<id>153</id>
 			<length>8</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -2632,7 +2648,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>153</id>
+			<id>154</id>
 			<length>8</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -2648,7 +2664,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>154</id>
+			<id>155</id>
 			<length>8</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -2664,7 +2680,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>155</id>
+			<id>156</id>
 			<length>8</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -2680,7 +2696,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>156</id>
+			<id>157</id>
 			<length>8</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -2696,7 +2712,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>157</id>
+			<id>158</id>
 			<length>4</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -2712,7 +2728,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>158</id>
+			<id>159</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2728,7 +2744,23 @@
 			<type>integer</type>
 		</word>
 		<word>
-			<id>159</id>
+			<id>160</id>
+			<length>null</length>
+			<decimal>null</decimal>
+			<array>false</array>
+			<array_dimension>null</array_dimension>
+			<unsigned>false</unsigned>
+			<zerofill>false</zerofill>
+			<binary>false</binary>
+			<args></args>
+			<char_semantics>false</char_semantics>
+			<description>年份</description>
+			<logical_name>年份</logical_name>
+			<physical_name>year</physical_name>
+			<type>integer</type>
+		</word>
+		<word>
+			<id>161</id>
 			<length>100</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2837,7 +2869,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>128</word_id>
+					<word_id>129</word_id>
 					<id>14</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -3037,10 +3069,10 @@
 			<connections>
 				<relation>
 					<id>0</id>
-					<source>9</source>
+					<source>7</source>
 					<target>1</target>
-						<source_xp>100</source_xp>
-						<source_yp>76</source_yp>
+						<source_xp>0</source_xp>
+						<source_yp>85</source_yp>
 						<target_xp>-1</target_xp>
 						<target_yp>-1</target_yp>
 						<color>
@@ -3059,10 +3091,10 @@
 				</relation>
 				<relation>
 					<id>1</id>
-					<source>7</source>
+					<source>9</source>
 					<target>1</target>
-						<source_xp>0</source_xp>
-						<source_yp>85</source_yp>
+						<source_xp>100</source_xp>
+						<source_yp>76</source_yp>
 						<target_xp>-1</target_xp>
 						<target_yp>-1</target_yp>
 						<color>
@@ -3090,7 +3122,7 @@
 				<normal_column>
 					<id>18</id>
 					<referenced_column>36</referenced_column>
-					<relation>1</relation>
+					<relation>0</relation>
 					<description>角色编号</description>
 					<unique_key_name></unique_key_name>
 					<logical_name>角色编号</logical_name>
@@ -3124,7 +3156,7 @@
 				<normal_column>
 					<id>19</id>
 					<referenced_column>56</referenced_column>
-					<relation>0</relation>
+					<relation>1</relation>
 					<description>机构编号</description>
 					<unique_key_name></unique_key_name>
 					<logical_name>机构编号</logical_name>
@@ -3184,7 +3216,7 @@
 			<connections>
 				<relation>
 					<id>2</id>
-					<source>0</source>
+					<source>7</source>
 					<target>2</target>
 						<source_xp>-1</source_xp>
 						<source_yp>-1</source_yp>
@@ -3206,7 +3238,7 @@
 				</relation>
 				<relation>
 					<id>3</id>
-					<source>7</source>
+					<source>0</source>
 					<target>2</target>
 						<source_xp>-1</source_xp>
 						<source_yp>-1</source_yp>
@@ -3237,7 +3269,7 @@
 				<normal_column>
 					<id>20</id>
 					<referenced_column>36</referenced_column>
-					<relation>3</relation>
+					<relation>2</relation>
 					<description>角色编号</description>
 					<unique_key_name></unique_key_name>
 					<logical_name>角色编号</logical_name>
@@ -3271,7 +3303,7 @@
 				<normal_column>
 					<id>21</id>
 					<referenced_column>12</referenced_column>
-					<relation>2</relation>
+					<relation>3</relation>
 					<description>菜单编号</description>
 					<unique_key_name></unique_key_name>
 					<logical_name>菜单编号</logical_name>
@@ -3547,7 +3579,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>132</word_id>
+					<word_id>133</word_id>
 					<id>26</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -3688,7 +3720,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>148</word_id>
+					<word_id>149</word_id>
 					<id>28</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -3754,7 +3786,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>135</word_id>
+					<word_id>136</word_id>
 					<id>30</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -3820,7 +3852,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>127</word_id>
+					<word_id>128</word_id>
 					<id>32</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -3853,7 +3885,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>91</word_id>
+					<word_id>92</word_id>
 					<id>33</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -3954,10 +3986,10 @@
 			<connections>
 				<relation>
 					<id>4</id>
-					<source>7</source>
+					<source>14</source>
 					<target>6</target>
-						<source_xp>0</source_xp>
-						<source_yp>45</source_yp>
+						<source_xp>-1</source_xp>
+						<source_yp>-1</source_yp>
 						<target_xp>-1</target_xp>
 						<target_yp>-1</target_yp>
 						<color>
@@ -3976,10 +4008,10 @@
 				</relation>
 				<relation>
 					<id>5</id>
-					<source>14</source>
+					<source>7</source>
 					<target>6</target>
-						<source_xp>-1</source_xp>
-						<source_yp>-1</source_yp>
+						<source_xp>0</source_xp>
+						<source_yp>45</source_yp>
 						<target_xp>-1</target_xp>
 						<target_yp>-1</target_yp>
 						<color>
@@ -4007,7 +4039,7 @@
 				<normal_column>
 					<id>34</id>
 					<referenced_column>110</referenced_column>
-					<relation>5</relation>
+					<relation>4</relation>
 					<description>用户编号</description>
 					<unique_key_name></unique_key_name>
 					<logical_name>用户编号</logical_name>
@@ -4041,7 +4073,7 @@
 				<normal_column>
 					<id>35</id>
 					<referenced_column>36</referenced_column>
-					<relation>4</relation>
+					<relation>5</relation>
 					<description>角色编号</description>
 					<unique_key_name></unique_key_name>
 					<logical_name>角色编号</logical_name>
@@ -4240,7 +4272,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>118</word_id>
+					<word_id>119</word_id>
 					<id>40</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -4273,7 +4305,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>147</word_id>
+					<word_id>148</word_id>
 					<id>41</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -4372,7 +4404,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>143</word_id>
+					<word_id>144</word_id>
 					<id>44</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -4500,7 +4532,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>133</word_id>
+					<word_id>134</word_id>
 					<id>46</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -4533,7 +4565,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>129</word_id>
+					<word_id>130</word_id>
 					<id>47</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -4632,7 +4664,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>114</word_id>
+					<word_id>115</word_id>
 					<id>50</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -4665,7 +4697,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>145</word_id>
+					<word_id>146</word_id>
 					<id>51</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -4698,7 +4730,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>115</word_id>
+					<word_id>116</word_id>
 					<id>52</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -5040,7 +5072,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>134</word_id>
+					<word_id>135</word_id>
 					<id>59</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -5139,7 +5171,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>159</word_id>
+					<word_id>161</word_id>
 					<id>62</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -5304,7 +5336,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>144</word_id>
+					<word_id>145</word_id>
 					<id>67</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -5524,7 +5556,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>158</word_id>
+					<word_id>159</word_id>
 					<id>71</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -5590,7 +5622,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>157</word_id>
+					<word_id>158</word_id>
 					<id>73</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -5692,7 +5724,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>108</word_id>
+					<word_id>109</word_id>
 					<id>75</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -5725,7 +5757,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>109</word_id>
+					<word_id>110</word_id>
 					<id>76</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -6144,7 +6176,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>146</word_id>
+					<word_id>147</word_id>
 					<id>85</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -6375,7 +6407,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>120</word_id>
+					<word_id>121</word_id>
 					<id>92</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -6441,7 +6473,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>116</word_id>
+					<word_id>117</word_id>
 					<id>94</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -6474,7 +6506,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>117</word_id>
+					<word_id>118</word_id>
 					<id>95</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -6540,7 +6572,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>139</word_id>
+					<word_id>140</word_id>
 					<id>97</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -6705,7 +6737,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>142</word_id>
+					<word_id>143</word_id>
 					<id>102</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -6771,7 +6803,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>110</word_id>
+					<word_id>111</word_id>
 					<id>104</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -7381,7 +7413,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>147</word_id>
+					<word_id>148</word_id>
 					<id>120</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -7735,7 +7767,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>107</word_id>
+					<word_id>108</word_id>
 					<id>127</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -7802,7 +7834,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>158</word_id>
+					<word_id>159</word_id>
 					<id>129</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -7868,7 +7900,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>112</word_id>
+					<word_id>113</word_id>
 					<id>131</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -7901,7 +7933,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>157</word_id>
+					<word_id>158</word_id>
 					<id>132</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -8033,7 +8065,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>149</word_id>
+					<word_id>150</word_id>
 					<id>136</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -8066,7 +8098,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>151</word_id>
+					<word_id>152</word_id>
 					<id>137</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -8099,7 +8131,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>150</word_id>
+					<word_id>151</word_id>
 					<id>138</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -8297,7 +8329,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>155</word_id>
+					<word_id>156</word_id>
 					<id>144</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -8495,7 +8527,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>124</word_id>
+					<word_id>125</word_id>
 					<id>150</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -8528,7 +8560,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>153</word_id>
+					<word_id>154</word_id>
 					<id>151</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -8561,7 +8593,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>156</word_id>
+					<word_id>157</word_id>
 					<id>152</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -8594,7 +8626,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>152</word_id>
+					<word_id>153</word_id>
 					<id>153</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -8627,7 +8659,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>154</word_id>
+					<word_id>155</word_id>
 					<id>154</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -8851,7 +8883,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>110</word_id>
+					<word_id>111</word_id>
 					<id>159</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -8884,7 +8916,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>111</word_id>
+					<word_id>112</word_id>
 					<id>160</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -9130,12 +9162,12 @@
 		</table>
 		<table>
 			<id>17</id>
-			<height>639</height>
-			<width>292</width>
+			<height>735</height>
+			<width>448</width>
 				<font_name>Segoe UI</font_name>
 				<font_size>9</font_size>
-			<x>1260</x>
-			<y>-504</y>
+			<x>1592</x>
+			<y>-759</y>
 			<color>
 				<r>128</r>
 				<g>128</g>
@@ -9165,15 +9197,15 @@
 					<referenced_complex_unique_key>null</referenced_complex_unique_key>
 				</relation>
 			</connections>
-			<physical_name>wages_social_fun</physical_name>
-			<logical_name>社保公积金表</logical_name>
-			<description>社保公积金表</description>
+			<physical_name>wages_social_security</physical_name>
+			<logical_name>个人缴纳社保公积金表</logical_name>
+			<description>个人缴纳社保公积金表</description>
 			<constraint></constraint>
 			<primary_key_name></primary_key_name>
 			<option></option>
 			<columns>
 				<normal_column>
-					<word_id>51</word_id>
+					<word_id>52</word_id>
 					<id>167</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -9240,7 +9272,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>101</word_id>
+					<word_id>107</word_id>
 					<id>169</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -9251,7 +9283,7 @@
 					<default_value></default_value>
 					<auto_increment>false</auto_increment>
 					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
+					<not_null>true</not_null>
 					<primary_key>false</primary_key>
 					<unique_key>false</unique_key>
 					<character_set></character_set>
@@ -9273,13 +9305,13 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>43</word_id>
+					<word_id>159</word_id>
 					<id>170</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
-					<type>varchar(n)</type>
+					<type>integer</type>
 					<constraint></constraint>
 					<default_value></default_value>
 					<auto_increment>false</auto_increment>
@@ -9306,13 +9338,13 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>80</word_id>
+					<word_id>81</word_id>
 					<id>171</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
-					<type>datetime</type>
+					<type>integer</type>
 					<constraint></constraint>
 					<default_value></default_value>
 					<auto_increment>false</auto_increment>
@@ -9339,7 +9371,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>95</word_id>
+					<word_id>1</word_id>
 					<id>172</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -9347,7 +9379,7 @@
 					<physical_name></physical_name>
 					<type>decimal(p,s)</type>
 					<constraint></constraint>
-					<default_value>0</default_value>
+					<default_value></default_value>
 					<auto_increment>false</auto_increment>
 					<foreign_key>false</foreign_key>
 					<not_null>false</not_null>
@@ -9372,7 +9404,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>96</word_id>
+					<word_id>99</word_id>
 					<id>173</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -9380,10 +9412,10 @@
 					<physical_name></physical_name>
 					<type>decimal(p,s)</type>
 					<constraint></constraint>
-					<default_value>0</default_value>
+					<default_value></default_value>
 					<auto_increment>false</auto_increment>
 					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
+					<not_null>true</not_null>
 					<primary_key>false</primary_key>
 					<unique_key>false</unique_key>
 					<character_set></character_set>
@@ -9405,7 +9437,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>97</word_id>
+					<word_id>158</word_id>
 					<id>174</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -9413,7 +9445,7 @@
 					<physical_name></physical_name>
 					<type>decimal(p,s)</type>
 					<constraint></constraint>
-					<default_value>0</default_value>
+					<default_value></default_value>
 					<auto_increment>false</auto_increment>
 					<foreign_key>false</foreign_key>
 					<not_null>false</not_null>
@@ -9438,7 +9470,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>136</word_id>
+					<word_id>8</word_id>
 					<id>175</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -9446,7 +9478,7 @@
 					<physical_name></physical_name>
 					<type>decimal(p,s)</type>
 					<constraint></constraint>
-					<default_value>0</default_value>
+					<default_value></default_value>
 					<auto_increment>false</auto_increment>
 					<foreign_key>false</foreign_key>
 					<not_null>false</not_null>
@@ -9471,7 +9503,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>137</word_id>
+					<word_id>82</word_id>
 					<id>176</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -9479,7 +9511,7 @@
 					<physical_name></physical_name>
 					<type>decimal(p,s)</type>
 					<constraint></constraint>
-					<default_value>0</default_value>
+					<default_value></default_value>
 					<auto_increment>false</auto_increment>
 					<foreign_key>false</foreign_key>
 					<not_null>false</not_null>
@@ -9504,7 +9536,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>138</word_id>
+					<word_id>5</word_id>
 					<id>177</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -9512,7 +9544,7 @@
 					<physical_name></physical_name>
 					<type>decimal(p,s)</type>
 					<constraint></constraint>
-					<default_value>0</default_value>
+					<default_value></default_value>
 					<auto_increment>false</auto_increment>
 					<foreign_key>false</foreign_key>
 					<not_null>false</not_null>
@@ -9536,20 +9568,78 @@
 						<decimal_size>0</decimal_size>
 					</sequence>
 				</normal_column>
+				<column_group>0</column_group>
+			</columns>
+			<indexes>
+			</indexes>
+			<complex_unique_key_list>
+			</complex_unique_key_list>
+			<table_properties>
+				<schema></schema>
+				<character_set></character_set>
+				<collation></collation>
+				<storage_engine></storage_engine>
+				<primary_key_length_of_text>null</primary_key_length_of_text>
+			</table_properties>
+		</table>
+		<table>
+			<id>18</id>
+			<height>639</height>
+			<width>292</width>
+				<font_name>Segoe UI</font_name>
+				<font_size>9</font_size>
+			<x>1260</x>
+			<y>-504</y>
+			<color>
+				<r>128</r>
+				<g>128</g>
+				<b>192</b>
+			</color>
+			<connections>
+				<relation>
+					<id>13</id>
+					<source>14</source>
+					<target>18</target>
+						<source_xp>-1</source_xp>
+						<source_yp>-1</source_yp>
+						<target_xp>-1</target_xp>
+						<target_yp>-1</target_yp>
+						<color>
+							<r>0</r>
+							<g>0</g>
+							<b>0</b>
+						</color>
+					<child_cardinality>1..n</child_cardinality>
+					<parent_cardinality>1</parent_cardinality>
+					<reference_for_pk>true</reference_for_pk>
+					<name></name>
+					<on_delete_action>RESTRICT</on_delete_action>
+					<on_update_action>RESTRICT</on_update_action>
+					<referenced_column>null</referenced_column>
+					<referenced_complex_unique_key>null</referenced_complex_unique_key>
+				</relation>
+			</connections>
+			<physical_name>wages_social_fun</physical_name>
+			<logical_name>社保公积金表</logical_name>
+			<description>社保公积金表</description>
+			<constraint></constraint>
+			<primary_key_name></primary_key_name>
+			<option></option>
+			<columns>
 				<normal_column>
-					<word_id>75</word_id>
+					<word_id>51</word_id>
 					<id>178</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
-					<type>decimal(p,s)</type>
+					<type>varchar(n)</type>
 					<constraint></constraint>
-					<default_value>0</default_value>
+					<default_value></default_value>
 					<auto_increment>false</auto_increment>
 					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
+					<not_null>true</not_null>
+					<primary_key>true</primary_key>
 					<unique_key>false</unique_key>
 					<character_set></character_set>
 					<collation></collation>
@@ -9570,18 +9660,19 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>76</word_id>
 					<id>179</id>
-					<description></description>
+					<referenced_column>110</referenced_column>
+					<relation>13</relation>
+					<description>用户ID</description>
 					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>decimal(p,s)</type>
+					<logical_name>用户ID</logical_name>
+					<physical_name>user_id</physical_name>
+					<type>varchar(n)</type>
 					<constraint></constraint>
-					<default_value>0</default_value>
+					<default_value></default_value>
 					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
+					<foreign_key>true</foreign_key>
+					<not_null>true</not_null>
 					<primary_key>false</primary_key>
 					<unique_key>false</unique_key>
 					<character_set></character_set>
@@ -9603,15 +9694,15 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>77</word_id>
+					<word_id>101</word_id>
 					<id>180</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
-					<type>decimal(p,s)</type>
+					<type>varchar(n)</type>
 					<constraint></constraint>
-					<default_value>0</default_value>
+					<default_value></default_value>
 					<auto_increment>false</auto_increment>
 					<foreign_key>false</foreign_key>
 					<not_null>false</not_null>
@@ -9636,15 +9727,15 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>14</word_id>
+					<word_id>43</word_id>
 					<id>181</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
-					<type>decimal(p,s)</type>
+					<type>varchar(n)</type>
 					<constraint></constraint>
-					<default_value>0</default_value>
+					<default_value></default_value>
 					<auto_increment>false</auto_increment>
 					<foreign_key>false</foreign_key>
 					<not_null>false</not_null>
@@ -9669,15 +9760,15 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>15</word_id>
+					<word_id>160</word_id>
 					<id>182</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
-					<type>decimal(p,s)</type>
+					<type>integer</type>
 					<constraint></constraint>
-					<default_value>0</default_value>
+					<default_value></default_value>
 					<auto_increment>false</auto_increment>
 					<foreign_key>false</foreign_key>
 					<not_null>false</not_null>
@@ -9702,15 +9793,15 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>54</word_id>
+					<word_id>80</word_id>
 					<id>183</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
-					<type>decimal(p,s)</type>
+					<type>integer</type>
 					<constraint></constraint>
-					<default_value>0</default_value>
+					<default_value></default_value>
 					<auto_increment>false</auto_increment>
 					<foreign_key>false</foreign_key>
 					<not_null>false</not_null>
@@ -9735,7 +9826,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>55</word_id>
+					<word_id>95</word_id>
 					<id>184</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -9768,7 +9859,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>16</word_id>
+					<word_id>96</word_id>
 					<id>185</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -9801,7 +9892,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>17</word_id>
+					<word_id>97</word_id>
 					<id>186</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -9834,7 +9925,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>125</word_id>
+					<word_id>137</word_id>
 					<id>187</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -9867,7 +9958,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>123</word_id>
+					<word_id>138</word_id>
 					<id>188</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -9900,7 +9991,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>44</word_id>
+					<word_id>139</word_id>
 					<id>189</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -9933,13 +10024,13 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>42</word_id>
+					<word_id>75</word_id>
 					<id>190</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
-					<type>double precision(m,d)</type>
+					<type>decimal(p,s)</type>
 					<constraint></constraint>
 					<default_value>0</default_value>
 					<auto_increment>false</auto_increment>
@@ -9966,7 +10057,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>45</word_id>
+					<word_id>76</word_id>
 					<id>191</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -9999,7 +10090,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>119</word_id>
+					<word_id>77</word_id>
 					<id>192</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -10032,15 +10123,15 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>29</word_id>
+					<word_id>14</word_id>
 					<id>193</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
-					<type>varchar(n)</type>
+					<type>decimal(p,s)</type>
 					<constraint></constraint>
-					<default_value></default_value>
+					<default_value>0</default_value>
 					<auto_increment>false</auto_increment>
 					<foreign_key>false</foreign_key>
 					<not_null>false</not_null>
@@ -10065,15 +10156,15 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>121</word_id>
+					<word_id>15</word_id>
 					<id>194</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
-					<type>datetime</type>
+					<type>decimal(p,s)</type>
 					<constraint></constraint>
-					<default_value></default_value>
+					<default_value>0</default_value>
 					<auto_increment>false</auto_increment>
 					<foreign_key>false</foreign_key>
 					<not_null>false</not_null>
@@ -10098,15 +10189,15 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>41</word_id>
+					<word_id>54</word_id>
 					<id>195</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
-					<type>datetime</type>
+					<type>decimal(p,s)</type>
 					<constraint></constraint>
-					<default_value></default_value>
+					<default_value>0</default_value>
 					<auto_increment>false</auto_increment>
 					<foreign_key>false</foreign_key>
 					<not_null>false</not_null>
@@ -10131,15 +10222,15 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>122</word_id>
+					<word_id>55</word_id>
 					<id>196</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
-					<type>character(n)</type>
+					<type>decimal(p,s)</type>
 					<constraint></constraint>
-					<default_value></default_value>
+					<default_value>0</default_value>
 					<auto_increment>false</auto_increment>
 					<foreign_key>false</foreign_key>
 					<not_null>false</not_null>
@@ -10163,100 +10254,20 @@
 						<decimal_size>0</decimal_size>
 					</sequence>
 				</normal_column>
-				<column_group>0</column_group>
-			</columns>
-			<indexes>
-			</indexes>
-			<complex_unique_key_list>
-			</complex_unique_key_list>
-			<table_properties>
-				<schema></schema>
-				<character_set></character_set>
-				<collation></collation>
-				<storage_engine></storage_engine>
-				<primary_key_length_of_text>null</primary_key_length_of_text>
-			</table_properties>
-		</table>
-		<table>
-			<id>18</id>
-			<height>735</height>
-			<width>448</width>
-				<font_name>Segoe UI</font_name>
-				<font_size>9</font_size>
-			<x>1592</x>
-			<y>-759</y>
-			<color>
-				<r>128</r>
-				<g>128</g>
-				<b>192</b>
-			</color>
-			<connections>
-				<relation>
-					<id>13</id>
-					<source>14</source>
-					<target>18</target>
-						<source_xp>-1</source_xp>
-						<source_yp>-1</source_yp>
-						<target_xp>-1</target_xp>
-						<target_yp>-1</target_yp>
-						<color>
-							<r>0</r>
-							<g>0</g>
-							<b>0</b>
-						</color>
-					<child_cardinality>1..n</child_cardinality>
-					<parent_cardinality>1</parent_cardinality>
-					<reference_for_pk>true</reference_for_pk>
-					<name></name>
-					<on_delete_action>RESTRICT</on_delete_action>
-					<on_update_action>RESTRICT</on_update_action>
-					<referenced_column>null</referenced_column>
-					<referenced_complex_unique_key>null</referenced_complex_unique_key>
-				</relation>
-				<relation>
-					<id>14</id>
-					<source>11</source>
-					<target>18</target>
-						<source_xp>-1</source_xp>
-						<source_yp>-1</source_yp>
-						<target_xp>-1</target_xp>
-						<target_yp>-1</target_yp>
-						<color>
-							<r>0</r>
-							<g>0</g>
-							<b>0</b>
-						</color>
-					<child_cardinality>1..n</child_cardinality>
-					<parent_cardinality>1</parent_cardinality>
-					<reference_for_pk>true</reference_for_pk>
-					<name></name>
-					<on_delete_action>RESTRICT</on_delete_action>
-					<on_update_action>RESTRICT</on_update_action>
-					<referenced_column>null</referenced_column>
-					<referenced_complex_unique_key>null</referenced_complex_unique_key>
-				</relation>
-			</connections>
-			<physical_name>wages_social_security</physical_name>
-			<logical_name>个人缴纳社保公积金表</logical_name>
-			<description>个人缴纳社保公积金表</description>
-			<constraint></constraint>
-			<primary_key_name></primary_key_name>
-			<option></option>
-			<columns>
 				<normal_column>
-					<word_id>52</word_id>
+					<word_id>16</word_id>
 					<id>197</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
-					<type>varchar(n)</type>
+					<type>decimal(p,s)</type>
 					<constraint></constraint>
-					<default_value></default_value>
+					<default_value>0</default_value>
 					<auto_increment>false</auto_increment>
 					<foreign_key>false</foreign_key>
-					<not_null>true</not_null>
-					<primary_key>true</primary_key>
+					<not_null>false</not_null>
+					<primary_key>false</primary_key>
 					<unique_key>false</unique_key>
 					<character_set></character_set>
 					<collation></collation>
@@ -10277,19 +10288,18 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
+					<word_id>17</word_id>
 					<id>198</id>
-					<referenced_column>110</referenced_column>
-					<relation>13</relation>
-					<description>用户ID</description>
+					<description></description>
 					<unique_key_name></unique_key_name>
-					<logical_name>用户ID</logical_name>
-					<physical_name>user_id</physical_name>
-					<type>varchar(n)</type>
+					<logical_name></logical_name>
+					<physical_name></physical_name>
+					<type>decimal(p,s)</type>
 					<constraint></constraint>
-					<default_value></default_value>
+					<default_value>0</default_value>
 					<auto_increment>false</auto_increment>
-					<foreign_key>true</foreign_key>
-					<not_null>true</not_null>
+					<foreign_key>false</foreign_key>
+					<not_null>false</not_null>
 					<primary_key>false</primary_key>
 					<unique_key>false</unique_key>
 					<character_set></character_set>
@@ -10311,19 +10321,18 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
+					<word_id>126</word_id>
 					<id>199</id>
-					<referenced_column>74</referenced_column>
-					<relation>14</relation>
-					<description>所属项目编号</description>
+					<description></description>
 					<unique_key_name></unique_key_name>
-					<logical_name>所属项目编号</logical_name>
-					<physical_name>pro_id</physical_name>
-					<type>varchar(n)</type>
+					<logical_name></logical_name>
+					<physical_name></physical_name>
+					<type>decimal(p,s)</type>
 					<constraint></constraint>
-					<default_value></default_value>
+					<default_value>0</default_value>
 					<auto_increment>false</auto_increment>
-					<foreign_key>true</foreign_key>
-					<not_null>true</not_null>
+					<foreign_key>false</foreign_key>
+					<not_null>false</not_null>
 					<primary_key>false</primary_key>
 					<unique_key>false</unique_key>
 					<character_set></character_set>
@@ -10345,15 +10354,15 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>158</word_id>
+					<word_id>124</word_id>
 					<id>200</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
-					<type>integer</type>
+					<type>decimal(p,s)</type>
 					<constraint></constraint>
-					<default_value></default_value>
+					<default_value>0</default_value>
 					<auto_increment>false</auto_increment>
 					<foreign_key>false</foreign_key>
 					<not_null>false</not_null>
@@ -10378,15 +10387,15 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>81</word_id>
+					<word_id>44</word_id>
 					<id>201</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
-					<type>integer</type>
+					<type>decimal(p,s)</type>
 					<constraint></constraint>
-					<default_value></default_value>
+					<default_value>0</default_value>
 					<auto_increment>false</auto_increment>
 					<foreign_key>false</foreign_key>
 					<not_null>false</not_null>
@@ -10411,15 +10420,15 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>1</word_id>
+					<word_id>42</word_id>
 					<id>202</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
-					<type>decimal(p,s)</type>
+					<type>double precision(m,d)</type>
 					<constraint></constraint>
-					<default_value></default_value>
+					<default_value>0</default_value>
 					<auto_increment>false</auto_increment>
 					<foreign_key>false</foreign_key>
 					<not_null>false</not_null>
@@ -10444,7 +10453,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>99</word_id>
+					<word_id>45</word_id>
 					<id>203</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -10452,10 +10461,10 @@
 					<physical_name></physical_name>
 					<type>decimal(p,s)</type>
 					<constraint></constraint>
-					<default_value></default_value>
+					<default_value>0</default_value>
 					<auto_increment>false</auto_increment>
 					<foreign_key>false</foreign_key>
-					<not_null>true</not_null>
+					<not_null>false</not_null>
 					<primary_key>false</primary_key>
 					<unique_key>false</unique_key>
 					<character_set></character_set>
@@ -10477,7 +10486,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>157</word_id>
+					<word_id>120</word_id>
 					<id>204</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -10485,7 +10494,7 @@
 					<physical_name></physical_name>
 					<type>decimal(p,s)</type>
 					<constraint></constraint>
-					<default_value></default_value>
+					<default_value>0</default_value>
 					<auto_increment>false</auto_increment>
 					<foreign_key>false</foreign_key>
 					<not_null>false</not_null>
@@ -10510,13 +10519,13 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>8</word_id>
+					<word_id>29</word_id>
 					<id>205</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
-					<type>decimal(p,s)</type>
+					<type>varchar(n)</type>
 					<constraint></constraint>
 					<default_value></default_value>
 					<auto_increment>false</auto_increment>
@@ -10543,13 +10552,13 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>82</word_id>
+					<word_id>122</word_id>
 					<id>206</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
-					<type>decimal(p,s)</type>
+					<type>datetime</type>
 					<constraint></constraint>
 					<default_value></default_value>
 					<auto_increment>false</auto_increment>
@@ -10576,13 +10585,46 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>5</word_id>
+					<word_id>41</word_id>
 					<id>207</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
-					<type>decimal(p,s)</type>
+					<type>datetime</type>
+					<constraint></constraint>
+					<default_value></default_value>
+					<auto_increment>false</auto_increment>
+					<foreign_key>false</foreign_key>
+					<not_null>false</not_null>
+					<primary_key>false</primary_key>
+					<unique_key>false</unique_key>
+					<character_set></character_set>
+					<collation></collation>
+					<sequence>
+						<name></name>
+						<schema></schema>
+						<increment></increment>
+						<min_value></min_value>
+						<max_value></max_value>
+						<start></start>
+						<cache></cache>
+						<nocache>false</nocache>
+						<cycle>false</cycle>
+						<order>false</order>
+						<description></description>
+						<data_type></data_type>
+						<decimal_size>0</decimal_size>
+					</sequence>
+				</normal_column>
+				<normal_column>
+					<word_id>123</word_id>
+					<id>208</id>
+					<description></description>
+					<unique_key_name></unique_key_name>
+					<logical_name></logical_name>
+					<physical_name></physical_name>
+					<type>character(n)</type>
 					<constraint></constraint>
 					<default_value></default_value>
 					<auto_increment>false</auto_increment>
@@ -10695,7 +10737,7 @@
 						</sequence>
 					</normal_column>
 					<normal_column>
-						<word_id>140</word_id>
+						<word_id>141</word_id>
 						<id>2</id>
 						<description></description>
 						<unique_key_name></unique_key_name>
@@ -10728,7 +10770,7 @@
 						</sequence>
 					</normal_column>
 					<normal_column>
-						<word_id>141</word_id>
+						<word_id>142</word_id>
 						<id>3</id>
 						<description></description>
 						<unique_key_name></unique_key_name>
@@ -10761,7 +10803,7 @@
 						</sequence>
 					</normal_column>
 					<normal_column>
-						<word_id>113</word_id>
+						<word_id>114</word_id>
 						<id>4</id>
 						<description></description>
 						<unique_key_name></unique_key_name>
@@ -10833,7 +10875,7 @@
 				<group_name>tree_fild</group_name>
 				<columns>
 					<normal_column>
-						<word_id>92</word_id>
+						<word_id>91</word_id>
 						<id>6</id>
 						<description></description>
 						<unique_key_name></unique_key_name>
@@ -10932,7 +10974,7 @@
 						</sequence>
 					</normal_column>
 					<normal_column>
-						<word_id>126</word_id>
+						<word_id>127</word_id>
 						<id>9</id>
 						<description></description>
 						<unique_key_name></unique_key_name>
@@ -10965,7 +11007,7 @@
 						</sequence>
 					</normal_column>
 					<normal_column>
-						<word_id>130</word_id>
+						<word_id>131</word_id>
 						<id>10</id>
 						<description></description>
 						<unique_key_name></unique_key_name>
@@ -10998,7 +11040,7 @@
 						</sequence>
 					</normal_column>
 					<normal_column>
-						<word_id>131</word_id>
+						<word_id>132</word_id>
 						<id>11</id>
 						<description></description>
 						<unique_key_name></unique_key_name>
diff --git a/jsite-web/src/main/resources/db/sys/jsite_sys_mysql.sql b/jsite-web/src/main/resources/db/sys/jsite_sys_mysql.sql
index 6d5a7cb9..68bd5c9e 100644
--- a/jsite-web/src/main/resources/db/sys/jsite_sys_mysql.sql
+++ b/jsite-web/src/main/resources/db/sys/jsite_sys_mysql.sql
@@ -636,8 +636,10 @@ CREATE TABLE wages_social_fun
 	person_num varchar(64) COMMENT '个人编号',
 	-- 公积金编号
 	fund_num varchar(64) COMMENT '公积金编号',
+	-- 年份
+	year int COMMENT '年份',
 	-- 月份
-	month datetime COMMENT '月份',
+	month int COMMENT '月份',
 	-- 养老缴费基数
 	pension_base decimal(6,2) DEFAULT 0 COMMENT '养老缴费基数',
 	-- 养老单位本金19%
diff --git a/jsite-web/src/main/resources/mappings/modules/wages/WagesSocialFunDao.xml b/jsite-web/src/main/resources/mappings/modules/wages/WagesSocialFunDao.xml
index 4913174f..1219ec23 100644
--- a/jsite-web/src/main/resources/mappings/modules/wages/WagesSocialFunDao.xml
+++ b/jsite-web/src/main/resources/mappings/modules/wages/WagesSocialFunDao.xml
@@ -7,6 +7,7 @@
 		a.user_id AS "user.id",
 		a.person_num AS "personNum",
 		a.fund_num AS "fundNum",
+		a.year AS "year",
 		a.month AS "month",
 		a.pension_base AS "pensionBase",
 		a.pension_company AS "pensionCompany",
@@ -56,21 +57,29 @@
 		WHERE a.id = #{id}
 	</select>
 
-	<select id="getByEntity" resultType="WagesSocialFun">
+	<select id="getByNameYearMonth" resultType="WagesSocialFun">
 		SELECT
 		<include refid="wagesSocialFunColumns"/>
-		FROM wages_social_fun a
+		FROM wages_social_security a
 		<include refid="wagesSocialFunJoins"/>
-		<where>
-			a.del_flag = #{DEL_FLAG_NORMAL}
-			<if test="id != null and id != ''">
-				AND a.id = #{id}
-			</if>
-			<if test="user != null and user.id != null and user.id != ''">
-				AND a.user_id = #{user.id}
-			</if>
-		</where>
+		WHERE a.user_id = #{user.id} AND a.year = #{year} AND a.month = #{month} AND a.del_flag = #{DEL_FLAG_NORMAL}
 	</select>
+
+	<!--<select id="getByEntity" resultType="WagesSocialFun">-->
+		<!--SELECT-->
+		<!--<include refid="wagesSocialFunColumns"/>-->
+		<!--FROM wages_social_fun a-->
+		<!--<include refid="wagesSocialFunJoins"/>-->
+		<!--<where>-->
+			<!--a.del_flag = #{DEL_FLAG_NORMAL}-->
+			<!--<if test="id != null and id != ''">-->
+				<!--AND a.id = #{id}-->
+			<!--</if>-->
+			<!--<if test="user != null and user.id != null and user.id != ''">-->
+				<!--AND a.user_id = #{user.id}-->
+			<!--</if>-->
+		<!--</where>-->
+	<!--</select>-->
 	
 	<select id="findList" resultType="WagesSocialFun">
 		SELECT 
@@ -88,9 +97,11 @@
 			<if test="socialFundStatus != null and socialFundStatus != ''">
 				AND a.social_fund_status = #{socialFundStatus}
 			</if>
-			<if test="month != null">
-				AND year(a.month) = year(#{month})
-				AND month(a.month) = month(#{month})
+			<if test="year != null and year != ''">
+				AND a.year = #{year}
+			</if>
+			<if test="month != null and month != ''">
+				AND a.month = #{month}
 			</if>
 			<if test="fundNum != null and fundNum != ''">
 				AND a.fund_num LIKE 
@@ -133,6 +144,7 @@
 			user_id,
 			person_num,
 			fund_num,
+			year,
 			month,
 			pension_base,
 			pension_company,
@@ -170,6 +182,7 @@
 			#{user.id},
 			#{personNum},
 			#{fundNum},
+			#{year},
 			#{month},
 			#{pensionBase},
 			#{pensionCompany},
@@ -210,6 +223,7 @@
 			user_id = #{user.id},
 			person_num = #{personNum},
 			fund_num = #{fundNum},
+			year = #{year},
 			month = #{month},
 			pension_base = #{pensionBase},
 			pension_company = #{pensionCompany},
diff --git a/jsite-web/src/main/resources/views/modules/wages/wagesSocialFunForm.html b/jsite-web/src/main/resources/views/modules/wages/wagesSocialFunForm.html
index 80fab6ce..d64cd23c 100644
--- a/jsite-web/src/main/resources/views/modules/wages/wagesSocialFunForm.html
+++ b/jsite-web/src/main/resources/views/modules/wages/wagesSocialFunForm.html
@@ -46,14 +46,25 @@
 							</div>
 						</div>
 					</div>
+				</div>
+				<div class="row">
+					<div class="col-xs-6">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">
+								<span class="required hide">*</span> 年份：<i class="fa icon-question hide"></i>
+							</label>
+							<div class="col-sm-8">
+								<#form:select path="year" name="label" data="getDictList:year" class="form-control required " />
+							</div>
+						</div>
+					</div>
 					<div class="col-xs-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="">
-							 月份：
+								<span class="required hide">*</span> 月份：<i class="fa icon-question hide"></i>
 							</label>
 							<div class="col-sm-8">
-								<input id="month" type="text" name="month" maxlength="20" readonly="readonly" class="form-control  "
-										value="${wagesSocialFun.month}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});" />
+								<#form:select path="month" name="label" data="getDictList:month" class="form-control required " />
 							</div>
 						</div>
 					</div>
diff --git a/jsite-web/src/main/resources/views/modules/wages/wagesSocialFunList.html b/jsite-web/src/main/resources/views/modules/wages/wagesSocialFunList.html
index adc1b948..9dd9dce1 100644
--- a/jsite-web/src/main/resources/views/modules/wages/wagesSocialFunList.html
+++ b/jsite-web/src/main/resources/views/modules/wages/wagesSocialFunList.html
@@ -15,7 +15,7 @@
 						<i class="fa fa-navicon"></i> <span class="caret"></span>
 					</a>
 					<ul class="dropdown-menu">
-						<li><a href="${ctx}/wages/wagesSocialFun/export" id="btnExport"><i class="glyphicon glyphicon-export"></i> 导出</a></li>
+						<li><a href="javascript:" id="btnExport"><i class="glyphicon glyphicon-export"></i> 导出</a></li>
 						<li><a href="javascript:" id="btnImport"><i class="glyphicon glyphicon-import"></i> 导入</a></li>
 					</ul>
 				</div>
@@ -37,11 +37,16 @@
 						<#form:treeselect  id="office" name="user.office.id" title="部门选择" url="/sys/office/treeData?type=2" btnClass="btn-sm" allowClear="true" canSelectParent="true"/>
 					</div>
 				</div>
+				<div class="form-group">
+					<label class="control-label">年份：</label>
+					<div class="control-inline">
+						<#form:select path="year" name="label" data="getDictList:year" class="form-control " />
+					</div>
+				</div>
 				<div class="form-group">
 					<label class="control-label">月份：</label>
 					<div class="control-inline">
-						<input id="month" name="month" maxlength="20" readonly="readonly" class="form-control "
-							   value="" onclick="WdatePicker({dateFmt:'yyyy-MM',isShowClear:true});" />
+						<#form:select path="month" name="label" data="getDictList:month" class="form-control " />
 					</div>
 				</div>
 				<div class="form-group">
@@ -69,6 +74,7 @@ $('#dataGrid').dataGrid({
 	columnModel: [
 		{header:'用户', name:'user.name', index:'a.name', width:90, align:"center"},
 		{header:'公积金编号', name:'fundNum', index:'a.fund_num', width:90, align:"center"},
+		{header:'年份', name:'year', index:'a.year', width:90, align:"center"},
 		{header:'月份', name:'month', index:'a.month', width:90, align:"center"},
 		// {header:'养老单位本金', name:'pensionCompany', index:'a.pension_company', width:90, align:"center"},
 		// {header:'养老个人本金', name:'pensionPersonal', index:'a.pension_personal', width:90, align:"center"},
@@ -113,6 +119,8 @@ $('#dataGrid').dataGrid({
 <script type="text/javascript">
 	$('#reset').click(function(){
 		$('#userid').val(null).trigger("change");
+		$('#year').val(null).trigger("change");
+		$('#month').val(null).trigger("change");
 		$('#officeId').val(null);
 		$('#socialFundStatus').val(null).trigger("change");
 	});
@@ -130,17 +138,25 @@ $('#dataGrid').dataGrid({
 			yes: function(index, layero){
 				var form = {
 					inputForm: layero.find('#inputForm'),
-					file: layero.find('#file').val()
+					file: layero.find('#file').val(),
+					year: layero.find('#year').val(),
+					month: layero.find('#month').val()
 				};
 				js.print(form);
 
+				if (form.year == '' || form.month == ''){
+					js.showMessage("年份或月份不能为空！", null, 'warning');
+					return false;
+				}
 				if (form.file == '' || (!js.endWith(form.file, '.xls') && !js.endWith(form.file, '.xlsx'))){
 					js.showMessage("文件不正确，请选择后缀为 “xls”或“xlsx”的文件。", null, 'warning');
 					return false;
 				}
+
+				js.layer.closeAll();
 				js.ajaxSubmitForm(form.inputForm, function(data){
 					console.log(data);
-					js.layer.closeAll();
+
 					if (data.result == "true") {
 						js.showMessage(data.message);
 					} else {
@@ -158,6 +174,24 @@ $('#dataGrid').dataGrid({
 <script id="importTpl" type="text">//<!--
 <form id="inputForm" action="${ctx}/wages/wagesSocialFun/import" method="post" enctype="multipart/form-data"
 	class="form-horizontal mt20 mb10" style="overflow:auto;max-height:200px;">
+    <div class="row">
+					<div class="col-xs-5 col-xs-offset-1">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">年份:</label>
+							<div class="col-sm-8">
+								<#form:select path="year" name="label" data="getDictList:year" class="form-control width-90" />
+							</div>
+						</div>
+					</div>
+					<div class="col-xs-5">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">月份:</label>
+							<div class="col-sm-8">
+								<#form:select path="month" name="label" data="getDictList:month" class="form-control width-90" />
+							</div>
+						</div>
+					</div>
+				</div>
 	<div class="row">
 		<div class="col-xs-12 col-xs-offset-1">
 			<input type="file" id="file" name="file" class="form-file"/>
@@ -170,4 +204,70 @@ $('#dataGrid').dataGrid({
 		</div>
 	</div>
 </form>
+//--></script>
+
+
+<script type="text/javascript">
+	$('#btnExport').click(function(){
+		js.layer.open({
+			type: 1,
+			area: ['400px'],
+			title: '导出社保公积金基础数据',
+			resize: false,
+			scrollbar: true,
+			content: js.formatHtml('exportTpl'),
+			btn: ['<i class="fa fa-check"></i> 导出',
+				'<i class="fa fa-remove"></i> 取消'],
+			yes: function(index, layero){
+				var form = {
+					inputForm: layero.find('#inputForm'),
+					year: layero.find('#year').val(),
+					month: layero.find('#month').val()
+				};
+				if (form.year == '' || form.month == ''){
+					js.showMessage("年份或月份不能为空！", null, 'warning');
+					return false;
+				}
+
+				js.ajaxRequest("${ctx}/wages/wagesSocialFun/exportCheck",
+						{year:form.year, month:form.month}, function (data) {
+							if (data.result == "true") {
+								form.inputForm.submit();
+							} else {
+								js.showErrorMessage(data.message);
+							}
+
+						});
+
+				js.layer.closeAll();
+				return true;
+			},
+			btn2: function(index, layero){
+			}
+		});
+	});
+</script>
+
+<script id="exportTpl" type="text">//<!--
+<form id="inputForm" action="${ctx}/wages/wagesSocialFun/export" method="post"
+	class="form-horizontal mt20 mb10" style="overflow:auto;max-height:200px;">
+<div class="row">
+					<div class="col-xs-5 col-xs-offset-1">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">年份:</label>
+							<div class="col-sm-8">
+								<#form:select path="year" name="label" data="getDictList:year" class="form-control width-90" />
+							</div>
+						</div>
+					</div>
+					<div class="col-xs-5">
+						<div class="form-group">
+							<label class="control-label col-sm-4" title="">月份:</label>
+							<div class="col-sm-8">
+								<#form:select path="month" name="label" data="getDictList:month" class="form-control width-90" />
+							</div>
+						</div>
+					</div>
+				</div>
+</form>
 //--></script>
\ No newline at end of file
-- 
Gitee


From ce30637881935bff116013dee11da14c82f89b2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E6=96=B0=E5=85=83?= <xxy554518704176@gmail.com>
Date: Thu, 30 May 2019 17:20:27 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E7=A4=BE=E4=BF=9D=E5=85=AC=E7=A7=AF?=
 =?UTF-8?q?=E9=87=91=E5=A4=A7=E8=A1=A8=E5=AF=BC=E5=87=BAbug=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsite/modules/wages/web/WagesSocialFunController.java | 4 ++--
 .../resources/mappings/modules/wages/WagesSocialFunDao.xml    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jsite-web/src/main/java/com/jsite/modules/wages/web/WagesSocialFunController.java b/jsite-web/src/main/java/com/jsite/modules/wages/web/WagesSocialFunController.java
index 481f92cf..681c25d0 100644
--- a/jsite-web/src/main/java/com/jsite/modules/wages/web/WagesSocialFunController.java
+++ b/jsite-web/src/main/java/com/jsite/modules/wages/web/WagesSocialFunController.java
@@ -154,7 +154,7 @@ public class WagesSocialFunController extends BaseController {
 			return renderResult(Global.TRUE, "导出检查成功");
 		}
 
-		return renderResult(Global.FALSE, "导出月份的公积金数据不存在，请检查！");
+		return renderResult(Global.FALSE, "导出月份的社保公积金基础数据不存在，请检查！");
 	}
 
 	@RequiresPermissions("wages:wagesSocialFun:view")
@@ -162,7 +162,7 @@ public class WagesSocialFunController extends BaseController {
 	public String export(String year, String month,HttpServletResponse response) {
 		try {
 			List<WagesSocialFun> wagesSocialFuns = wagesSocialFunService.findList(new WagesSocialFun(year,month));
-			String fileName = year+"年"+month+"月"+"_员工公积金基础数据.xlsx";
+			String fileName = year+"年"+month+"月"+"-员工公积金基础数据.xlsx";
 			new ExportExcel(year+"年"+month+"月"+"社保公积金基础信息汇总", WagesSocialFun.class).setDataList(wagesSocialFuns).write(response, fileName).dispose();
 			return null;
 		} catch (Exception e) {
diff --git a/jsite-web/src/main/resources/mappings/modules/wages/WagesSocialFunDao.xml b/jsite-web/src/main/resources/mappings/modules/wages/WagesSocialFunDao.xml
index 1219ec23..d74a1896 100644
--- a/jsite-web/src/main/resources/mappings/modules/wages/WagesSocialFunDao.xml
+++ b/jsite-web/src/main/resources/mappings/modules/wages/WagesSocialFunDao.xml
@@ -60,7 +60,7 @@
 	<select id="getByNameYearMonth" resultType="WagesSocialFun">
 		SELECT
 		<include refid="wagesSocialFunColumns"/>
-		FROM wages_social_security a
+		FROM wages_social_fun a
 		<include refid="wagesSocialFunJoins"/>
 		WHERE a.user_id = #{user.id} AND a.year = #{year} AND a.month = #{month} AND a.del_flag = #{DEL_FLAG_NORMAL}
 	</select>
-- 
Gitee


From 4a53596f2391aeca69b81c4a7953bf1f7bdc4e79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E6=96=B0=E5=85=83?= <xxy554518704176@gmail.com>
Date: Fri, 31 May 2019 10:42:40 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E5=92=8C=E5=9F=B9=E8=AE=AD=E5=AE=9E=E6=96=BD=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/train/entity/TrainExecution.java  |  4 +-
 .../jsite/modules/train/entity/TrainPlan.java |  2 +-
 .../train/web/TrainExecutionController.java   |  3 +-
 .../train/web/TrainPlanController.java        |  3 +-
 .../modules/train/TrainExecutionDao.xml       | 21 ++++++--
 .../mappings/modules/train/TrainPlanDao.xml   | 12 +++++
 .../modules/train/trainExecutionForm.html     |  4 +-
 .../modules/train/trainExecutionList.html     | 54 +++++++++++++++----
 .../views/modules/train/trainPlanForm.html    |  2 +-
 .../views/modules/train/trainPlanList.html    | 36 +++++++++++--
 10 files changed, 113 insertions(+), 28 deletions(-)

diff --git a/jsite-web/src/main/java/com/jsite/modules/train/entity/TrainExecution.java b/jsite-web/src/main/java/com/jsite/modules/train/entity/TrainExecution.java
index 38e95edf..000520bb 100644
--- a/jsite-web/src/main/java/com/jsite/modules/train/entity/TrainExecution.java
+++ b/jsite-web/src/main/java/com/jsite/modules/train/entity/TrainExecution.java
@@ -144,7 +144,7 @@ public class TrainExecution extends DataEntity<TrainExecution> {
     }
 
     @Length(min=0, max=60, message="状态长度必须介于 0 和 60 之间")
-    @ExcelField(title="状态", align=2, sort=9)
+    @ExcelField(title="状态", align=2, sort=9, dictType = "train_execution_status")
     public String getStatus() {
         return status;
     }
@@ -163,7 +163,7 @@ public class TrainExecution extends DataEntity<TrainExecution> {
         this.trainingRemarks = trainingRemarks;
     }
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     @ExcelField(title="实际培训日期", align=2, sort=11)
     public Date getRealTime() {
         return realTime;
diff --git a/jsite-web/src/main/java/com/jsite/modules/train/entity/TrainPlan.java b/jsite-web/src/main/java/com/jsite/modules/train/entity/TrainPlan.java
index 9dcb5c4b..4febcd52 100644
--- a/jsite-web/src/main/java/com/jsite/modules/train/entity/TrainPlan.java
+++ b/jsite-web/src/main/java/com/jsite/modules/train/entity/TrainPlan.java
@@ -59,7 +59,7 @@ public class TrainPlan extends DataEntity<TrainPlan> {
     }
 
 	@ExcelField(title="培训日期", align=2, sort=2)
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM")
 	@NotNull(message="计划培训日期不能为空")
 	public Date getPlanTime() {
 		return planTime;
diff --git a/jsite-web/src/main/java/com/jsite/modules/train/web/TrainExecutionController.java b/jsite-web/src/main/java/com/jsite/modules/train/web/TrainExecutionController.java
index 0b139a8b..663cc170 100644
--- a/jsite-web/src/main/java/com/jsite/modules/train/web/TrainExecutionController.java
+++ b/jsite-web/src/main/java/com/jsite/modules/train/web/TrainExecutionController.java
@@ -64,7 +64,8 @@ public class TrainExecutionController extends BaseController {
 
     @RequiresPermissions("train:execution:view")
     @RequestMapping(value = {"list", ""})
-    public String list() {
+    public String list(Model model) {
+        model.addAttribute("userList", UserUtils.getUserList());
         return "modules/train/trainExecutionList";
     }
 
diff --git a/jsite-web/src/main/java/com/jsite/modules/train/web/TrainPlanController.java b/jsite-web/src/main/java/com/jsite/modules/train/web/TrainPlanController.java
index 21b5d61e..4928a823 100644
--- a/jsite-web/src/main/java/com/jsite/modules/train/web/TrainPlanController.java
+++ b/jsite-web/src/main/java/com/jsite/modules/train/web/TrainPlanController.java
@@ -55,7 +55,8 @@ public class TrainPlanController extends BaseController {
 	
 	@RequiresPermissions("train:trainPlan:view")
 	@RequestMapping(value = {"list", ""})
-	public String list() {
+	public String list(Model model) {
+		model.addAttribute("userList", UserUtils.getUserList());
 		return "modules/train/trainPlanList";
 	}
 	
diff --git a/jsite-web/src/main/resources/mappings/modules/train/TrainExecutionDao.xml b/jsite-web/src/main/resources/mappings/modules/train/TrainExecutionDao.xml
index 973618c1..2dcf5fad 100644
--- a/jsite-web/src/main/resources/mappings/modules/train/TrainExecutionDao.xml
+++ b/jsite-web/src/main/resources/mappings/modules/train/TrainExecutionDao.xml
@@ -54,13 +54,24 @@
 			<if test="trainingObject != null and trainingObject != ''">
 				AND a.training_object = #{trainingObject}
 			</if>
-		<!--	<if test="office != null and office!=''">
+			<if test="office != null and office.id != null and office.id != ''">
 				AND a.dep_id = #{office.id}
-			</if>-->
-
-			<!--<if test="user!= null">
+			</if>
+			<if test="user!= null and user.id != null and user.id != ''">
 				AND a.training_leader = #{user.id}
-			</if>-->
+			</if>
+			<if test="internalTrainer!= null and internalTrainer != ''">
+				AND a.internal_trainer = #{internalTrainer}
+			</if>
+			<if test="status!= null and status != ''">
+				AND a.status = #{status}
+			</if>
+			<if test="realTime != null">
+				and a.real_time = #{realTime}
+			</if>
+			<if test="trainingPeople!= null and trainingPeople != ''">
+				AND a.training_people = #{trainingPeople}
+			</if>
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
diff --git a/jsite-web/src/main/resources/mappings/modules/train/TrainPlanDao.xml b/jsite-web/src/main/resources/mappings/modules/train/TrainPlanDao.xml
index 086c0f5d..a423b682 100644
--- a/jsite-web/src/main/resources/mappings/modules/train/TrainPlanDao.xml
+++ b/jsite-web/src/main/resources/mappings/modules/train/TrainPlanDao.xml
@@ -59,6 +59,18 @@
 			<if test="planTime != null">
 				and a.plan_time = #{planTime}
 			</if>
+			<if test="trainingObject != null and trainingObject != ''">
+				and a.training_object = #{trainingObject}
+			</if>
+			<if test="trainingLeader != null and trainingLeader.id != null and trainingLeader.id != ''">
+				and a.training_leader = #{trainingLeader.id}
+			</if>
+			<if test="internalTrainer != null and internalTrainer != ''">
+				and a.internal_trainer = #{internalTrainer}
+			</if>
+			<if test="outsideTrainer != null and outsideTrainer != ''">
+				and a.outside_trainer = #{outsideTrainer}
+			</if>
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
diff --git a/jsite-web/src/main/resources/views/modules/train/trainExecutionForm.html b/jsite-web/src/main/resources/views/modules/train/trainExecutionForm.html
index a8a8907c..4787e75a 100644
--- a/jsite-web/src/main/resources/views/modules/train/trainExecutionForm.html
+++ b/jsite-web/src/main/resources/views/modules/train/trainExecutionForm.html
@@ -117,10 +117,10 @@
 				<div class="col-xs-6">
 					<div class="form-group">
 						<label class="control-label col-sm-4" title="">
-							状态：
+							<span class="required hide">*</span> 状态：<i class="fa icon-question hide"></i>
 						</label>
 						<div class="col-sm-8">
-							<#form:input path="status"  maxlength="60" class="form-control  "/>
+							<#form:select path="status" name="label" data="getDictList:train_execution_status" class="form-control required " />
 						</div>
 					</div>
 				</div>
diff --git a/jsite-web/src/main/resources/views/modules/train/trainExecutionList.html b/jsite-web/src/main/resources/views/modules/train/trainExecutionList.html
index 03613567..fad9bbd5 100644
--- a/jsite-web/src/main/resources/views/modules/train/trainExecutionList.html
+++ b/jsite-web/src/main/resources/views/modules/train/trainExecutionList.html
@@ -1,4 +1,4 @@
-<% layout('/layout/default.html', {title: '培训实施', libs: ['dataGrid']}){ %>
+<% layout('/layout/default.html', {title: '培训实施', libs: ['dataGrid','icheck']}){ %>
 <div class="main-content">
 	<div class="box box-main">
 		<div class="box-header">
@@ -43,15 +43,46 @@
 						<input name="trainingObject"  maxlength="255" class="form-control"/>
 					</div>
 				</div>
-			<!--	<div class="form-group">
+				<div class="form-group">
 					<label class="control-label">组织部门：</label>
 					<div class="control-inline width-90">
-						<input name="office.name"  maxlength="255" class="form-control"/>
+						<#form:treeselect  id="office" name="office.id" title="部门选择" url="/sys/office/treeData?type=2" btnClass="btn-sm" allowClear="true"  canSelectParent="true" isSubTag="false"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">负责人：</label>
+					<div class="control-inline">
+						<#form:select id="userid" path="user.id" name="name" value="id" data="${userList}" class="form-control " />
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">内训师：</label>
+					<div class="control-inline">
+						<input name="internalTrainer"  maxlength="60" class="form-control"/>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">状态：</label>
+					<div class="control-inline">
+						<#form:select id="status" path="status" name="label" data="getDictList:train_execution_status" class="form-control " />
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">实际培训日期：</label>
+					<div class="control-inline">
+						<input id="realTime" name="realTime" maxlength="20" readonly="readonly" class="form-control "
+							   value="" onclick="WdatePicker({dateFmt:'yyyy-MM-dd ',isShowClear:false});" />
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="control-label">参训人数：</label>
+					<div class="control-inline">
+						<input name="trainingPeople"  maxlength="60" class="form-control"/>
 					</div>
-				</div>-->
+				</div>
 				<div class="form-group">
 					<button type="submit" class="btn btn-primary btn-sm">查询</button>
-					<button type="reset" class="btn btn-default btn-sm">重置</button>
+					<button id="reset" type="reset" class="btn btn-default btn-sm">重置</button>
 				</div>
 			</form>
 			<table id="dataGrid"></table>
@@ -73,7 +104,9 @@
 			{header:'组织部门', name:'office.name', index:'office.id', width:90, align:"center"},
 			{header:'负责人', name:'user.name', index:'user.id', width:90, align:"center"},
 			{header:'内训师', name:'internalTrainer', index:'internal_trainer', width:90, align:"center"},
-			{header:'状态', name:'status', index:'a.status', width:90, align:"center"},
+			{header:'状态', name:'status', index:'a.status', width:90, align:"center",formatter: function(val, obj, row, act){
+					return js.transDictLabel(${@DictUtils.getDictListJson('train_execution_status')}, val, '未知');
+				}},
 			{header:'备注', name:'trainingRemarks', index:'a.training_remarks', width:90, align:"center"},
 			{header:'实际培训日期', name:'realTime', index:'a.real_time', width:90, align:"center"},
 			{header:'参训人数', name:'trainingPeople', index:'a.training_people', width:90, align:"center"},
@@ -100,11 +133,10 @@
 
 
 <script type="text/javascript">
-	/*	$('#reset').click(function(){
-			$('#userid').val(null).trigger("change");
-			$('#year').val(null).trigger("change");
-			$('#month').val(null).trigger("change");
-		});*/
+	$('#reset').click(function () {
+		$('#userid').val(null).trigger("change");
+		$('#officeId').val(null);
+	});
 
 	$('#btnImport').click(function(){
 		js.layer.open({
diff --git a/jsite-web/src/main/resources/views/modules/train/trainPlanForm.html b/jsite-web/src/main/resources/views/modules/train/trainPlanForm.html
index 67993d5a..00dbd62b 100644
--- a/jsite-web/src/main/resources/views/modules/train/trainPlanForm.html
+++ b/jsite-web/src/main/resources/views/modules/train/trainPlanForm.html
@@ -33,7 +33,7 @@
 							</label>
 							<div class="col-sm-8">
 								<input id="planTime" type="text" name="planTime" maxlength="20" readonly="readonly" class="form-control required "
-										value="${trainPlan.planTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});" />
+										value="${trainPlan.planTime}" onclick="WdatePicker({dateFmt:'yyyy-MM',isShowClear:false});" />
 							</div>
 						</div>
 					</div>
diff --git a/jsite-web/src/main/resources/views/modules/train/trainPlanList.html b/jsite-web/src/main/resources/views/modules/train/trainPlanList.html
index 85d5755d..a1b2d750 100644
--- a/jsite-web/src/main/resources/views/modules/train/trainPlanList.html
+++ b/jsite-web/src/main/resources/views/modules/train/trainPlanList.html
@@ -1,4 +1,4 @@
-<% layout('/layout/default.html', {title: '培训计划信息', libs: ['dataGrid']}){ %>
+<% layout('/layout/default.html', {title: '培训计划信息', libs: ['dataGrid','icheck']}){ %>
 <div class="main-content">
 	<div class="box box-main">
 		<div class="box-header">
@@ -31,7 +31,7 @@
 					<label class="control-label">培训日期：</label>
 					<div class="control-inline">
 						<input id="planTime" name="planTime" maxlength="20" readonly="readonly" class="form-control "
-							   value="" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});" />
+							   value="" onclick="WdatePicker({dateFmt:'yyyy-MM',isShowClear:false});" />
 					</div>
 				</div>
 
@@ -49,9 +49,37 @@
 					</div>
 				</div>
 
+				<div class="form-group">
+					<label class="control-label">培训对象：</label>
+					<div class="control-inline">
+						<input name="trainingObject"  maxlength="60" class="form-control"/>
+					</div>
+				</div>
+
+				<div class="form-group">
+					<label class="control-label">负责人：</label>
+					<div class="control-inline">
+						<#form:select id="trainingLeaderid" path="trainingLeader.id" name="name" value="id" data="${userList}" class="form-control " />
+					</div>
+				</div>
+
+				<div class="form-group">
+					<label class="control-label">内训师：</label>
+					<div class="control-inline">
+						<input name="internalTrainer"  maxlength="60" class="form-control"/>
+					</div>
+				</div>
+
+				<div class="form-group">
+					<label class="control-label">外训师：</label>
+					<div class="control-inline">
+						<input name="outsideTrainer"  maxlength="60" class="form-control"/>
+					</div>
+				</div>
+
 				<div class="form-group">
 					<button type="submit" class="btn btn-primary btn-sm">查询</button>
-					<button type="reset" class="btn btn-default btn-sm">重置</button>
+					<button id="reset" type="reset" class="btn btn-default btn-sm">重置</button>
 				</div>
 			</form>			
 			<table id="dataGrid"></table>
@@ -94,7 +122,7 @@ $('#dataGrid').dataGrid({
 
 <script type="text/javascript">
     $('#reset').click(function(){
-        $('#userid').val(null).trigger("change");
+        $('#trainingLeaderid').val(null).trigger("change");
     });
 
     $('#btnImport').click(function(){
-- 
Gitee


From a6033dc4547c52f6724d1c9f164cf7f116c588da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E6=96=B0=E5=85=83?= <xxy554518704176@gmail.com>
Date: Fri, 31 May 2019 11:01:51 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E7=A4=BE=E4=BF=9D=E5=85=AC=E7=A7=AF?=
 =?UTF-8?q?=E9=87=91=E5=A4=A7=E8=A1=A8=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/views/modules/wages/wagesSocialFunList.html  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/jsite-web/src/main/resources/views/modules/wages/wagesSocialFunList.html b/jsite-web/src/main/resources/views/modules/wages/wagesSocialFunList.html
index 9dd9dce1..fa7ea001 100644
--- a/jsite-web/src/main/resources/views/modules/wages/wagesSocialFunList.html
+++ b/jsite-web/src/main/resources/views/modules/wages/wagesSocialFunList.html
@@ -23,8 +23,7 @@
 			</div>
 		</div>
 		<div class="box-body">
-			<#form:form id="searchForm" action="${ctx}/wages/wagesSocialFun/listData" method="post" class="form-inline hide"
-			data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
+			<form id="searchForm" action="${ctx}/wages/wagesSocialFun/listData" method="post" class="form-inline hide" >
 				<div class="form-group">
 					<label class="control-label">用户：</label>
 					<div class="control-inline">
@@ -34,7 +33,7 @@
 				<div class="form-group">
 					<label class="control-label">部门：</label>
 					<div class="control-inline width-90">
-						<#form:treeselect  id="office" name="user.office.id" title="部门选择" url="/sys/office/treeData?type=2" btnClass="btn-sm" allowClear="true" canSelectParent="true"/>
+						<#form:treeselect  id="office" name="user.office.id" title="部门选择" url="/sys/office/treeData?type=2" btnClass="btn-sm" allowClear="true" canSelectParent="true" isSubTag="false"/>
 					</div>
 				</div>
 				<div class="form-group">
@@ -59,7 +58,7 @@
 					<button type="submit" class="btn btn-primary btn-sm">查询</button>
 					<button id="reset" type="reset" class="btn btn-default btn-sm">重置</button>
 				</div>
-			</#form:form>
+			</form>
 			<table id="dataGrid"></table>
 			<div id="dataGridPage"></div>
 		</div>
-- 
Gitee


From fd2c01f318bc1ee04c0e07b3ef886fb56dc0cfe2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E6=96=B0=E5=85=83?= <xxy554518704176@gmail.com>
Date: Fri, 31 May 2019 14:00:22 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E7=A4=BE=E4=BF=9D=E5=85=AC=E7=A7=AF?=
 =?UTF-8?q?=E9=87=91=E5=A4=A7=E8=A1=A8=E5=88=A0=E9=99=A4socialAddTime?=
 =?UTF-8?q?=E5=92=8CfundAddTime=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0erm=E5=92=8CSQL=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/wages/entity/WagesSocialFun.java  |  24 +-
 .../wages/web/WagesSocialFunController.java   |   1 +
 .../src/main/resources/db/sys/jsite_sys.erm   | 662 ++++++++----------
 .../main/resources/db/sys/jsite_sys_mysql.sql |   4 -
 .../modules/wages/WagesSocialFunDao.xml       |   8 -
 .../modules/wages/WagesSocialSecurityDao.xml  |   6 +
 .../modules/wages/wagesSocialFunForm.html     |  29 +-
 7 files changed, 292 insertions(+), 442 deletions(-)

diff --git a/jsite-web/src/main/java/com/jsite/modules/wages/entity/WagesSocialFun.java b/jsite-web/src/main/java/com/jsite/modules/wages/entity/WagesSocialFun.java
index 7103066a..e070e9a3 100644
--- a/jsite-web/src/main/java/com/jsite/modules/wages/entity/WagesSocialFun.java
+++ b/jsite-web/src/main/java/com/jsite/modules/wages/entity/WagesSocialFun.java
@@ -47,8 +47,6 @@ public class WagesSocialFun extends DataEntity<WagesSocialFun> {
 	private Double fundPersonalPay;		// 公积金个人缴费
 	private Double serviceCost;		// 服务费
 	private String delegatedCompany;		// 委托单位
-	private Date socialAddTime;		// 社保增员时间
-	private Date fundAddTime;		// 公积金增员时间
 	private String socialFundStatus;  //社保公积金状态
 	
 	public WagesSocialFun() {
@@ -302,28 +300,8 @@ public class WagesSocialFun extends DataEntity<WagesSocialFun> {
 	public void setDelegatedCompany(String delegatedCompany) {
 		this.delegatedCompany = delegatedCompany;
 	}
-	
-	@JsonFormat(pattern = "yyyy-MM-dd")
-	@ExcelField(title="社保增员时间", align=2, sort=200)
-	public Date getSocialAddTime() {
-		return socialAddTime;
-	}
-
-	public void setSocialAddTime(Date socialAddTime) {
-		this.socialAddTime = socialAddTime;
-	}
-	
-	@JsonFormat(pattern = "yyyy-MM-dd")
-	@ExcelField(title="社保减员时间", align=2, sort=210)
-	public Date getFundAddTime() {
-		return fundAddTime;
-	}
-
-	public void setFundAddTime(Date fundAddTime) {
-		this.fundAddTime = fundAddTime;
-	}
 
-	@ExcelField(title="社保公积金状态", align=2, sort=220, dictType = "social_fund_status")
+	@ExcelField(title="社保公积金状态", align=2, sort=200, dictType = "social_fund_status")
 	public String getSocialFundStatus() {
 		return socialFundStatus;
 	}
diff --git a/jsite-web/src/main/java/com/jsite/modules/wages/web/WagesSocialFunController.java b/jsite-web/src/main/java/com/jsite/modules/wages/web/WagesSocialFunController.java
index 681c25d0..3cdf8e09 100644
--- a/jsite-web/src/main/java/com/jsite/modules/wages/web/WagesSocialFunController.java
+++ b/jsite-web/src/main/java/com/jsite/modules/wages/web/WagesSocialFunController.java
@@ -70,6 +70,7 @@ public class WagesSocialFunController extends BaseController {
 	@RequestMapping(value = "form")
 	public String form(WagesSocialFun wagesSocialFun, Model model) {
 		model.addAttribute("wagesSocialFun", wagesSocialFun);
+		model.addAttribute("userList", UserUtils.getUserList());
 		return "modules/wages/wagesSocialFunForm";
 	}
 
diff --git a/jsite-web/src/main/resources/db/sys/jsite_sys.erm b/jsite-web/src/main/resources/db/sys/jsite_sys.erm
index 17703ff0..52ac58db 100644
--- a/jsite-web/src/main/resources/db/sys/jsite_sys.erm
+++ b/jsite-web/src/main/resources/db/sys/jsite_sys.erm
@@ -22,8 +22,8 @@
 	</page_setting>
 	<category_index>0</category_index>
 	<zoom>0.8</zoom>
-	<x>995</x>
-	<y>-544</y>
+	<x>974</x>
+	<y>-450</y>
 	<default_color>
 		<r>128</r>
 		<g>128</g>
@@ -146,7 +146,7 @@
 			</connections>
 			<display>false</display>
 			<creation_date>2013-04-23 21:13:37</creation_date>
-			<updated_date>2019-05-30 14:06:00</updated_date>
+			<updated_date>2019-05-31 11:46:48</updated_date>
 			<model_property>
 				<name>Project Name</name>
 				<value>JeeSite</value>
@@ -841,22 +841,6 @@
 		</word>
 		<word>
 			<id>41</id>
-			<length>null</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description>公积金增员时间</description>
-			<logical_name>公积金增员时间</logical_name>
-			<physical_name>fund_add_time</physical_name>
-			<type>datetime</type>
-		</word>
-		<word>
-			<id>42</id>
 			<length>6</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -872,7 +856,7 @@
 			<type>double precision(m,d)</type>
 		</word>
 		<word>
-			<id>43</id>
+			<id>42</id>
 			<length>64</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -888,7 +872,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>44</id>
+			<id>43</id>
 			<length>6</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -904,7 +888,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>45</id>
+			<id>44</id>
 			<length>6</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -920,7 +904,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>46</id>
+			<id>45</id>
 			<length>1</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -936,7 +920,7 @@
 			<type>character(n)</type>
 		</word>
 		<word>
-			<id>47</id>
+			<id>46</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -952,7 +936,7 @@
 			<type>datetime</type>
 		</word>
 		<word>
-			<id>48</id>
+			<id>47</id>
 			<length>6</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -968,7 +952,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>49</id>
+			<id>48</id>
 			<length>2000</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -984,7 +968,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>50</id>
+			<id>49</id>
 			<length>100</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1000,7 +984,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>51</id>
+			<id>50</id>
 			<length>64</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1016,7 +1000,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>52</id>
+			<id>51</id>
 			<length>64</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1032,7 +1016,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>53</id>
+			<id>52</id>
 			<length>64</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1048,7 +1032,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>54</id>
+			<id>53</id>
 			<length>6</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -1064,7 +1048,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>55</id>
+			<id>54</id>
 			<length>6</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -1080,7 +1064,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>56</id>
+			<id>55</id>
 			<length>6</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -1096,7 +1080,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>57</id>
+			<id>56</id>
 			<length>6</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -1112,7 +1096,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>58</id>
+			<id>57</id>
 			<length>6</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -1128,7 +1112,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>59</id>
+			<id>58</id>
 			<length>1</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1144,7 +1128,7 @@
 			<type>character(n)</type>
 		</word>
 		<word>
-			<id>60</id>
+			<id>59</id>
 			<length>1</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1160,7 +1144,7 @@
 			<type>character(n)</type>
 		</word>
 		<word>
-			<id>61</id>
+			<id>60</id>
 			<length>64</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1176,7 +1160,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>62</id>
+			<id>61</id>
 			<length>100</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1192,7 +1176,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>63</id>
+			<id>62</id>
 			<length>6</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -1208,7 +1192,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>64</id>
+			<id>63</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1224,7 +1208,7 @@
 			<type>datetime</type>
 		</word>
 		<word>
-			<id>65</id>
+			<id>64</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1240,7 +1224,7 @@
 			<type>datetime</type>
 		</word>
 		<word>
-			<id>66</id>
+			<id>65</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1256,7 +1240,7 @@
 			<type>datetime</type>
 		</word>
 		<word>
-			<id>67</id>
+			<id>66</id>
 			<length>4</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -1272,7 +1256,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>68</id>
+			<id>67</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1288,7 +1272,7 @@
 			<type>char</type>
 		</word>
 		<word>
-			<id>69</id>
+			<id>68</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1304,7 +1288,7 @@
 			<type>datetime</type>
 		</word>
 		<word>
-			<id>70</id>
+			<id>69</id>
 			<length>64</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1320,7 +1304,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>71</id>
+			<id>70</id>
 			<length>100</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1336,7 +1320,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>72</id>
+			<id>71</id>
 			<length>100</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1352,7 +1336,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>73</id>
+			<id>72</id>
 			<length>255</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1368,7 +1352,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>74</id>
+			<id>73</id>
 			<length>100</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1384,7 +1368,7 @@
 			<type>nvarchar(n)</type>
 		</word>
 		<word>
-			<id>75</id>
+			<id>74</id>
 			<length>6</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -1400,7 +1384,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>76</id>
+			<id>75</id>
 			<length>6</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -1416,7 +1400,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>77</id>
+			<id>76</id>
 			<length>6</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -1432,7 +1416,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>78</id>
+			<id>77</id>
 			<length>5</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1448,7 +1432,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>79</id>
+			<id>78</id>
 			<length>200</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1464,7 +1448,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>80</id>
+			<id>79</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1480,7 +1464,7 @@
 			<type>integer</type>
 		</word>
 		<word>
-			<id>81</id>
+			<id>80</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1496,7 +1480,7 @@
 			<type>integer</type>
 		</word>
 		<word>
-			<id>82</id>
+			<id>81</id>
 			<length>4</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -1512,7 +1496,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>83</id>
+			<id>82</id>
 			<length>100</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1528,7 +1512,7 @@
 			<type>nvarchar(n)</type>
 		</word>
 		<word>
-			<id>84</id>
+			<id>83</id>
 			<length>100</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1544,7 +1528,7 @@
 			<type>nvarchar(n)</type>
 		</word>
 		<word>
-			<id>85</id>
+			<id>84</id>
 			<length>100</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1560,7 +1544,7 @@
 			<type>nvarchar(n)</type>
 		</word>
 		<word>
-			<id>86</id>
+			<id>85</id>
 			<length>64</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1576,7 +1560,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>87</id>
+			<id>86</id>
 			<length>100</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1592,7 +1576,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>88</id>
+			<id>87</id>
 			<length>64</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1608,7 +1592,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>89</id>
+			<id>88</id>
 			<length>100</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1624,7 +1608,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>90</id>
+			<id>89</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1640,7 +1624,7 @@
 			<type>text</type>
 		</word>
 		<word>
-			<id>91</id>
+			<id>90</id>
 			<length>64</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1656,7 +1640,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>92</id>
+			<id>91</id>
 			<length>64</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1672,7 +1656,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>93</id>
+			<id>92</id>
 			<length>2000</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1688,7 +1672,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>94</id>
+			<id>93</id>
 			<length>100</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1704,7 +1688,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>95</id>
+			<id>94</id>
 			<length>6</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -1720,7 +1704,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>96</id>
+			<id>95</id>
 			<length>6</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -1736,7 +1720,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>97</id>
+			<id>96</id>
 			<length>6</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -1752,7 +1736,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>98</id>
+			<id>97</id>
 			<length>8</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -1768,7 +1752,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>99</id>
+			<id>98</id>
 			<length>5</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -1784,7 +1768,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>100</id>
+			<id>99</id>
 			<length>200</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1800,7 +1784,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>101</id>
+			<id>100</id>
 			<length>64</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1816,7 +1800,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>102</id>
+			<id>101</id>
 			<length>200</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1832,7 +1816,7 @@
 			<type>nvarchar(n)</type>
 		</word>
 		<word>
-			<id>103</id>
+			<id>102</id>
 			<length>200</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1848,7 +1832,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>104</id>
+			<id>103</id>
 			<length>1000</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1864,7 +1848,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>105</id>
+			<id>104</id>
 			<length>1</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1880,7 +1864,7 @@
 			<type>character(n)</type>
 		</word>
 		<word>
-			<id>106</id>
+			<id>105</id>
 			<length>64</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1896,7 +1880,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>107</id>
+			<id>106</id>
 			<length>64</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1912,7 +1896,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>108</id>
+			<id>107</id>
 			<length>255</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1928,7 +1912,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>109</id>
+			<id>108</id>
 			<length>255</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1944,7 +1928,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>110</id>
+			<id>109</id>
 			<length>1</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1960,7 +1944,7 @@
 			<type>character(n)</type>
 		</word>
 		<word>
-			<id>111</id>
+			<id>110</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -1976,7 +1960,7 @@
 			<type>datetime</type>
 		</word>
 		<word>
-			<id>112</id>
+			<id>111</id>
 			<length>4</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -1992,7 +1976,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>113</id>
+			<id>112</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2008,7 +1992,7 @@
 			<type>char</type>
 		</word>
 		<word>
-			<id>114</id>
+			<id>113</id>
 			<length>255</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2024,7 +2008,7 @@
 			<type>nvarchar(n)</type>
 		</word>
 		<word>
-			<id>115</id>
+			<id>114</id>
 			<length>255</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2040,7 +2024,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>116</id>
+			<id>115</id>
 			<length>255</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2056,7 +2040,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>117</id>
+			<id>116</id>
 			<length>255</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2072,7 +2056,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>118</id>
+			<id>117</id>
 			<length>1</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2088,7 +2072,7 @@
 			<type>character(n)</type>
 		</word>
 		<word>
-			<id>119</id>
+			<id>118</id>
 			<length>255</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2104,7 +2088,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>120</id>
+			<id>119</id>
 			<length>6</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -2120,7 +2104,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>121</id>
+			<id>120</id>
 			<length>1</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2136,23 +2120,7 @@
 			<type>character(n)</type>
 		</word>
 		<word>
-			<id>122</id>
-			<length>null</length>
-			<decimal>null</decimal>
-			<array>false</array>
-			<array_dimension>null</array_dimension>
-			<unsigned>false</unsigned>
-			<zerofill>false</zerofill>
-			<binary>false</binary>
-			<args></args>
-			<char_semantics>false</char_semantics>
-			<description>社保增员时间</description>
-			<logical_name>社保增员时间</logical_name>
-			<physical_name>social_add_time</physical_name>
-			<type>datetime</type>
-		</word>
-		<word>
-			<id>123</id>
+			<id>121</id>
 			<length>1</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2168,7 +2136,7 @@
 			<type>character(n)</type>
 		</word>
 		<word>
-			<id>124</id>
+			<id>122</id>
 			<length>6</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -2184,7 +2152,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>125</id>
+			<id>123</id>
 			<length>8</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -2200,7 +2168,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>126</id>
+			<id>124</id>
 			<length>6</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -2216,7 +2184,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>127</id>
+			<id>125</id>
 			<length>10</length>
 			<decimal>0</decimal>
 			<array>false</array>
@@ -2232,7 +2200,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>128</id>
+			<id>126</id>
 			<length>10</length>
 			<decimal>0</decimal>
 			<array>false</array>
@@ -2248,7 +2216,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>129</id>
+			<id>127</id>
 			<length>20</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2264,7 +2232,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>130</id>
+			<id>128</id>
 			<length>500</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2280,7 +2248,7 @@
 			<type>nvarchar(n)</type>
 		</word>
 		<word>
-			<id>131</id>
+			<id>129</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2296,7 +2264,7 @@
 			<type>char</type>
 		</word>
 		<word>
-			<id>132</id>
+			<id>130</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2312,7 +2280,7 @@
 			<type>integer</type>
 		</word>
 		<word>
-			<id>133</id>
+			<id>131</id>
 			<length>1</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2328,7 +2296,7 @@
 			<type>character(n)</type>
 		</word>
 		<word>
-			<id>134</id>
+			<id>132</id>
 			<length>1</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2344,7 +2312,7 @@
 			<type>character(n)</type>
 		</word>
 		<word>
-			<id>135</id>
+			<id>133</id>
 			<length>1</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2360,7 +2328,7 @@
 			<type>character(n)</type>
 		</word>
 		<word>
-			<id>136</id>
+			<id>134</id>
 			<length>100</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2376,7 +2344,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>137</id>
+			<id>135</id>
 			<length>6</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -2392,7 +2360,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>138</id>
+			<id>136</id>
 			<length>6</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -2408,7 +2376,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>139</id>
+			<id>137</id>
 			<length>6</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -2424,7 +2392,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>140</id>
+			<id>138</id>
 			<length>255</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2440,7 +2408,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>141</id>
+			<id>139</id>
 			<length>64</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2456,7 +2424,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>142</id>
+			<id>140</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2472,7 +2440,7 @@
 			<type>datetime</type>
 		</word>
 		<word>
-			<id>143</id>
+			<id>141</id>
 			<length>32</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2488,7 +2456,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>144</id>
+			<id>142</id>
 			<length>64</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2504,7 +2472,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>145</id>
+			<id>143</id>
 			<length>64</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2520,7 +2488,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>146</id>
+			<id>144</id>
 			<length>255</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2536,7 +2504,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>147</id>
+			<id>145</id>
 			<length>64</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2552,7 +2520,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>148</id>
+			<id>146</id>
 			<length>1</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2568,7 +2536,7 @@
 			<type>character(n)</type>
 		</word>
 		<word>
-			<id>149</id>
+			<id>147</id>
 			<length>100</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2584,7 +2552,7 @@
 			<type>varchar(n)</type>
 		</word>
 		<word>
-			<id>150</id>
+			<id>148</id>
 			<length>8</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -2600,7 +2568,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>151</id>
+			<id>149</id>
 			<length>8</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -2616,7 +2584,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>152</id>
+			<id>150</id>
 			<length>8</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -2632,7 +2600,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>153</id>
+			<id>151</id>
 			<length>8</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -2648,7 +2616,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>154</id>
+			<id>152</id>
 			<length>8</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -2664,7 +2632,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>155</id>
+			<id>153</id>
 			<length>8</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -2680,7 +2648,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>156</id>
+			<id>154</id>
 			<length>8</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -2696,7 +2664,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>157</id>
+			<id>155</id>
 			<length>8</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -2712,7 +2680,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>158</id>
+			<id>156</id>
 			<length>4</length>
 			<decimal>2</decimal>
 			<array>false</array>
@@ -2728,7 +2696,7 @@
 			<type>decimal(p,s)</type>
 		</word>
 		<word>
-			<id>159</id>
+			<id>157</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2744,7 +2712,7 @@
 			<type>integer</type>
 		</word>
 		<word>
-			<id>160</id>
+			<id>158</id>
 			<length>null</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2760,7 +2728,7 @@
 			<type>integer</type>
 		</word>
 		<word>
-			<id>161</id>
+			<id>159</id>
 			<length>100</length>
 			<decimal>null</decimal>
 			<array>false</array>
@@ -2802,7 +2770,7 @@
 			<option></option>
 			<columns>
 				<normal_column>
-					<word_id>52</word_id>
+					<word_id>51</word_id>
 					<id>12</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -2836,7 +2804,7 @@
 				</normal_column>
 				<column_group>1</column_group>
 				<normal_column>
-					<word_id>49</word_id>
+					<word_id>48</word_id>
 					<id>13</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -2869,7 +2837,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>129</word_id>
+					<word_id>127</word_id>
 					<id>14</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -2902,7 +2870,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>50</word_id>
+					<word_id>49</word_id>
 					<id>15</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -2935,7 +2903,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>60</word_id>
+					<word_id>59</word_id>
 					<id>16</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -2968,7 +2936,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>100</word_id>
+					<word_id>99</word_id>
 					<id>17</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -3069,10 +3037,10 @@
 			<connections>
 				<relation>
 					<id>0</id>
-					<source>7</source>
+					<source>9</source>
 					<target>1</target>
-						<source_xp>0</source_xp>
-						<source_yp>85</source_yp>
+						<source_xp>100</source_xp>
+						<source_yp>76</source_yp>
 						<target_xp>-1</target_xp>
 						<target_yp>-1</target_yp>
 						<color>
@@ -3091,10 +3059,10 @@
 				</relation>
 				<relation>
 					<id>1</id>
-					<source>9</source>
+					<source>7</source>
 					<target>1</target>
-						<source_xp>100</source_xp>
-						<source_yp>76</source_yp>
+						<source_xp>0</source_xp>
+						<source_yp>85</source_yp>
 						<target_xp>-1</target_xp>
 						<target_yp>-1</target_yp>
 						<color>
@@ -3122,7 +3090,7 @@
 				<normal_column>
 					<id>18</id>
 					<referenced_column>36</referenced_column>
-					<relation>0</relation>
+					<relation>1</relation>
 					<description>角色编号</description>
 					<unique_key_name></unique_key_name>
 					<logical_name>角色编号</logical_name>
@@ -3156,7 +3124,7 @@
 				<normal_column>
 					<id>19</id>
 					<referenced_column>56</referenced_column>
-					<relation>1</relation>
+					<relation>0</relation>
 					<description>机构编号</description>
 					<unique_key_name></unique_key_name>
 					<logical_name>机构编号</logical_name>
@@ -3216,7 +3184,7 @@
 			<connections>
 				<relation>
 					<id>2</id>
-					<source>7</source>
+					<source>0</source>
 					<target>2</target>
 						<source_xp>-1</source_xp>
 						<source_yp>-1</source_yp>
@@ -3238,7 +3206,7 @@
 				</relation>
 				<relation>
 					<id>3</id>
-					<source>0</source>
+					<source>7</source>
 					<target>2</target>
 						<source_xp>-1</source_xp>
 						<source_yp>-1</source_yp>
@@ -3269,7 +3237,7 @@
 				<normal_column>
 					<id>20</id>
 					<referenced_column>36</referenced_column>
-					<relation>2</relation>
+					<relation>3</relation>
 					<description>角色编号</description>
 					<unique_key_name></unique_key_name>
 					<logical_name>角色编号</logical_name>
@@ -3303,7 +3271,7 @@
 				<normal_column>
 					<id>21</id>
 					<referenced_column>12</referenced_column>
-					<relation>3</relation>
+					<relation>2</relation>
 					<description>菜单编号</description>
 					<unique_key_name></unique_key_name>
 					<logical_name>菜单编号</logical_name>
@@ -3370,7 +3338,7 @@
 			<option></option>
 			<columns>
 				<normal_column>
-					<word_id>52</word_id>
+					<word_id>51</word_id>
 					<id>22</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -3512,7 +3480,7 @@
 			<option></option>
 			<columns>
 				<normal_column>
-					<word_id>52</word_id>
+					<word_id>51</word_id>
 					<id>24</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -3579,7 +3547,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>133</word_id>
+					<word_id>131</word_id>
 					<id>26</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -3687,7 +3655,7 @@
 			<option></option>
 			<columns>
 				<normal_column>
-					<word_id>52</word_id>
+					<word_id>51</word_id>
 					<id>27</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -3720,7 +3688,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>149</word_id>
+					<word_id>147</word_id>
 					<id>28</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -3753,7 +3721,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>62</word_id>
+					<word_id>61</word_id>
 					<id>29</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -3786,7 +3754,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>136</word_id>
+					<word_id>134</word_id>
 					<id>30</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -3852,7 +3820,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>128</word_id>
+					<word_id>126</word_id>
 					<id>32</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -3885,7 +3853,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>92</word_id>
+					<word_id>90</word_id>
 					<id>33</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -3986,10 +3954,10 @@
 			<connections>
 				<relation>
 					<id>4</id>
-					<source>14</source>
+					<source>7</source>
 					<target>6</target>
-						<source_xp>-1</source_xp>
-						<source_yp>-1</source_yp>
+						<source_xp>0</source_xp>
+						<source_yp>45</source_yp>
 						<target_xp>-1</target_xp>
 						<target_yp>-1</target_yp>
 						<color>
@@ -4008,10 +3976,10 @@
 				</relation>
 				<relation>
 					<id>5</id>
-					<source>7</source>
+					<source>14</source>
 					<target>6</target>
-						<source_xp>0</source_xp>
-						<source_yp>45</source_yp>
+						<source_xp>-1</source_xp>
+						<source_yp>-1</source_yp>
 						<target_xp>-1</target_xp>
 						<target_yp>-1</target_yp>
 						<color>
@@ -4039,7 +4007,7 @@
 				<normal_column>
 					<id>34</id>
 					<referenced_column>110</referenced_column>
-					<relation>4</relation>
+					<relation>5</relation>
 					<description>用户编号</description>
 					<unique_key_name></unique_key_name>
 					<logical_name>用户编号</logical_name>
@@ -4073,7 +4041,7 @@
 				<normal_column>
 					<id>35</id>
 					<referenced_column>36</referenced_column>
-					<relation>5</relation>
+					<relation>4</relation>
 					<description>角色编号</description>
 					<unique_key_name></unique_key_name>
 					<logical_name>角色编号</logical_name>
@@ -4140,7 +4108,7 @@
 			<option></option>
 			<columns>
 				<normal_column>
-					<word_id>52</word_id>
+					<word_id>51</word_id>
 					<id>36</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -4173,7 +4141,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>88</word_id>
+					<word_id>87</word_id>
 					<id>37</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -4206,7 +4174,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>85</word_id>
+					<word_id>84</word_id>
 					<id>38</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -4272,7 +4240,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>119</word_id>
+					<word_id>118</word_id>
 					<id>40</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -4305,7 +4273,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>148</word_id>
+					<word_id>146</word_id>
 					<id>41</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -4371,7 +4339,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>61</word_id>
+					<word_id>60</word_id>
 					<id>43</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -4404,7 +4372,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>144</word_id>
+					<word_id>142</word_id>
 					<id>44</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -4499,7 +4467,7 @@
 			<option></option>
 			<columns>
 				<normal_column>
-					<word_id>52</word_id>
+					<word_id>51</word_id>
 					<id>45</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -4532,7 +4500,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>134</word_id>
+					<word_id>132</word_id>
 					<id>46</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -4565,7 +4533,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>130</word_id>
+					<word_id>128</word_id>
 					<id>47</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -4664,7 +4632,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>115</word_id>
+					<word_id>114</word_id>
 					<id>50</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -4697,7 +4665,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>146</word_id>
+					<word_id>144</word_id>
 					<id>51</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -4730,7 +4698,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>116</word_id>
+					<word_id>115</word_id>
 					<id>52</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -4763,7 +4731,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>78</word_id>
+					<word_id>77</word_id>
 					<id>53</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -4796,7 +4764,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>90</word_id>
+					<word_id>89</word_id>
 					<id>54</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -4971,7 +4939,7 @@
 			<option></option>
 			<columns>
 				<normal_column>
-					<word_id>52</word_id>
+					<word_id>51</word_id>
 					<id>56</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -5072,7 +5040,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>135</word_id>
+					<word_id>133</word_id>
 					<id>59</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -5105,7 +5073,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>46</word_id>
+					<word_id>45</word_id>
 					<id>60</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -5171,7 +5139,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>161</word_id>
+					<word_id>159</word_id>
 					<id>62</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -5204,7 +5172,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>74</word_id>
+					<word_id>73</word_id>
 					<id>63</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -5237,7 +5205,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>102</word_id>
+					<word_id>101</word_id>
 					<id>64</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -5336,7 +5304,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>145</word_id>
+					<word_id>143</word_id>
 					<id>67</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -5369,7 +5337,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>106</word_id>
+					<word_id>105</word_id>
 					<id>68</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -5523,7 +5491,7 @@
 			<option></option>
 			<columns>
 				<normal_column>
-					<word_id>52</word_id>
+					<word_id>51</word_id>
 					<id>70</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -5556,7 +5524,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>159</word_id>
+					<word_id>157</word_id>
 					<id>71</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -5589,7 +5557,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>81</word_id>
+					<word_id>80</word_id>
 					<id>72</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -5622,7 +5590,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>158</word_id>
+					<word_id>156</word_id>
 					<id>73</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -5691,7 +5659,7 @@
 			<option></option>
 			<columns>
 				<normal_column>
-					<word_id>52</word_id>
+					<word_id>51</word_id>
 					<id>74</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -5724,7 +5692,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>109</word_id>
+					<word_id>108</word_id>
 					<id>75</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -5757,7 +5725,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>110</word_id>
+					<word_id>109</word_id>
 					<id>76</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -5875,7 +5843,7 @@
 			<option></option>
 			<columns>
 				<normal_column>
-					<word_id>52</word_id>
+					<word_id>51</word_id>
 					<id>77</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -5942,7 +5910,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>68</word_id>
+					<word_id>67</word_id>
 					<id>79</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -5975,7 +5943,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>66</word_id>
+					<word_id>65</word_id>
 					<id>80</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -6008,7 +5976,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>65</word_id>
+					<word_id>64</word_id>
 					<id>81</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -6041,7 +6009,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>67</word_id>
+					<word_id>66</word_id>
 					<id>82</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -6143,7 +6111,7 @@
 			<option></option>
 			<columns>
 				<normal_column>
-					<word_id>52</word_id>
+					<word_id>51</word_id>
 					<id>84</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -6176,7 +6144,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>147</word_id>
+					<word_id>145</word_id>
 					<id>85</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -6209,7 +6177,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>53</word_id>
+					<word_id>52</word_id>
 					<id>86</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -6242,7 +6210,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>86</word_id>
+					<word_id>85</word_id>
 					<id>87</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -6374,7 +6342,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>59</word_id>
+					<word_id>58</word_id>
 					<id>91</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -6407,7 +6375,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>121</word_id>
+					<word_id>120</word_id>
 					<id>92</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -6440,7 +6408,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>105</word_id>
+					<word_id>104</word_id>
 					<id>93</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -6473,7 +6441,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>117</word_id>
+					<word_id>116</word_id>
 					<id>94</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -6506,7 +6474,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>118</word_id>
+					<word_id>117</word_id>
 					<id>95</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -6539,7 +6507,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>47</word_id>
+					<word_id>46</word_id>
 					<id>96</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -6572,7 +6540,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>140</word_id>
+					<word_id>138</word_id>
 					<id>97</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -6605,7 +6573,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>73</word_id>
+					<word_id>72</word_id>
 					<id>98</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -6737,7 +6705,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>143</word_id>
+					<word_id>141</word_id>
 					<id>102</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -6803,7 +6771,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>111</word_id>
+					<word_id>110</word_id>
 					<id>104</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -6935,7 +6903,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>64</word_id>
+					<word_id>63</word_id>
 					<id>108</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -7081,7 +7049,7 @@
 			<option></option>
 			<columns>
 				<normal_column>
-					<word_id>52</word_id>
+					<word_id>51</word_id>
 					<id>110</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -7182,7 +7150,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>72</word_id>
+					<word_id>71</word_id>
 					<id>113</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -7215,7 +7183,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>94</word_id>
+					<word_id>93</word_id>
 					<id>114</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -7248,7 +7216,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>87</word_id>
+					<word_id>86</word_id>
 					<id>115</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -7281,7 +7249,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>84</word_id>
+					<word_id>83</word_id>
 					<id>116</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -7347,7 +7315,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>103</word_id>
+					<word_id>102</word_id>
 					<id>118</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -7380,7 +7348,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>79</word_id>
+					<word_id>78</word_id>
 					<id>119</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -7413,7 +7381,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>148</word_id>
+					<word_id>146</word_id>
 					<id>120</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -7446,7 +7414,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>104</word_id>
+					<word_id>103</word_id>
 					<id>121</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -7479,7 +7447,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>71</word_id>
+					<word_id>70</word_id>
 					<id>122</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -7512,7 +7480,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>69</word_id>
+					<word_id>68</word_id>
 					<id>123</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -7545,7 +7513,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>70</word_id>
+					<word_id>69</word_id>
 					<id>124</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -7701,7 +7669,7 @@
 			<option></option>
 			<columns>
 				<normal_column>
-					<word_id>52</word_id>
+					<word_id>51</word_id>
 					<id>125</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -7734,7 +7702,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>89</word_id>
+					<word_id>88</word_id>
 					<id>126</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -7767,7 +7735,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>108</word_id>
+					<word_id>107</word_id>
 					<id>127</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -7834,7 +7802,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>159</word_id>
+					<word_id>157</word_id>
 					<id>129</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -7867,7 +7835,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>81</word_id>
+					<word_id>80</word_id>
 					<id>130</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -7900,7 +7868,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>113</word_id>
+					<word_id>112</word_id>
 					<id>131</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -7933,7 +7901,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>158</word_id>
+					<word_id>156</word_id>
 					<id>132</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -8032,7 +8000,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>98</word_id>
+					<word_id>97</word_id>
 					<id>135</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -8065,7 +8033,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>150</word_id>
+					<word_id>148</word_id>
 					<id>136</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -8098,7 +8066,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>152</word_id>
+					<word_id>150</word_id>
 					<id>137</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -8131,7 +8099,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>151</word_id>
+					<word_id>149</word_id>
 					<id>138</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -8329,7 +8297,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>156</word_id>
+					<word_id>154</word_id>
 					<id>144</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -8362,7 +8330,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>56</word_id>
+					<word_id>55</word_id>
 					<id>145</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -8395,7 +8363,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>57</word_id>
+					<word_id>56</word_id>
 					<id>146</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -8428,7 +8396,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>58</word_id>
+					<word_id>57</word_id>
 					<id>147</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -8461,7 +8429,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>48</word_id>
+					<word_id>47</word_id>
 					<id>148</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -8494,7 +8462,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>63</word_id>
+					<word_id>62</word_id>
 					<id>149</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -8527,7 +8495,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>125</word_id>
+					<word_id>123</word_id>
 					<id>150</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -8560,7 +8528,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>154</word_id>
+					<word_id>152</word_id>
 					<id>151</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -8593,7 +8561,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>157</word_id>
+					<word_id>155</word_id>
 					<id>152</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -8626,7 +8594,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>153</word_id>
+					<word_id>151</word_id>
 					<id>153</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -8659,7 +8627,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>155</word_id>
+					<word_id>153</word_id>
 					<id>154</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -8783,7 +8751,7 @@
 			<option></option>
 			<columns>
 				<normal_column>
-					<word_id>52</word_id>
+					<word_id>51</word_id>
 					<id>156</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -8883,7 +8851,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>111</word_id>
+					<word_id>110</word_id>
 					<id>159</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -8916,7 +8884,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>112</word_id>
+					<word_id>111</word_id>
 					<id>160</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -8982,7 +8950,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>98</word_id>
+					<word_id>97</word_id>
 					<id>162</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -9205,7 +9173,7 @@
 			<option></option>
 			<columns>
 				<normal_column>
-					<word_id>52</word_id>
+					<word_id>51</word_id>
 					<id>167</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -9272,7 +9240,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>107</word_id>
+					<word_id>106</word_id>
 					<id>169</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -9305,7 +9273,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>159</word_id>
+					<word_id>157</word_id>
 					<id>170</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -9338,7 +9306,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>81</word_id>
+					<word_id>80</word_id>
 					<id>171</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -9404,7 +9372,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>99</word_id>
+					<word_id>98</word_id>
 					<id>173</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -9437,7 +9405,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>158</word_id>
+					<word_id>156</word_id>
 					<id>174</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -9503,7 +9471,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>82</word_id>
+					<word_id>81</word_id>
 					<id>176</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -9627,7 +9595,7 @@
 			<option></option>
 			<columns>
 				<normal_column>
-					<word_id>51</word_id>
+					<word_id>50</word_id>
 					<id>178</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -9694,7 +9662,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>101</word_id>
+					<word_id>100</word_id>
 					<id>180</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -9727,7 +9695,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>43</word_id>
+					<word_id>42</word_id>
 					<id>181</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -9760,7 +9728,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>160</word_id>
+					<word_id>158</word_id>
 					<id>182</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -9793,7 +9761,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>80</word_id>
+					<word_id>79</word_id>
 					<id>183</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -9826,7 +9794,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>95</word_id>
+					<word_id>94</word_id>
 					<id>184</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -9859,7 +9827,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>96</word_id>
+					<word_id>95</word_id>
 					<id>185</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -9892,7 +9860,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>97</word_id>
+					<word_id>96</word_id>
 					<id>186</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -9925,7 +9893,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>137</word_id>
+					<word_id>135</word_id>
 					<id>187</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -9958,7 +9926,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>138</word_id>
+					<word_id>136</word_id>
 					<id>188</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -9991,7 +9959,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>139</word_id>
+					<word_id>137</word_id>
 					<id>189</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -10024,7 +9992,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>75</word_id>
+					<word_id>74</word_id>
 					<id>190</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -10057,7 +10025,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>76</word_id>
+					<word_id>75</word_id>
 					<id>191</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -10090,7 +10058,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>77</word_id>
+					<word_id>76</word_id>
 					<id>192</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -10189,7 +10157,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>54</word_id>
+					<word_id>53</word_id>
 					<id>195</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -10222,7 +10190,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>55</word_id>
+					<word_id>54</word_id>
 					<id>196</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -10321,7 +10289,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>126</word_id>
+					<word_id>124</word_id>
 					<id>199</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -10354,7 +10322,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>124</word_id>
+					<word_id>122</word_id>
 					<id>200</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -10387,7 +10355,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>44</word_id>
+					<word_id>43</word_id>
 					<id>201</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -10420,7 +10388,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>42</word_id>
+					<word_id>41</word_id>
 					<id>202</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -10453,7 +10421,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>45</word_id>
+					<word_id>44</word_id>
 					<id>203</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -10486,7 +10454,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>120</word_id>
+					<word_id>119</word_id>
 					<id>204</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -10552,78 +10520,12 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>122</word_id>
+					<word_id>121</word_id>
 					<id>206</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
 					<physical_name></physical_name>
-					<type>datetime</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>41</word_id>
-					<id>207</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
-					<type>datetime</type>
-					<constraint></constraint>
-					<default_value></default_value>
-					<auto_increment>false</auto_increment>
-					<foreign_key>false</foreign_key>
-					<not_null>false</not_null>
-					<primary_key>false</primary_key>
-					<unique_key>false</unique_key>
-					<character_set></character_set>
-					<collation></collation>
-					<sequence>
-						<name></name>
-						<schema></schema>
-						<increment></increment>
-						<min_value></min_value>
-						<max_value></max_value>
-						<start></start>
-						<cache></cache>
-						<nocache>false</nocache>
-						<cycle>false</cycle>
-						<order>false</order>
-						<description></description>
-						<data_type></data_type>
-						<decimal_size>0</decimal_size>
-					</sequence>
-				</normal_column>
-				<normal_column>
-					<word_id>123</word_id>
-					<id>208</id>
-					<description></description>
-					<unique_key_name></unique_key_name>
-					<logical_name></logical_name>
-					<physical_name></physical_name>
 					<type>character(n)</type>
 					<constraint></constraint>
 					<default_value></default_value>
@@ -10737,7 +10639,7 @@
 						</sequence>
 					</normal_column>
 					<normal_column>
-						<word_id>141</word_id>
+						<word_id>139</word_id>
 						<id>2</id>
 						<description></description>
 						<unique_key_name></unique_key_name>
@@ -10770,7 +10672,7 @@
 						</sequence>
 					</normal_column>
 					<normal_column>
-						<word_id>142</word_id>
+						<word_id>140</word_id>
 						<id>3</id>
 						<description></description>
 						<unique_key_name></unique_key_name>
@@ -10803,7 +10705,7 @@
 						</sequence>
 					</normal_column>
 					<normal_column>
-						<word_id>114</word_id>
+						<word_id>113</word_id>
 						<id>4</id>
 						<description></description>
 						<unique_key_name></unique_key_name>
@@ -10908,7 +10810,7 @@
 						</sequence>
 					</normal_column>
 					<normal_column>
-						<word_id>93</word_id>
+						<word_id>92</word_id>
 						<id>7</id>
 						<description></description>
 						<unique_key_name></unique_key_name>
@@ -10941,7 +10843,7 @@
 						</sequence>
 					</normal_column>
 					<normal_column>
-						<word_id>83</word_id>
+						<word_id>82</word_id>
 						<id>8</id>
 						<description></description>
 						<unique_key_name></unique_key_name>
@@ -10974,7 +10876,7 @@
 						</sequence>
 					</normal_column>
 					<normal_column>
-						<word_id>127</word_id>
+						<word_id>125</word_id>
 						<id>9</id>
 						<description></description>
 						<unique_key_name></unique_key_name>
@@ -11007,7 +10909,7 @@
 						</sequence>
 					</normal_column>
 					<normal_column>
-						<word_id>131</word_id>
+						<word_id>129</word_id>
 						<id>10</id>
 						<description></description>
 						<unique_key_name></unique_key_name>
@@ -11040,7 +10942,7 @@
 						</sequence>
 					</normal_column>
 					<normal_column>
-						<word_id>132</word_id>
+						<word_id>130</word_id>
 						<id>11</id>
 						<description></description>
 						<unique_key_name></unique_key_name>
diff --git a/jsite-web/src/main/resources/db/sys/jsite_sys_mysql.sql b/jsite-web/src/main/resources/db/sys/jsite_sys_mysql.sql
index 68bd5c9e..6b4ca37d 100644
--- a/jsite-web/src/main/resources/db/sys/jsite_sys_mysql.sql
+++ b/jsite-web/src/main/resources/db/sys/jsite_sys_mysql.sql
@@ -684,10 +684,6 @@ CREATE TABLE wages_social_fun
 	service_cost decimal(6,2) DEFAULT 0 COMMENT '服务费',
 	-- 委托单位
 	delegated_company varchar(64) COMMENT '委托单位',
-	-- 社保增员时间
-	social_add_time datetime COMMENT '社保增员时间',
-	-- 公积金增员时间
-	fund_add_time datetime COMMENT '公积金增员时间',
 	-- 社保公积金状态
 	social_fund_status char(1) COMMENT '社保公积金状态',
 	-- 创建者
diff --git a/jsite-web/src/main/resources/mappings/modules/wages/WagesSocialFunDao.xml b/jsite-web/src/main/resources/mappings/modules/wages/WagesSocialFunDao.xml
index d74a1896..fb024746 100644
--- a/jsite-web/src/main/resources/mappings/modules/wages/WagesSocialFunDao.xml
+++ b/jsite-web/src/main/resources/mappings/modules/wages/WagesSocialFunDao.xml
@@ -31,8 +31,6 @@
 		a.fund_personal_pay AS "fundPersonalPay",
 		a.service_cost AS "serviceCost",
 		a.delegated_company AS "delegatedCompany",
-		a.social_add_time AS "socialAddTime",
-		a.fund_add_time AS "fundAddTime",
 		a.social_fund_status AS "socialFundStatus",
 		a.create_by AS "createBy.id",
 		a.create_date AS "createDate",
@@ -168,8 +166,6 @@
 			fund_personal_pay,
 			service_cost,
 			delegated_company,
-			social_add_time,
-			fund_add_time,
 			social_fund_status,
 			create_by,
 			create_date,
@@ -206,8 +202,6 @@
 			#{fundPersonalPay},
 			#{serviceCost},
 			#{delegatedCompany},
-			#{socialAddTime},
-			#{fundAddTime},
 			#{socialFundStatus},
 			#{createBy.id},
 			#{createDate},
@@ -247,8 +241,6 @@
 			fund_personal_pay = #{fundPersonalPay},
 			service_cost = #{serviceCost},
 			delegated_company = #{delegatedCompany},
-			social_add_time = #{socialAddTime},
-			fund_add_time = #{fundAddTime},
 			social_fund_status = #{socialFundStatus},
 			update_by = #{updateBy.id},
 			update_date = #{updateDate},
diff --git a/jsite-web/src/main/resources/mappings/modules/wages/WagesSocialSecurityDao.xml b/jsite-web/src/main/resources/mappings/modules/wages/WagesSocialSecurityDao.xml
index b22c5e92..fcf730ae 100644
--- a/jsite-web/src/main/resources/mappings/modules/wages/WagesSocialSecurityDao.xml
+++ b/jsite-web/src/main/resources/mappings/modules/wages/WagesSocialSecurityDao.xml
@@ -97,9 +97,15 @@
 			<if test="year != null and year != ''">
 				AND a.year = #{year}
 			</if>
+			<if test="year != null and year != ''">
+				AND f.year = #{year}
+			</if>
 			<if test="month != null and month != ''">
 				AND a.month = #{month}
 			</if>
+			<if test="month != null and month != ''">
+				AND f.month = #{month}
+			</if>
 		</where>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
diff --git a/jsite-web/src/main/resources/views/modules/wages/wagesSocialFunForm.html b/jsite-web/src/main/resources/views/modules/wages/wagesSocialFunForm.html
index d64cd23c..df3db112 100644
--- a/jsite-web/src/main/resources/views/modules/wages/wagesSocialFunForm.html
+++ b/jsite-web/src/main/resources/views/modules/wages/wagesSocialFunForm.html
@@ -16,11 +16,10 @@
 					<div class="col-xs-6">
 						<div class="form-group">
 							<label class="control-label col-sm-4" title="">
-							<span class="required hide">*</span> 用户：<i class="fa icon-question hide"></i>
+								<span class="required hide">*</span> 用户姓名：<i class="fa icon-question hide"></i>
 							</label>
 							<div class="col-sm-8">
-								<#form:treeselect id="userId" name="user.id" value="${wagesSocialFun.user.id!}" labelName="user.name"
-										labelValue="${wagesSocialFun.user.name!}" title="用户" url="/sys/office/treeData?type=3" cssClass="required" notAllowSelectParent="true" />
+								<#form:select path="user.id" name="name" value="id" data="${userList}" class="form-control required" />
 							</div>
 						</div>
 					</div>
@@ -311,30 +310,6 @@
 						</div>
 					</div>
 				</div>
-				<div class="row">
-					<div class="col-xs-6">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-							 社保增员时间：
-							</label>
-							<div class="col-sm-8">
-								<input id="socialAddTime" type="text" name="socialAddTime" maxlength="20" readonly="readonly" class="form-control  "
-										value="${wagesSocialFun.socialAddTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});" />
-							</div>
-						</div>
-					</div>
-					<div class="col-xs-6">
-						<div class="form-group">
-							<label class="control-label col-sm-4" title="">
-							 公积金增员时间：
-							</label>
-							<div class="col-sm-8">
-								<input id="fundAddTime" type="text" name="fundAddTime" maxlength="20" readonly="readonly" class="form-control  "
-										value="${wagesSocialFun.fundAddTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:false});" />
-							</div>
-						</div>
-					</div>
-				</div>
 				<div class="row">
 					<div class="col-xs-6">
 						<div class="form-group">
-- 
Gitee


From db13d27b7da64cfc7274b256c45685b129601dfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E6=96=B0=E5=85=83?= <xxy554518704176@gmail.com>
Date: Fri, 31 May 2019 15:27:23 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E7=A4=BE=E4=BF=9D=E5=85=AC=E7=A7=AF?=
 =?UTF-8?q?=E9=87=91WagesSocialSecurityDao=E6=B7=BB=E5=8A=A0=E7=A4=BE?=
 =?UTF-8?q?=E4=BF=9D=E5=85=AC=E7=A7=AF=E9=87=91=E5=A4=A7=E8=A1=A8=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=A0=87=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mappings/modules/wages/WagesSocialSecurityDao.xml  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/jsite-web/src/main/resources/mappings/modules/wages/WagesSocialSecurityDao.xml b/jsite-web/src/main/resources/mappings/modules/wages/WagesSocialSecurityDao.xml
index fcf730ae..86e23e09 100644
--- a/jsite-web/src/main/resources/mappings/modules/wages/WagesSocialSecurityDao.xml
+++ b/jsite-web/src/main/resources/mappings/modules/wages/WagesSocialSecurityDao.xml
@@ -59,7 +59,7 @@
 			<include refid="wagesSocialSecurityColumns"/>
 		FROM wages_social_security a
 		<include refid="wagesSocialSecurityJoins"/>
-		WHERE a.id = #{id} AND a.del_flag = 0
+		WHERE a.id = #{id} AND a.del_flag = 0 AND f.del_flag = 0
 	</select>
 
     <select id="getByNameYearMonth" resultType="WagesSocialSecurity">
@@ -67,7 +67,7 @@
             <include refid="wagesSocialSecurityColumns"/>
         FROM wages_social_security a
         <include refid="wagesSocialSecurityJoins"/>
-        WHERE a.user_id = #{user.id} AND a.year = #{year} AND a.month = #{month} AND a.del_flag = #{DEL_FLAG_NORMAL}
+        WHERE a.user_id = #{user.id} AND a.year = #{year} AND a.month = #{month} AND a.del_flag = #{DEL_FLAG_NORMAL} AND f.del_flag = #{DEL_FLAG_NORMAL}
     </select>
 	
 	<!--<select id="getMaxMonth" resultType="java.lang.Integer">-->
@@ -81,7 +81,7 @@
           <include refid="wagesSocialSecurityColumns"/>
         FROM wages_social_security a
           <include refid="wagesSocialSecurityJoins"/>
-        WHERE a.year=#{year} AND a.month =#{month} AND a.del_flag = 0
+        WHERE a.year=#{year} AND a.month =#{month} AND a.del_flag = 0 AND f.del_flag = 0
     </select>
     
 	<select id="findList" resultType="WagesSocialSecurity">
@@ -90,7 +90,7 @@
 		FROM wages_social_security a
 		<include refid="wagesSocialSecurityJoins"/>
 		<where>
-			a.del_flag = #{DEL_FLAG_NORMAL}
+			a.del_flag = #{DEL_FLAG_NORMAL} and f.del_flag = #{DEL_FLAG_NORMAL}
 			<if test="user != null and user.id != null and user.id != ''">
 				AND a.user_id = #{user.id}
 			</if>
@@ -141,7 +141,7 @@
 		FROM wages_social_security a
 		<include refid="wagesSocialSecurityJoins"/>
 		<where>
-			a.del_flag = 0
+			a.del_flag = 0 and f.del_flag = 0
 		</where>
         limit 1
 	</select>
-- 
Gitee