我的面板-我的信息-直接修改

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

@@ -197,7 +197,11 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
      * @throws IOException
      */
     @Transactional(readOnly = false)
-    public void saveAchieveDirectly(WorkStaffBasicInfo workStaffBasicInfo,HttpServletRequest request) throws IOException {
+    public void updateAchieveDirectly(WorkStaffBasicInfo workStaffBasicInfo,HttpServletRequest request) throws IOException {
+        List<WorkStaffEducation> list = workStaffBasicInfo.getEducationList();
+        for(int i=0;i<list.size();i = i+2){
+            list.remove(i);
+        }
         String baseId = workStaffBasicInfo.getId();
         workStaffBasicInfo.setId(workStaffBasicInfo.getAchiveId());
         this.saveAchive(workStaffBasicInfo,request);

src/main/java/com/jeeplus/modules/workstaff/web/WorkStaffBasicInfoController.java

@@ -530,14 +530,17 @@ public class WorkStaffBasicInfoController extends BaseController {
 	}
 
 	/**
-	 * 我的信息-直接保存员工信息
+	 * 我的信息-直接修改员工信息
 	 */
 	@RequestMapping(value = "saveAchiveModifyDirectly")
 	public String saveAchiveModifyDirectly(WorkStaffBasicInfo workStaffBasicInfo, Model model, RedirectAttributes redirectAttributes,HttpServletRequest request) throws Exception{
 		if (!beanValidator(model, workStaffBasicInfo)){
 			return form(workStaffBasicInfo, model,false);
 		}
-		workStaffBasicInfoService.saveAchieveDirectly(workStaffBasicInfo,request);
+        WorkStaffBasicInfo basicInfo = UserUtils.getBasicInfo();
+		workStaffBasicInfo.setId(basicInfo.getId());
+		workStaffBasicInfo.setAchiveId(basicInfo.getId());
+        workStaffBasicInfoService.updateAchieveDirectly(workStaffBasicInfo,request);
 		addMessage(redirectAttributes, "保存员工档案信息成功");
 		return "redirect:"+Global.getAdminPath()+"/sys/user/info?repage";
 	}

src/main/webapp/webpage/modules/projectrecord/projectRecordsForm.jsp

@@ -268,46 +268,47 @@
                 }
             });
 
-            function formSubmit2($document, inputForm, index) {
-                var validateForm = $($document.getElementById(inputForm)).validate({
-                    submitHandler: function (form) {
-                        loading('正在提交，请稍等...');
-                        form.submit();
-                    },
-                    errorContainer: "#messageBox",
-                    errorPlacement: function (error, element) {
-                        $($document.getElementById("#messageBox")).text("输入有误，请先更正。");
-                        if (element.is(":checkbox") || element.is(":radio") || element.parent().is(".input-append")) {
-                            error.appendTo(element.parent().parent());
-                        } else {
-                            error.insertAfter(element);
+
+        }
+
+        function formSubmit2($document, inputForm, index) {
+            var validateForm = $($document.getElementById(inputForm)).validate({
+                submitHandler: function (form) {
+                    loading('正在提交，请稍等...');
+                    form.submit();
+                },
+                errorContainer: "#messageBox",
+                errorPlacement: function (error, element) {
+                    $($document.getElementById("#messageBox")).text("输入有误，请先更正。");
+                    if (element.is(":checkbox") || element.is(":radio") || element.parent().is(".input-append")) {
+                        error.appendTo(element.parent().parent());
+                    } else {
+                        error.insertAfter(element);
+                    }
+                }
+            });
+            if (validateForm.form()) {
+                $($document.getElementById(inputForm)).ajaxSubmit({
+                    success: function (data) {
+                        var d = data;
+                        if (d.msg == "false") {
+                            parent.layer.msg("保存客户信息异常!", {icon: 2});
+                            return false;
                         }
+                        addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanRowIdx);
+                        workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;
+                        var row = workClientLinkmanRowIdx - 1;
+                        $("#" + "workClientLinkmanList" + row + "_id").val(d.id);
+                        $("#" + "workClientLinkmanList" + row + "_office").val(d.office);
+                        $("#" + "workClientLinkmanList" + row + "_name").val(d.name);
+                        $("#" + "workClientLinkmanList" + row + "_linkPhone").val(d.linkPhone);
+                        $("#" + "workClientLinkmanList" + row + "_linkMobile").val(d.linkMobile);
+                        parent.layer.msg(d.str, {icon: 1});
+                        top.layer.close(index)
                     }
                 });
-                if (validateForm.form()) {
-                    $($document.getElementById(inputForm)).ajaxSubmit({
-                        success: function (data) {
-                            var d = data;
-                            if (d.msg == "false") {
-                                parent.layer.msg("保存客户信息异常!", {icon: 2});
-                                return false;
-                            }
-                            addRow('#workClientLinkmanList', workClientLinkmanRowIdx, workClientLinkmanRowIdx);
-                            workClientLinkmanRowIdx = workClientLinkmanRowIdx + 1;
-                            var row = workClientLinkmanRowIdx - 1;
-                            $("#" + "workClientLinkmanList" + row + "_id").val(d.id);
-                            $("#" + "workClientLinkmanList" + row + "_office").val(d.office);
-                            $("#" + "workClientLinkmanList" + row + "_name").val(d.name);
-                            $("#" + "workClientLinkmanList" + row + "_linkPhone").val(d.linkPhone);
-                            $("#" + "workClientLinkmanList" + row + "_linkMobile").val(d.linkMobile);
-                            parent.layer.msg(d.str, {icon: 1});
-                            top.layer.close(index)
-                        }
-                    });
-                }
             }
         }
-
     </script>
 </head>
 <body>

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

@@ -423,9 +423,9 @@
                         </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 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 required basicInfo"
+                            <input id="industryDate" name="industryDate" type="text" maxlength="20" readonly class="laydate-icondate form-control layui-input layer-date laydate-icon  basicInfo"
                                    value="<fmt:formatDate value="${workStaffBasicInfo.industryDate}" pattern="yyyy-MM"/>"/>
                         </div>
                     </div>