新增承接分包、项目工作量表

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

+package com.ruoyi.web.controller.oa;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.oa.domain.CmcContractSubContract;
+import com.ruoyi.oa.service.ICmcContractSubContractService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * cmc承接分包合同Controller
+ * 
+ * @author cmc
+ * @date 2024-06-19
+ */
+@RestController
+@RequestMapping("/oa/contractSubcontract")
+public class CmcContractSubContractController extends BaseController
+{
+    @Autowired
+    private ICmcContractSubContractService cmcContractSubContractService;
+
+    /**
+     * 查询cmc承接分包合同列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcContractSubContract cmcContractSubContract)
+    {
+        startPage();
+        List<CmcContractSubContract> list = cmcContractSubContractService.selectCmcContractSubContractList(cmcContractSubContract);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc承接分包合同列表
+     */
+    @Log(title = "cmc承接分包合同", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcContractSubContract cmcContractSubContract)
+    {
+        List<CmcContractSubContract> list = cmcContractSubContractService.selectCmcContractSubContractList(cmcContractSubContract);
+        ExcelUtil<CmcContractSubContract> util = new ExcelUtil<CmcContractSubContract>(CmcContractSubContract.class);
+        util.exportExcel(response, list, "cmc承接分包合同数据");
+    }
+
+    /**
+     * 获取cmc承接分包合同详细信息
+     */
+    @GetMapping(value = "/{contractId}")
+    public AjaxResult getInfo(@PathVariable("contractId") String contractId)
+    {
+        return success(cmcContractSubContractService.selectCmcContractSubContractByContractId(contractId));
+    }
+
+    /**
+     * 新增cmc承接分包合同
+     */
+    @Log(title = "cmc承接分包合同", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcContractSubContract cmcContractSubContract)
+    {
+        return toAjax(cmcContractSubContractService.insertCmcContractSubContract(cmcContractSubContract));
+    }
+
+    /**
+     * 修改cmc承接分包合同
+     */
+    @Log(title = "cmc承接分包合同", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcContractSubContract cmcContractSubContract)
+    {
+        return toAjax(cmcContractSubContractService.updateCmcContractSubContract(cmcContractSubContract));
+    }
+
+    /**
+     * 删除cmc承接分包合同
+     */
+    @Log(title = "cmc承接分包合同", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{subContractIds}")
+    public AjaxResult remove(@PathVariable String[] subContractIds)
+    {
+        return success(cmcContractSubContractService.deleteCmcContractSubContractBySubContractIds(subContractIds));
+    }
+}

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

+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.CmcProjectWorkload;
+import com.ruoyi.oa.service.ICmcProjectWorkloadService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * cmc项目工作量Controller
+ *
+ * @author cmc
+ * @date 2024-09-02
+ */
+@RestController
+@RequestMapping("/oa/projectWorkload")
+public class CmcProjectWorkloadController extends BaseController
+{
+    @Autowired
+    private ICmcProjectWorkloadService cmcProjectWorkloadService;
+
+    /**
+     * 查询cmc项目工作量列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcProjectWorkload cmcProjectWorkload)
+    {
+        startPage();
+        List<CmcProjectWorkload> list = cmcProjectWorkloadService.selectCmcProjectWorkloadList(cmcProjectWorkload);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出cmc项目工作量列表
+     */
+    @Log(title = "cmc项目工作量", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcProjectWorkload cmcProjectWorkload)
+    {
+        List<CmcProjectWorkload> list = cmcProjectWorkloadService.selectCmcProjectWorkloadList(cmcProjectWorkload);
+        ExcelUtil<CmcProjectWorkload> util = new ExcelUtil<CmcProjectWorkload>(CmcProjectWorkload.class);
+        util.exportExcel(response, list, "cmc项目工作量数据");
+    }
+
+    /**
+     * 获取cmc项目工作量详细信息
+     */
+    @GetMapping(value = "/{projectId}")
+    public AjaxResult getInfo(@PathVariable("projectId") String projectId)
+    {
+        return success(cmcProjectWorkloadService.selectCmcProjectWorkloadListByProjectId(projectId));
+    }
+
+    /**
+     * 新增cmc项目工作量
+     */
+    @Log(title = "cmc项目工作量", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcProjectWorkload cmcProjectWorkload)
+    {
+        return toAjax(cmcProjectWorkloadService.insertCmcProjectWorkload(cmcProjectWorkload));
+    }
+
+    /**
+     * 修改cmc项目工作量
+     */
+    @Log(title = "cmc项目工作量", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcProjectWorkload cmcProjectWorkload)
+    {
+        return toAjax(cmcProjectWorkloadService.updateCmcProjectWorkload(cmcProjectWorkload));
+    }
+
+    /**
+     * 删除cmc项目工作量
+     */
+    @Log(title = "cmc项目工作量", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{projectId}")
+    public AjaxResult remove(@PathVariable String[] projectId)
+    {
+        return success(cmcProjectWorkloadService.deleteCmcProjectWorkloadByProjectIds(projectId));
+    }
+}

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

         boolean isLeader = false;
         String deptId = getLoginUser().getDeptId().toString();
         List<Long> userIdList = new ArrayList<>();
-        if (postService.selectDeptLeaderByDeptId(deptId) != null)
+        if (postService.selectDeptLeaderByDeptId(deptId) != null) //主任
             userIdList.add(postService.selectDeptLeaderByDeptId(deptId).getUserId());
-        if (postService.selectViceDeptLeaderListByDeptId(deptId) != null)
+        if (postService.selectViceDeptLeaderListByDeptId(deptId) != null) //副主任
             for(SysUser sysUser : postService.selectViceDeptLeaderListByDeptId(deptId))
                 userIdList.add(sysUser.getUserId());
-        if (postService.selectSubLeaderByDeptId(deptId) != null)
+        if (postService.selectSubLeaderByDeptId(deptId) != null) //子公司执行董事
             userIdList.add(postService.selectSubLeaderByDeptId(deptId).getUserId());
-        if (postService.selectSubGmByDeptId(deptId) != null)
+        if (postService.selectSubGmByDeptId(deptId) != null) //子公司总经理
             userIdList.add(postService.selectSubGmByDeptId(deptId).getUserId());
-        if (postService.selectBranchLeaderByDeptId(deptId) != null)
+        if (postService.selectBranchLeaderByDeptId(deptId) != null) //分公司经理
             userIdList.add(postService.selectBranchLeaderByDeptId(deptId).getUserId());
         if (userIdList.contains(getLoginUser().getUserId()))
             isLeader = true;

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

             return error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
         user.setCreateBy(getUsername());
+        if (user.getPoliticalAffiliation() == null || user.getPoliticalAffiliation().equals(""))
+            user.setPoliticalAffiliation("13");
         String pinyin = Pinyin4jUtil.getPinyin(user.getNickName());
         user.setPinyin(pinyin.contains(",") ? pinyin.split(",")[0] : pinyin);
-        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        user.setPassword(SecurityUtils.encryptPassword(user.getIdCard().substring(12,18)));
         if (user.getBirthday() != null)
             user.setAge(DateUtils.getAgeByBirth(user.getBirthday()));
         return toAjax(userService.insertUser(user));
             if (user.getUserId() > 1) {
                 String pinyin = Pinyin4jUtil.getPinyin(user.getNickName());
                 user.setPinyin(pinyin.contains(",") ? pinyin.split(",")[0] : pinyin);
+                if (user.getContractSign() == null || user.getContractExpire() == null) {
+                    if (user.getContractSign() == null)
+                        userService.updateUserContractSign(user);
+                    if (user.getContractExpire() == null)
+                        userService.updateUserContractExpire(user);
+                }
                 userService.updateUser(user);
             }
         }
         user.setUpdateReason(user.getUpdateReason());
         if (user.getBirthday() != null)
             user.setAge(DateUtils.getAgeByBirth(user.getBirthday()));
+        if (user.getContractSign() == null || user.getContractExpire() == null) {
+            if (user.getContractSign() == null)
+                userService.updateUserContractSign(user);
+            if (user.getContractExpire() == null)
+                userService.updateUserContractExpire(user);
+        }
         return toAjax(userService.updateUser(user));
     }
 

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

+package com.ruoyi.oa.domain;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * cmc承接分包合同对象 cmc_contract_sub_contract
+ * 
+ * @author cmc
+ * @date 2024-06-19
+ */
+public class CmcContractSubContract extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 承接合同id */
+    private String contractId;
+
+    /** 分包合同id */
+    private String subContractId;
+
+    public void setContractId(String contractId) 
+    {
+        this.contractId = contractId;
+    }
+
+    public String getContractId() 
+    {
+        return contractId;
+    }
+    public void setSubContractId(String subContractId) 
+    {
+        this.subContractId = subContractId;
+    }
+
+    public String getSubContractId() 
+    {
+        return subContractId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("contractId", getContractId())
+            .append("subContractId", getSubContractId())
+            .toString();
+    }
+}

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

+package com.ruoyi.oa.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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_project_workload
+ *
+ * @author cmc
+ * @date 2024-09-02
+ */
+public class CmcProjectWorkload extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 工作量id */
+    private Long workloadId;
+
+    /** 项目id */
+    @Excel(name = "项目id")
+    private String projectId;
+
+    /** 工作内容 */
+    @Excel(name = "工作内容")
+    private String content;
+
+    /** 等级或比例尺 */
+    @Excel(name = "等级或比例尺")
+    private String scale;
+
+    /** 单位 */
+    @Excel(name = "单位")
+    private String unit;
+
+    /** 实际工作量 */
+    @Excel(name = "实际工作量")
+    private String workload;
+
+    /** 实际完成时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "实际完成时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date finishTime;
+
+    public void setWorkloadId(Long workloadId)
+    {
+        this.workloadId = workloadId;
+    }
+
+    public Long getWorkloadId()
+    {
+        return workloadId;
+    }
+    public void setProjectId(String projectId)
+    {
+        this.projectId = projectId;
+    }
+
+    public String getProjectId()
+    {
+        return projectId;
+    }
+    public void setContent(String content)
+    {
+        this.content = content;
+    }
+
+    public String getContent()
+    {
+        return content;
+    }
+    public void setScale(String scale)
+    {
+        this.scale = scale;
+    }
+
+    public String getScale()
+    {
+        return scale;
+    }
+    public void setUnit(String unit)
+    {
+        this.unit = unit;
+    }
+
+    public String getUnit()
+    {
+        return unit;
+    }
+    public void setWorkload(String workload)
+    {
+        this.workload = workload;
+    }
+
+    public String getWorkload()
+    {
+        return workload;
+    }
+    public void setFinishTime(Date finishTime)
+    {
+        this.finishTime = finishTime;
+    }
+
+    public Date getFinishTime()
+    {
+        return finishTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("workloadId", getWorkloadId())
+                .append("projectId", getProjectId())
+                .append("content", getContent())
+                .append("scale", getScale())
+                .append("unit", getUnit())
+                .append("workload", getWorkload())
+                .append("finishTime", getFinishTime())
+                .append("remark", getRemark())
+                .toString();
+    }
+}

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

+package com.ruoyi.oa.mapper;
+
+import com.ruoyi.oa.domain.CmcContractSubContract;
+
+import java.util.List;
+
+/**
+ * cmc承接分包合同Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-06-19
+ */
+public interface CmcContractSubContractMapper 
+{
+    /**
+     * 查询cmc承接分包合同
+     * 
+     * @param contractId cmc承接分包合同主键
+     * @return cmc承接分包合同
+     */
+    public CmcContractSubContract selectCmcContractSubContractByContractId(String contractId);
+
+    /**
+     * 查询cmc承接分包合同列表
+     * 
+     * @param cmcContractSubContract cmc承接分包合同
+     * @return cmc承接分包合同集合
+     */
+    public List<CmcContractSubContract> selectCmcContractSubContractList(CmcContractSubContract cmcContractSubContract);
+
+    /**
+     * 新增cmc承接分包合同
+     * 
+     * @param cmcContractSubContract cmc承接分包合同
+     * @return 结果
+     */
+    public int insertCmcContractSubContract(CmcContractSubContract cmcContractSubContract);
+
+    /**
+     * 修改cmc承接分包合同
+     * 
+     * @param cmcContractSubContract cmc承接分包合同
+     * @return 结果
+     */
+    public int updateCmcContractSubContract(CmcContractSubContract cmcContractSubContract);
+
+    /**
+     * 删除cmc承接分包合同
+     * 
+     * @param contractId cmc承接分包合同主键
+     * @return 结果
+     */
+    public int deleteCmcContractSubContractByContractId(String contractId);
+
+    /**
+     * 批量删除cmc承接分包合同
+     * 
+     * @param subContractIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcContractSubContractBySubContractIds(String[] subContractIds);
+}

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

+package com.ruoyi.oa.mapper;
+
+import com.ruoyi.oa.domain.CmcProjectWorkload;
+
+import java.util.List;
+
+/**
+ * cmc项目内容Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-02-28
+ */
+public interface CmcProjectWorkloadMapper
+{
+    /**
+     * 查询cmc项目内容
+     * 
+     * @param projectId cmc项目id
+     * @return cmc项目内容集合
+     */
+    public List<CmcProjectWorkload> selectCmcProjectWorkloadListByProjectId(String projectId);
+
+    /**
+     * 查询cmc项目内容列表
+     * 
+     * @param cmcProjectWorkload cmc项目内容
+     * @return cmc项目内容集合
+     */
+    public List<CmcProjectWorkload> selectCmcProjectWorkloadList(CmcProjectWorkload cmcProjectWorkload);
+
+    /**
+     * 新增cmc项目内容
+     * 
+     * @param cmcProjectWorkload cmc项目内容
+     * @return 结果
+     */
+    public int insertCmcProjectWorkload(CmcProjectWorkload cmcProjectWorkload);
+
+    /**
+     * 修改cmc项目内容
+     * 
+     * @param cmcProjectWorkload cmc项目内容
+     * @return 结果
+     */
+    public int updateCmcProjectWorkload(CmcProjectWorkload cmcProjectWorkload);
+
+    /**
+     * 删除cmc项目内容
+     * 
+     * @param workId cmc项目内容主键
+     * @return 结果
+     */
+    public int deleteCmcProjectWorkloadByProjectId(String workId);
+
+    /**
+     * 批量删除cmc项目内容
+     * 
+     * @param workIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcProjectWorkloadByProjectIds(String[] workIds);
+}

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

+package com.ruoyi.oa.service;
+
+import com.ruoyi.oa.domain.CmcContractSubContract;
+
+import java.util.List;
+
+/**
+ * cmc承接分包合同Service接口
+ * 
+ * @author cmc
+ * @date 2024-06-19
+ */
+public interface ICmcContractSubContractService 
+{
+    /**
+     * 查询cmc承接分包合同
+     * 
+     * @param contractId cmc承接分包合同主键
+     * @return cmc承接分包合同
+     */
+    public CmcContractSubContract selectCmcContractSubContractByContractId(String contractId);
+
+    /**
+     * 查询cmc承接分包合同列表
+     * 
+     * @param cmcContractSubContract cmc承接分包合同
+     * @return cmc承接分包合同集合
+     */
+    public List<CmcContractSubContract> selectCmcContractSubContractList(CmcContractSubContract cmcContractSubContract);
+
+    /**
+     * 新增cmc承接分包合同
+     * 
+     * @param cmcContractSubContract cmc承接分包合同
+     * @return 结果
+     */
+    public int insertCmcContractSubContract(CmcContractSubContract cmcContractSubContract);
+
+    /**
+     * 修改cmc承接分包合同
+     * 
+     * @param cmcContractSubContract cmc承接分包合同
+     * @return 结果
+     */
+    public int updateCmcContractSubContract(CmcContractSubContract cmcContractSubContract);
+
+    /**
+     * 批量删除cmc承接分包合同
+     * 
+     * @param subContractIds 需要删除的cmc承接分包合同主键集合
+     * @return 结果
+     */
+    public int deleteCmcContractSubContractBySubContractIds(String[] subContractIds);
+
+    /**
+     * 删除cmc承接分包合同信息
+     * 
+     * @param contractId cmc承接分包合同主键
+     * @return 结果
+     */
+    public int deleteCmcContractSubContractByContractId(String contractId);
+}

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

+package com.ruoyi.oa.service;
+
+import com.ruoyi.oa.domain.CmcProjectWorkload;
+
+import java.util.List;
+
+/**
+ * cmc项目内容Service接口
+ * 
+ * @author cmc
+ * @date 2024-02-28
+ */
+public interface ICmcProjectWorkloadService
+{
+    /**
+     * 查询cmc项目内容
+     * 
+     * @param projectId cmc项目id
+     * @return cmc项目内容集合
+     */
+    public List<CmcProjectWorkload> selectCmcProjectWorkloadListByProjectId(String projectId);
+
+    /**
+     * 查询cmc项目内容列表
+     * 
+     * @param cmcProjectWorkload cmc项目内容
+     * @return cmc项目内容集合
+     */
+    public List<CmcProjectWorkload> selectCmcProjectWorkloadList(CmcProjectWorkload cmcProjectWorkload);
+
+    /**
+     * 新增cmc项目内容
+     * 
+     * @param cmcProjectWorkload cmc项目内容
+     * @return 结果
+     */
+    public int insertCmcProjectWorkload(CmcProjectWorkload cmcProjectWorkload);
+
+    /**
+     * 修改cmc项目内容
+     * 
+     * @param cmcProjectWorkload cmc项目内容
+     * @return 结果
+     */
+    public int updateCmcProjectWorkload(CmcProjectWorkload cmcProjectWorkload);
+
+    /**
+     * 批量删除cmc项目内容
+     * 
+     * @param projectIds 需要删除的cmc项目内容主键集合
+     * @return 结果
+     */
+    public int deleteCmcProjectWorkloadByProjectIds(String[] projectIds);
+
+    /**
+     * 删除cmc项目内容信息
+     * 
+     * @param projectId cmc项目内容主键
+     * @return 结果
+     */
+    public int deleteCmcProjectWorkloadByProjectId(String projectId);
+}

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

+package com.ruoyi.oa.service.impl;
+
+import com.ruoyi.oa.domain.CmcContractSubContract;
+import com.ruoyi.oa.mapper.CmcContractSubContractMapper;
+import com.ruoyi.oa.service.ICmcContractSubContractService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * cmc承接分包合同Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-06-19
+ */
+@Service
+public class CmcContractSubContractServiceImpl implements ICmcContractSubContractService 
+{
+    @Autowired
+    private CmcContractSubContractMapper cmcContractSubContractMapper;
+
+    /**
+     * 查询cmc承接分包合同
+     * 
+     * @param contractId cmc承接分包合同主键
+     * @return cmc承接分包合同
+     */
+    @Override
+    public CmcContractSubContract selectCmcContractSubContractByContractId(String contractId)
+    {
+        return cmcContractSubContractMapper.selectCmcContractSubContractByContractId(contractId);
+    }
+
+    /**
+     * 查询cmc承接分包合同列表
+     * 
+     * @param cmcContractSubContract cmc承接分包合同
+     * @return cmc承接分包合同
+     */
+    @Override
+    public List<CmcContractSubContract> selectCmcContractSubContractList(CmcContractSubContract cmcContractSubContract)
+    {
+        return cmcContractSubContractMapper.selectCmcContractSubContractList(cmcContractSubContract);
+    }
+
+    /**
+     * 新增cmc承接分包合同
+     * 
+     * @param cmcContractSubContract cmc承接分包合同
+     * @return 结果
+     */
+    @Override
+    public int insertCmcContractSubContract(CmcContractSubContract cmcContractSubContract)
+    {
+        return cmcContractSubContractMapper.insertCmcContractSubContract(cmcContractSubContract);
+    }
+
+    /**
+     * 修改cmc承接分包合同
+     * 
+     * @param cmcContractSubContract cmc承接分包合同
+     * @return 结果
+     */
+    @Override
+    public int updateCmcContractSubContract(CmcContractSubContract cmcContractSubContract)
+    {
+        return cmcContractSubContractMapper.updateCmcContractSubContract(cmcContractSubContract);
+    }
+
+    /**
+     * 批量删除cmc承接分包合同
+     * 
+     * @param subContractIds 需要删除的cmc承接分包合同主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcContractSubContractBySubContractIds(String[] subContractIds)
+    {
+        return cmcContractSubContractMapper.deleteCmcContractSubContractBySubContractIds(subContractIds);
+    }
+
+    /**
+     * 删除cmc承接分包合同信息
+     * 
+     * @param contractId cmc承接分包合同主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcContractSubContractByContractId(String contractId)
+    {
+        return cmcContractSubContractMapper.deleteCmcContractSubContractByContractId(contractId);
+    }
+}

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

+package com.ruoyi.oa.service.impl;
+
+import com.ruoyi.oa.domain.CmcProjectWorkload;
+import com.ruoyi.oa.mapper.CmcProjectWorkloadMapper;
+import com.ruoyi.oa.service.ICmcProjectWorkloadService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * cmc项目内容Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-02-28
+ */
+@Service
+public class CmcProjectWorkloadServiceImpl implements ICmcProjectWorkloadService
+{
+    @Autowired
+    private CmcProjectWorkloadMapper cmcProjectWorkloadMapper;
+
+    /**
+     * 查询cmc项目内容
+     * 
+     * @param projectId cmc项目id
+     * @return cmc项目内容集合
+     */
+    @Override
+    public List<CmcProjectWorkload> selectCmcProjectWorkloadListByProjectId(String projectId)
+    {
+        return cmcProjectWorkloadMapper.selectCmcProjectWorkloadListByProjectId(projectId);
+    }
+
+    /**
+     * 查询cmc项目内容列表
+     * 
+     * @param cmcProjectWorkload cmc项目内容
+     * @return cmc项目内容
+     */
+    @Override
+    public List<CmcProjectWorkload> selectCmcProjectWorkloadList(CmcProjectWorkload cmcProjectWorkload)
+    {
+        return cmcProjectWorkloadMapper.selectCmcProjectWorkloadList(cmcProjectWorkload);
+    }
+
+    /**
+     * 新增cmc项目内容
+     * 
+     * @param cmcProjectWorkload cmc项目内容
+     * @return 结果
+     */
+    @Override
+    public int insertCmcProjectWorkload(CmcProjectWorkload cmcProjectWorkload)
+    {
+        return cmcProjectWorkloadMapper.insertCmcProjectWorkload(cmcProjectWorkload);
+    }
+
+    /**
+     * 修改cmc项目内容
+     * 
+     * @param cmcProjectWorkload cmc项目内容
+     * @return 结果
+     */
+    @Override
+    public int updateCmcProjectWorkload(CmcProjectWorkload cmcProjectWorkload)
+    {
+        return cmcProjectWorkloadMapper.updateCmcProjectWorkload(cmcProjectWorkload);
+    }
+
+    /**
+     * 批量删除cmc项目内容
+     * 
+     * @param workIds 需要删除的cmc项目内容主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcProjectWorkloadByProjectIds(String[] workIds)
+    {
+        return cmcProjectWorkloadMapper.deleteCmcProjectWorkloadByProjectIds(workIds);
+    }
+
+    /**
+     * 删除cmc项目内容信息
+     * 
+     * @param projectId cmc项目内容主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcProjectWorkloadByProjectId(String projectId)
+    {
+        return cmcProjectWorkloadMapper.deleteCmcProjectWorkloadByProjectId(projectId);
+    }
+}

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

      */
     public int updateUserAvatar(@Param("userName") String userName, @Param("avatar") String avatar);
 
+    /**
+     * 修改用户合同签订日期
+     *
+     * @param user 用户信息
+     * @return 结果
+     */
+    public int updateUserContractSign(SysUser user);
+
+    /**
+     * 修改用户合同到期日期
+     *
+     * @param user 用户信息
+     * @return 结果
+     */
+    public int updateUserContractExpire(SysUser user);
+
     /**
      * 重置用户密码
      * 

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

      */
     public int updateUserStatus(SysUser user);
 
+    /**
+     * 修改用户合同签订日期
+     *
+     * @param user 用户信息
+     * @return 结果
+     */
+    public int updateUserContractSign(SysUser user);
+
+    /**
+     * 修改用户合同到期日期
+     *
+     * @param user 用户信息
+     * @return 结果
+     */
+    public int updateUserContractExpire(SysUser user);
+
     /**
      * 修改用户基本信息
      * 

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

         return userMapper.updateUser(user);
     }
 
+    /**
+     * 修改用户合同签订日期
+     *
+     * @param user 用户信息
+     * @return 结果
+     */
+    @Override
+    public int updateUserContractSign(SysUser user)
+    {
+        return userMapper.updateUserContractSign(user);
+    }
+
+    /**
+     * 修改用户合同到期日期
+     *
+     * @param user 用户信息
+     * @return 结果
+     */
+    @Override
+    public int updateUserContractExpire(SysUser user)
+    {
+        return userMapper.updateUserContractExpire(user);
+    }
+
     /**
      * 修改用户基本信息
      * 

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

+<?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.CmcContractSubContractMapper">
+    
+    <resultMap type="CmcContractSubContract" id="CmcContractSubContractResult">
+        <result property="contractId"    column="contract_id"    />
+        <result property="subContractId"    column="sub_contract_id"    />
+    </resultMap>
+
+    <sql id="selectCmcContractSubContractVo">
+        select contract_id, sub_contract_id from cmc_contract_sub_contract
+    </sql>
+
+    <select id="selectCmcContractSubContractList" parameterType="CmcContractSubContract" resultMap="CmcContractSubContractResult">
+        <include refid="selectCmcContractSubContractVo"/>
+        <where>
+            <if test="contractId != null  and contractId != ''"> and contract_id = #{contractId}</if>
+            <if test="subContractId != null  and subContractId != ''"> and sub_contract_id = #{subContractId}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcContractSubContractByContractId" parameterType="String" resultMap="CmcContractSubContractResult">
+        <include refid="selectCmcContractSubContractVo"/>
+        where contract_id = #{contractId}
+    </select>
+        
+    <insert id="insertCmcContractSubContract" parameterType="CmcContractSubContract">
+        insert into cmc_contract_sub_contract
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="contractId != null">contract_id,</if>
+            <if test="subContractId != null">sub_contract_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="contractId != null">#{contractId},</if>
+            <if test="subContractId != null">#{subContractId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcContractSubContract" parameterType="CmcContractSubContract">
+        update cmc_contract_sub_contract
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="subContractId != null">sub_contract_id = #{subContractId},</if>
+        </trim>
+        where contract_id = #{contractId}
+    </update>
+
+    <delete id="deleteCmcContractSubContractByContractId" parameterType="String">
+        delete from cmc_contract_sub_contract where contract_id = #{contractId}
+    </delete>
+
+    <delete id="deleteCmcContractSubContractBySubContractIds" parameterType="String">
+        delete from cmc_contract_sub_contract where sub_contract_id in
+        <foreach item="subContractId" collection="array" open="(" separator="," close=")">
+            #{subContractId}
+        </foreach>
+    </delete>
+</mapper>

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

+<?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.CmcProjectWorkloadMapper">
+    
+    <resultMap type="CmcProjectWorkload" id="CmcProjectWorkloadResult">
+        <result property="workloadId"    column="workload_id"    />
+        <result property="projectId"    column="project_id"    />
+        <result property="content"    column="content"    />
+        <result property="scale"    column="scale"    />
+        <result property="unit"    column="unit"    />
+        <result property="workload"    column="workload"    />
+        <result property="finishTime"    column="finish_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectCmcProjectWorkloadVo">
+        select workload_id, project_id, content, scale, unit, workload, finish_time, remark from cmc_project_work
+    </sql>
+
+    <select id="selectCmcProjectWorkloadList" parameterType="CmcProjectWorkload" resultMap="CmcProjectWorkloadResult">
+        <include refid="selectCmcProjectWorkloadVo"/>
+        <where>  
+            <if test="projectId != null  and projectId != ''"> and project_id = #{projectId}</if>
+            <if test="content != null  and content != ''"> and content like concat('%', #{content}, '%')</if>
+            <if test="scale != null  and scale != ''"> and scale like concat('%', #{scale}, '%')</if>
+            <if test="unit != null  and unit != ''"> and unit like concat('%', #{unit}, '%')</if>
+            <if test="workload != null  and workload != ''"> and workload = #{workload}</if>
+            <if test="finishTime != null "> and finish_time like concat('%', #{finishTime}, '%')</if>
+        </where>
+        order by finish_time desc
+    </select>
+    
+    <select id="selectCmcProjectWorkloadListByProjectId" parameterType="String" resultMap="CmcProjectWorkloadResult">
+        <include refid="selectCmcProjectWorkloadVo"/>
+        where project_id = #{projectId}
+    </select>
+        
+    <insert id="insertCmcProjectWorkload" parameterType="CmcProjectWorkload">
+        insert into cmc_project_work
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="workloadId != null">workload_id,</if>
+            <if test="projectId != null">project_id,</if>
+            <if test="content != null">content,</if>
+            <if test="scale != null">scale,</if>
+            <if test="unit != null">unit,</if>
+            <if test="workload != null">workload,</if>
+            <if test="finishTime != null">finish_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="workloadId != null">#{workloadId},</if>
+            <if test="projectId != null">#{projectId},</if>
+            <if test="content != null">#{content},</if>
+            <if test="scale != null">#{scale},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="workload != null">#{workload},</if>
+            <if test="finishTime != null">#{finishTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcProjectWorkload" parameterType="CmcProjectWorkload">
+        update cmc_project_work
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="projectId != null">project_id = #{projectId},</if>
+            <if test="content != null">content = #{content},</if>
+            <if test="scale != null">scale = #{scale},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="workload != null">workload = #{workload},</if>
+            <if test="finishTime != null">finish_time = #{finishTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where workload_id = #{workloadId}
+    </update>
+
+    <delete id="deleteCmcProjectWorkloadByProjectId" parameterType="String">
+        delete from cmc_project_work where project_id = #{projectId}
+    </delete>
+
+    <delete id="deleteCmcProjectWorkloadByProjectIds" parameterType="String">
+        delete from cmc_project_work where project_id in
+        <foreach item="projectId" collection="array" open="(" separator="," close=")">
+            #{projectId}
+        </foreach>
+    </delete>
+</mapper>

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

 			<if test="graduateSchool != null">graduate_school = #{graduateSchool},</if>
 			<if test="major != null">major = #{major},</if>
 			<if test="degree != null">degree = #{degree},</if>
-			contract_sign = #{contractSign},
-			contract_expire = #{contractExpire},
+			<if test="contractSign != null">contract_sign = #{contractSign},</if>
+			<if test="contractExpire != null">contract_expire = #{contractExpire},</if>
 			<if test="homePlace != null">home_place = #{homePlace},</if>
 			<if test="pinyin != null">pinyin = #{pinyin},</if>
  			update_time = sysdate()
 	<update id="updateUserAvatar" parameterType="SysUser">
  		update sys_user set avatar = #{avatar} where user_name = #{userName}
 	</update>
-	
+
+	<update id="updateUserContractSign" parameterType="SysUser">
+ 		update sys_user set contract_sign = #{contractSign} where user_id = #{userId}
+	</update>
+
+	<update id="updateUserContractExpire" parameterType="SysUser">
+ 		update sys_user set contract_expire = #{contractExpire} where user_id = #{userId}
+	</update>
+
 	<update id="resetUserPwd" parameterType="SysUser">
  		update sys_user set password = #{password} where user_name = #{userName}
 	</update>

oa-ui/src/api/oa/contract/contractSubcontract.js

+/*
+ * @Author: wrh
+ * @Date: 2024-09-02 15:06:51
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-09-02 15:26:21
+ */
+import request from '@/utils/request'
+
+// 查询cmc承接分包合同列表
+export function listContractSubcontract(query) {
+  return request({
+    url: '/oa/contractSubcontract/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc承接分包合同详细
+export function getContractSubcontract(contractId) {
+  return request({
+    url: '/oa/contractSubcontract/' + contractId,
+    method: 'get'
+  })
+}
+
+// 新增cmc承接分包合同
+export function addContractSubcontract(data) {
+  return request({
+    url: '/oa/contractSubcontract',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc承接分包合同
+export function updateContractSubcontract(data) {
+  return request({
+    url: '/oa/contractSubcontract',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc承接分包合同
+export function delContractSubcontract(contractId) {
+  return request({
+    url: '/oa/contractSubcontract/' + contractId,
+    method: 'delete'
+  })
+}

oa-ui/src/api/oa/project/projectWorkload.js

+/*
+ * @Author: wrh
+ * @Date: 2024-04-07 15:29:32
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-09-02 15:04:44
+ */
+import request from '@/utils/request'
+
+// 查询cmc项目内容列表
+export function listProjectWorkload(query) {
+  return request({
+    url: '/oa/projectWorkload/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询cmc项目内容详细
+export function getProjectWorkload(projectId) {
+  return request({
+    url: '/oa/projectWorkload/' + projectId,
+    method: 'get'
+  })
+}
+
+// 新增cmc项目内容
+export function addProjectWorkload(data) {
+  return request({
+    url: '/oa/projectWorkload',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改cmc项目内容
+export function updateProjectWorkload(data) {
+  return request({
+    url: '/oa/projectWorkload',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除cmc项目内容
+export function delProjectWorkload(projectId) {
+  return request({
+    url: '/oa/projectWorkload/' + projectId,
+    method: 'delete'
+  })
+}

oa-ui/src/views/flowable/form/projectProcess/manageReview.vue

 <!--
  * @Author: ysh
  * @Date: 2024-04-08 13:56:14
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-30 11:30:01
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-08-30 09:28:03
 -->
 <template>
   <div class="app-container">
 import { parseTime } from "@/utils/ruoyi";
 import { complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm } from "@/api/flowable/todo";
 import { getProjectComment, addProjectComment, updateProjectComment } from "@/api/oa/project/projectComment"
+import { getProject } from "@/api/oa/project/project"
 import { getUsersDeptLeaderByDept } from '@/api/system/post'
 export default {
   computed: {
   },
   data() {
     return {
+      projectLeader: undefined,
       form: {
         manageApprover: '',
         manageApproverName: '',
   },
   methods: {
     initForm() {
+      getProject(this.taskForm.formId).then(res => {
+        if (res.data) {
+          this.projectLeader = res.data.projectLeader;
+        }
+      })
       getProjectComment(this.taskForm.formId).then(res => {
         if (res.data) {
           this.form = res.data
       })
     },
     getDeptLeader(val) {
-      this.deptLeaderList = [];
+      this.deptLeaderList = [this.projectLeader];
       for (let v of val) {
         getUsersDeptLeaderByDept({ deptId: Number(v) }).then(res => {
           this.deptLeaderList.push(res.data.userId);

oa-ui/src/views/flowable/form/settleForm.vue

 <!--
  * @Author: ysh
  * @Date: 2024-04-30 09:03:14
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-08-20 10:44:03
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-08-30 14:00:09
 -->
 <template>
   <div class="app-container" v-loading="loading">
             <el-col :span="6" :xs="24" :offset="12">
               <el-form-item label="工作上报人：" prop="reporterName">
                 <span class="auditor">
-                  {{ form.reporterName }}
+                  {{ getUserName(form.reporter) }}
                 </span>
               </el-form-item>
             </el-col>
             <el-row>
               <el-col :span="6" :xs="24" :offset="12">
                 <el-form-item label="签名：" label-width="120px">
-                  <span class="auditor"> {{ form.zhUserName }} </span>
+                  <span class="auditor"> {{ getUserName(form.zhUserId) }} </span>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
             <el-row>
               <el-col :span="6" :xs="24" :offset="12">
                 <el-form-item label="签名：" label-width="120px">
-                  <span class="auditor"> {{ form.jsUserName }} </span>
+                  <span class="auditor"> {{ getUserName(form.jsUserId) }} </span>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
             <el-row>
               <el-col :span="6" :xs="24" :offset="12">
                 <el-form-item label="签名：" label-width="120px">
-                  <span class="auditor"> {{ form.jyUserName }} </span>
+                  <span class="auditor"> {{ getUserName(form.jyUserId) }} </span>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
             <el-row>
               <el-col :span="6" :xs="24" :offset="12">
                 <el-form-item label="签名：" label-width="120px">
-                  <span class="auditor"> {{ form.managerUserName }} </span>
+                  <span class="auditor"> {{ getUserName(form.managerUserId) }} </span>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
             <el-row>
               <el-col :span="6" :xs="24" :offset="12">
                 <el-form-item label="签名：" label-width="120px">
-                  <span class="auditor"> {{ form.gmUserName }} </span>
+                  <span class="auditor"> {{ getUserName(form.gmUserId) }} </span>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
             <el-row v-if="exceed">
               <el-col :span="6" :xs="24" :offset="12">
                 <el-form-item label="签名：" label-width="120px">
-                  <span class="auditor"> {{ form.dszUserName }} </span>
+                  <span class="auditor"> {{ form.dszUserName ? "" : getUserName(form.dszUserId) }} </span>
                 </el-form-item>
               </el-col>
               <el-col :span="6">

oa-ui/src/views/flowable/form/settleOther.vue

 <!--
  * @Author: ysh
  * @Date: 2024-04-30 09:03:14
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-08-07 14:15:44
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-08-30 13:52:06
 -->
 <template>
   <div class="app-container" v-loading="loading">
             <el-col :span="6" :xs="24" :offset="12">
               <el-form-item label="工作上报人：" prop="reporterName">
                 <span class="auditor">
-                  {{ form.reporterName }}
+                  {{ getUserName(form.reporter) }}
                 </span>
               </el-form-item>
             </el-col>
             <el-row>
               <el-col :span="6" :xs="24" :offset="12">
                 <el-form-item label="签名：" label-width="120px">
-                  <span class="auditor"> {{ form.managerUserName }} </span>
+                  <span class="auditor"> {{ getUserName(form.managerUserId) }} </span>
                 </el-form-item>
               </el-col>
               <el-col :span="6">
             <el-row>
               <el-col :span="6" :xs="24" :offset="12">
                 <el-form-item label="签名：" label-width="120px">
-                  <span class="auditor"> {{ form.gmUserName }} </span>
+                  <span class="auditor"> {{ getUserName(form.gmUserId) }} </span>
                 </el-form-item>
               </el-col>
               <el-col :span="6">