离职流程bug

zjugis-business/src/main/java/com/zjugis/business/flow/interview/controller/InterviewController.java

@@ -118,6 +118,12 @@ public class InterviewController extends BaseController {
         return success(true);
     }
 
+
+    /**
+     * 根据身份证查询面试信息
+     * @param cardId 身份证号
+     * @return
+     */
     @GetMapping("/getByCardId")
     @Operation(summary = "根据身份证查询面试信息")
     public CommonResult<InterviewDO> getByCardId(@RequestParam("cardId") String cardId) {

zjugis-business/src/main/resources/templates/Resign/js/index.js

@@ -164,7 +164,8 @@
         }
 
         //将string类型的时间转换成时间戳
-        var detail = []
+        var unfinished = []
+        var finished = []
         for (let key of Object.keys(postData)) {
             let mealName = postData[key];
             if (key.startsWith("createReqVO")) {
@@ -176,10 +177,15 @@
                 postData.createReqVO = mealName;
             }
             if (key.startsWith("ResignDetailDO")) {
-                detail.push(z.ui.form.childStringify(mealName));
+                unfinished.push(z.ui.form.childStringify(mealName));
+            }
+
+            if (key.startsWith("ResignFinishedDetailDO")) {
+                finished.push(z.ui.form.childStringify(mealName));
             }
         }
-        postData.createReqVO.unfinishedList = detail;
+        postData.createReqVO.unfinishedList = unfinished;
+        postData.createReqVO.finishedList = finished;
 
         z.ui.ajax({
             type: "post",
@@ -239,17 +245,17 @@
         trDom.innerHTML = '<td name="qjsj_seq">' + (i + 1) + '</td>'
             + '<td>'/*内容*/
             + '<div class="form-item" >'
-            + '<div class="z-comp-input" name="ResignDetailDO1[' + i + ']$content">'
+            + '<div class="z-comp-input" name="ResignFinishedDetailDO[' + i + ']$content">'
             + '<input type="text" value="">'
             + '</div>'
             + '</div>'
             + '</td>'
-            + '<input type="hidden" name="ResignDetailDO1[' + i + ']$state" value="2">'
+            + '<input type="hidden" name="ResignFinishedDetailDO[' + i + ']$state" value="2">'
             + '<td>'
             + '<div class="form-flex">'
             + '<div class="form-item" style="width: 100%;margin-right: 5px;">'
             + '<div class="z-comp-selecttree" name="receive1[' + i + ']">'
-            + '<input type="hidden" name="ResignDetailDO1[' + i + ']$receiver" value="' + finishedArray[i].receiver + '">'
+            + '<input type="hidden" name="ResignFinishedDetailDO[' + i + ']$receiver" value="' + finishedArray[i].receiver + '">'
             + '<div class="z-inputselect-bar">'
             + '<span></span><i></i>'
             + '</div>'
@@ -261,7 +267,7 @@
             // + '<div class="form-flex">'
             // + '<div class="form-item" style="width: 100%;margin-right: 5px;">'
             // + '<div class="z-comp-selecttree" name="review1[' + i + ']">'
-            // + '<input type="hidden" name="ResignDetailDO1[' + i + ']$reviewer" value="' + finishedArray[i].reviewer + '">'
+            // + '<input type="hidden" name="ResignFinishedDetailDO[' + i + ']$reviewer" value="' + finishedArray[i].reviewer + '">'
             // + '<div class="z-inputselect-bar">'
             // + '<span></span><i></i>'
             // + '</div>'
@@ -292,19 +298,19 @@
 
                 //初始化
                 res.forEach(obj => {
-                    obj.treeName = 'ResignDetailDO1[' + i + ']$receiver';
+                    obj.treeName = 'ResignFinishedDetailDO[' + i + ']$receiver';
                 })
                 selecttree("[name='receive1[" + i + "]']", res, clickReceive)
 
                 // res.forEach(obj => {
-                //     obj.treeName = 'ResignDetailDO1[' + i + ']$reviewer';
+                //     obj.treeName = 'ResignFinishedDetailDO[' + i + ']$reviewer';
                 // })
                 // selecttree("[name='review1[" + i + "]']", res, clickReview)
 
 
                 //赋值
                 if (!(!finishedArray[i].content || finishedArray[i].content.trim() === '')) {
-                    z.ui.input("[name='ResignDetailDO1[" + i + "]$content']").setValue(finishedArray[i].content);
+                    z.ui.input("[name='ResignFinishedDetailDO[" + i + "]$content']").setValue(finishedArray[i].content);
                 }
                 if (!(!finishedArray[i].receiver || finishedArray[i].receiver.trim() === '')) {
                     z.ui.selecttree("[name='receive1[" + i + "]']").setValue(finishedArray[i].receiver)
@@ -516,7 +522,7 @@
         $("#delBtn_" + i).css("display", "block");
         $("[name='receive1[" + i + "]']").removeClass("z-readonly").css("pointer-events", "auto");
         // $("[name='review1[" + i + "]']").removeClass("z-readonly").css("pointer-events", "auto");
-        $("[name='ResignDetailDO1[" + i + "]$content']").removeClass("z-readonly").css("pointer-events", "auto");
+        $("[name='ResignFinishedDetailDO[" + i + "]$content']").removeClass("z-readonly").css("pointer-events", "auto");
     }
 
     function detailReadonly(i) {
@@ -524,7 +530,7 @@
         $("#delBtn_" + i).css("display", "none");
         $("[name='receive1[" + i + "]']").addClass("z-readonly").css("pointer-events", "none");
         // $("[name='review1[" + i + "]']").addClass("z-readonly").css("pointer-events", "none");
-        $("[name='ResignDetailDO1[" + i + "]$content']").addClass("z-readonly").css("pointer-events", "none");
+        $("[name='ResignFinishedDetailDO[" + i + "]$content']").addClass("z-readonly").css("pointer-events", "none");
     }
 
 

zjugis-module-adm/zjugis-module-adm-api/src/main/java/com/zjugis/module/adm/api/staff/dto/StaffRecordsDTO.java

@@ -24,124 +24,248 @@ public class StaffRecordsDTO {
     private String id;
 
 
+    /**
+     * 用户ID
+     */
     @Schema(description = "用户ID")
     private String userId;
 
+    /**
+     * 状态
+     */
     @Schema(description = "状态 1-实习;2-试用;3-正式;4-离职")
     private Integer state;
 
+
+    /**
+     * 政治面貌
+     */
     @Schema(description = "政治面貌")
     private Integer zzmm;
 
+
+    /**
+     * 户口性质
+     */
     @Schema(description = "户口性质")
     private Integer hkxz;
 
+    /**
+     * 毕业学校
+     */
     @Schema(description = "毕业学校")
     private String byxx;
 
+    /**
+     * 毕业时间
+     */
     @Schema(description = "毕业时间")
     private LocalDateTime bysj;
 
+
+    /**
+     * 最高学历
+     */
     @Schema(description = "最高学历")
     private Integer zgxl;
 
+
+    /**
+     * 专业
+     */
     @Schema(description = "专业")
     private String major;
 
+    /**
+     * 参加工作时间
+     */
     @Schema(description = "参加工作时间")
     private LocalDateTime cjgzsj;
 
+    /**
+     * 入公司时间
+     */
     @Schema(description = "入公司时间")
     private LocalDateTime rgssj;
 
+    /**
+     * 离职时间
+     */
     @Schema(description = "离职时间")
     private LocalDateTime lzsj;
 
+    /**
+     * 性别
+     */
     @Schema(description = "性别")
     private Integer sex;
 
+
+    /**
+     * 民族
+     */
     @Schema(description = "民族")
     private String nation;
 
+
+    /**
+     * 出生日期
+     */
     @Schema(description = "出生日期")
     private LocalDateTime birthday;
 
+
+    /**
+     * 身份证号码
+     */
     @Schema(description = "身份证号码")
     private String cardid;
 
 
-
+    /**
+     * 户口所在地
+     */
     @Schema(description = "户口所在地")
     private String hkszd;
 
+
+    /**
+     * 婚姻状况
+     */
     @Schema(description = "婚姻状况")
     private Integer hyzk;
 
 
+    /**
+     * 手机
+     */
     @Schema(description = "手机")
     private String mobilePhone;
 
+
+    /**
+     * 指导人ID
+     */
     @Schema(description = "指导人ID")
     private String zdr;
 
+
+    /**
+     * 紧急联系人号码
+     */
     @Schema(description = "紧急联系人号码")
     private String jjlxrhm;
 
+
+    /**
+     * 紧急联系人姓名
+     */
     @Schema(description = "紧急联系人姓名")
     private String jjlxrxm;
 
     /**
-     * 1父母 2夫妻 3子女 4兄弟姐妹 5其他
+     * 紧急联系人关系
      */
     @Schema(description = "紧急联系人关系")
     private Integer jjlxrgx;
 
 
+    /**
+     * 所属部门
+     */
     @Schema(description = "所属部门")
     private String ssbm;
 
+    /**
+     * 担任职务
+     */
     @Schema(description = "担任职务")
     private String drzw;
 
+    /**
+     * 职称
+     */
     @Schema(description = "职称")
     private String zc;
 
 
+    /**
+     * 转正时间
+     */
     @Schema(description = "转正时间")
     private LocalDateTime zzsj;
 
+
+    /**
+     * 合同到期时间
+     */
     @Schema(description = "合同到期时间")
     private LocalDateTime htdqs;
 
+
+    /**
+     * 签订公司ID
+     */
     @Schema(description = "签订公司ID")
     private String qdgsid;
 
+
+    /**
+     * 能力等级
+     */
     @Schema(description = "能力等级")
     private String nldj;
 
 
-
+    /**
+     * 员工姓名
+     */
     @Schema(description = "员工姓名")
     private String nickname;
 
+
+    /**
+     * 部门名称
+     */
     @Schema(description = "部门名称")
     private String deptName;
 
+
+    /**
+     * 部门Id
+     */
     @Schema(description = "部门Id")
     private String deptId;
 
+
+    /**
+     * 签订公司
+     */
     @Schema(description = "签订公司")
     private String qdgs;
 
+    /**
+     * 指导人名称
+     */
     @Schema(description = "指导人名称")
     private String zdrmc;
 
+    /**
+     * 登录名称(员工工号)
+     */
     @Schema(description = "登录名称(员工工号)")
     private String loginName;
 
+    /**
+     * 开户银行
+     */
     @Schema(description = "开户银行")
     private String khyh;
 
+
+    /**
+     * 银行账号
+     */
     @Schema(description = "银行账号")
     private String yhzh;