java71- 张威豹 3 роки тому
батько
коміт
1b0b600200

+ 2 - 9
ruoyi-ahrs/src/main/java/com/ruoyi/ahrs/recruitplan/controller/RecruitPlanMainController.java

@@ -4,22 +4,15 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
-
-import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.ahrs.recruitPersonnel.service.IRecruitPersonnelService;
 import com.ruoyi.ahrs.recruitplan.domian.RecruitPlanChild;
 import com.ruoyi.ahrs.recruitplan.domian.RecruitPlanMain;
 import com.ruoyi.ahrs.recruitplan.service.impl.RecruitPlanChildServiceImpl;
 import com.ruoyi.ahrs.recruitplan.service.impl.RecruitPlanMainServiceImpl;
 import com.ruoyi.common.core.text.Convert;
-import com.ruoyi.common.enums.UserEnums;
 import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.util.ShiroUtils;
 import com.ruoyi.system.domain.SysDept;
 import com.ruoyi.system.service.ISysDeptService;
-import io.swagger.models.auth.In;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -316,7 +309,7 @@ public class RecruitPlanMainController extends BaseController
         return toAjax(true);
     }
 
-/*    //岗位代码修改时发出提醒
+    //删除或岗位代码修改时发出提醒
     @GetMapping("/verifyRecruitPlanChild/{recruitPlanChildId}")
     @ResponseBody
     public AjaxResult verifyPersonnel(@PathVariable("recruitPlanChildId") Long recruitPlanChildId){
@@ -332,6 +325,6 @@ public class RecruitPlanMainController extends BaseController
         }catch (Exception e){
             return toAjax(false);
         }
-    }*/
+    }
 
 }

+ 2 - 9
ruoyi-ahrs/src/main/java/com/ruoyi/ahrs/recruitplan/service/impl/RecruitPlanMainServiceImpl.java

@@ -73,15 +73,8 @@ public class RecruitPlanMainServiceImpl implements IRecruitPlanMainService {
                 }
             }
         }
-        recruitPM.setRecruitPlanYear(recruitPlanMain.getRecruitPlanYear());
-        recruitPM.setVersion(recruitPlanMain.getVersion());
-        recruitPM.setDeptId(recruitPlanMain.getDeptId());
-        recruitPM.setRecruitPlanMainId(recruitPlanMainId);
-        recruitPM.setDeptName(recruitPlanMain.getDeptName());
-        recruitPM.setColumns(recruitPlanMain.getAhrsRecruitPlanChildList());
-        recruitPM.setAttachment(recruitPlanMain.getAttachment());
-        recruitPM.setRemark(recruitPlanMain.getRemark());
-        return  recruitPM;
+       recruitPlanMain.setColumns(recruitPlanMain.getAhrsRecruitPlanChildList());
+        return  recruitPlanMain;
     }
 
     /**

+ 3 - 1
ruoyi-ahrs/src/main/resources/templates/ahrs/recruitplan/edit.html

@@ -507,7 +507,8 @@
         }
     }
 
-    //校验该招聘计划是否有已招聘人员
+/*
+    //校验该招聘计划是否有已招聘人员 已不需要,岗位代码在修改界面不可变更
     function changePostNumId(index,obj){
         try {
             var rId = RecruitPlanMain.columns[index].recruitPlanChildId;
@@ -541,6 +542,7 @@
                 });
         }
     }
+*/
 
     function insertRow() {
         pnI = parseInt(pnI)+parseInt(countNum);