优化和调整入职登记模块代码

src/main/java/com/jeeplus/modules/workstaff/entity/WorkStaffBasicInfo.java

@@ -99,6 +99,14 @@ public class WorkStaffBasicInfo extends DataEntity<WorkStaffBasicInfo> {
 
     private String auditUserId;   //总审人员id
     private String auditUserName;   //总审人员名称
+    private String socialSecurityId;   //社保账号
+    private String medicalInsuranceId;   //医保账号
+    private String accumulationFundId;   //公积金账号
+    private String wechatId;   //微信号
+    private String qqId;   //QQ号
+    private String tryOutJob;   //试用岗位
+    private String trialPeriod;   //试用期（月）
+	private String individualResume;   //个人简介
 
 	//劳动关系临时属性
 	private String relationshipStatus;
@@ -736,4 +744,68 @@ public class WorkStaffBasicInfo extends DataEntity<WorkStaffBasicInfo> {
 	public void setAuditUserName(String auditUserName) {
 		this.auditUserName = auditUserName;
 	}
+
+	public String getSocialSecurityId() {
+		return socialSecurityId;
+	}
+
+	public void setSocialSecurityId(String socialSecurityId) {
+		this.socialSecurityId = socialSecurityId;
+	}
+
+	public String getMedicalInsuranceId() {
+		return medicalInsuranceId;
+	}
+
+	public void setMedicalInsuranceId(String medicalInsuranceId) {
+		this.medicalInsuranceId = medicalInsuranceId;
+	}
+
+	public String getAccumulationFundId() {
+		return accumulationFundId;
+	}
+
+	public void setAccumulationFundId(String accumulationFundId) {
+		this.accumulationFundId = accumulationFundId;
+	}
+
+	public String getWechatId() {
+		return wechatId;
+	}
+
+	public void setWechatId(String wechatId) {
+		this.wechatId = wechatId;
+	}
+
+	public String getQqId() {
+		return qqId;
+	}
+
+	public void setQqId(String qqId) {
+		this.qqId = qqId;
+	}
+
+	public String getTryOutJob() {
+		return tryOutJob;
+	}
+
+	public void setTryOutJob(String tryOutJob) {
+		this.tryOutJob = tryOutJob;
+	}
+
+	public String getTrialPeriod() {
+		return trialPeriod;
+	}
+
+	public void setTrialPeriod(String trialPeriod) {
+		this.trialPeriod = trialPeriod;
+	}
+
+	public String getIndividualResume() {
+		return individualResume;
+	}
+
+	public void setIndividualResume(String individualResume) {
+		this.individualResume = individualResume;
+	}
 }

src/main/java/com/jeeplus/modules/workstaff/service/WorkStaffBasicInfoService.java

@@ -226,9 +226,11 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
 	public void save(WorkStaffBasicInfo workStaffBasicInfo,HttpServletRequest request) throws IOException {
         String baseId = workStaffBasicInfo.getId();
         workStaffBasicInfo.setId(workStaffBasicInfo.getAchiveId());
+        //保存员工档案
         this.saveAchive(workStaffBasicInfo,request);
         workStaffBasicInfo.setAchiveId(workStaffBasicInfo.getId());
         workStaffBasicInfo.setId(baseId);
+        //调用保存方法
 		super.save(workStaffBasicInfo);
 	    //同步修改sys_user表中的name
         if(roleService.getRoleIdByUserId(workStaffBasicInfo.getUserId())!=null){
@@ -292,6 +294,13 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
         UserUtils.clearCache();
 
     }
+
+    /**
+     * 新增用户信息
+     * @param workStaffBasicInfo
+     * @param request
+     * @throws IOException
+     */
     public void preSave(WorkStaffBasicInfo workStaffBasicInfo, HttpServletRequest request) throws IOException {
         if(workStaffBasicInfo.getCompany()==null){
             workStaffBasicInfo.setCompany(UserUtils.getSelectCompany());
@@ -403,6 +412,10 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
         }
     }
 
+    /**
+     * 新增员工档案
+     * @param workStaffBasicInfo
+     */
     private void saveAchive(WorkStaffBasicInfo workStaffBasicInfo) {
         if (workStaffBasicInfo.getIsNewRecord()){
             workStaffBasicInfo.preInsert();
@@ -495,7 +508,7 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
         user.setLoginFlag("1");
         user.setFirstFlag("1");
         //微信标识
-        user.setWeChatId(workStaffBasicInfo.getNo());
+        user.setWeChatId(workStaffBasicInfo.getWechatId());
         return user;
     }
 
@@ -669,13 +682,17 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
         if(branchOffice!=null&&StringUtils.isNotBlank(branchOffice.getBranchOffice())){
             workStaffBasicInfo.setBranchOffice(new Office(branchOffice.getBranchOffice()));
         }
+        //新增用户信息
         this.preSave(workStaffBasicInfo, request);
 //        this.uploadFile(workStaffBasicInfo);
+        //新增员工档案
         this.saveAchive(workStaffBasicInfo);
         workStaffBasicInfo.setAchiveId(workStaffBasicInfo.getId());
+        //保存用户下边的附内容信息
         int cou = this.saveDetails(workStaffBasicInfo,true);
         //计算信息完成度
         cou +=this.cacuField(workStaffBasicInfo);
+        //修改员工档案表父节点信息
         workStaffAchivesDao.updatePercent(workStaffBasicInfo.getId(),this.cacuPercent(cou));
         if (StringUtils.isNotBlank(workStaffBasicInfo.getHome()) && "home".equals(workStaffBasicInfo.getHome())){
             WorkProjectNotify workProjectNotify = new WorkProjectNotify();

src/main/resources/mappings/modules/workstaff/WorkStaffAchivesDao.xml

@@ -51,7 +51,15 @@
 		jg.pay AS "salary",
 		nativePlace.name AS "nativePlace.name",
 		a.percent AS "percent",
-		a.try_end_time AS "tryEndTime"
+		a.try_end_time AS "tryEndTime",
+		a.social_security_id AS "socialSecurityId",
+		a.medical_insurance_id AS "medicalInsuranceId",
+		a.accumulation_fund_id AS "accumulationFundId",
+		a.wechat_id AS "wechatId",
+		a.qq_id AS "qqId",
+		a.try_out_job AS "tryOutJob",
+		a.trial_period AS "trialPeriod",
+		a.individual_resume AS "individualResume"
 	</sql>
 	
 	<sql id="workStaffBasicInfoJoins">
@@ -376,7 +384,15 @@
 			user_id,
 			branch_office,
 			percent,
-		    try_end_time
+		    try_end_time,
+		    social_security_id,
+			medical_insurance_id,
+			accumulation_fund_id,
+			wechat_id,
+			qq_id,
+			try_out_job,
+			trial_period,
+			individual_resume
 		) VALUES (
 			#{id},
 			#{createBy.id},
@@ -419,7 +435,15 @@
 			#{userId},
 			#{branchOffice.id},
 			#{percent},
-            #{tryEndTime}
+            #{tryEndTime},
+            #{socialSecurityId},
+            #{medicalInsuranceId},
+			#{accumulationFundId},
+			#{wechatId},
+			#{qqId},
+			#{tryOutJob},
+			#{trialPeriod},
+			#{individualResume}
 		)
 	</insert>
 	
@@ -462,7 +486,15 @@
 			user_id = #{userId},
 			branch_office = #{branchOffice.id},
 			percent = #{percent},
-            try_end_time = #{tryEndTime}
+            try_end_time = #{tryEndTime},
+		    social_security_id = #{socialSecurityId},
+			medical_insurance_id = #{medicalInsuranceId},
+			accumulation_fund_id = #{accumulationFundId},
+			wechat_id = #{wechatId},
+			qq_id = #{qqId},
+			try_out_job = #{tryOutJob},
+			trial_period = #{trialPeriod},
+			individual_resume = #{individualResume}
 		WHERE id = #{id}
 	</update>
 	

src/main/resources/mappings/modules/workstaff/WorkStaffBasicInfoDao.xml

@@ -49,7 +49,15 @@
 		a.achive_id AS "achiveId",
 		nativePlace.name AS "nativePlace.name",
 		a.try_end_time AS "tryEndTime",
-		a.audit_user_id AS "auditUserId"
+		a.audit_user_id AS "auditUserId",
+		a.social_security_id AS "socialSecurityId",
+		a.medical_insurance_id AS "medicalInsuranceId",
+		a.accumulation_fund_id AS "accumulationFundId",
+		a.wechat_id AS "wechatId",
+		a.qq_id AS "qqId",
+		a.try_out_job AS "tryOutJob",
+		a.trial_period AS "trialPeriod",
+		a.individual_resume AS "individualResume"
 <!--		ur.role_id AS "roleId",-->
 <!--		r.name AS "roleName"-->
 	</sql>
@@ -328,7 +336,15 @@
 			user_id,
 			branch_office,
 			achive_id,
-			try_end_time
+			try_end_time,
+		    social_security_id,
+			medical_insurance_id,
+			accumulation_fund_id,
+			wechat_id,
+			qq_id,
+			try_out_job,
+			trial_period,
+			individual_resume
 		) VALUES (
 			#{id},
 			#{createBy.id},
@@ -369,7 +385,15 @@
 			#{userId},
 			#{branchOffice.id},
 			#{achiveId},
-			#{tryEndTime}
+			#{tryEndTime},
+            #{socialSecurityId},
+            #{medicalInsuranceId},
+			#{accumulationFundId},
+			#{wechatId},
+			#{qqId},
+			#{tryOutJob},
+			#{trialPeriod},
+			#{individualResume}
 		)
 	</insert>
 	
@@ -410,7 +434,15 @@
 			user_id = #{userId},
 			branch_office = #{branchOffice.id},
 			achive_id = #{achiveId},
-			try_end_time = #{tryEndTime}
+			try_end_time = #{tryEndTime},
+		    social_security_id = #{socialSecurityId},
+			medical_insurance_id = #{medicalInsuranceId},
+			accumulation_fund_id = #{accumulationFundId},
+			wechat_id = #{wechatId},
+			qq_id = #{qqId},
+			try_out_job = #{tryOutJob},
+			trial_period = #{trialPeriod},
+			individual_resume = #{individualResume}
 		WHERE id = #{id}
 	</update>
 	

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoForm.jsp

@@ -79,11 +79,11 @@
                 });
             }
 
-            $('#bankName').editableSelect({
+            /*$('#bankName').editableSelect({
                 effects: 'slide'
             });
             $('#bankName').val("${workStaffBasicInfo.bankName}");
-            cacuAge('${workStaffBasicInfo.idCard}','1');
+            cacuAge('${workStaffBasicInfo.idCard}','1');*/
 
             changeTryEndTime('${workStaffBasicInfo.status}');
 
@@ -454,56 +454,85 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>归属部门：</label>
-                    <div class="layui-input-block with-icon">
-                        <sys:treeselect id="office" name="office.id" value="${workStaffBasicInfo.office.id}" labelName="office.name" labelValue="${workStaffBasicInfo.office.name}"
-                                        title="部门" url="/sys/office/treeData?type=2" cssClass="form-control layui-input required" notAllowSelectParent="true"/>
+                    <label class="layui-form-label"><span class="require-item">*</span>员工状态：</label>
+                    <div class="layui-input-block">
+                        <form:select path="status" onchange="changeTryEndTime(this.value);" class="form-control simple-select required">
+                            <form:option value="" label=""/>
+                            <form:options items="${fns:getDictList('staff_status')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+                        </form:select>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>岗   位：</label>
-                    <div class="layui-input-block ">
-                        <select id="roleId" class="form-control simple-select required" name="roleId">
-                        </select>
+                    <label class="layui-form-label">银行卡号：</label>
+                    <div class="layui-input-block">
+                        <form:input path="bankCard" htmlEscape="false" minlength="16" maxlength="19" class="form-control layui-input digits"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">职    位：</label>
+                    <label class="layui-form-label">婚姻状况：</label>
                     <div class="layui-input-block">
-                        <form:select path="duty" class="form-control simple-select">
+                        <form:select path="marriage" class="form-control simple-select">
                             <form:option value="" label=""/>
-                            <form:options items="${fns:getMainDictList('staff_duty')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+                            <form:options items="${fns:getDictList('marriage_status')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
                         </form:select>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">职    级：</label>
-                    <div class="layui-input-block with-icon">
-                        <sys:treeselectJobGrade id="jobGrade" name="jobGrade.id" value="${workStaffBasicInfo.jobGrade.id}" labelName="jobGrade.name" labelValue="${workStaffBasicInfo.jobGrade.name}"
-                                                title="职级类型" url="/workjobgrade/workJobGrade/treeData"  cssClass="form-control layui-input " allowClear="true" notAllowSelectParent="true"/>
+                    <label class="layui-form-label">政治面貌：</label>
+                    <div class="layui-input-block">
+                        <form:select path="politics" class="form-control simple-select">
+                            <form:option value="" label=""/>
+                            <form:options items="${fns:getDictList('politics_type')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+                        </form:select>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">基本工资：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>籍    贯：</label>
                     <div class="layui-input-block with-icon">
-                        <input id="salary" htmlEscape="false" readonly value="<fmt:formatNumber pattern="#,##0.00#" value="${workStaffBasicInfo.salary}"/>" class="form-control layui-input"/>
+                        <sys:treeselect id="nativePlace" name="nativePlace.id" value="${workStaffBasicInfo.nativePlace.id}" labelName="" labelValue="${workStaffBasicInfo.nativePlace.name}"
+                                        title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
-                <%--<div class="layui-item layui-col-sm6 lw7">--%>
-                    <%--<label class="layui-form-label double-line"><span class="require-item">*</span>是否 TS人员：</label>--%>
-                    <%--<div class="layui-input-block">--%>
-                        <%--<form:select path="ts" class="form-control simple-select required">--%>
-                            <%--<form:options items="${fns:getDictList('yes_no')}" itemLabel="label" itemValue="value" htmlEscape="false"/>--%>
-                        <%--</form:select>--%>
-                    <%--</div>--%>
-                <%--</div>--%>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>员工状态：</label>
+                    <label class="layui-form-label">户口所在地：</label>
                     <div class="layui-input-block">
-                        <form:select path="status" onchange="changeTryEndTime(this.value);" class="form-control simple-select required">
-                            <form:option value="" label=""/>
-                            <form:options items="${fns:getDictList('staff_status')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
-                        </form:select>
+                        <form:input path="household" htmlEscape="false" class="form-control layui-input"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">常住地址：</label>
+                    <div class="layui-input-block">
+                        <form:input path="address" htmlEscape="false" class="form-control layui-input"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">社保账号：</label>
+                    <div class="layui-input-block">
+                        <form:input path="socialSecurityId" htmlEscape="false" class="form-control layui-input number" maxlength="12"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">医保账号：</label>
+                    <div class="layui-input-block">
+                        <form:input path="medicalInsuranceId" htmlEscape="false" class="form-control layui-input number" maxlength="12"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">公积金账号：</label>
+                    <div class="layui-input-block">
+                        <form:input path="accumulationFundId" htmlEscape="false" class="form-control layui-input number" maxlength="12"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">微信号：</label>
+                    <div class="layui-input-block">
+                        <form:input path="wechatId" htmlEscape="false" class="form-control layui-input"/>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">QQ号：</label>
+                    <div class="layui-input-block">
+                        <form:input path="qqId" htmlEscape="false" class="form-control layui-input number" minlength="5" maxlength="10"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -514,85 +543,112 @@
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label double-line">参加工作日期：</label>
+                    <label class="layui-form-label">试用岗位：</label>
                     <div class="layui-input-block">
-                        <input id="workDate" name="workDate" type="text" maxlength="20" readonly class="laydate-icondate form-control layui-input layer-date laydate-icon "
-                               value="<fmt:formatDate value="${workStaffBasicInfo.workDate}" pattern="yyyy-MM"/>"/>
+                        <form:input path="tryOutJob" htmlEscape="false" class="form-control layui-input"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">开户银行：</label>
+                    <label class="layui-form-label double-line">试用期(月)：</label>
                     <div class="layui-input-block">
-                        <form:select path="bankName" class="form-control editable-select layui-input">
-                            <form:option value=""/>
-                            <form:options items="${fns:getMainDictList('bank_type')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
-                        </form:select>
+                        <form:input path="trialPeriod" htmlEscape="false" class="form-control layui-input number" maxlength="2"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">银行卡号：</label>
+                    <label class="layui-form-label double-line"><span id="tryEndTimeSpan" class="require-item"></span>试用期结束日期：</label>
                     <div class="layui-input-block">
-                        <form:input path="bankCard" htmlEscape="false" minlength="16" maxlength="19" class="form-control layui-input digits"/>
+                        <input id="tryEndTime" name="tryEndTime"  type="text" maxlength="20" readonly class="laydate-icondate form-control layui-input layer-date laydate-icon"
+                               value="<fmt:formatDate value="${workStaffBasicInfo.tryEndTime}" pattern="yyyy-MM-dd"/>"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">婚姻状况：</label>
-                    <div class="layui-input-block">
-                        <form:select path="marriage" class="form-control simple-select">
-                            <form:option value="" label=""/>
-                            <form:options items="${fns:getDictList('marriage_status')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
-                        </form:select>
+                    <label class="layui-form-label"><span class="require-item">*</span>归属部门：</label>
+                    <div class="layui-input-block with-icon">
+                        <sys:treeselect id="office" name="office.id" value="${workStaffBasicInfo.office.id}" labelName="office.name" labelValue="${workStaffBasicInfo.office.name}"
+                                        title="部门" url="/sys/office/treeData?type=2" cssClass="form-control layui-input required" notAllowSelectParent="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">政治面貌：</label>
+                    <label class="layui-form-label"><span class="require-item">*</span>岗   位：</label>
+                    <div class="layui-input-block ">
+                        <select id="roleId" class="form-control simple-select required" name="roleId">
+                        </select>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm12 with-textarea">
+                    <label class="layui-form-label">备注：</label>
                     <div class="layui-input-block">
-                        <form:select path="politics" class="form-control simple-select">
-                            <form:option value="" label=""/>
-                            <form:options items="${fns:getDictList('politics_type')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
-                        </form:select>
+                        <form:textarea path="remarks" htmlEscape="false" rows="4" maxlength="500" class="form-control "/>
                     </div>
                 </div>
-                <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label double-line">是否退伍军人：</label>
+                <div class="layui-item layui-col-sm12 with-textarea">
+                    <label class="layui-form-label">个人简介：</label>
                     <div class="layui-input-block">
-                        <form:select path="exSoldier" class="form-control simple-select">
+                        <form:textarea path="individualResume" htmlEscape="false" rows="4" maxlength="500" class="form-control "/>
+                    </div>
+                </div>
+
+
+                <%--<div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label">职    位：</label>
+                    <div class="layui-input-block">
+                        <form:select path="duty" class="form-control simple-select">
                             <form:option value="" label=""/>
-                            <form:options items="${fns:getDictList('yes_no')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                            <form:options items="${fns:getMainDictList('staff_duty')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
                         </form:select>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">常住地址：</label>
-                    <div class="layui-input-block">
-                        <form:input path="address" htmlEscape="false" class="form-control layui-input"/>
+                    <label class="layui-form-label">职    级：</label>
+                    <div class="layui-input-block with-icon">
+                        <sys:treeselectJobGrade id="jobGrade" name="jobGrade.id" value="${workStaffBasicInfo.jobGrade.id}" labelName="jobGrade.name" labelValue="${workStaffBasicInfo.jobGrade.name}"
+                                                title="职级类型" url="/workjobgrade/workJobGrade/treeData"  cssClass="form-control layui-input " allowClear="true" notAllowSelectParent="true"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label"><span class="require-item">*</span>籍    贯：</label>
+                    <label class="layui-form-label">基本工资：</label>
                     <div class="layui-input-block with-icon">
-                        <sys:treeselect id="nativePlace" name="nativePlace.id" value="${workStaffBasicInfo.nativePlace.id}" labelName="" labelValue="${workStaffBasicInfo.nativePlace.name}"
-                                        title="区域" url="/sys/area/treeData" cssClass="form-control layui-input" allowClear="true" notAllowSelectParent="true"/>
+                        <input id="salary" htmlEscape="false" readonly value="<fmt:formatNumber pattern="#,##0.00#" value="${workStaffBasicInfo.salary}"/>" class="form-control layui-input"/>
                     </div>
                 </div>
+                &lt;%&ndash;<div class="layui-item layui-col-sm6 lw7">&ndash;%&gt;
+                    &lt;%&ndash;<label class="layui-form-label double-line"><span class="require-item">*</span>是否 TS人员：</label>&ndash;%&gt;
+                    &lt;%&ndash;<div class="layui-input-block">&ndash;%&gt;
+                        &lt;%&ndash;<form:select path="ts" class="form-control simple-select required">&ndash;%&gt;
+                            &lt;%&ndash;<form:options items="${fns:getDictList('yes_no')}" itemLabel="label" itemValue="value" htmlEscape="false"/>&ndash;%&gt;
+                        &lt;%&ndash;</form:select>&ndash;%&gt;
+                    &lt;%&ndash;</div>&ndash;%&gt;
+                &lt;%&ndash;</div>&ndash;%&gt;
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label">户口所在地：</label>
+                    <label class="layui-form-label double-line">参加工作日期：</label>
                     <div class="layui-input-block">
-                        <form:input path="household" htmlEscape="false" class="form-control layui-input"/>
+                        <input id="workDate" name="workDate" type="text" maxlength="20" readonly class="laydate-icondate form-control layui-input layer-date laydate-icon "
+                               value="<fmt:formatDate value="${workStaffBasicInfo.workDate}" pattern="yyyy-MM"/>"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label double-line">从事本行业日期：</label>
+                    <label class="layui-form-label">开户银行：</label>
                     <div class="layui-input-block">
-                        <input id="industryDate" name="industryDate" type="text" maxlength="20" readonly class="laydate-icondate form-control layui-input layer-date laydate-icon"
-                               value="<fmt:formatDate value="${workStaffBasicInfo.industryDate}" pattern="yyyy-MM"/>"/>
+                        <form:select path="bankName" class="form-control editable-select layui-input">
+                            <form:option value=""/>
+                            <form:options items="${fns:getMainDictList('bank_type')}" itemLabel="label" itemValue="label" htmlEscape="false"/>
+                        </form:select>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
-                    <label class="layui-form-label double-line"><span id="tryEndTimeSpan" class="require-item"></span>试用期结束日期：</label>
+                    <label class="layui-form-label double-line">是否退伍军人：</label>
                     <div class="layui-input-block">
-                        <input id="tryEndTime" name="tryEndTime"  type="text" maxlength="20" readonly class="laydate-icondate form-control layui-input layer-date laydate-icon"
-                               value="<fmt:formatDate value="${workStaffBasicInfo.tryEndTime}" pattern="yyyy-MM-dd"/>"/>
+                        <form:select path="exSoldier" class="form-control simple-select">
+                            <form:option value="" label=""/>
+                            <form:options items="${fns:getDictList('yes_no')}" itemLabel="label" itemValue="value" htmlEscape="false"/>
+                        </form:select>
+                    </div>
+                </div>
+                <div class="layui-item layui-col-sm6 lw7">
+                    <label class="layui-form-label double-line">从事本行业日期：</label>
+                    <div class="layui-input-block">
+                        <input id="industryDate" name="industryDate" type="text" maxlength="20" readonly class="laydate-icondate form-control layui-input layer-date laydate-icon"
+                               value="<fmt:formatDate value="${workStaffBasicInfo.industryDate}" pattern="yyyy-MM"/>"/>
                     </div>
                 </div>
                 <div class="layui-item layui-col-sm6 lw7">
@@ -608,7 +664,7 @@
                         <input id="workEndDate"  type="text" maxlength="20" readonly class="form-control layui-input"
                                value="<fmt:formatDate value="${workStaffBasicInfo.workEndDate}" pattern="yyyy-MM-dd"/>"/>
                     </div>
-                </div>
+                </div>--%>
             </div>
             <div class="form-group layui-row">
                 <div class="form-group-label"><h2>教育经历</h2></div>
@@ -761,10 +817,12 @@
                             laydate.render({
                                 elem: startDateId, //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
                                 event: 'click' //响应事件。如果没有传入event，则按照默认的click
+                                ,trigger: 'click' //自动弹出控件的事件，采用click弹出
                             });
                             laydate.render({
                                 elem: endDateId, //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
                                 event: 'click' //响应事件。如果没有传入event，则按照默认的click
+                                ,trigger: 'click' //自动弹出控件的事件，采用click弹出
                             });
                         }
                     </script>
@@ -933,6 +991,7 @@
                             laydate.render({
                                 elem: startDateId, //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
                                 event: 'click' //响应事件。如果没有传入event，则按照默认的click
+                                ,trigger: 'click' //自动弹出控件的事件，采用click弹出
                             });
                         }
                     </script>
@@ -1043,10 +1102,12 @@
                             laydate.render({
                                 elem: startDateId, //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
                                 event: 'click' //响应事件。如果没有传入event，则按照默认的click
+                                ,trigger: 'click' //自动弹出控件的事件，采用click弹出
                             });
                             laydate.render({
                                 elem: endDateId, //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
                                 event: 'click' //响应事件。如果没有传入event，则按照默认的click
+                                ,trigger: 'click' //自动弹出控件的事件，采用click弹出
                             });
                         }
                     </script>
@@ -1199,10 +1260,12 @@
                             laydate.render({
                                 elem: startDateId, //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
                                 event: 'click' //响应事件。如果没有传入event，则按照默认的click
+                                ,trigger: 'click' //自动弹出控件的事件，采用click弹出
                             });
                             laydate.render({
                                 elem: registDateId, //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
                                 event: 'click' //响应事件。如果没有传入event，则按照默认的click
+                                ,trigger: 'click' //自动弹出控件的事件，采用click弹出
                             });
                         }
                     </script>
@@ -1309,6 +1372,7 @@
                             laydate.render({
                                 elem: startDateId, //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
                                 event: 'click' //响应事件。如果没有传入event，则按照默认的click
+                                ,trigger: 'click' //自动弹出控件的事件，采用click弹出
                             });
                         }
                     </script>
@@ -1548,10 +1612,12 @@
                             laydate.render({
                                 elem: startDateId, //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
                                 event: 'click' //响应事件。如果没有传入event，则按照默认的click
+                                ,trigger: 'click' //自动弹出控件的事件，采用click弹出
                             });
                             laydate.render({
                                 elem: endDateId, //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
                                 event: 'click' //响应事件。如果没有传入event，则按照默认的click
+                                ,trigger: 'click' //自动弹出控件的事件，采用click弹出
                             });
                         }
                     </script>
@@ -1641,10 +1707,12 @@
                             laydate.render({
                                 elem: startDateId, //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
                                 event: 'click' //响应事件。如果没有传入event，则按照默认的click
+                                ,trigger: 'click' //自动弹出控件的事件，采用click弹出
                             });
                             laydate.render({
                                 elem: endDateId, //目标元素。由于laydate.js封装了一个轻量级的选择器引擎，因此elem还允许你传入class、tag但必须按照这种方式 '#id .class'
                                 event: 'click' //响应事件。如果没有传入event，则按照默认的click
+                                ,trigger: 'click' //自动弹出控件的事件，采用click弹出
                             });
                         }
                     </script>

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoView.jsp

@@ -146,122 +146,181 @@
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label"><span class="require-item">*</span>归属部门：</label>
+                        <label class="layui-form-label"><span class="require-item">*</span>员工状态：</label>
                         <div class="layui-input-block">
-                            <input name="office.name" value="${workStaffBasicInfo.office.name}" type="text" readonly="true" class="form-control  layui-input" />
-                            <input name="office.id" value="${workStaffBasicInfo.office.id}" type="hidden" readonly="true" class="form-control  layui-input" />
+                            <input name="status" value="${workStaffBasicInfo.status}" type="text" readonly="true" class="form-control  layui-input" />
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label"><span class="require-item">*</span>岗   位：</label>
-                        <div class="layui-input-block ">
-                            <input id="roleName" value="${workStaffBasicInfo.roleName}" type="text" readonly class="form-control layui-input" />
+                        <label class="layui-form-label">银行卡号：</label>
+                        <div class="layui-input-block">
+                            <form:input path="bankCard" htmlEscape="false" readonly="true" class="form-control layui-input digits"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label">职    位：</label>
+                        <label class="layui-form-label"><span class="require-item">*</span>婚姻状况：</label>
                         <div class="layui-input-block">
-                            <input name="duty" value="${workStaffBasicInfo.duty}" type="text" readonly="true" class="form-control  layui-input" />
+                            <input name="marriage" value="${workStaffBasicInfo.marriage}" type="text" readonly="true" class="form-control  layui-input" />
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label">职    级：</label>
-                        <div class="layui-input-block with-icon">
-                            <form:input path="jobGrade.name" htmlEscape="false"  readonly="true"  class="form-control layui-input required"/>
-                            <form:hidden path="jobGrade.id" htmlEscape="false"  readonly="true"  class="form-control layui-input required"/>
+                        <label class="layui-form-label"><span class="require-item">*</span>政治面貌：</label>
+                        <div class="layui-input-block">
+                            <input name="politics" value="${workStaffBasicInfo.politics}" type="text" readonly="true" class="form-control  layui-input" />
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label"><span class="require-item">*</span>基本工资：</label>
-                        <div class="layui-input-block with-icon">
-                            <input id="salary" htmlEscape="false" readonly value="<fmt:formatNumber pattern="#,##0.00#" value="${workStaffBasicInfo.salary}"/>" class="form-control layui-input"/>
+                        <label class="layui-form-label"><span class="require-item">*</span>籍    贯：</label>
+                        <div class="layui-input-block">
+                            <input name="nativePlace.name" value="${workStaffBasicInfo.nativePlace.name}" type="text" readonly="true" class="form-control  layui-input" />
                         </div>
                     </div>
-                    <%--<div class="layui-item layui-col-sm6 lw7">--%>
-                        <%--<label class="layui-form-label double-line"><span class="require-item">*</span>是否 TS人员：</label>--%>
-                        <%--<div class="layui-input-block">--%>
-                            <%--<input value="${fns:getDictLabel(workStaffBasicInfo.ts,'yes_no','')}" type="text" readonly="true" class="form-control  layui-input" />--%>
-                            <%--<input name="ts" value="${workStaffBasicInfo.ts}" type="hidden" readonly="true" class="form-control  layui-input" />--%>
-                        <%--</div>--%>
-                    <%--</div>--%>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label"><span class="require-item">*</span>员工状态：</label>
+                        <label class="layui-form-label">户口所在地：</label>
                         <div class="layui-input-block">
-                            <input name="status" value="${workStaffBasicInfo.status}" type="text" readonly="true" class="form-control  layui-input" />
+                            <form:input path="household" htmlEscape="false" readonly="true" class="form-control layui-input"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label"><span class="require-item">*</span>入职日期：</label>
+                        <label class="layui-form-label">常住地址：</label>
                         <div class="layui-input-block">
-                            <input name="entryDate" value="<fmt:formatDate value="${workStaffBasicInfo.entryDate}" pattern="yyyy-MM-dd"/>" type="text" readonly="true" class="form-control  layui-input" />
+                            <form:input path="address" htmlEscape="false" readonly="true" class="form-control layui-input"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label double-line"><span class="require-item">*</span>参加工作日期：</label>
+                        <label class="layui-form-label">社保账号：</label>
                         <div class="layui-input-block">
-                            <input name="workDate" value="<fmt:formatDate value="${workStaffBasicInfo.workDate}" pattern="yyyy-MM"/>" type="text" readonly="true" class="form-control  layui-input" />
+                            <form:input path="socialSecurityId" htmlEscape="false" readonly="true" class="form-control layui-input number" maxlength="12"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label">开户银行：</label>
+                        <label class="layui-form-label">医保账号：</label>
                         <div class="layui-input-block">
-                            <input name="bankName" value="${workStaffBasicInfo.bankName}" type="text" readonly="true" class="form-control  layui-input" />
+                            <form:input path="medicalInsuranceId" htmlEscape="false" readonly="true" class="form-control layui-input number" maxlength="12"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label">银行卡号：</label>
+                        <label class="layui-form-label">公积金账号：</label>
                         <div class="layui-input-block">
-                            <form:input path="bankCard" htmlEscape="false" readonly="true" class="form-control layui-input digits"/>
+                            <form:input path="accumulationFundId" htmlEscape="false" readonly="true" class="form-control layui-input number" maxlength="12"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label"><span class="require-item">*</span>婚姻状况：</label>
+                        <label class="layui-form-label">微信号：</label>
                         <div class="layui-input-block">
-                            <input name="marriage" value="${workStaffBasicInfo.marriage}" type="text" readonly="true" class="form-control  layui-input" />
+                            <form:input path="wechatId" htmlEscape="false" readonly="true" class="form-control layui-input"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label"><span class="require-item">*</span>政治面貌：</label>
+                        <label class="layui-form-label">QQ号：</label>
                         <div class="layui-input-block">
-                            <input name="politics" value="${workStaffBasicInfo.politics}" type="text" readonly="true" class="form-control  layui-input" />
+                            <form:input path="qqId" htmlEscape="false" readonly="true" class="form-control layui-input number" minlength="5" maxlength="10"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label double-line">是否退伍军人：</label>
+                        <label class="layui-form-label"><span class="require-item">*</span>入职日期：</label>
                         <div class="layui-input-block">
-                            <input name="exSoldier" value="${fns:getDictLabel(workStaffBasicInfo.exSoldier,'yes_no','')}" type="text" readonly="true" class="form-control  layui-input" />
+                            <input name="entryDate" value="<fmt:formatDate value="${workStaffBasicInfo.entryDate}" pattern="yyyy-MM-dd"/>" type="text" readonly="true" class="form-control  layui-input" />
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label">常住地址：</label>
+                        <label class="layui-form-label">试用岗位：</label>
                         <div class="layui-input-block">
-                            <form:input path="address" htmlEscape="false" readonly="true" class="form-control layui-input"/>
+                            <form:input path="tryOutJob" htmlEscape="false" readonly="true" class="form-control layui-input"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label"><span class="require-item">*</span>籍    贯：</label>
+                        <label class="layui-form-label double-line">试用期(月)：</label>
                         <div class="layui-input-block">
-                            <input name="nativePlace.name" value="${workStaffBasicInfo.nativePlace.name}" type="text" readonly="true" class="form-control  layui-input" />
+                            <form:input path="trialPeriod" htmlEscape="false" readonly="true" class="form-control layui-input number" maxlength="2"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label">户口所在地：</label>
+                        <label class="layui-form-label double-line">试用期结束日期：</label>
                         <div class="layui-input-block">
-                            <form:input path="household" htmlEscape="false" readonly="true" class="form-control layui-input"/>
+                            <input id="tryEndTime"  type="text" maxlength="20" readonly class="form-control layui-input"
+                                   value="<fmt:formatDate value="${workStaffBasicInfo.tryEndTime}" pattern="yyyy-MM-dd"/>"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label double-line"><span class="require-item">*</span>从事本行业日期：</label>
+                        <label class="layui-form-label"><span class="require-item">*</span>归属部门：</label>
                         <div class="layui-input-block">
-                            <input id="industryDate" name="industryDate" type="text" maxlength="20" readonly class="form-control layui-input"
-                                   value="<fmt:formatDate value="${workStaffBasicInfo.industryDate}" pattern="yyyy-MM"/>"/>
+                            <input name="office.name" value="${workStaffBasicInfo.office.name}" type="text" readonly="true" class="form-control  layui-input" />
+                            <input name="office.id" value="${workStaffBasicInfo.office.id}" type="hidden" readonly="true" class="form-control  layui-input" />
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
-                        <label class="layui-form-label double-line">试用期结束日期：</label>
+                        <label class="layui-form-label"><span class="require-item">*</span>岗   位：</label>
+                        <div class="layui-input-block ">
+                            <input id="roleName" value="${workStaffBasicInfo.roleName}" type="text" readonly class="form-control layui-input" />
+                        </div>
+                    </div>
+                    <div class="layui-item layui-col-sm12 with-textarea">
+                        <label class="layui-form-label">备注：</label>
                         <div class="layui-input-block">
-                            <input id="tryEndTime"  type="text" maxlength="20" readonly class="form-control layui-input"
-                                   value="<fmt:formatDate value="${workStaffBasicInfo.tryEndTime}" pattern="yyyy-MM-dd"/>"/>
+                            <form:textarea path="remarks" htmlEscape="false" readonly="true" rows="4" maxlength="500" class="form-control "/>
+                        </div>
+                    </div>
+                    <div class="layui-item layui-col-sm12 with-textarea">
+                        <label class="layui-form-label">个人简介：</label>
+                        <div class="layui-input-block">
+                            <form:textarea path="individualResume" htmlEscape="false" readonly="true" rows="4" maxlength="500" class="form-control "/>
+                        </div>
+                    </div>
+
+
+
+
+
+                    <%--<div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label">职    位：</label>
+                        <div class="layui-input-block">
+                            <input name="duty" value="${workStaffBasicInfo.duty}" type="text" readonly="true" class="form-control  layui-input" />
+                        </div>
+                    </div>
+                    <div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label">职    级：</label>
+                        <div class="layui-input-block with-icon">
+                            <form:input path="jobGrade.name" htmlEscape="false"  readonly="true"  class="form-control layui-input required"/>
+                            <form:hidden path="jobGrade.id" htmlEscape="false"  readonly="true"  class="form-control layui-input required"/>
+                        </div>
+                    </div>
+                    <div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label"><span class="require-item">*</span>基本工资：</label>
+                        <div class="layui-input-block with-icon">
+                            <input id="salary" htmlEscape="false" readonly value="<fmt:formatNumber pattern="#,##0.00#" value="${workStaffBasicInfo.salary}"/>" class="form-control layui-input"/>
+                        </div>
+                    </div>
+                    &lt;%&ndash;<div class="layui-item layui-col-sm6 lw7">&ndash;%&gt;
+                        &lt;%&ndash;<label class="layui-form-label double-line"><span class="require-item">*</span>是否 TS人员：</label>&ndash;%&gt;
+                        &lt;%&ndash;<div class="layui-input-block">&ndash;%&gt;
+                            &lt;%&ndash;<input value="${fns:getDictLabel(workStaffBasicInfo.ts,'yes_no','')}" type="text" readonly="true" class="form-control  layui-input" />&ndash;%&gt;
+                            &lt;%&ndash;<input name="ts" value="${workStaffBasicInfo.ts}" type="hidden" readonly="true" class="form-control  layui-input" />&ndash;%&gt;
+                        &lt;%&ndash;</div>&ndash;%&gt;
+                    &lt;%&ndash;</div>&ndash;%&gt;
+                    <div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label double-line"><span class="require-item">*</span>参加工作日期：</label>
+                        <div class="layui-input-block">
+                            <input name="workDate" value="<fmt:formatDate value="${workStaffBasicInfo.workDate}" pattern="yyyy-MM"/>" type="text" readonly="true" class="form-control  layui-input" />
+                        </div>
+                    </div>
+                    <div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label">开户银行：</label>
+                        <div class="layui-input-block">
+                            <input name="bankName" value="${workStaffBasicInfo.bankName}" type="text" readonly="true" class="form-control  layui-input" />
+                        </div>
+                    </div>
+                    <div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label double-line">是否退伍军人：</label>
+                        <div class="layui-input-block">
+                            <input name="exSoldier" value="${fns:getDictLabel(workStaffBasicInfo.exSoldier,'yes_no','')}" type="text" readonly="true" class="form-control  layui-input" />
+                        </div>
+                    </div>
+                    <div class="layui-item layui-col-sm6 lw7">
+                        <label class="layui-form-label double-line"><span class="require-item">*</span>从事本行业日期：</label>
+                        <div class="layui-input-block">
+                            <input id="industryDate" name="industryDate" type="text" maxlength="20" readonly class="form-control layui-input"
+                                   value="<fmt:formatDate value="${workStaffBasicInfo.industryDate}" pattern="yyyy-MM"/>"/>
                         </div>
                     </div>
                     <div class="layui-item layui-col-sm6 lw7">
@@ -277,7 +336,7 @@
                             <input id="workEndDate"  type="text" maxlength="20" readonly class="form-control layui-input"
                                    value="<fmt:formatDate value="${workStaffBasicInfo.workEndDate}" pattern="yyyy-MM-dd"/>"/>
                         </div>
-                    </div>
+                    </div>--%>
                 </div>
                 <div class="form-group layui-row">
                     <div class="form-group-label"><h2>教育经历</h2></div>