项目完整显示多个合同编码；新增集中学习党建专题；新增招聘、调岗审批流程

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectController.java

@@ -13,9 +13,7 @@ import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.file.domain.FilesAchievement;
 import com.ruoyi.file.service.IFilesAchievementService;
-import com.ruoyi.oa.domain.CmcArchive;
-import com.ruoyi.oa.domain.CmcManageDept;
-import com.ruoyi.oa.domain.CmcSettle;
+import com.ruoyi.oa.domain.*;
 import com.ruoyi.oa.service.*;
 import com.ruoyi.system.service.ISysDeptService;
 import com.ruoyi.system.service.ISysUserService;
@@ -26,7 +24,6 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.oa.domain.CmcProject;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 
@@ -49,6 +46,12 @@ public class CmcProjectController extends BaseController
     @Autowired
     private ICmcProjectWorkService cmcProjectWorkService;
 
+    @Autowired
+    private ICmcProjectContractService cmcProjectContractService;
+
+    @Autowired
+    private ICmcContractService cmcContractService;
+
     @Autowired
     private ISysDeptService deptService;
 
@@ -82,6 +85,10 @@ public class CmcProjectController extends BaseController
         for (CmcProject project : list) {
             project.setUndertakingDeptName(deptIdToName(project));
             project.setQualityInspectorName(inspectorIdToName(project));
+            CmcContract contract = joinContract(project);
+            project.setContractCode(contract.getContractCode());
+            project.setContractNumber(contract.getContractNumber());
+            project.setContractName(contract.getContractName());
         }
         return getDataTable(list);
     }
@@ -97,6 +104,10 @@ public class CmcProjectController extends BaseController
         for (CmcProject project : list) {
             project.setUndertakingDeptName(deptIdToName(project));
             project.setQualityInspectorName(inspectorIdToName(project));
+            CmcContract contract = joinContract(project);
+            project.setContractCode(contract.getContractCode());
+            project.setContractNumber(contract.getContractNumber());
+            project.setContractName(contract.getContractName());
         }
         return getDataTable(list);
     }
@@ -116,6 +127,10 @@ public class CmcProjectController extends BaseController
         for (CmcProject project : list) {
             project.setUndertakingDeptName(deptIdToName(project));
             project.setQualityInspectorName(inspectorIdToName(project));
+            CmcContract contract = joinContract(project);
+            project.setContractCode(contract.getContractCode());
+            project.setContractNumber(contract.getContractNumber());
+            project.setContractName(contract.getContractName());
         }
         ExcelUtil<CmcProject> util = new ExcelUtil<CmcProject>(CmcProject.class);
         util.exportExcel(response, list, "cmc项目数据");
@@ -130,13 +145,11 @@ public class CmcProjectController extends BaseController
         CmcProject cmcProject = cmcProjectService.selectCmcProjectByProjectId(projectId);
         if (cmcProject != null) {
             cmcProject.setUndertakingDeptName(deptIdToName(cmcProject));
-            String qualityInspector = cmcProject.getQualityInspector();
-            StringBuilder qualityInspectorName = new StringBuilder();
-            if (qualityInspector != null && !qualityInspector.equals("") && qualityInspector.split(",").length > 0) {
-                for (String inspector : qualityInspector.split(","))
-                    qualityInspectorName.append(userService.selectUserById(Long.parseLong(inspector)).getNickName()).append(",");
-                cmcProject.setQualityInspectorName(qualityInspectorName.substring(0, qualityInspectorName.length() - 1));
-            }
+            cmcProject.setQualityInspectorName(inspectorIdToName(cmcProject));
+            CmcContract contract = joinContract(cmcProject);
+            cmcProject.setContractCode(contract.getContractCode());
+            cmcProject.setContractNumber(contract.getContractNumber());
+            cmcProject.setContractName(contract.getContractName());
         }
         return success(cmcProject);
     }
@@ -384,6 +397,34 @@ public class CmcProjectController extends BaseController
         return cmcProject.getQualityInspectorName();
     }
 
+    public CmcContract joinContract(CmcProject cmcProject) {
+        CmcContract contract = new CmcContract();
+            CmcProjectContract cmcProjectContract = new CmcProjectContract();
+            cmcProjectContract.setProjectId(cmcProject.getProjectId());
+            List<CmcProjectContract> cmcProjectContractList = cmcProjectContractService.selectCmcProjectContractList(cmcProjectContract);
+            cmcProjectContractList.forEach(projectContract -> {
+                try {
+                    CmcContract cmcContract = cmcContractService.selectCmcContractByContractId(projectContract.getContractId());
+                    if (contract.getContractCode() != null)
+                        contract.setContractCode(contract.getContractCode() + "、" + cmcContract.getContractCode());
+                    else
+                        contract.setContractCode(cmcContract.getContractCode());
+                    if (contract.getContractNumber() != null)
+                        contract.setContractNumber(contract.getContractNumber() + "、" + cmcContract.getContractNumber());
+                    else
+                        contract.setContractNumber(cmcContract.getContractNumber());
+                    if (contract.getContractName() != null)
+                        contract.setContractName(contract.getContractName() + "、" + cmcContract.getContractName());
+                    else
+                        contract.setContractName(cmcContract.getContractName());
+                }
+                catch (Exception e){
+                    System.out.println(cmcProjectContractList);
+                }
+            });
+        return contract;
+    }
+
     public List<SysUser> getManageId(String deptId, String partyAId) {
         List<SysUser> userList = new ArrayList<>();
         CmcManageDept cmcManageDept = new CmcManageDept();

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcRecruitController.java

@@ -0,0 +1,97 @@
+package com.ruoyi.web.controller.oa;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.oa.domain.CmcRecruit;
+import com.ruoyi.oa.service.ICmcRecruitService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc员工招聘Controller
+ * 
+ * @author cmc
+ * @date 2025-10-16
+ */
+@RestController
+@RequestMapping("/oa/recruit")
+public class CmcRecruitController extends BaseController
+{
+    @Autowired
+    private ICmcRecruitService cmcRecruitService;
+
+    /**
+     * 查询cmc员工招聘列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcRecruit cmcRecruit)
+    {
+        startPage();
+        List<CmcRecruit> list = cmcRecruitService.selectCmcRecruitList(cmcRecruit);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc员工招聘列表
+     */
+    @Log(title = "cmc员工招聘", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcRecruit cmcRecruit)
+    {
+        List<CmcRecruit> list = cmcRecruitService.selectCmcRecruitList(cmcRecruit);
+        ExcelUtil<CmcRecruit> util = new ExcelUtil<CmcRecruit>(CmcRecruit.class);
+        util.exportExcel(response, list, "cmc员工招聘数据");
+    }
+
+    /**
+     * 获取cmc员工招聘详细信息
+     */
+    @GetMapping(value = "/{recruitId}")
+    public AjaxResult getInfo(@PathVariable("recruitId") String recruitId)
+    {
+        return success(cmcRecruitService.selectCmcRecruitByRecruitId(recruitId));
+    }
+
+    /**
+     * 新增cmc员工招聘
+     */
+    @Log(title = "cmc员工招聘", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcRecruit cmcRecruit)
+    {
+        return toAjax(cmcRecruitService.insertCmcRecruit(cmcRecruit));
+    }
+
+    /**
+     * 修改cmc员工招聘
+     */
+    @Log(title = "cmc员工招聘", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcRecruit cmcRecruit)
+    {
+        return toAjax(cmcRecruitService.updateCmcRecruit(cmcRecruit));
+    }
+
+    /**
+     * 删除cmc员工招聘
+     */
+    @Log(title = "cmc员工招聘", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{recruitIds}")
+    public AjaxResult remove(@PathVariable String[] recruitIds)
+    {
+        return success(cmcRecruitService.deleteCmcRecruitByRecruitIds(recruitIds));
+    }
+}

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcTransferController.java

@@ -0,0 +1,97 @@
+package com.ruoyi.web.controller.oa;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.oa.domain.CmcTransfer;
+import com.ruoyi.oa.service.ICmcTransferService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc员工调岗Controller
+ * 
+ * @author cmc
+ * @date 2025-10-16
+ */
+@RestController
+@RequestMapping("/oa/transfer")
+public class CmcTransferController extends BaseController
+{
+    @Autowired
+    private ICmcTransferService cmcTransferService;
+
+    /**
+     * 查询cmc员工调岗列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcTransfer cmcTransfer)
+    {
+        startPage();
+        List<CmcTransfer> list = cmcTransferService.selectCmcTransferList(cmcTransfer);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc员工调岗列表
+     */
+    @Log(title = "cmc员工调岗", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcTransfer cmcTransfer)
+    {
+        List<CmcTransfer> list = cmcTransferService.selectCmcTransferList(cmcTransfer);
+        ExcelUtil<CmcTransfer> util = new ExcelUtil<CmcTransfer>(CmcTransfer.class);
+        util.exportExcel(response, list, "cmc员工调岗数据");
+    }
+
+    /**
+     * 获取cmc员工调岗详细信息
+     */
+    @GetMapping(value = "/{transferId}")
+    public AjaxResult getInfo(@PathVariable("transferId") String transferId)
+    {
+        return success(cmcTransferService.selectCmcTransferByTransferId(transferId));
+    }
+
+    /**
+     * 新增cmc员工调岗
+     */
+    @Log(title = "cmc员工调岗", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcTransfer cmcTransfer)
+    {
+        return toAjax(cmcTransferService.insertCmcTransfer(cmcTransfer));
+    }
+
+    /**
+     * 修改cmc员工调岗
+     */
+    @Log(title = "cmc员工调岗", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcTransfer cmcTransfer)
+    {
+        return toAjax(cmcTransferService.updateCmcTransfer(cmcTransfer));
+    }
+
+    /**
+     * 删除cmc员工调岗
+     */
+    @Log(title = "cmc员工调岗", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{transferIds}")
+    public AjaxResult remove(@PathVariable String[] transferIds)
+    {
+        return success(cmcTransferService.deleteCmcTransferByTransferIds(transferIds));
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcProject.java

@@ -209,8 +209,6 @@ public class CmcProject extends BaseEntity
 
     private SysUser siteLeaderUser;
 
-    private CmcContract contract;
-
     public void setProjectId(String projectId)
     {
         this.projectId = projectId;
@@ -632,17 +630,32 @@ public class CmcProject extends BaseEntity
     {
         return joinDept;
     }
-    public void setContract(CmcContract contract)
+    public void setContractCode(String contractCode)
+    {
+        this.contractCode = contractCode;
+    }
+
+    public String getContractCode()
+    {
+        return contractCode;
+    }
+    public void setContractNumber(String contractNumber)
+    {
+        this.contractNumber = contractNumber;
+    }
+
+    public String getContractNumber()
+    {
+        return contractNumber;
+    }
+    public void setContractName(String contractName)
     {
-        this.contract = contract;
-        this.contractNumber = contract == null ? "" : contract.getContractNumber();
-        this.contractCode = contract == null ? "" : contract.getContractCode();
-        this.contractName = contract == null ? "" : contract.getContractName();
+        this.contractName = contractName;
     }
 
-    public CmcContract getContract()
+    public String getContractName()
     {
-        return contract;
+        return contractName;
     }
     public void setQueryString(String queryString)
     {

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcRecruit.java

@@ -0,0 +1,374 @@
+package com.ruoyi.oa.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * cmc招聘申请对象 cmc_recruit
+ *
+ * @author cmc
+ * @date 2025-10-16
+ */
+public class CmcRecruit extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 员工招聘id */
+    private String recruitId;
+
+    /** 申请人 */
+    private Long applier;
+    @Excel(name = "申请人")
+    private String applierUserName;
+    private SysUser applierUser;
+
+    /** 申请部门 */
+    private Long applyDept;
+    @Excel(name = "申请部门")
+    private String deptName;
+    private SysDept dept;
+
+    /** 项目id */
+    private String projectId;
+    @Excel(name = "项目编号")
+    private String projectNumber;
+    @Excel(name = "项目名称")
+    private String projectName;
+    @Excel(name = "承担部门")
+    private String undertakingDept;
+    private CmcProject project;
+
+    /** 申请日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "申请日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date applyDate;
+
+    /** 岗位名称 */
+    @Excel(name = "岗位名称")
+    private String postName;
+
+    /** 岗位人数 */
+    @Excel(name = "岗位人数")
+    private Long postNumber;
+
+    /** 岗位职责 */
+    @Excel(name = "岗位职责")
+    private String duty;
+
+    /** 任职资格 */
+    @Excel(name = "任职资格")
+    private String qualification;
+
+    /** 薪酬待遇 */
+    @Excel(name = "薪酬待遇")
+    private String wage;
+
+    /** 部门意见 */
+    @Excel(name = "部门意见")
+    private String deptComment;
+
+    /** 部门负责人 */
+    private Long deptUserId;
+    @Excel(name = "部门负责人")
+    private String deptUserName;
+    private SysUser deptUser;
+
+    /** 部门审批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "部门审批时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date deptTime;
+
+    /** 分管领导意见 */
+    @Excel(name = "分管领导意见")
+    private String managerComment;
+
+    /** 分管领导 */
+    private Long managerUserId;
+    @Excel(name = "分管领导")
+    private String managerUserName;
+    private SysUser managerUser;
+
+    /** 分管领导审批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "分管领导审批时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date managerTime;
+
+    /** 总经理意见 */
+    @Excel(name = "总经理意见")
+    private String zjlComment;
+
+    /** 总经理 */
+    private Long zjlUserId;
+    @Excel(name = "总经理")
+    private String zjlUserName;
+    private SysUser zjlUser;
+
+    /** 总经理审批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "总经理审批时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date zjlTime;
+
+    public void setRecruitId(String recruitId)
+    {
+        this.recruitId = recruitId;
+    }
+
+    public String getRecruitId()
+    {
+        return recruitId;
+    }
+    public void setApplier(Long applier)
+    {
+        this.applier = applier;
+    }
+
+    public Long getApplier()
+    {
+        return applier;
+    }
+    public void setApplyDept(Long applyDept)
+    {
+        this.applyDept = applyDept;
+    }
+
+    public Long getApplyDept()
+    {
+        return applyDept;
+    }
+    public void setProjectId(String projectId)
+    {
+        this.projectId = projectId;
+    }
+
+    public String getProjectId()
+    {
+        return projectId;
+    }
+    public void setApplyDate(Date applyDate)
+    {
+        this.applyDate = applyDate;
+    }
+
+    public Date getApplyDate()
+    {
+        return applyDate;
+    }
+    public void setPostName(String postName)
+    {
+        this.postName = postName;
+    }
+
+    public String getPostName()
+    {
+        return postName;
+    }
+    public void setPostNumber(Long postNumber)
+    {
+        this.postNumber = postNumber;
+    }
+
+    public Long getPostNumber()
+    {
+        return postNumber;
+    }
+    public void setDuty(String duty)
+    {
+        this.duty = duty;
+    }
+
+    public String getDuty()
+    {
+        return duty;
+    }
+    public void setQualification(String qualification)
+    {
+        this.qualification = qualification;
+    }
+
+    public String getQualification()
+    {
+        return qualification;
+    }
+    public void setWage(String wage)
+    {
+        this.wage = wage;
+    }
+
+    public String getWage()
+    {
+        return wage;
+    }
+    public void setDeptComment(String deptComment)
+    {
+        this.deptComment = deptComment;
+    }
+
+    public String getDeptComment()
+    {
+        return deptComment;
+    }
+    public void setDeptUserId(Long deptUserId)
+    {
+        this.deptUserId = deptUserId;
+    }
+
+    public Long getDeptUserId()
+    {
+        return deptUserId;
+    }
+    public void setDeptTime(Date deptTime)
+    {
+        this.deptTime = deptTime;
+    }
+
+    public Date getDeptTime()
+    {
+        return deptTime;
+    }
+    public void setManagerComment(String managerComment)
+    {
+        this.managerComment = managerComment;
+    }
+
+    public String getManagerComment()
+    {
+        return managerComment;
+    }
+    public void setManagerUserId(Long managerUserId)
+    {
+        this.managerUserId = managerUserId;
+    }
+
+    public Long getManagerUserId()
+    {
+        return managerUserId;
+    }
+    public void setManagerTime(Date managerTime)
+    {
+        this.managerTime = managerTime;
+    }
+
+    public Date getManagerTime()
+    {
+        return managerTime;
+    }
+    public void setZjlComment(String zjlComment)
+    {
+        this.zjlComment = zjlComment;
+    }
+
+    public String getZjlComment()
+    {
+        return zjlComment;
+    }
+    public void setZjlUserId(Long zjlUserId)
+    {
+        this.zjlUserId = zjlUserId;
+    }
+
+    public Long getZjlUserId()
+    {
+        return zjlUserId;
+    }
+    public void setZjlTime(Date zjlTime)
+    {
+        this.zjlTime = zjlTime;
+    }
+
+    public Date getZjlTime()
+    {
+        return zjlTime;
+    }
+    public void setDept(SysDept dept)
+    {
+        this.dept = dept;
+        this.deptName = dept == null ? "" : dept.getDeptName();
+    }
+
+    public SysDept getDept()
+    {
+        return dept;
+    }
+    public void setApplierUser(SysUser applierUser)
+    {
+        this.applierUser = applierUser;
+        this.applierUserName = applierUser == null ? "" : applierUser.getNickName();
+    }
+
+    public SysUser getApplierUser()
+    {
+        return applierUser;
+    }
+    public void setDeptUser(SysUser deptUser)
+    {
+        this.deptUser = deptUser;
+        this.deptUserName = deptUser == null ? "" : deptUser.getNickName();
+    }
+
+    public SysUser getDeptUser()
+    {
+        return deptUser;
+    }
+    public void setManagerUser(SysUser managerUser)
+    {
+        this.managerUser = managerUser;
+        this.managerUserName = managerUser == null ? "" : managerUser.getNickName();
+    }
+
+    public SysUser getManagerUser()
+    {
+        return managerUser;
+    }
+    public void setZjlUser(SysUser zjlUser)
+    {
+        this.zjlUser = zjlUser;
+        this.zjlUserName = zjlUser == null ? "" : zjlUser.getNickName();
+    }
+
+    public SysUser getZjlUser()
+    {
+        return zjlUser;
+    }
+    public void setProject(CmcProject project)
+    {
+        this.project = project;
+        this.projectNumber = project == null ? "" : project.getProjectNumber();
+        this.projectName = project == null ? "" : project.getProjectName();
+    }
+
+    public CmcProject getProject()
+    {
+        return project;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("recruitId", getRecruitId())
+                .append("applier", getApplier())
+                .append("applyDept", getApplyDept())
+                .append("projectId", getProjectId())
+                .append("applyDate", getApplyDate())
+                .append("postName", getPostName())
+                .append("postNumber", getPostNumber())
+                .append("duty", getDuty())
+                .append("qualification", getQualification())
+                .append("wage", getWage())
+                .append("deptComment", getDeptComment())
+                .append("deptUserId", getDeptUserId())
+                .append("deptTime", getDeptTime())
+                .append("managerComment", getManagerComment())
+                .append("managerUserId", getManagerUserId())
+                .append("managerTime", getManagerTime())
+                .append("zjlComment", getZjlComment())
+                .append("zjlUserId", getZjlUserId())
+                .append("zjlTime", getZjlTime())
+                .toString();
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcTransfer.java

@@ -0,0 +1,463 @@
+package com.ruoyi.oa.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.system.domain.SysPost;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * cmc员工调岗对象 cmc_transfer
+ * 
+ * @author cmc
+ * @date 2025-10-16
+ */
+public class CmcTransfer extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 调岗id */
+    private String transferId;
+
+    /** 申请人id */
+    private Long applier;
+    @Excel(name = "申请人")
+    private String applierUserName;
+    private SysUser applierUser;
+
+
+    /** 申请日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "申请日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date applyDate;
+
+    /** 调整前所在部门id */
+    private Long beforeDeptId;
+    @Excel(name = "调整前所在部门")
+    private String beforeDeptName;
+    private SysDept beforeDept;
+
+    /** 调整前岗位id */
+    private Long beforePostId;
+    @Excel(name = "调整前岗位")
+    private String beforePostName;
+    private SysPost beforePost;
+
+    /** 调整后所在部门id */
+    private Long afterDeptId;
+    @Excel(name = "调整后所在部门")
+    private String afterDeptName;
+    private SysDept afterDept;
+
+    /** 调整后岗位id */
+    private Long afterPostId;
+    @Excel(name = "调整后岗位")
+    private String afterPostName;
+    private SysPost afterPost;
+
+    /** 调整前所在部门意见 */
+    @Excel(name = "调整前所在部门意见")
+    private String beforeDeptComment;
+
+    /** 调整前所在部门负责人 */
+    private Long beforeDeptLeader;
+    @Excel(name = "调整前所在部门负责人")
+    private String beforeDeptUserName;
+    private SysUser beforeDeptUser;
+
+    /** 调整前所在部门审批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "调整前所在部门审批时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date beforeDeptTime;
+
+    /** 调整后所在部门意见 */
+    @Excel(name = "调整后所在部门意见")
+    private String afterDeptComment;
+
+    /** 调整后所在部门审批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "调整后所在部门审批时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date afterDeptTime;
+
+    /** 调整后所在部门负责人 */
+    private Long afterDeptLeader;
+    @Excel(name = "调整后所在部门负责人")
+    private String afterDeptUserName;
+    private SysUser afterDeptUser;
+
+    /** 综合事务部意见 */
+    @Excel(name = "综合事务部意见")
+    private String zhComment;
+
+    /** 综合事务部审批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "综合事务部审批时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date zhTime;
+
+    /** 综合事务部负责人 */
+    private Long zhUserId;
+    @Excel(name = "综合事务部负责人")
+    private String zhUserName;
+    private SysUser zhUser;
+
+    /** 分管领导意见 */
+    @Excel(name = "分管领导意见")
+    private String managerComment;
+
+    /** 分管领导审批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "分管领导审批时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date managerTime;
+
+    /** 分管领导 */
+    private Long managerUserId;
+    @Excel(name = "分管领导")
+    private String managerUserName;
+    private SysUser managerUser;
+
+    /** 总经理意见 */
+    @Excel(name = "总经理意见")
+    private String zjlComment;
+
+    /** 总经理审批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "总经理审批时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date zjlTime;
+
+    /** 总经理 */
+    private Long zjlUserId;
+    @Excel(name = "总经理")
+    private String zjlUserName;
+    private SysUser zjlUser;
+
+    public void setTransferId(String transferId) 
+    {
+        this.transferId = transferId;
+    }
+
+    public String getTransferId() 
+    {
+        return transferId;
+    }
+    public void setApplier(Long applier) 
+    {
+        this.applier = applier;
+    }
+
+    public Long getApplier() 
+    {
+        return applier;
+    }
+    public void setApplyDate(Date applyDate) 
+    {
+        this.applyDate = applyDate;
+    }
+
+    public Date getApplyDate() 
+    {
+        return applyDate;
+    }
+    public void setBeforeDeptId(Long beforeDeptId) 
+    {
+        this.beforeDeptId = beforeDeptId;
+    }
+
+    public Long getBeforeDeptId() 
+    {
+        return beforeDeptId;
+    }
+    public void setBeforePostId(Long beforePostId) 
+    {
+        this.beforePostId = beforePostId;
+    }
+
+    public Long getBeforePostId() 
+    {
+        return beforePostId;
+    }
+    public void setAfterDeptId(Long afterDeptId) 
+    {
+        this.afterDeptId = afterDeptId;
+    }
+
+    public Long getAfterDeptId() 
+    {
+        return afterDeptId;
+    }
+    public void setAfterPostId(Long afterPostId) 
+    {
+        this.afterPostId = afterPostId;
+    }
+
+    public Long getAfterPostId() 
+    {
+        return afterPostId;
+    }
+    public void setBeforeDeptComment(String beforeDeptComment) 
+    {
+        this.beforeDeptComment = beforeDeptComment;
+    }
+
+    public String getBeforeDeptComment() 
+    {
+        return beforeDeptComment;
+    }
+    public void setBeforeDeptLeader(Long beforeDeptLeader) 
+    {
+        this.beforeDeptLeader = beforeDeptLeader;
+    }
+
+    public Long getBeforeDeptLeader() 
+    {
+        return beforeDeptLeader;
+    }
+    public void setBeforeDeptTime(Date beforeDeptTime) 
+    {
+        this.beforeDeptTime = beforeDeptTime;
+    }
+
+    public Date getBeforeDeptTime() 
+    {
+        return beforeDeptTime;
+    }
+    public void setAfterDeptComment(String afterDeptComment) 
+    {
+        this.afterDeptComment = afterDeptComment;
+    }
+
+    public String getAfterDeptComment() 
+    {
+        return afterDeptComment;
+    }
+    public void setAfterDeptTime(Date afterDeptTime) 
+    {
+        this.afterDeptTime = afterDeptTime;
+    }
+
+    public Date getAfterDeptTime() 
+    {
+        return afterDeptTime;
+    }
+    public void setAfterDeptLeader(Long afterDeptLeader) 
+    {
+        this.afterDeptLeader = afterDeptLeader;
+    }
+
+    public Long getAfterDeptLeader() 
+    {
+        return afterDeptLeader;
+    }
+    public void setZhComment(String zhComment) 
+    {
+        this.zhComment = zhComment;
+    }
+
+    public String getZhComment() 
+    {
+        return zhComment;
+    }
+    public void setZhTime(Date zhTime) 
+    {
+        this.zhTime = zhTime;
+    }
+
+    public Date getZhTime() 
+    {
+        return zhTime;
+    }
+    public void setZhUserId(Long zhUserId) 
+    {
+        this.zhUserId = zhUserId;
+    }
+
+    public Long getZhUserId() 
+    {
+        return zhUserId;
+    }
+    public void setManagerComment(String managerComment) 
+    {
+        this.managerComment = managerComment;
+    }
+
+    public String getManagerComment() 
+    {
+        return managerComment;
+    }
+    public void setManagerTime(Date managerTime) 
+    {
+        this.managerTime = managerTime;
+    }
+
+    public Date getManagerTime() 
+    {
+        return managerTime;
+    }
+    public void setManagerUserId(Long managerUserId) 
+    {
+        this.managerUserId = managerUserId;
+    }
+
+    public Long getManagerUserId() 
+    {
+        return managerUserId;
+    }
+    public void setZjlComment(String zjlComment) 
+    {
+        this.zjlComment = zjlComment;
+    }
+
+    public String getZjlComment() 
+    {
+        return zjlComment;
+    }
+    public void setZjlTime(Date zjlTime) 
+    {
+        this.zjlTime = zjlTime;
+    }
+
+    public Date getZjlTime() 
+    {
+        return zjlTime;
+    }
+    public void setZjlUserId(Long zjlUserId) 
+    {
+        this.zjlUserId = zjlUserId;
+    }
+
+    public Long getZjlUserId() 
+    {
+        return zjlUserId;
+    }
+    public void setBeforePost(SysPost beforePost)
+    {
+        this.beforePost = beforePost;
+        this.beforePostName = beforePost == null ? "" : beforePost.getPostName();
+    }
+
+    public SysPost getBeforePost()
+    {
+        return beforePost;
+    }
+    public void setAfterPost(SysPost afterPost)
+    {
+        this.afterPost = afterPost;
+        this.afterPostName = afterPost == null ? "" : afterPost.getPostName();
+    }
+
+    public SysPost getAfterPost()
+    {
+        return beforePost;
+    }
+    public void setBeforeDept(SysDept beforeDept)
+    {
+        this.beforeDept = beforeDept;
+        this.beforeDeptName = beforeDept == null ? "" : beforeDept.getDeptName();
+    }
+
+    public SysDept getBeforeDept()
+    {
+        return beforeDept;
+    }
+    public void setAfterDept(SysDept afterDept)
+    {
+        this.afterDept = afterDept;
+        this.afterDeptName = afterDept == null ? "" : afterDept.getDeptName();
+    }
+
+    public SysDept getAfterDept()
+    {
+        return beforeDept;
+    }
+    public void setApplierUser(SysUser applierUser)
+    {
+        this.applierUser = applierUser;
+        this.applierUserName = applierUser == null ? "" : applierUser.getNickName();
+    }
+
+    public SysUser getApplierUser()
+    {
+        return applierUser;
+    }
+    public void setBeforeDeptUser(SysUser beforeDeptUser)
+    {
+        this.beforeDeptUser = beforeDeptUser;
+        this.beforeDeptUserName = beforeDeptUser == null ? "" : beforeDeptUser.getNickName();
+    }
+
+    public SysUser getBeforeDeptUser()
+    {
+        return beforeDeptUser;
+    }
+    public void setAfterDeptUser(SysUser afterDeptUser)
+    {
+        this.afterDeptUser = afterDeptUser;
+        this.afterDeptUserName = afterDeptUser == null ? "" : afterDeptUser.getNickName();
+    }
+
+    public SysUser getAfterDeptUser()
+    {
+        return beforeDeptUser;
+    }
+    public void setZhUser(SysUser zhUser)
+    {
+        this.zhUser = zhUser;
+        this.zhUserName = zhUser == null ? "" : zhUser.getNickName();
+    }
+
+    public SysUser getZhUser()
+    {
+        return zhUser;
+    }
+    public void setManagerUser(SysUser managerUser)
+    {
+        this.managerUser = managerUser;
+        this.managerUserName = managerUser == null ? "" : managerUser.getNickName();
+    }
+
+    public SysUser getManagerUser()
+    {
+        return managerUser;
+    }
+    public void setZjlUser(SysUser zjlUser)
+    {
+        this.zjlUser = zjlUser;
+        this.zjlUserName = zjlUser == null ? "" : zjlUser.getNickName();
+    }
+
+    public SysUser getZjlUser()
+    {
+        return zjlUser;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("transferId", getTransferId())
+            .append("applier", getApplier())
+            .append("applyDate", getApplyDate())
+            .append("beforeDeptId", getBeforeDeptId())
+            .append("beforePostId", getBeforePostId())
+            .append("afterDeptId", getAfterDeptId())
+            .append("afterPostId", getAfterPostId())
+            .append("beforeDeptComment", getBeforeDeptComment())
+            .append("beforeDeptLeader", getBeforeDeptLeader())
+            .append("beforeDeptTime", getBeforeDeptTime())
+            .append("afterDeptComment", getAfterDeptComment())
+            .append("afterDeptTime", getAfterDeptTime())
+            .append("afterDeptLeader", getAfterDeptLeader())
+            .append("zhComment", getZhComment())
+            .append("zhTime", getZhTime())
+            .append("zhUserId", getZhUserId())
+            .append("managerComment", getManagerComment())
+            .append("managerTime", getManagerTime())
+            .append("managerUserId", getManagerUserId())
+            .append("zjlComment", getZjlComment())
+            .append("zjlTime", getZjlTime())
+            .append("zjlUserId", getZjlUserId())
+            .toString();
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcRecruitMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcRecruit;
+
+/**
+ * cmc员工招聘Mapper接口
+ * 
+ * @author cmc
+ * @date 2025-10-16
+ */
+public interface CmcRecruitMapper 
+{
+    /**
+     * 查询cmc员工招聘
+     * 
+     * @param recruitId cmc员工招聘主键
+     * @return cmc员工招聘
+     */
+    public CmcRecruit selectCmcRecruitByRecruitId(String recruitId);
+
+    /**
+     * 查询cmc员工招聘列表
+     * 
+     * @param cmcRecruit cmc员工招聘
+     * @return cmc员工招聘集合
+     */
+    public List<CmcRecruit> selectCmcRecruitList(CmcRecruit cmcRecruit);
+
+    /**
+     * 新增cmc员工招聘
+     * 
+     * @param cmcRecruit cmc员工招聘
+     * @return 结果
+     */
+    public int insertCmcRecruit(CmcRecruit cmcRecruit);
+
+    /**
+     * 修改cmc员工招聘
+     * 
+     * @param cmcRecruit cmc员工招聘
+     * @return 结果
+     */
+    public int updateCmcRecruit(CmcRecruit cmcRecruit);
+
+    /**
+     * 删除cmc员工招聘
+     * 
+     * @param recruitId cmc员工招聘主键
+     * @return 结果
+     */
+    public int deleteCmcRecruitByRecruitId(String recruitId);
+
+    /**
+     * 批量删除cmc员工招聘
+     * 
+     * @param recruitIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcRecruitByRecruitIds(String[] recruitIds);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcTransferMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcTransfer;
+
+/**
+ * cmc员工调岗Mapper接口
+ * 
+ * @author cmc
+ * @date 2025-10-16
+ */
+public interface CmcTransferMapper 
+{
+    /**
+     * 查询cmc员工调岗
+     * 
+     * @param transferId cmc员工调岗主键
+     * @return cmc员工调岗
+     */
+    public CmcTransfer selectCmcTransferByTransferId(String transferId);
+
+    /**
+     * 查询cmc员工调岗列表
+     * 
+     * @param cmcTransfer cmc员工调岗
+     * @return cmc员工调岗集合
+     */
+    public List<CmcTransfer> selectCmcTransferList(CmcTransfer cmcTransfer);
+
+    /**
+     * 新增cmc员工调岗
+     * 
+     * @param cmcTransfer cmc员工调岗
+     * @return 结果
+     */
+    public int insertCmcTransfer(CmcTransfer cmcTransfer);
+
+    /**
+     * 修改cmc员工调岗
+     * 
+     * @param cmcTransfer cmc员工调岗
+     * @return 结果
+     */
+    public int updateCmcTransfer(CmcTransfer cmcTransfer);
+
+    /**
+     * 删除cmc员工调岗
+     * 
+     * @param transferId cmc员工调岗主键
+     * @return 结果
+     */
+    public int deleteCmcTransferByTransferId(String transferId);
+
+    /**
+     * 批量删除cmc员工调岗
+     * 
+     * @param transferIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcTransferByTransferIds(String[] transferIds);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcRecruitService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcRecruit;
+
+/**
+ * cmc员工招聘Service接口
+ * 
+ * @author cmc
+ * @date 2025-10-16
+ */
+public interface ICmcRecruitService 
+{
+    /**
+     * 查询cmc员工招聘
+     * 
+     * @param recruitId cmc员工招聘主键
+     * @return cmc员工招聘
+     */
+    public CmcRecruit selectCmcRecruitByRecruitId(String recruitId);
+
+    /**
+     * 查询cmc员工招聘列表
+     * 
+     * @param cmcRecruit cmc员工招聘
+     * @return cmc员工招聘集合
+     */
+    public List<CmcRecruit> selectCmcRecruitList(CmcRecruit cmcRecruit);
+
+    /**
+     * 新增cmc员工招聘
+     * 
+     * @param cmcRecruit cmc员工招聘
+     * @return 结果
+     */
+    public int insertCmcRecruit(CmcRecruit cmcRecruit);
+
+    /**
+     * 修改cmc员工招聘
+     * 
+     * @param cmcRecruit cmc员工招聘
+     * @return 结果
+     */
+    public int updateCmcRecruit(CmcRecruit cmcRecruit);
+
+    /**
+     * 批量删除cmc员工招聘
+     * 
+     * @param recruitIds 需要删除的cmc员工招聘主键集合
+     * @return 结果
+     */
+    public int deleteCmcRecruitByRecruitIds(String[] recruitIds);
+
+    /**
+     * 删除cmc员工招聘信息
+     * 
+     * @param recruitId cmc员工招聘主键
+     * @return 结果
+     */
+    public int deleteCmcRecruitByRecruitId(String recruitId);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcTransferService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcTransfer;
+
+/**
+ * cmc员工调岗Service接口
+ * 
+ * @author cmc
+ * @date 2025-10-16
+ */
+public interface ICmcTransferService 
+{
+    /**
+     * 查询cmc员工调岗
+     * 
+     * @param transferId cmc员工调岗主键
+     * @return cmc员工调岗
+     */
+    public CmcTransfer selectCmcTransferByTransferId(String transferId);
+
+    /**
+     * 查询cmc员工调岗列表
+     * 
+     * @param cmcTransfer cmc员工调岗
+     * @return cmc员工调岗集合
+     */
+    public List<CmcTransfer> selectCmcTransferList(CmcTransfer cmcTransfer);
+
+    /**
+     * 新增cmc员工调岗
+     * 
+     * @param cmcTransfer cmc员工调岗
+     * @return 结果
+     */
+    public int insertCmcTransfer(CmcTransfer cmcTransfer);
+
+    /**
+     * 修改cmc员工调岗
+     * 
+     * @param cmcTransfer cmc员工调岗
+     * @return 结果
+     */
+    public int updateCmcTransfer(CmcTransfer cmcTransfer);
+
+    /**
+     * 批量删除cmc员工调岗
+     * 
+     * @param transferIds 需要删除的cmc员工调岗主键集合
+     * @return 结果
+     */
+    public int deleteCmcTransferByTransferIds(String[] transferIds);
+
+    /**
+     * 删除cmc员工调岗信息
+     * 
+     * @param transferId cmc员工调岗主键
+     * @return 结果
+     */
+    public int deleteCmcTransferByTransferId(String transferId);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcRecruitServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.oa.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.oa.mapper.CmcRecruitMapper;
+import com.ruoyi.oa.domain.CmcRecruit;
+import com.ruoyi.oa.service.ICmcRecruitService;
+
+/**
+ * cmc员工招聘Service业务层处理
+ * 
+ * @author cmc
+ * @date 2025-10-16
+ */
+@Service
+public class CmcRecruitServiceImpl implements ICmcRecruitService 
+{
+    @Autowired
+    private CmcRecruitMapper cmcRecruitMapper;
+
+    /**
+     * 查询cmc员工招聘
+     * 
+     * @param recruitId cmc员工招聘主键
+     * @return cmc员工招聘
+     */
+    @Override
+    public CmcRecruit selectCmcRecruitByRecruitId(String recruitId)
+    {
+        return cmcRecruitMapper.selectCmcRecruitByRecruitId(recruitId);
+    }
+
+    /**
+     * 查询cmc员工招聘列表
+     * 
+     * @param cmcRecruit cmc员工招聘
+     * @return cmc员工招聘
+     */
+    @Override
+    public List<CmcRecruit> selectCmcRecruitList(CmcRecruit cmcRecruit)
+    {
+        return cmcRecruitMapper.selectCmcRecruitList(cmcRecruit);
+    }
+
+    /**
+     * 新增cmc员工招聘
+     * 
+     * @param cmcRecruit cmc员工招聘
+     * @return 结果
+     */
+    @Override
+    public int insertCmcRecruit(CmcRecruit cmcRecruit)
+    {
+        return cmcRecruitMapper.insertCmcRecruit(cmcRecruit);
+    }
+
+    /**
+     * 修改cmc员工招聘
+     * 
+     * @param cmcRecruit cmc员工招聘
+     * @return 结果
+     */
+    @Override
+    public int updateCmcRecruit(CmcRecruit cmcRecruit)
+    {
+        return cmcRecruitMapper.updateCmcRecruit(cmcRecruit);
+    }
+
+    /**
+     * 批量删除cmc员工招聘
+     * 
+     * @param recruitIds 需要删除的cmc员工招聘主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcRecruitByRecruitIds(String[] recruitIds)
+    {
+        return cmcRecruitMapper.deleteCmcRecruitByRecruitIds(recruitIds);
+    }
+
+    /**
+     * 删除cmc员工招聘信息
+     * 
+     * @param recruitId cmc员工招聘主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcRecruitByRecruitId(String recruitId)
+    {
+        return cmcRecruitMapper.deleteCmcRecruitByRecruitId(recruitId);
+    }
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcTransferServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.oa.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.oa.mapper.CmcTransferMapper;
+import com.ruoyi.oa.domain.CmcTransfer;
+import com.ruoyi.oa.service.ICmcTransferService;
+
+/**
+ * cmc员工调岗Service业务层处理
+ * 
+ * @author cmc
+ * @date 2025-10-16
+ */
+@Service
+public class CmcTransferServiceImpl implements ICmcTransferService 
+{
+    @Autowired
+    private CmcTransferMapper cmcTransferMapper;
+
+    /**
+     * 查询cmc员工调岗
+     * 
+     * @param transferId cmc员工调岗主键
+     * @return cmc员工调岗
+     */
+    @Override
+    public CmcTransfer selectCmcTransferByTransferId(String transferId)
+    {
+        return cmcTransferMapper.selectCmcTransferByTransferId(transferId);
+    }
+
+    /**
+     * 查询cmc员工调岗列表
+     * 
+     * @param cmcTransfer cmc员工调岗
+     * @return cmc员工调岗
+     */
+    @Override
+    public List<CmcTransfer> selectCmcTransferList(CmcTransfer cmcTransfer)
+    {
+        return cmcTransferMapper.selectCmcTransferList(cmcTransfer);
+    }
+
+    /**
+     * 新增cmc员工调岗
+     * 
+     * @param cmcTransfer cmc员工调岗
+     * @return 结果
+     */
+    @Override
+    public int insertCmcTransfer(CmcTransfer cmcTransfer)
+    {
+        return cmcTransferMapper.insertCmcTransfer(cmcTransfer);
+    }
+
+    /**
+     * 修改cmc员工调岗
+     * 
+     * @param cmcTransfer cmc员工调岗
+     * @return 结果
+     */
+    @Override
+    public int updateCmcTransfer(CmcTransfer cmcTransfer)
+    {
+        return cmcTransferMapper.updateCmcTransfer(cmcTransfer);
+    }
+
+    /**
+     * 批量删除cmc员工调岗
+     * 
+     * @param transferIds 需要删除的cmc员工调岗主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcTransferByTransferIds(String[] transferIds)
+    {
+        return cmcTransferMapper.deleteCmcTransferByTransferIds(transferIds);
+    }
+
+    /**
+     * 删除cmc员工调岗信息
+     * 
+     * @param transferId cmc员工调岗主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcTransferByTransferId(String transferId)
+    {
+        return cmcTransferMapper.deleteCmcTransferByTransferId(transferId);
+    }
+}

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcProjectMapper.xml

@@ -50,7 +50,6 @@
         <association property="technicalDirectorUser"    javaType="SysUser"         resultMap="TechnicalDirectorResult" />
         <association property="technicalDesignerUser"    javaType="SysUser"         resultMap="TechnicalDesignerResult" />
         <association property="partyA"    javaType="CmcPartyA"         resultMap="CmcPartyAResult" />
-        <association property="contract"    javaType="CmcContract"         resultMap="CmcContractResult" />
     </resultMap>
 
     <resultMap type="SysUser" id="ProjectLeaderResult">
@@ -88,19 +87,12 @@
         <result property="partyAName"    column="party_a_name"    />
     </resultMap>
 
-    <resultMap type="CmcContract" id="CmcContractResult">
-        <result property="contractId"    column="contract_id"    />
-        <result property="contractNumber"    column="contract_number"    />
-        <result property="contractCode"    column="contract_code"    />
-        <result property="contractName"    column="contract_name"    />
-    </resultMap>
-
     <sql id="selectCmcProjectVo">
         select distinct(p.project_id), p.project_number, p.project_name, p.project_leader, u.nick_name as leader_nick_name, p.is_finished, p.project_source, p.party_a_id, pa.party_a_name, p.contact_person, p.telephone,
                p.project_type, p.project_level, p.project_registrant, u1.nick_name as registrant_nick_name, p.undertaking_dept, p.project_planner, p.site_leader, p.organize_document, p.organize_time, p.is_complete,
                p.register_time, p.plan_time, p.entry_time, p.exit_time, p.remark, tp.technical_director, u2.nick_name as director_nick_name, tp.quality_inspector, p.project_kml, p.project_cp, p.kml_lng, p.kml_lat,
                p.cars, p.drivers, p.devices, p.participates, p.task_document, p.project_request, tp.technical_designer, u3.nick_name as designer_nick_name, u4.nick_name as planner_nick_name,
-               u5.nick_name as site_nick_name, p.in_leader, p.out_leader, p.lead_dept, p.join_dept, pc.contract_id, c.contract_number, c.contract_code, c.contract_name from cmc_project as p
+               u5.nick_name as site_nick_name, p.in_leader, p.out_leader, p.lead_dept, p.join_dept from cmc_project as p
         left join sys_user as u on u.user_id = p.project_leader
         left join sys_user as u1 on u1.user_id = p.project_registrant
         left join cmc_technical_plan as tp on tp.project_id = p.project_id
@@ -109,8 +101,6 @@
         left join sys_user as u4 on u4.user_id = p.project_planner
         left join sys_user as u5 on u5.user_id = p.site_leader
         left join cmc_party_a as pa on pa.party_a_id = p.party_a_id
-        left join cmc_project_contract as pc on pc.project_id = p.project_id
-        left join cmc_contract as c on c.contract_id = pc.contract_id
     </sql>
 
     <select id="selectCmcProjectList" parameterType="CmcProject" resultMap="CmcProjectResult">
@@ -151,7 +141,7 @@
         p.project_type, p.project_level, p.project_registrant, u1.nick_name as registrant_nick_name, p.undertaking_dept, p.project_planner, p.site_leader, p.organize_document, p.organize_time, p.is_complete,
         p.register_time, p.plan_time, p.entry_time, p.exit_time, p.remark, tp.technical_director, u2.nick_name as director_nick_name, tp.quality_inspector, p.project_kml, p.project_cp, p.kml_lng, p.kml_lat,
         p.cars, p.drivers, p.devices, p.participates, p.task_document, p.project_request, tp.technical_designer, u3.nick_name as designer_nick_name, u4.nick_name as planner_nick_name,
-        u5.nick_name as site_nick_name, p.in_leader, p.out_leader, p.lead_dept, p.join_dept, pc.contract_id, c.contract_number, c.contract_code, c.contract_name from cmc_project as p
+        u5.nick_name as site_nick_name, p.in_leader, p.out_leader, p.lead_dept, p.join_dept from cmc_project as p
         left join sys_user as u on u.user_id = p.project_leader
         left join sys_user as u1 on u1.user_id = p.project_registrant
         left join cmc_technical_plan as tp on tp.project_id = p.project_id
@@ -160,8 +150,6 @@
         left join sys_user as u4 on u4.user_id = p.project_planner
         left join sys_user as u5 on u5.user_id = p.site_leader
         left join cmc_party_a as pa on pa.party_a_id = p.party_a_id
-        left join cmc_project_contract as pc on pc.project_id = p.project_id
-        left join cmc_contract as c on c.contract_id = pc.contract_id
         <where>
             (p.project_number REGEXP '^[0-9]+W[0-9]' or p.project_number REGEXP '^[0-9]+C[0-9]') AND NOT (p.project_number REGEXP '[/\\*-]')
             and (case when p.undertaking_dept not like concat('%', '113', '%') then p.undertaking_dept not like concat('%', '113', '%')
@@ -200,7 +188,7 @@
         p.project_type, p.project_level, p.project_registrant, u1.nick_name as registrant_nick_name, p.undertaking_dept, p.project_planner, p.site_leader, p.organize_document, p.organize_time, p.is_complete,
         p.register_time, p.plan_time, p.entry_time, p.exit_time, p.remark, tp.technical_director, u2.nick_name as director_nick_name, tp.quality_inspector, p.project_kml, p.project_cp, p.kml_lng, p.kml_lat,
         p.cars, p.drivers, p.devices, p.participates, p.task_document, p.project_request, tp.technical_designer, u3.nick_name as designer_nick_name, u4.nick_name as planner_nick_name,
-        u5.nick_name as site_nick_name, p.in_leader, p.out_leader, p.lead_dept, p.join_dept, pc.contract_id, c.contract_number, c.contract_code, c.contract_name from cmc_project as p
+        u5.nick_name as site_nick_name, p.in_leader, p.out_leader, p.lead_dept, p.join_dept from cmc_project as p
         left join sys_user as u on u.user_id = p.project_leader
         left join sys_user as u1 on u1.user_id = p.project_registrant
         left join cmc_technical_plan as tp on tp.project_id = p.project_id
@@ -209,8 +197,6 @@
         left join sys_user as u4 on u4.user_id = p.project_planner
         left join sys_user as u5 on u5.user_id = p.site_leader
         left join cmc_party_a as pa on pa.party_a_id = p.party_a_id
-        left join cmc_project_contract as pc on pc.project_id = p.project_id
-        left join cmc_contract as c on c.contract_id = pc.contract_id
         left join cmc_project_work as pw on pw.project_id = p.project_id
         <where>
             (p.project_number REGEXP '^[0-9]+W[0-9]' or p.project_number REGEXP '^[0-9]+C[0-9]') AND NOT (p.project_number REGEXP '[/\\*-]')

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcRecruitMapper.xml

@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.oa.mapper.CmcRecruitMapper">
+
+    <resultMap type="CmcRecruit" id="CmcRecruitResult">
+        <result property="recruitId"    column="recruit_id"    />
+        <result property="applier"    column="applier"    />
+        <result property="applyDept"    column="apply_dept"    />
+        <result property="projectId"    column="project_id"    />
+        <result property="applyDate"    column="apply_date"    />
+        <result property="postName"    column="post_name"    />
+        <result property="postNumber"    column="post_number"    />
+        <result property="duty"    column="duty"    />
+        <result property="qualification"    column="qualification"    />
+        <result property="wage"    column="wage"    />
+        <result property="deptComment"    column="dept_comment"    />
+        <result property="deptUserId"    column="dept_user_id"    />
+        <result property="deptTime"    column="dept_time"    />
+        <result property="managerComment"    column="manager_comment"    />
+        <result property="managerUserId"    column="manager_user_id"    />
+        <result property="managerTime"    column="manager_time"    />
+        <result property="zjlComment"    column="zjl_comment"    />
+        <result property="zjlUserId"    column="zjl_user_id"    />
+        <result property="zjlTime"    column="zjl_time"    />
+        <association property="applierUser"    javaType="SysUser"         resultMap="ApplierUserResult" />
+        <association property="deptUser"    javaType="SysUser"         resultMap="DeptUserResult" />
+        <association property="managerUser"    javaType="SysUser"         resultMap="ManagerUserResult" />
+        <association property="zjlUser"    javaType="SysUser"         resultMap="ZjlUserResult" />
+        <association property="dept"    javaType="SysDept"         resultMap="SysDeptResult" />
+        <association property="project"    javaType="CmcProject"         resultMap="CmcProjectResult" />
+    </resultMap>
+
+    <resultMap type="SysUser" id="ApplierUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="applier_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="DeptUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="dept_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="ManagerUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="manager_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="ZjlUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="zjl_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysDept" id="SysDeptResult">
+        <result property="deptId"    column="dept_id"    />
+        <result property="deptName"    column="dept_name"    />
+    </resultMap>
+
+    <resultMap type="CmcProject" id="CmcProjectResult">
+        <result property="projectId"    column="project_id"    />
+        <result property="projectNumber"    column="project_number"    />
+        <result property="projectName"    column="project_name"    />
+        <result property="undertakingDept"    column="undertaking_dept"    />
+    </resultMap>
+
+    <sql id="selectCmcRecruitVo">
+        select r.recruit_id, r.applier, u.nick_name as applier_nick_name, d.dept_name, r.apply_dept, r.project_id, p.project_number, p.project_name, p.undertaking_dept, r.apply_date, r.post_name, r.post_number, r.duty,
+        r.qualification, r.wage, r.dept_comment, r.dept_user_id, u1.nick_name as dept_nick_name, r.dept_time, r.manager_comment, r.manager_user_id, u2.nick_name as manager_nick_name, r.manager_time,
+        r.zjl_comment, r.zjl_user_id, u3.nick_name as zjl_nick_name, r.zjl_time from cmc_recruit as r
+        left join sys_user as u on u.user_id = r.applier
+        left join sys_user as u1 on u1.user_id = r.dept_user_id
+        left join sys_user as u2 on u2.user_id = r.manager_user_id
+        left join sys_user as u3 on u3.user_id = r.zjl_user_id
+        left join sys_dept as d on d.dept_id = r.apply_dept
+        left join cmc_project as p on r.project_id = p.project_id
+    </sql>
+
+    <select id="selectCmcRecruitList" parameterType="CmcRecruit" resultMap="CmcRecruitResult">
+        <include refid="selectCmcRecruitVo"/>
+        <where>
+            <if test="applier != null "> and r.applier = #{applier}</if>
+            <if test="applyDept != null "> and r.apply_dept = #{applyDept}</if>
+            <if test="projectId != null  and projectId != ''"> and r.project_id = #{projectId}</if>
+            <if test="applyDate != null "> and r.apply_date = #{applyDate}</if>
+            <if test="postName != null  and postName != ''"> and r.post_name like concat('%', r.#{postName}, r.'%')</if>
+            <if test="postNumber != null "> and r.post_number = #{postNumber}</if>
+            <if test="duty != null  and duty != ''"> and r.duty = #{duty}</if>
+            <if test="qualification != null  and qualification != ''"> and r.qualification = #{qualification}</if>
+            <if test="wage != null  and wage != ''"> and r.wage = #{wage}</if>
+            <if test="deptComment != null  and deptComment != ''"> and r.dept_comment = #{deptComment}</if>
+            <if test="deptUserId != null "> and r.dept_user_id = #{deptUserId}</if>
+            <if test="deptTime != null "> and r.dept_time = #{deptTime}</if>
+            <if test="managerComment != null  and managerComment != ''"> and r.manager_comment = #{managerComment}</if>
+            <if test="managerUserId != null "> and r.manager_user_id = #{managerUserId}</if>
+            <if test="managerTime != null "> and r.manager_time = #{managerTime}</if>
+            <if test="zjlComment != null  and zjlComment != ''"> and r.zjl_comment = #{zjlComment}</if>
+            <if test="zjlUserId != null "> and r.zjl_user_id = #{zjlUserId}</if>
+            <if test="zjlTime != null "> and r.zjl_time = #{zjlTime}</if>
+        </where>
+    </select>
+
+    <select id="selectCmcRecruitByRecruitId" parameterType="String" resultMap="CmcRecruitResult">
+        <include refid="selectCmcRecruitVo"/>
+        where recruit_id = #{recruitId}
+    </select>
+
+    <insert id="insertCmcRecruit" parameterType="CmcRecruit">
+        insert into cmc_recruit
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="recruitId != null">recruit_id,</if>
+            <if test="applier != null">applier,</if>
+            <if test="applyDept != null">apply_dept,</if>
+            <if test="projectId != null">project_id,</if>
+            <if test="applyDate != null">apply_date,</if>
+            <if test="postName != null">post_name,</if>
+            <if test="postNumber != null">post_number,</if>
+            <if test="duty != null">duty,</if>
+            <if test="qualification != null">qualification,</if>
+            <if test="wage != null">wage,</if>
+            <if test="deptComment != null">dept_comment,</if>
+            <if test="deptUserId != null">dept_user_id,</if>
+            <if test="deptTime != null">dept_time,</if>
+            <if test="managerComment != null">manager_comment,</if>
+            <if test="managerUserId != null">manager_user_id,</if>
+            <if test="managerTime != null">manager_time,</if>
+            <if test="zjlComment != null">zjl_comment,</if>
+            <if test="zjlUserId != null">zjl_user_id,</if>
+            <if test="zjlTime != null">zjl_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="recruitId != null">#{recruitId},</if>
+            <if test="applier != null">#{applier},</if>
+            <if test="applyDept != null">#{applyDept},</if>
+            <if test="projectId != null">#{projectId},</if>
+            <if test="applyDate != null">#{applyDate},</if>
+            <if test="postName != null">#{postName},</if>
+            <if test="postNumber != null">#{postNumber},</if>
+            <if test="duty != null">#{duty},</if>
+            <if test="qualification != null">#{qualification},</if>
+            <if test="wage != null">#{wage},</if>
+            <if test="deptComment != null">#{deptComment},</if>
+            <if test="deptUserId != null">#{deptUserId},</if>
+            <if test="deptTime != null">#{deptTime},</if>
+            <if test="managerComment != null">#{managerComment},</if>
+            <if test="managerUserId != null">#{managerUserId},</if>
+            <if test="managerTime != null">#{managerTime},</if>
+            <if test="zjlComment != null">#{zjlComment},</if>
+            <if test="zjlUserId != null">#{zjlUserId},</if>
+            <if test="zjlTime != null">#{zjlTime},</if>
+        </trim>
+    </insert>
+
+    <update id="updateCmcRecruit" parameterType="CmcRecruit">
+        update cmc_recruit
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="applier != null">applier = #{applier},</if>
+            <if test="applyDept != null">apply_dept = #{applyDept},</if>
+            <if test="projectId != null">project_id = #{projectId},</if>
+            <if test="applyDate != null">apply_date = #{applyDate},</if>
+            <if test="postName != null">post_name = #{postName},</if>
+            <if test="postNumber != null">post_number = #{postNumber},</if>
+            <if test="duty != null">duty = #{duty},</if>
+            <if test="qualification != null">qualification = #{qualification},</if>
+            <if test="wage != null">wage = #{wage},</if>
+            <if test="deptComment != null">dept_comment = #{deptComment},</if>
+            <if test="deptUserId != null">dept_user_id = #{deptUserId},</if>
+            <if test="deptTime != null">dept_time = #{deptTime},</if>
+            <if test="managerComment != null">manager_comment = #{managerComment},</if>
+            <if test="managerUserId != null">manager_user_id = #{managerUserId},</if>
+            <if test="managerTime != null">manager_time = #{managerTime},</if>
+            <if test="zjlComment != null">zjl_comment = #{zjlComment},</if>
+            <if test="zjlUserId != null">zjl_user_id = #{zjlUserId},</if>
+            <if test="zjlTime != null">zjl_time = #{zjlTime},</if>
+        </trim>
+        where recruit_id = #{recruitId}
+    </update>
+
+    <delete id="deleteCmcRecruitByRecruitId" parameterType="String">
+        delete from cmc_recruit where recruit_id = #{recruitId}
+    </delete>
+
+    <delete id="deleteCmcRecruitByRecruitIds" parameterType="String">
+        delete from cmc_recruit where recruit_id in
+        <foreach item="recruitId" collection="array" open="(" separator="," close=")">
+            #{recruitId}
+        </foreach>
+    </delete>
+</mapper>

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcResourceMapper.xml

@@ -56,7 +56,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectCmcResourceListBelow" parameterType="CmcResource" resultMap="CmcResourceResult">
-        SELECT r.resource_id, r.uploader, r.upload_dept, r.title, r.source_path, r.type, r.field_id, tree.field, r.upload_time, r.hours
+        SELECT * FROM
+        ( SELECT r.resource_id, r.uploader, r.upload_dept, r.title, r.source_path, r.type, r.field_id, tree.field, r.upload_time, r.hours
         FROM cmc_resource AS r
         LEFT JOIN sys_user AS u ON u.user_id = r.uploader
         LEFT JOIN sys_dept AS d ON d.dept_id = r.upload_dept
@@ -69,15 +70,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         RIGHT JOIN cmc_resource_field AS rf2 ON rf2.parent_id = rf3.sub_field_id
         WHERE rf3.sub_field_id = #{fieldId} OR rf2.field_id = #{fieldId} OR rf3.field_id = #{fieldId}
         ) as tree on tree.field_id = r.field_id
+        UNION
+        SELECT r.resource_id, r.uploader, r.upload_dept, r.title, r.source_path, r.type, r.field_id, tree.field, r.upload_time, r.hours
+        FROM cmc_resource AS r
+        LEFT JOIN sys_user AS u ON u.user_id = r.uploader
+        LEFT JOIN sys_dept AS d ON d.dept_id = r.upload_dept
+        RIGHT JOIN (
+        SELECT rf5.field_id, rf5.field FROM
+        ( SELECT rf2.field_id AS sub_sub_field_id, rf2.parent_id AS sub_sub_parent_id, rf3.* FROM
+        ( SELECT rf1.field_id AS sub_field_id, rf1.parent_id AS sub_parent_id, rf0.field_id, rf0.parent_id
+        FROM cmc_resource_field AS rf0
+        LEFT JOIN cmc_resource_field AS rf1 ON rf1.parent_id = rf0.field_id
+        WHERE rf0.field_id = #{fieldId} OR rf1.field_id = #{fieldId} ) AS rf3
+        RIGHT JOIN cmc_resource_field AS rf2 ON rf2.parent_id = rf3.sub_field_id
+        WHERE rf3.sub_field_id = #{fieldId} OR rf2.field_id = #{fieldId} OR rf3.field_id = #{fieldId} ) AS rf4
+        RIGHT JOIN cmc_resource_field AS rf5 ON rf5.parent_id = rf4.sub_sub_field_id
+        WHERE rf4.sub_field_id = #{fieldId} OR rf4.field_id = #{fieldId} OR rf5.field_id = #{fieldId}
+        ) as tree on tree.field_id = r.field_id
+        ) AS t
         <where>
-            r.resource_id is not null
-            <if test="uploader != null "> and r.uploader = #{uploader}</if>
-            <if test="uploadDept != null "> and r.upload_dept = #{uploadDept}</if>
-            <if test="title != null  and title != ''"> and r.title like concat('%', #{title}, '%')</if>
-            <if test="sourcePath != null  and sourcePath != ''"> and r.source_path = #{sourcePath}</if>
-            <if test="type != null  and type != ''"> and r.type = #{type}</if>
-            <if test="uploadTime != null "> and r.upload_time = #{uploadTime}</if>
-            <if test="hours != null "> and r.hours = #{hours}</if>
+            t.resource_id is not null
+            <if test="uploader != null "> and t.uploader = #{uploader}</if>
+            <if test="uploadDept != null "> and t.upload_dept = #{uploadDept}</if>
+            <if test="title != null  and title != ''"> and t.title like concat('%', #{title}, '%')</if>
+            <if test="sourcePath != null  and sourcePath != ''"> and t.source_path = #{sourcePath}</if>
+            <if test="type != null  and type != ''"> and t.type = #{type}</if>
+            <if test="uploadTime != null "> and t.upload_time = #{uploadTime}</if>
+            <if test="hours != null "> and t.hours = #{hours}</if>
         </where>
     </select>
 

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcTransferMapper.xml

@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.oa.mapper.CmcTransferMapper">
+    
+    <resultMap type="CmcTransfer" id="CmcTransferResult">
+        <result property="transferId"    column="transfer_id"    />
+        <result property="applier"    column="applier"    />
+        <result property="applyDate"    column="apply_date"    />
+        <result property="beforeDeptId"    column="before_dept_id"    />
+        <result property="beforePostId"    column="before_post_id"    />
+        <result property="afterDeptId"    column="after_dept_id"    />
+        <result property="afterPostId"    column="after_post_id"    />
+        <result property="beforeDeptComment"    column="before_dept_comment"    />
+        <result property="beforeDeptLeader"    column="before_dept_leader"    />
+        <result property="beforeDeptTime"    column="before_dept_time"    />
+        <result property="afterDeptComment"    column="after_dept_comment"    />
+        <result property="afterDeptTime"    column="after_dept_time"    />
+        <result property="afterDeptLeader"    column="after_dept_leader"    />
+        <result property="zhComment"    column="zh_comment"    />
+        <result property="zhTime"    column="zh_time"    />
+        <result property="zhUserId"    column="zh_user_id"    />
+        <result property="managerComment"    column="manager_comment"    />
+        <result property="managerTime"    column="manager_time"    />
+        <result property="managerUserId"    column="manager_user_id"    />
+        <result property="zjlComment"    column="zjl_comment"    />
+        <result property="zjlTime"    column="zjl_time"    />
+        <result property="zjlUserId"    column="zjl_user_id"    />
+        <association property="applierUser"    javaType="SysUser"         resultMap="ApplierUserResult" />
+        <association property="beforeDeptUser"    javaType="SysUser"         resultMap="BeforeDeptUserResult" />
+        <association property="afterDeptUser"    javaType="SysUser"         resultMap="AfterDeptUserResult" />
+        <association property="zhUser"    javaType="SysUser"         resultMap="ZhUserResult" />
+        <association property="managerUser"    javaType="SysUser"         resultMap="ManagerUserResult" />
+        <association property="zjlUser"    javaType="SysUser"         resultMap="ZjlUserResult" />
+        <association property="beforePost"    javaType="SysPost"         resultMap="BeforePostResult" />
+        <association property="afterPost"    javaType="SysPost"         resultMap="AfterPostResult" />
+        <association property="beforeDept"    javaType="SysDept"         resultMap="BeforeDeptResult" />
+        <association property="afterDept"    javaType="SysDept"         resultMap="AfterDeptResult" />
+    </resultMap>
+
+    <resultMap type="SysUser" id="ApplierUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="applier_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="BeforeDeptUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="before_dept_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="AfterDeptUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="after_dept_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="ZhUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="zh_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="ManagerUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="manager_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysUser" id="ZjlUserResult">
+        <result property="userId"    column="user_id"    />
+        <result property="nickName"    column="zjl_nick_name"    />
+    </resultMap>
+
+    <resultMap type="SysPost" id="BeforePostResult">
+        <result property="postId"    column="post_id"    />
+        <result property="postName"    column="before_post_name"    />
+    </resultMap>
+
+    <resultMap type="SysPost" id="AfterPostResult">
+        <result property="postId"    column="post_id"    />
+        <result property="postName"    column="after_post_name"    />
+    </resultMap>
+
+    <resultMap type="SysDept" id="BeforeDeptResult">
+        <result property="deptId"    column="dept_id"    />
+        <result property="deptName"    column="before_dept_name"    />
+    </resultMap>
+
+    <resultMap type="SysDept" id="AfterDeptResult">
+        <result property="deptId"    column="dept_id"    />
+        <result property="deptName"    column="after_dept_name"    />
+    </resultMap>
+
+    <sql id="selectCmcTransferVo">
+        select t.transfer_id, t.applier, u.nick_name as applier_nick_name, t.apply_date, d.dept_name as before_dept_name, t.before_dept_id, p.post_name as before_post_name, t.before_post_id, d1.dept_name as after_dept_name, t.after_dept_id,
+        p1.post_name as after_post_name, t.after_post_id, t.before_dept_comment, t.before_dept_leader, u1.nick_name as before_dept_nick_name, t.before_dept_time, t.after_dept_comment, t.after_dept_time, t.after_dept_leader,
+        u2.nick_name as after_dept_nick_name, t.zh_comment, t.zh_time, t.zh_user_id, u3.nick_name as zh_nick_name, t.manager_comment, t.manager_time, t.manager_user_id, u4.nick_name as manager_nick_name,
+        t.zjl_comment, t.zjl_time, t.zjl_user_id, u5.nick_name as zjl_nick_name from cmc_transfer as t
+        left join sys_user as u on u.user_id = t.applier
+        left join sys_user as u1 on u1.user_id = t.before_dept_leader
+        left join sys_user as u2 on u2.user_id = t.after_dept_leader
+        left join sys_user as u3 on u3.user_id = t.zh_user_id
+        left join sys_user as u4 on u4.user_id = t.manager_user_id
+        left join sys_user as u5 on u5.user_id = t.zjl_user_id
+        left join sys_post as p on p.post_id = t.before_post_id
+        left join sys_post as p1 on p1.post_id = t.after_post_id
+        left join sys_dept as d on d.dept_id = t.before_dept_id
+        left join sys_dept as d1 on d1.dept_id = t.after_dept_id
+    </sql>
+
+    <select id="selectCmcTransferList" parameterType="CmcTransfer" resultMap="CmcTransferResult">
+        <include refid="selectCmcTransferVo"/>
+        <where>  
+            <if test="applier != null "> and t.applier = #{applier}</if>
+            <if test="applyDate != null "> and t.apply_date = #{applyDate}</if>
+            <if test="beforeDeptId != null "> and t.before_dept_id = #{beforeDeptId}</if>
+            <if test="beforePostId != null "> and t.before_post_id = #{beforePostId}</if>
+            <if test="afterDeptId != null "> and t.after_dept_id = #{afterDeptId}</if>
+            <if test="afterPostId != null "> and t.after_post_id = #{afterPostId}</if>
+            <if test="beforeDeptComment != null  and beforeDeptComment != ''"> and t.before_dept_comment = #{beforeDeptComment}</if>
+            <if test="beforeDeptLeader != null "> and t.before_dept_leader = #{beforeDeptLeader}</if>
+            <if test="beforeDeptTime != null "> and t.before_dept_time = #{beforeDeptTime}</if>
+            <if test="afterDeptComment != null  and afterDeptComment != ''"> and t.after_dept_comment = #{afterDeptComment}</if>
+            <if test="afterDeptTime != null "> and t.after_dept_time = #{afterDeptTime}</if>
+            <if test="afterDeptLeader != null "> and t.after_dept_leader = #{afterDeptLeader}</if>
+            <if test="zhComment != null  and zhComment != ''"> and t.zh_comment = #{zhComment}</if>
+            <if test="zhTime != null "> and t.zh_time = #{zhTime}</if>
+            <if test="zhUserId != null "> and t.zh_user_id = #{zhUserId}</if>
+            <if test="managerComment != null  and managerComment != ''"> and t.manager_comment = #{managerComment}</if>
+            <if test="managerTime != null "> and t.manager_time = #{managerTime}</if>
+            <if test="managerUserId != null "> and t.manager_user_id = #{managerUserId}</if>
+            <if test="zjlComment != null  and zjlComment != ''"> and t.zjl_comment = #{zjlComment}</if>
+            <if test="zjlTime != null "> and t.zjl_time = #{zjlTime}</if>
+            <if test="zjlUserId != null "> and t.zjl_user_id = #{zjlUserId}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcTransferByTransferId" parameterType="String" resultMap="CmcTransferResult">
+        <include refid="selectCmcTransferVo"/>
+        where transfer_id = #{transferId}
+    </select>
+        
+    <insert id="insertCmcTransfer" parameterType="CmcTransfer">
+        insert into cmc_transfer
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="transferId != null">transfer_id,</if>
+            <if test="applier != null">applier,</if>
+            <if test="applyDate != null">apply_date,</if>
+            <if test="beforeDeptId != null">before_dept_id,</if>
+            <if test="beforePostId != null">before_post_id,</if>
+            <if test="afterDeptId != null">after_dept_id,</if>
+            <if test="afterPostId != null">after_post_id,</if>
+            <if test="beforeDeptComment != null">before_dept_comment,</if>
+            <if test="beforeDeptLeader != null">before_dept_leader,</if>
+            <if test="beforeDeptTime != null">before_dept_time,</if>
+            <if test="afterDeptComment != null">after_dept_comment,</if>
+            <if test="afterDeptTime != null">after_dept_time,</if>
+            <if test="afterDeptLeader != null">after_dept_leader,</if>
+            <if test="zhComment != null">zh_comment,</if>
+            <if test="zhTime != null">zh_time,</if>
+            <if test="zhUserId != null">zh_user_id,</if>
+            <if test="managerComment != null">manager_comment,</if>
+            <if test="managerTime != null">manager_time,</if>
+            <if test="managerUserId != null">manager_user_id,</if>
+            <if test="zjlComment != null">zjl_comment,</if>
+            <if test="zjlTime != null">zjl_time,</if>
+            <if test="zjlUserId != null">zjl_user_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="transferId != null">#{transferId},</if>
+            <if test="applier != null">#{applier},</if>
+            <if test="applyDate != null">#{applyDate},</if>
+            <if test="beforeDeptId != null">#{beforeDeptId},</if>
+            <if test="beforePostId != null">#{beforePostId},</if>
+            <if test="afterDeptId != null">#{afterDeptId},</if>
+            <if test="afterPostId != null">#{afterPostId},</if>
+            <if test="beforeDeptComment != null">#{beforeDeptComment},</if>
+            <if test="beforeDeptLeader != null">#{beforeDeptLeader},</if>
+            <if test="beforeDeptTime != null">#{beforeDeptTime},</if>
+            <if test="afterDeptComment != null">#{afterDeptComment},</if>
+            <if test="afterDeptTime != null">#{afterDeptTime},</if>
+            <if test="afterDeptLeader != null">#{afterDeptLeader},</if>
+            <if test="zhComment != null">#{zhComment},</if>
+            <if test="zhTime != null">#{zhTime},</if>
+            <if test="zhUserId != null">#{zhUserId},</if>
+            <if test="managerComment != null">#{managerComment},</if>
+            <if test="managerTime != null">#{managerTime},</if>
+            <if test="managerUserId != null">#{managerUserId},</if>
+            <if test="zjlComment != null">#{zjlComment},</if>
+            <if test="zjlTime != null">#{zjlTime},</if>
+            <if test="zjlUserId != null">#{zjlUserId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcTransfer" parameterType="CmcTransfer">
+        update cmc_transfer
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="applier != null">applier = #{applier},</if>
+            <if test="applyDate != null">apply_date = #{applyDate},</if>
+            <if test="beforeDeptId != null">before_dept_id = #{beforeDeptId},</if>
+            <if test="beforePostId != null">before_post_id = #{beforePostId},</if>
+            <if test="afterDeptId != null">after_dept_id = #{afterDeptId},</if>
+            <if test="afterPostId != null">after_post_id = #{afterPostId},</if>
+            <if test="beforeDeptComment != null">before_dept_comment = #{beforeDeptComment},</if>
+            <if test="beforeDeptLeader != null">before_dept_leader = #{beforeDeptLeader},</if>
+            <if test="beforeDeptTime != null">before_dept_time = #{beforeDeptTime},</if>
+            <if test="afterDeptComment != null">after_dept_comment = #{afterDeptComment},</if>
+            <if test="afterDeptTime != null">after_dept_time = #{afterDeptTime},</if>
+            <if test="afterDeptLeader != null">after_dept_leader = #{afterDeptLeader},</if>
+            <if test="zhComment != null">zh_comment = #{zhComment},</if>
+            <if test="zhTime != null">zh_time = #{zhTime},</if>
+            <if test="zhUserId != null">zh_user_id = #{zhUserId},</if>
+            <if test="managerComment != null">manager_comment = #{managerComment},</if>
+            <if test="managerTime != null">manager_time = #{managerTime},</if>
+            <if test="managerUserId != null">manager_user_id = #{managerUserId},</if>
+            <if test="zjlComment != null">zjl_comment = #{zjlComment},</if>
+            <if test="zjlTime != null">zjl_time = #{zjlTime},</if>
+            <if test="zjlUserId != null">zjl_user_id = #{zjlUserId},</if>
+        </trim>
+        where transfer_id = #{transferId}
+    </update>
+
+    <delete id="deleteCmcTransferByTransferId" parameterType="String">
+        delete from cmc_transfer where transfer_id = #{transferId}
+    </delete>
+
+    <delete id="deleteCmcTransferByTransferIds" parameterType="String">
+        delete from cmc_transfer where transfer_id in 
+        <foreach item="transferId" collection="array" open="(" separator="," close=")">
+            #{transferId}
+        </foreach>
+    </delete>
+</mapper>

oa-ui-app/pages/project/projectInfo.vue

@@ -63,11 +63,11 @@
           </view>
           <view class="info-item">
             <text class="label">合同编码</text>
-            <text class="value">{{ contractCode }}</text>
+            <text class="value">{{ project.contractCode }}</text>
           </view>
           <view class="info-item">
             <text class="label">合同编号</text>
-            <text class="value">{{ contractNumber }}</text>
+            <text class="value">{{ project.contractNumber }}</text>
           </view>
           <view class="info-item full-width">
             <text class="label">项目概况</text>
@@ -370,8 +370,6 @@ import { listProjectWork, addProjectWork } from "@/api/oa/project/projectWork";
 import { listProjectComment, getProjectComment } from "@/api/oa/project/projectComment";
 import { listProjectProgress, getProjectProgress } from "@/api/oa/project/projectProgress";
 import { listProjectWorkload } from '@/api/oa/project/projectWorkload'
-import { listProjectContract, addProjectContract } from "@/api/oa/contract/projectContract";
-import { listContract, getContract } from "@/api/oa/contract/contract";
 import { listDevice, getDevice } from "@/api/oa/device/device";
 import { listCar, getCar } from '@/api/oa/car/car';
 import { listProjectChange } from "@/api/oa/project/projectChange";
@@ -396,8 +394,6 @@ export default {
       deptLeaderList: [],
       progressList: [],
       actualList: [],
-      contractCode: "",
-      contractNumber: "",
       openPlan: false,
       openSafe: false,
       openTech: false,
@@ -448,7 +444,6 @@ export default {
       this.getProjectInfo(projectId);
       this.getProjectWorkList(projectId);
       this.getProjectCommentList(projectId);
-      this.getContractDataList(projectId);
       this.getProjectProgressList(projectId);
       this.getActualList(projectId);
       this.getProjectChangeList(projectId);
@@ -569,30 +564,6 @@ export default {
       })
     },
 
-    // 获取合同数据列表
-    getContractDataList(projectId) {
-      listProjectContract({ projectId }).then(res => {
-        if (res.rows) {
-          for (let row of res.rows) {
-            getContract(row.contractId).then(res => {
-              if (res.data) {
-                if (this.contractCode != '') {
-                  this.contractCode = this.contractCode + '、' + res.data.contractCode;
-                } else {
-                  this.contractCode = res.data.contractCode;
-                }
-                if (this.contractNumber != '') {
-                  this.contractNumber = this.contractNumber + '、' + res.data.contractNumber;
-                } else {
-                  this.contractNumber = res.data.contractNumber;
-                }
-              }
-            })
-          }
-        }
-      })
-    },
-
     // 获取项目变更列表
     getProjectChangeList(projectId) {
       listProjectChange({ pageNum: 1, pageSize: 100, projectId }).then(response => {

oa-ui/src/api/oa/recruit/recruit.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询cmc招聘申请列表
+export function listRecruit(query) {
+  return request({
+    url: '/oa/recruit/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc招聘申请详细
+export function getRecruit(recruitId) {
+  return request({
+    url: '/oa/recruit/' + recruitId,
+    method: 'get'
+  })
+}
+
+// 新增cmc招聘申请
+export function addRecruit(data) {
+  return request({
+    url: '/oa/recruit',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc招聘申请
+export function updateRecruit(data) {
+  return request({
+    url: '/oa/recruit',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc招聘申请
+export function delRecruit(recruitId) {
+  return request({
+    url: '/oa/recruit/' + recruitId,
+    method: 'delete'
+  })
+}

oa-ui/src/api/oa/transfer/transfer.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询cmc调岗申请列表
+export function listTransfer(query) {
+  return request({
+    url: '/oa/transfer/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc调岗申请详细
+export function getTransfer(transferId) {
+  return request({
+    url: '/oa/transfer/' + transferId,
+    method: 'get'
+  })
+}
+
+// 新增cmc调岗申请
+export function addTransfer(data) {
+  return request({
+    url: '/oa/transfer',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc调岗申请
+export function updateTransfer(data) {
+  return request({
+    url: '/oa/transfer',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc调岗申请
+export function delTransfer(transferId) {
+  return request({
+    url: '/oa/transfer/' + transferId,
+    method: 'delete'
+  })
+}

oa-ui/src/assets/icons/svg/recruit.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1760596200100" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1688" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M507.3 531.9c76-0.2 150.8 18.9 217.3 55.5-89.8 3-169.1 52.8-202 126.7-32.8 74-13 158.1 50.6 214.2h-438c-9.9 0.1-19.6-3.4-27.1-9.9-7-6-11.1-14.7-11.2-24 0.2-200 183.8-362.3 410.4-362.5zM752 620.7c20.4-1.2 38 14.3 39.3 34.7v84.5h95.6c13.4-1.6 26.6 4.6 33.8 16 7.2 11.4 7.2 26 0 37.4-7.2 11.4-20.4 17.7-33.8 16h-95.6v84.5c-2.5 19.8-19.3 34.7-39.3 34.7-20 0-36.8-14.9-39.3-34.7v-84.5h-95.6c-13.4 1.7-26.6-4.6-33.8-16-7.2-11.4-7.2-26 0-37.4 7.2-11.4 20.4-17.7 33.8-16h95.4v-84.3c1.4-20.6 19-36.1 39.5-34.9z m-244.6-89.2c-135.1-0.2 135-0.2 0 0z m0 0" p-id="1689"></path><path d="M294.3 316.3c0 120 97.2 217.2 217.2 217.2 120 0 217.2-97.2 217.2-217.2 0-120-97.2-217.2-217.2-217.2-119.9 0-217.2 97.2-217.2 217.2z m0 0" p-id="1690"></path></svg>

oa-ui/src/assets/icons/svg/transfer.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1760596474211" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6931" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M743.424 423.936c-151.04 0-273.408 122.88-273.408 273.408 0 151.04 122.88 273.408 273.408 273.408s273.408-122.88 273.408-273.408c0-151.552-121.856-273.408-273.408-273.408z m160.768 349.184h-261.632l32.256 34.816c9.728 10.24 9.216 27.648-1.536 37.888-10.24 9.728-27.648 9.216-37.888-1.536l-71.68-78.848s0-0.512-0.512-0.512c-2.048-2.048-3.584-5.12-5.12-7.68 0-0.512 0-0.512-0.512-1.536-0.512-2.56-1.536-5.12-1.536-7.68v-2.048c0-2.56 0.512-6.144 2.048-8.192 0-0.512 0.512-0.512 0.512-1.536 1.536-2.56 2.56-5.12 5.632-7.168 0 0 0-0.512 0.512-0.512 0 0 0.512 0 0.512-0.512 2.048-2.048 5.12-3.584 7.68-4.096 0.512 0 0.512 0 1.536-0.512 2.56-0.512 5.12-1.536 7.68-1.536h321.536c14.848 0 26.624 11.776 26.624 26.624 0 12.8-11.776 24.576-26.112 24.576z m26.112-124.928v1.536c0 2.56-0.512 6.144-2.048 9.216 0 0.512-0.512 0.512-0.512 1.536-1.536 2.56-2.56 5.12-5.632 7.168 0 0 0 0.512-0.512 0.512 0 0-0.512 0-0.512 0.512-2.048 2.048-5.12 3.584-7.68 4.096-0.512 0-0.512 0-1.536 0.512-2.56 0.512-5.12 1.536-7.68 1.536h-321.536c-14.848 0-26.624-11.776-26.624-26.624s11.776-26.624 26.624-26.624h261.632l-32.256-34.816c-9.728-10.24-9.216-27.648 1.536-37.888 10.24-9.728 27.648-9.216 37.888 1.536l71.68 78.848s0 0.512 0.512 0.512c2.048 2.048 3.584 5.12 5.12 7.68 0 0.512 0 0.512 0.512 1.536 0.512 2.56 1.536 5.12 1.536 7.68l-0.512 1.536z" p-id="6932"></path><path d="M423.424 697.344c0-90.624 44.032-171.008 112.128-220.672-22.528-7.168-45.056-12.288-67.584-15.872 83.968-26.624 146.944-106.496 146.944-198.656 0-114.176-93.696-208.384-207.872-208.384S198.656 147.456 198.656 261.632c0 90.624 59.392 168.448 139.776 196.608-163.84 28.672-296.448 160.256-330.24 331.776-4.096 14.336 0 28.672 9.216 41.984 9.216 11.264 23.552 18.432 37.888 18.432h414.72c-29.184-44.032-46.592-96.768-46.592-153.088z" p-id="6933"></path></svg>

oa-ui/src/views/oa/project/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-02-21 10:20:56
+ * @LastEditors: wrh
+ * @LastEditTime: 2025-10-14 15:24:21
 -->
 <template>
   <div class="project-wrapper">
@@ -74,7 +74,7 @@
         </el-table-column>
         <el-table-column label="项目编号" align="center" key="projectNumber" prop="projectNumber" width="120px" sortable />
         <el-table-column label="项目名称" align="center" key="projectName" prop="projectName" sortable />
-        <el-table-column label="合同编码" align="center" prop="contract.contractCode" sortable />
+        <el-table-column label="合同编码" align="center" prop="contractCode" sortable />
         <el-table-column label="承担部门" align="center" key="undertakingDeptName" prop="undertakingDeptName" sortable />
         <el-table-column label="项目负责人" align="center" key="projectLeaderName" prop="projectLeaderUser.nickName" sortable
           width="120px" />

oa-ui/src/views/oa/project/info.vue

@@ -89,21 +89,21 @@
                 <svg-icon slot="prefix" icon-class="contractSign" />
                 合同编码
               </template>
-              {{ contractCode }}
+              {{ project.contractCode }}
             </el-descriptions-item>
             <el-descriptions-item>
               <template slot="label">
                 <svg-icon slot="prefix" icon-class="number" />
                 合同编号
               </template>
-              {{ contractNumber }}
+              {{ project.contractNumber }}
             </el-descriptions-item>
             <el-descriptions-item>
               <template slot="label">
                 <svg-icon slot="prefix" icon-class="dept" />
                 承担部门
               </template>
-              {{ getDeptNames(project.undertakingDept) }}
+              {{ project.undertakingDeptName }}
             </el-descriptions-item>
             <el-descriptions-item>
               <template slot="label">
@@ -168,7 +168,7 @@
           </el-descriptions>
         </div>
       </div>
-      <!-- 项目管理部安排 -->
+      <!-- 部门安排 -->
       <div class="box1 mt20" ref="section2">
         <div class="title">项目安排
           <div class="line"></div>
@@ -181,7 +181,7 @@
                 承担部门
               </template>
               <div style="display: flex;" class="ml20" v-if="project.undertakingDept">
-                <div>{{ getDeptNames(project.undertakingDept) }}</div>
+                <div>{{ project.undertakingDeptName }}</div>
                 <div class="ml20">
                   <el-button type="success" plain size="mini" icon="el-icon-refresh" @click="deptOpen = true"
                     v-hasPermi="['oa:project:edit']">
@@ -504,7 +504,7 @@
     <el-dialog title="更换承担部门" :visible.sync="deptOpen" width="1000px" append-to-body>
       <el-form>
         <el-form-item label="当前承担部门：">
-          {{ getDeptNames(project.undertakingDept) }}
+          {{ project.undertakingDeptName }}
         </el-form-item>
         <el-form-item label="更换承担部门：">
           <el-select v-model="undertakingDept" multiple clearable style="width:80%">
@@ -545,8 +545,6 @@ import { listProjectWork, addProjectWork } from "@/api/oa/project/projectWork";
 import { listProjectComment, getProjectComment } from "@/api/oa/project/projectComment";
 import { listProjectProgress, getProjectProgress } from "@/api/oa/project/projectProgress";
 import { listProjectWorkload } from '@/api/oa/project/projectWorkload'
-import { listProjectContract, addProjectContract } from "@/api/oa/contract/projectContract";
-import { listContract, getContract } from "@/api/oa/contract/contract";
 import { listDevice } from "@/api/oa/device/device";
 import { listCar } from '@/api/oa/car/car';
 import budgetInfo from '@/views/flowable/form/budget/budgetInfo.vue';
@@ -594,7 +592,6 @@ export default {
       this.getProjectInfo(projectId);
       this.getProjectWorkList(projectId);
       this.getProjectCommentList(projectId);
-      this.getContractDataList(projectId);
       this.getProjectProgressList(projectId);
       this.getActualList(projectId);
       this.getProjectChangeList(projectId);
@@ -615,8 +612,6 @@ export default {
       deptLeaderList: [],
       progressList: [],
       actualList: [],
-      contractCode: "",
-      contractNumber: "",
       openBudget: false,
       openPlan: false,
       openSafe: false,
@@ -750,29 +745,6 @@ export default {
         }
       })
     },
-    // 获取项目相关合同编号
-    getContractDataList(projectId) {
-      listProjectContract({ projectId }).then(res => {
-        if (res.rows) {
-          for (let row of res.rows) {
-            getContract(row.contractId).then(res => {
-              if (res.data) {
-                if (this.contractCode != '') {
-                  this.contractCode = this.contractCode + '、' + res.data.contractCode;
-                } else {
-                  this.contractCode = res.data.contractCode;
-                }
-                if (this.contractNumber != '') {
-                  this.contractNumber = this.contractNumber + '、' + res.data.contractNumber;
-                } else {
-                  this.contractNumber = res.data.contractNumber;
-                }
-              }
-            })
-          }
-        }
-      })
-    },
     getProjectWorkList(projectId) {
       listProjectWork({ pageNum: 1, pageSize: 50, projectId }).then(res => {
         this.workList = res.rows;

oa-ui/src/views/oa/project/invest.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-10-17 11:27:44
+ * @LastEditors: wrh
+ * @LastEditTime: 2025-10-14 15:42:58
 -->
 <template>
   <div class="project-wrapper">
@@ -96,7 +96,7 @@
         </el-table-column>
         <el-table-column label="项目编号" align="center" key="projectNumber" prop="projectNumber" width="120px" />
         <el-table-column label="项目名称" align="center" key="projectName" prop="projectName" />
-        <el-table-column label="合同编码" align="center" prop="contract.contractCode" />
+        <el-table-column label="合同编码" align="center" prop="contractCode" />
         <el-table-column label="承担部门" align="center" key="undertakingDeptName" prop="undertakingDeptName" />
         <el-table-column label="项目负责人" align="center" key="projectLeaderName" prop="projectLeaderUser.nickName"
           width="120px" />

oa-ui/src/views/oa/recruit/index.vue

@@ -0,0 +1,519 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="申请人" prop="applier">
+        <el-input
+          v-model="queryParams.applier"
+          placeholder="请输入申请人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="申请部门" prop="applyDept">
+        <el-input
+          v-model="queryParams.applyDept"
+          placeholder="请输入申请部门"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="项目id" prop="projectId">
+        <el-input
+          v-model="queryParams.projectId"
+          placeholder="请输入项目id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="申请日期" prop="applyDate">
+        <el-date-picker clearable
+          v-model="queryParams.applyDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择申请日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="岗位名称" prop="postName">
+        <el-input
+          v-model="queryParams.postName"
+          placeholder="请输入岗位名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="岗位人数" prop="postNumber">
+        <el-input
+          v-model="queryParams.postNumber"
+          placeholder="请输入岗位人数"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="岗位职责" prop="duty">
+        <el-input
+          v-model="queryParams.duty"
+          placeholder="请输入岗位职责"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="任职资格" prop="qualification">
+        <el-input
+          v-model="queryParams.qualification"
+          placeholder="请输入任职资格"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="薪酬待遇" prop="wage">
+        <el-input
+          v-model="queryParams.wage"
+          placeholder="请输入薪酬待遇"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="部门意见" prop="deptComment">
+        <el-input
+          v-model="queryParams.deptComment"
+          placeholder="请输入部门意见"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="部门负责人" prop="deptLeader">
+        <el-input
+          v-model="queryParams.deptLeader"
+          placeholder="请输入部门负责人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="部门审批时间" prop="deptTime">
+        <el-date-picker clearable
+          v-model="queryParams.deptTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择部门审批时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="分管领导意见" prop="managerComment">
+        <el-input
+          v-model="queryParams.managerComment"
+          placeholder="请输入分管领导意见"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="分管领导" prop="managerLeader">
+        <el-input
+          v-model="queryParams.managerLeader"
+          placeholder="请输入分管领导"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="分管领导审批时间" prop="managerTime">
+        <el-date-picker clearable
+          v-model="queryParams.managerTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择分管领导审批时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="总经理意见" prop="zjlComment">
+        <el-input
+          v-model="queryParams.zjlComment"
+          placeholder="请输入总经理意见"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="总经理" prop="zjlLeader">
+        <el-input
+          v-model="queryParams.zjlLeader"
+          placeholder="请输入总经理"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="总经理审批时间" prop="zjlTime">
+        <el-date-picker clearable
+          v-model="queryParams.zjlTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择总经理审批时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['oa:recruit:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['oa:recruit:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['oa:recruit:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['oa:recruit:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="recruitList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="招聘申请id" align="center" prop="recruitId" />
+      <el-table-column label="申请人" align="center" prop="applier" />
+      <el-table-column label="申请部门" align="center" prop="applyDept" />
+      <el-table-column label="项目id" align="center" prop="projectId" />
+      <el-table-column label="申请日期" align="center" prop="applyDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.applyDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="岗位名称" align="center" prop="postName" />
+      <el-table-column label="岗位人数" align="center" prop="postNumber" />
+      <el-table-column label="岗位职责" align="center" prop="duty" />
+      <el-table-column label="任职资格" align="center" prop="qualification" />
+      <el-table-column label="薪酬待遇" align="center" prop="wage" />
+      <el-table-column label="部门意见" align="center" prop="deptComment" />
+      <el-table-column label="部门负责人" align="center" prop="deptLeader" />
+      <el-table-column label="部门审批时间" align="center" prop="deptTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.deptTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="分管领导意见" align="center" prop="managerComment" />
+      <el-table-column label="分管领导" align="center" prop="managerLeader" />
+      <el-table-column label="分管领导审批时间" align="center" prop="managerTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.managerTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="总经理意见" align="center" prop="zjlComment" />
+      <el-table-column label="总经理" align="center" prop="zjlLeader" />
+      <el-table-column label="总经理审批时间" align="center" prop="zjlTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.zjlTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['oa:recruit:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:recruit:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改cmc招聘申请对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="申请人" prop="applier">
+          <el-input v-model="form.applier" placeholder="请输入申请人" />
+        </el-form-item>
+        <el-form-item label="申请部门" prop="applyDept">
+          <el-input v-model="form.applyDept" placeholder="请输入申请部门" />
+        </el-form-item>
+        <el-form-item label="项目id" prop="projectId">
+          <el-input v-model="form.projectId" placeholder="请输入项目id" />
+        </el-form-item>
+        <el-form-item label="申请日期" prop="applyDate">
+          <el-date-picker clearable
+            v-model="form.applyDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择申请日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="岗位名称" prop="postName">
+          <el-input v-model="form.postName" placeholder="请输入岗位名称" />
+        </el-form-item>
+        <el-form-item label="岗位人数" prop="postNumber">
+          <el-input v-model="form.postNumber" placeholder="请输入岗位人数" />
+        </el-form-item>
+        <el-form-item label="岗位职责" prop="duty">
+          <el-input v-model="form.duty" placeholder="请输入岗位职责" />
+        </el-form-item>
+        <el-form-item label="任职资格" prop="qualification">
+          <el-input v-model="form.qualification" placeholder="请输入任职资格" />
+        </el-form-item>
+        <el-form-item label="薪酬待遇" prop="wage">
+          <el-input v-model="form.wage" placeholder="请输入薪酬待遇" />
+        </el-form-item>
+        <el-form-item label="部门意见" prop="deptComment">
+          <el-input v-model="form.deptComment" placeholder="请输入部门意见" />
+        </el-form-item>
+        <el-form-item label="部门负责人" prop="deptLeader">
+          <el-input v-model="form.deptLeader" placeholder="请输入部门负责人" />
+        </el-form-item>
+        <el-form-item label="部门审批时间" prop="deptTime">
+          <el-date-picker clearable
+            v-model="form.deptTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择部门审批时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="分管领导意见" prop="managerComment">
+          <el-input v-model="form.managerComment" placeholder="请输入分管领导意见" />
+        </el-form-item>
+        <el-form-item label="分管领导" prop="managerLeader">
+          <el-input v-model="form.managerLeader" placeholder="请输入分管领导" />
+        </el-form-item>
+        <el-form-item label="分管领导审批时间" prop="managerTime">
+          <el-date-picker clearable
+            v-model="form.managerTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择分管领导审批时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="总经理意见" prop="zjlComment">
+          <el-input v-model="form.zjlComment" placeholder="请输入总经理意见" />
+        </el-form-item>
+        <el-form-item label="总经理" prop="zjlLeader">
+          <el-input v-model="form.zjlLeader" placeholder="请输入总经理" />
+        </el-form-item>
+        <el-form-item label="总经理审批时间" prop="zjlTime">
+          <el-date-picker clearable
+            v-model="form.zjlTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择总经理审批时间">
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listRecruit, getRecruit, delRecruit, addRecruit, updateRecruit } from "@/api/oa/recruit/recruit";
+
+export default {
+  name: "Recruit",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc招聘申请表格数据
+      recruitList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        applier: null,
+        applyDept: null,
+        projectId: null,
+        applyDate: null,
+        postName: null,
+        postNumber: null,
+        duty: null,
+        qualification: null,
+        wage: null,
+        deptComment: null,
+        deptLeader: null,
+        deptTime: null,
+        managerComment: null,
+        managerLeader: null,
+        managerTime: null,
+        zjlComment: null,
+        zjlLeader: null,
+        zjlTime: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询cmc招聘申请列表 */
+    getList() {
+      this.loading = true;
+      listRecruit(this.queryParams).then(response => {
+        this.recruitList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        recruitId: null,
+        applier: null,
+        applyDept: null,
+        projectId: null,
+        applyDate: null,
+        postName: null,
+        postNumber: null,
+        duty: null,
+        qualification: null,
+        wage: null,
+        deptComment: null,
+        deptLeader: null,
+        deptTime: null,
+        managerComment: null,
+        managerLeader: null,
+        managerTime: null,
+        zjlComment: null,
+        zjlLeader: null,
+        zjlTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.recruitId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc招聘申请";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const recruitId = row.recruitId || this.ids
+      getRecruit(recruitId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc招聘申请";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.recruitId != null) {
+            updateRecruit(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addRecruit(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const recruitIds = row.recruitId || this.ids;
+      this.$modal.confirm('是否确认删除cmc招聘申请编号为"' + recruitIds + '"的数据项？').then(function() {
+        return delRecruit(recruitIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/recruit/export', {
+        ...this.queryParams
+      }, `recruit_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

oa-ui/src/views/oa/study/components/resourceTree.vue

@@ -7,16 +7,18 @@
     </el-row>
     <el-input v-model="filterText" placeholder="输入关键字过滤" />
     <el-tree v-if="refreshTable" ref="tree" :data="treeData" :props="defaultProps" node-key="fieldId"
-      :default-expanded-keys="[1, 2, 3, 4]" @node-click="handleNodeClick" :highlight-current="true"
+      :default-expanded-keys="[0,100]" @node-click="handleNodeClick" :highlight-current="true"
       :filter-node-method="filterNode" :default-expand-all="isExpandAll" :expand-on-click-node="false">
       <!-- 自定义节点样式 -->
       <span class="custom-tree-node" slot-scope="{ node, data }">
         <span>{{ node.label }}</span>
         <span v-if="isModify">
-          <el-button v-hasPermi="['oa:resource:edit']" type="text" icon="el-icon-plus" size="mini" @click="() => append(data)">
+          <el-button v-hasPermi="['oa:resource:edit']" type="text" icon="el-icon-plus" size="mini"
+            @click="() => append(data)">
             新增
           </el-button>
-          <el-button v-hasPermi="['oa:resource:remove']" type="text" icon="el-icon-delete" size="mini" @click="() => remove(node, data)">
+          <el-button v-hasPermi="['oa:resource:remove']" type="text" icon="el-icon-delete" size="mini"
+            @click="() => remove(node, data)">
             删除
           </el-button>
         </span>
@@ -41,15 +43,20 @@
 </template>
 
 <script>
-import { listField, getField, delField, addField, updateField } from "@/api/oa/study/resourceField";
 import { listResource, getResource, delResource, addResource, updateResource } from "@/api/oa/study/resource";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
   components: { Treeselect },
   props: {
-    isModify: Boolean,
-    default: true
+    isModify: {
+      type: Boolean,
+      default: false
+    },
+    fields: {
+      type: Array,
+      default: []
+    }
   },
   data() {
     return {
@@ -83,21 +90,44 @@ export default {
   watch: {
     filterText(val) {
       this.$refs.tree.filter(val);
+    },
+    // 监听父组件传入的 fields
+    fields: {
+      immediate: true,
+      handler(newVal) {
+        this.initTree(newVal || []);
+      }
     }
   },
-  created() {
-    this.initTree();
-  },
   methods: {
-    async initTree() {
-      const response = await listField({ pageSize: 9999 });
-      this.treeData = [{
-        fieldId: 0,
-        field: '全部专业',
-        children: []
-      }]
-      this.treeData[0].children = this.buildTree(response.rows);
-      this.$emit('getTreeData', this.buildTree(response.rows))
+    async initTree(fields) {
+      // 空数据保护
+      if (!fields || fields.length === 0) {
+        this.treeData = [{
+          fieldId: 0,
+          field: undefined,
+          children: []
+        }];
+        this.$emit('getTreeData', []);
+        return;
+      }
+
+      const built = this.buildTree(fields);
+      // 根节点按首项规则决定标题和 id
+      if (fields[0].fieldId === 0) {
+        this.treeData = [{
+          fieldId: 0,
+          field: '全部专业',
+          children: built
+        }];
+      } else {
+        this.treeData = [{
+          fieldId: 100,
+          field: '全部学习',
+          children: built
+        }];
+      }
+      this.$emit('getTreeData', built);
     },
     buildTree(items) {
       const map = {};      // 哈希表存储所有节点
@@ -109,9 +139,10 @@ export default {
       // 再次遍历建立父子关系
       items.forEach(item => {
         const node = map[item.fieldId];
-        if (item.parentId === 0) {
+        if (item.parentId === 0 || item.parentId === 100) {
           roots.push(node);
-        } else {
+        }
+        else {
           const parent = map[item.parentId];
           if (parent) {
             parent.children.push(node);
@@ -133,11 +164,7 @@ export default {
       resolve(await this.fetchChildNodes(node.key));
     },
     handleNodeClick(data) {
-      if (data.fieldId == 0) {
-        this.$emit('clickNode', {})
-      } else {
-        this.$emit('clickNode', data)
-      }
+      this.$emit('clickNode', data)
     },
     append(data) {
       this.resetForm();

oa-ui/src/views/oa/study/components/studyRight.vue

@@ -1,14 +1,28 @@
 <!--
  * @Author: ysh
  * @Date: 2025-03-05 15:36:17
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-05-20 11:35:06
+ * @LastEditors: wrh
+ * @LastEditTime: 2025-10-16 12:35:17
 -->
 <template>
   <div>
     <el-row :gutter="20">
       <el-col :span="8">
-        <resource-tree :isModify="false" @clickNode="queryField"></resource-tree>
+        <el-row>
+          <div class="title">
+            集中学习
+            <div class="line"></div>
+          </div>
+          <resource-tree :fields="fields1" :isModify="false" @clickNode="queryField"></resource-tree>
+        </el-row>
+        <el-divider />
+        <el-row>
+          <div class="title">
+            专业领域
+            <div class="line"></div>
+          </div>
+          <resource-tree :fields="fields" :isModify="false" @clickNode="queryField"></resource-tree>
+        </el-row>
       </el-col>
       <el-col :span="16">
         <el-form :model="queryParams" size="small" :inline="true" label-width="68px" @submit.native.prevent>
@@ -33,14 +47,15 @@
             </template>
           </el-table-column>
         </el-table>
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize" :autoScroll="false" @pagination="getResourceList" />
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+          :autoScroll="false" @pagination="getList" />
       </el-col>
     </el-row>
   </div>
 </template>
 
 <script>
+import { listField } from "@/api/oa/study/resourceField";
 import { listResource, getResource, delResource, addResource, updateResource, getListBelow } from "@/api/oa/study/resource";
 import { listStudy, getStudy, delStudy, addStudy, updateStudy } from "@/api/oa/study/myStudy";
 import resourceTree from './resourceTree.vue';
@@ -51,6 +66,8 @@ export default {
     return {
       resourceList: [],
       pdfList: [],
+      fields: [],
+      fields1: [],
       videoTab: 'video',
       pdfTab: 'pdf',
       queryParams: {
@@ -64,18 +81,34 @@ export default {
   },
   created() {
     this.getResourceList();
+    this.getFieldList();
   },
   methods: {
+    getList() {
+      if (this.queryParams.fieldId != undefined && this.queryParams.fieldId != null)
+        this.getAllListByFiedldId();
+      else
+        this.getResourceList();
+    },
     getResourceList() {
+      this.loading = true;
       listResource(this.queryParams).then(response => {
         this.resourceList = response.rows;
         this.total = response.total;
+        this.loading = false;
       });
     },
-    getList() {
-      listResource(this.queryParams).then(response => {
-        this.resourceList = response.rows;
-        this.total = response.total;
+    getFieldList() {
+      this.loading = true;
+      listField({pageSize: 999}).then(response => {
+        this.fields = [];
+        this.fields1 = [];
+        response.rows.forEach(element => {
+          if (element.fieldId < 100)
+            this.fields.push(element);
+          else
+            this.fields1.push(element);
+        });
       });
     },
     getAllListByFiedldId() {
@@ -110,19 +143,33 @@ export default {
       })
     },
     queryField(data) {
-      if (data.fieldId) {
+      if (data) {
         this.queryParams.fieldId = data.fieldId
         this.getAllListByFiedldId();
-      } else {
-        this.queryParams.fieldId = null
-        this.getList();
       }
-    }
+    },
   },
 }
 </script>
 
 <style lang="scss" scoped>
+.title {
+  position: relative;
+  font-weight: bold;
+  font-size: 13px;
+  padding-left: 40px;
+  padding-bottom: 20px;
+
+  .line {
+    position: absolute;
+    left: 22px;
+    top: 3px;
+    width: 5px;
+    height: 20px;
+    border-radius: 10px;
+    background-color: #2893e5;
+  }
+}
 .material-list {
   display: grid;
   grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));

oa-ui/src/views/oa/study/resource.vue

@@ -1,19 +1,28 @@
 <!--
  * @Author: ysh
  * @Date: 2025-03-05 09:15:54
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2025-03-27 10:08:59
+ * @LastEditors: wrh
+ * @LastEditTime: 2025-10-16 12:34:56
 -->
 <template>
   <div class="app-container">
     <el-row :gutter="20">
       <el-col :span="6">
+        <el-row>
+          <div class="title">
+            集中学习
+            <div class="line"></div>
+          </div>
+          <resource-tree @getTreeData="getTreeDataFn" :fields="fields1" @clickNode="queryField">
+          </resource-tree>
+        </el-row>
+        <el-divider />
         <el-row>
           <div class="title">
             专业领域
             <div class="line"></div>
           </div>
-          <resource-tree @getTreeData="getTreeDataFn" @clickNode="queryField">
+          <resource-tree @getTreeData="getTreeDataFn" :fields="fields" @clickNode="queryField">
           </resource-tree>
         </el-row>
       </el-col>
@@ -65,7 +74,7 @@
             <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
               v-hasPermi="['oa:resource:export']">导出</el-button>
           </el-col>
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getResourceList"></right-toolbar>
         </el-row>
 
         <el-table v-loading="loading" :data="resourceList" @selection-change="handleSelectionChange">
@@ -178,6 +187,7 @@
 </template>
 
 <script>
+import { listField } from "@/api/oa/study/resourceField";
 import { listResource, getResource, delResource, addResource, updateResource, getListBelow } from "@/api/oa/study/resource";
 import { parseTime } from "@/utils/ruoyi";
 import resourceTree from './components/resourceTree.vue';
@@ -222,14 +232,14 @@ export default {
       form: {},
       // 表单校验
       rules: {},
-      treeData: [],
+      fields: [],
+      fields1: [],
       fieldOptions: [],
       currentCheckedKey: null,
     };
   },
   watch: {
     'form.sourcePath'(val) {
-      console.log(val);
       if (val) {
         let name = this.getFileName(val);
         if (name.includes('pdf')) {
@@ -243,11 +253,18 @@ export default {
     },
   },
   created() {
-    this.getList();
+    this.getResourceList();
+    this.getFieldList();
   },
   methods: {
-    /** 查询cmc学习资料列表 */
     getList() {
+      if (this.queryParams.fieldId != undefined && this.queryParams.fieldId != null)
+        this.getAllListByFiedldId();
+      else
+        this.getResourceList();
+    },
+    /** 查询cmc学习资料列表 */
+    getResourceList() {
       this.loading = true;
       listResource(this.queryParams).then(response => {
         this.resourceList = response.rows;
@@ -255,6 +272,18 @@ export default {
         this.loading = false;
       });
     },
+    getFieldList() {
+      listField({pageSize: 999}).then(response => {
+        this.fields = [];
+        this.fields1 = [];
+        response.rows.forEach(element => {
+          if (element.fieldId < 100)
+            this.fields.push(element);
+          else
+            this.fields1.push(element);
+        });
+      });
+    },
     getAllListByFiedldId() {
       this.loading = true;
       getListBelow(this.queryParams).then(response => {
@@ -286,7 +315,7 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
-      this.getList();
+      this.getResourceList();
     },
     /** 重置按钮操作 */
     resetQuery() {
@@ -319,7 +348,6 @@ export default {
         this.form = response.data;
         this.open = true;
         this.title = "修改学习资料";
-        console.log(this.$refs.fieldIdTree);
         this.$nextTick(() => {
           this.$refs.fieldIdTree.setCheckedKeys([this.form.fieldId]);
         });
@@ -327,20 +355,19 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      console.log(this.form);
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.resourceId != null) {
             updateResource(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
-              this.getList();
+              this.getResourceList();
             });
           } else {
             addResource(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
-              this.getList();
+              this.getResourceList();
             });
           }
         }
@@ -352,7 +379,7 @@ export default {
       this.$modal.confirm('是否确认删除cmc学习资料编号为"' + resourceIds + '"的数据项？').then(function () {
         return delResource(resourceIds);
       }).then(() => {
-        this.getList();
+        this.getResourceList();
         this.$modal.msgSuccess("删除成功");
       }).catch(() => { });
     },
@@ -379,12 +406,9 @@ export default {
       return name
     },
     queryField(data) {
-      if (data.fieldId) {
+      if (data) {
         this.queryParams.fieldId = data.fieldId
         this.getAllListByFiedldId();
-      } else {
-        this.queryParams.fieldId = null
-        this.getList();
       }
     },
     getTreeDataFn(data) {

oa-ui/src/views/oa/transfer/index.vue

@@ -0,0 +1,579 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="申请人id" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入申请人id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="申请日期" prop="applyDate">
+        <el-date-picker clearable
+          v-model="queryParams.applyDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择申请日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="调整前所在部门id" prop="beforeDeptId">
+        <el-input
+          v-model="queryParams.beforeDeptId"
+          placeholder="请输入调整前所在部门id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="调整前岗位id" prop="beforePostId">
+        <el-input
+          v-model="queryParams.beforePostId"
+          placeholder="请输入调整前岗位id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="调整后所在部门id" prop="afterDeptId">
+        <el-input
+          v-model="queryParams.afterDeptId"
+          placeholder="请输入调整后所在部门id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="调整后岗位id" prop="afterPostId">
+        <el-input
+          v-model="queryParams.afterPostId"
+          placeholder="请输入调整后岗位id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="调整前所在部门意见" prop="beforeDeptComment">
+        <el-input
+          v-model="queryParams.beforeDeptComment"
+          placeholder="请输入调整前所在部门意见"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="调整前所在部门负责人" prop="beforeDeptLeader">
+        <el-input
+          v-model="queryParams.beforeDeptLeader"
+          placeholder="请输入调整前所在部门负责人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="调整前所在部门审批时间" prop="beforeDeptTime">
+        <el-date-picker clearable
+          v-model="queryParams.beforeDeptTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择调整前所在部门审批时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="调整后所在部门意见" prop="afterDeptComment">
+        <el-input
+          v-model="queryParams.afterDeptComment"
+          placeholder="请输入调整后所在部门意见"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="调整后所在部门审批时间" prop="afterDeptTime">
+        <el-date-picker clearable
+          v-model="queryParams.afterDeptTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择调整后所在部门审批时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="调整后所在部门负责人" prop="afterDeptLeader">
+        <el-input
+          v-model="queryParams.afterDeptLeader"
+          placeholder="请输入调整后所在部门负责人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="综合事务部意见" prop="zhComment">
+        <el-input
+          v-model="queryParams.zhComment"
+          placeholder="请输入综合事务部意见"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="综合事务部审批时间" prop="zhTime">
+        <el-date-picker clearable
+          v-model="queryParams.zhTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择综合事务部审批时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="综合事务部负责人" prop="zhUserId">
+        <el-input
+          v-model="queryParams.zhUserId"
+          placeholder="请输入综合事务部负责人"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="分管领导意见" prop="managerComment">
+        <el-input
+          v-model="queryParams.managerComment"
+          placeholder="请输入分管领导意见"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="分管领导审批时间" prop="managerTime">
+        <el-date-picker clearable
+          v-model="queryParams.managerTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择分管领导审批时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="分管领导" prop="managerUserId">
+        <el-input
+          v-model="queryParams.managerUserId"
+          placeholder="请输入分管领导"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="总经理意见" prop="zjlComment">
+        <el-input
+          v-model="queryParams.zjlComment"
+          placeholder="请输入总经理意见"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="总经理审批时间" prop="zjlTime">
+        <el-date-picker clearable
+          v-model="queryParams.zjlTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="请选择总经理审批时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="总经理" prop="zjlUserId">
+        <el-input
+          v-model="queryParams.zjlUserId"
+          placeholder="请输入总经理"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['oa:transfer:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['oa:transfer:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['oa:transfer:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['oa:transfer:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="transferList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="调岗id" align="center" prop="transferId" />
+      <el-table-column label="申请人id" align="center" prop="userId" />
+      <el-table-column label="申请日期" align="center" prop="applyDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.applyDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="调整前所在部门id" align="center" prop="beforeDeptId" />
+      <el-table-column label="调整前岗位id" align="center" prop="beforePostId" />
+      <el-table-column label="调整后所在部门id" align="center" prop="afterDeptId" />
+      <el-table-column label="调整后岗位id" align="center" prop="afterPostId" />
+      <el-table-column label="调整前所在部门意见" align="center" prop="beforeDeptComment" />
+      <el-table-column label="调整前所在部门负责人" align="center" prop="beforeDeptLeader" />
+      <el-table-column label="调整前所在部门审批时间" align="center" prop="beforeDeptTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.beforeDeptTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="调整后所在部门意见" align="center" prop="afterDeptComment" />
+      <el-table-column label="调整后所在部门审批时间" align="center" prop="afterDeptTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.afterDeptTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="调整后所在部门负责人" align="center" prop="afterDeptLeader" />
+      <el-table-column label="综合事务部意见" align="center" prop="zhComment" />
+      <el-table-column label="综合事务部审批时间" align="center" prop="zhTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.zhTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="综合事务部负责人" align="center" prop="zhUserId" />
+      <el-table-column label="分管领导意见" align="center" prop="managerComment" />
+      <el-table-column label="分管领导审批时间" align="center" prop="managerTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.managerTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="分管领导" align="center" prop="managerUserId" />
+      <el-table-column label="总经理意见" align="center" prop="zjlComment" />
+      <el-table-column label="总经理审批时间" align="center" prop="zjlTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.zjlTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="总经理" align="center" prop="zjlUserId" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['oa:transfer:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:transfer:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改cmc调岗申请对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="申请人id" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入申请人id" />
+        </el-form-item>
+        <el-form-item label="申请日期" prop="applyDate">
+          <el-date-picker clearable
+            v-model="form.applyDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择申请日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="调整前所在部门id" prop="beforeDeptId">
+          <el-input v-model="form.beforeDeptId" placeholder="请输入调整前所在部门id" />
+        </el-form-item>
+        <el-form-item label="调整前岗位id" prop="beforePostId">
+          <el-input v-model="form.beforePostId" placeholder="请输入调整前岗位id" />
+        </el-form-item>
+        <el-form-item label="调整后所在部门id" prop="afterDeptId">
+          <el-input v-model="form.afterDeptId" placeholder="请输入调整后所在部门id" />
+        </el-form-item>
+        <el-form-item label="调整后岗位id" prop="afterPostId">
+          <el-input v-model="form.afterPostId" placeholder="请输入调整后岗位id" />
+        </el-form-item>
+        <el-form-item label="调整前所在部门意见" prop="beforeDeptComment">
+          <el-input v-model="form.beforeDeptComment" placeholder="请输入调整前所在部门意见" />
+        </el-form-item>
+        <el-form-item label="调整前所在部门负责人" prop="beforeDeptLeader">
+          <el-input v-model="form.beforeDeptLeader" placeholder="请输入调整前所在部门负责人" />
+        </el-form-item>
+        <el-form-item label="调整前所在部门审批时间" prop="beforeDeptTime">
+          <el-date-picker clearable
+            v-model="form.beforeDeptTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择调整前所在部门审批时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="调整后所在部门意见" prop="afterDeptComment">
+          <el-input v-model="form.afterDeptComment" placeholder="请输入调整后所在部门意见" />
+        </el-form-item>
+        <el-form-item label="调整后所在部门审批时间" prop="afterDeptTime">
+          <el-date-picker clearable
+            v-model="form.afterDeptTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择调整后所在部门审批时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="调整后所在部门负责人" prop="afterDeptLeader">
+          <el-input v-model="form.afterDeptLeader" placeholder="请输入调整后所在部门负责人" />
+        </el-form-item>
+        <el-form-item label="综合事务部意见" prop="zhComment">
+          <el-input v-model="form.zhComment" placeholder="请输入综合事务部意见" />
+        </el-form-item>
+        <el-form-item label="综合事务部审批时间" prop="zhTime">
+          <el-date-picker clearable
+            v-model="form.zhTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择综合事务部审批时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="综合事务部负责人" prop="zhUserId">
+          <el-input v-model="form.zhUserId" placeholder="请输入综合事务部负责人" />
+        </el-form-item>
+        <el-form-item label="分管领导意见" prop="managerComment">
+          <el-input v-model="form.managerComment" placeholder="请输入分管领导意见" />
+        </el-form-item>
+        <el-form-item label="分管领导审批时间" prop="managerTime">
+          <el-date-picker clearable
+            v-model="form.managerTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择分管领导审批时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="分管领导" prop="managerUserId">
+          <el-input v-model="form.managerUserId" placeholder="请输入分管领导" />
+        </el-form-item>
+        <el-form-item label="总经理意见" prop="zjlComment">
+          <el-input v-model="form.zjlComment" placeholder="请输入总经理意见" />
+        </el-form-item>
+        <el-form-item label="总经理审批时间" prop="zjlTime">
+          <el-date-picker clearable
+            v-model="form.zjlTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择总经理审批时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="总经理" prop="zjlUserId">
+          <el-input v-model="form.zjlUserId" placeholder="请输入总经理" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listTransfer, getTransfer, delTransfer, addTransfer, updateTransfer } from "@/api/oa/transfer/transfer";
+
+export default {
+  name: "Transfer",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // cmc调岗申请表格数据
+      transferList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userId: null,
+        applyDate: null,
+        beforeDeptId: null,
+        beforePostId: null,
+        afterDeptId: null,
+        afterPostId: null,
+        beforeDeptComment: null,
+        beforeDeptLeader: null,
+        beforeDeptTime: null,
+        afterDeptComment: null,
+        afterDeptTime: null,
+        afterDeptLeader: null,
+        zhComment: null,
+        zhTime: null,
+        zhUserId: null,
+        managerComment: null,
+        managerTime: null,
+        managerUserId: null,
+        zjlComment: null,
+        zjlTime: null,
+        zjlUserId: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询cmc调岗申请列表 */
+    getList() {
+      this.loading = true;
+      listTransfer(this.queryParams).then(response => {
+        this.transferList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        transferId: null,
+        userId: null,
+        applyDate: null,
+        beforeDeptId: null,
+        beforePostId: null,
+        afterDeptId: null,
+        afterPostId: null,
+        beforeDeptComment: null,
+        beforeDeptLeader: null,
+        beforeDeptTime: null,
+        afterDeptComment: null,
+        afterDeptTime: null,
+        afterDeptLeader: null,
+        zhComment: null,
+        zhTime: null,
+        zhUserId: null,
+        managerComment: null,
+        managerTime: null,
+        managerUserId: null,
+        zjlComment: null,
+        zjlTime: null,
+        zjlUserId: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.transferId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加cmc调岗申请";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const transferId = row.transferId || this.ids
+      getTransfer(transferId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改cmc调岗申请";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.transferId != null) {
+            updateTransfer(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addTransfer(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const transferIds = row.transferId || this.ids;
+      this.$modal.confirm('是否确认删除cmc调岗申请编号为"' + transferIds + '"的数据项？').then(function() {
+        return delTransfer(transferIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/transfer/export', {
+        ...this.queryParams
+      }, `transfer_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>