项目委外流程

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcOutsourceController.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.CmcOutsource;
+import com.ruoyi.oa.service.ICmcOutsourceService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 项目委外Controller
+ * 
+ * @author cmc
+ * @date 2024-09-19
+ */
+@RestController
+@RequestMapping("/oa/outsource")
+public class CmcOutsourceController extends BaseController
+{
+    @Autowired
+    private ICmcOutsourceService cmcOutsourceService;
+
+    /**
+     * 查询项目委外列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(CmcOutsource cmcOutsource)
+    {
+        startPage();
+        List<CmcOutsource> list = cmcOutsourceService.selectCmcOutsourceList(cmcOutsource);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出项目委外列表
+     */
+    @Log(title = "项目委外", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, CmcOutsource cmcOutsource)
+    {
+        List<CmcOutsource> list = cmcOutsourceService.selectCmcOutsourceList(cmcOutsource);
+        ExcelUtil<CmcOutsource> util = new ExcelUtil<CmcOutsource>(CmcOutsource.class);
+        util.exportExcel(response, list, "项目委外数据");
+    }
+
+    /**
+     * 获取项目委外详细信息
+     */
+    @GetMapping(value = "/{outsoureId}")
+    public AjaxResult getInfo(@PathVariable("outsoureId") String outsoureId)
+    {
+        return success(cmcOutsourceService.selectCmcOutsourceByOutsoureId(outsoureId));
+    }
+
+    /**
+     * 新增项目委外
+     */
+    @Log(title = "项目委外", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CmcOutsource cmcOutsource)
+    {
+        return toAjax(cmcOutsourceService.insertCmcOutsource(cmcOutsource));
+    }
+
+    /**
+     * 修改项目委外
+     */
+    @Log(title = "项目委外", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CmcOutsource cmcOutsource)
+    {
+        return toAjax(cmcOutsourceService.updateCmcOutsource(cmcOutsource));
+    }
+
+    /**
+     * 删除项目委外
+     */
+    @Log(title = "项目委外", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{outsoureIds}")
+    public AjaxResult remove(@PathVariable String[] outsoureIds)
+    {
+        return toAjax(cmcOutsourceService.deleteCmcOutsourceByOutsoureIds(outsoureIds));
+    }
+}

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

@@ -0,0 +1,210 @@
+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_outsource
+ * 
+ * @author cmc
+ * @date 2024-09-19
+ */
+public class CmcOutsource extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 委外id */
+    private String outsoureId;
+
+    /** 委外说明 */
+    @Excel(name = "委外说明")
+    private String applyReason;
+
+    /** 项目id */
+    @Excel(name = "项目id")
+    private String projectId;
+
+    /** 合作单位id */
+    @Excel(name = "合作单位id")
+    private String partnerId;
+
+    /** 申请人 */
+    @Excel(name = "申请人")
+    private Long applier;
+
+    /** 申请部门 */
+    @Excel(name = "申请部门")
+    private Long applyDept;
+
+    /** 申请时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "申请时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date applyTime;
+
+    /** 分管审核人 */
+    @Excel(name = "分管审核人")
+    private Long managerUserId;
+
+    /** 分管审核意见 */
+    @Excel(name = "分管审核意见")
+    private String managerComment;
+
+    /** 分管审核时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "分管审核时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date managerTime;
+
+    /** 总经理审批人 */
+    @Excel(name = "总经理审批人")
+    private Long zjlUserId;
+
+    /** 总经理审批意见 */
+    @Excel(name = "总经理审批意见")
+    private String zjlComment;
+
+    /** 总经理审批时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "总经理审批时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date zjlTime;
+
+    public void setOutsoureId(String outsoureId) 
+    {
+        this.outsoureId = outsoureId;
+    }
+
+    public String getOutsoureId() 
+    {
+        return outsoureId;
+    }
+    public void setApplyReason(String applyReason) 
+    {
+        this.applyReason = applyReason;
+    }
+
+    public String getApplyReason() 
+    {
+        return applyReason;
+    }
+    public void setProjectId(String projectId) 
+    {
+        this.projectId = projectId;
+    }
+
+    public String getProjectId() 
+    {
+        return projectId;
+    }
+    public void setPartnerId(String partnerId) 
+    {
+        this.partnerId = partnerId;
+    }
+
+    public String getPartnerId() 
+    {
+        return partnerId;
+    }
+    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 setApplyTime(Date applyTime) 
+    {
+        this.applyTime = applyTime;
+    }
+
+    public Date getApplyTime() 
+    {
+        return applyTime;
+    }
+    public void setManagerUserId(Long managerUserId) 
+    {
+        this.managerUserId = managerUserId;
+    }
+
+    public Long getManagerUserId() 
+    {
+        return managerUserId;
+    }
+    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 setZjlUserId(Long zjlUserId) 
+    {
+        this.zjlUserId = zjlUserId;
+    }
+
+    public Long getZjlUserId() 
+    {
+        return zjlUserId;
+    }
+    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;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("outsoureId", getOutsoureId())
+            .append("applyReason", getApplyReason())
+            .append("projectId", getProjectId())
+            .append("partnerId", getPartnerId())
+            .append("applier", getApplier())
+            .append("applyDept", getApplyDept())
+            .append("applyTime", getApplyTime())
+            .append("managerUserId", getManagerUserId())
+            .append("managerComment", getManagerComment())
+            .append("managerTime", getManagerTime())
+            .append("zjlUserId", getZjlUserId())
+            .append("zjlComment", getZjlComment())
+            .append("zjlTime", getZjlTime())
+            .toString();
+    }
+}

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

@@ -32,6 +32,11 @@ public class CmcProcureApproval extends BaseEntity
     @Excel(name = "申请部门")
     private Long applyDept;
 
+    /** 申请时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "申请时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date applyTime;
+
     /** 分管审核人 */
     @Excel(name = "分管审核人")
     private Long managerUserId;
@@ -107,6 +112,15 @@ public class CmcProcureApproval extends BaseEntity
     {
         return applyDept;
     }
+    public void setApplyTime(Date applyTime)
+    {
+        this.applyTime = applyTime;
+    }
+
+    public Date getApplyTime()
+    {
+        return applyTime;
+    }
     public void setManagerUserId(Long managerUserId) 
     {
         this.managerUserId = managerUserId;
@@ -196,6 +210,7 @@ public class CmcProcureApproval extends BaseEntity
             .append("applyReason", getApplyReason())
             .append("applier", getApplier())
             .append("applyDept", getApplyDept())
+            .append("applyTime", getApplyTime())
             .append("managerUserId", getManagerUserId())
             .append("managerComment", getManagerComment())
             .append("managerTime", getManagerTime())

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.mapper;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcOutsource;
+
+/**
+ * 项目委外Mapper接口
+ * 
+ * @author cmc
+ * @date 2024-09-19
+ */
+public interface CmcOutsourceMapper 
+{
+    /**
+     * 查询项目委外
+     * 
+     * @param outsoureId 项目委外主键
+     * @return 项目委外
+     */
+    public CmcOutsource selectCmcOutsourceByOutsoureId(String outsoureId);
+
+    /**
+     * 查询项目委外列表
+     * 
+     * @param cmcOutsource 项目委外
+     * @return 项目委外集合
+     */
+    public List<CmcOutsource> selectCmcOutsourceList(CmcOutsource cmcOutsource);
+
+    /**
+     * 新增项目委外
+     * 
+     * @param cmcOutsource 项目委外
+     * @return 结果
+     */
+    public int insertCmcOutsource(CmcOutsource cmcOutsource);
+
+    /**
+     * 修改项目委外
+     * 
+     * @param cmcOutsource 项目委外
+     * @return 结果
+     */
+    public int updateCmcOutsource(CmcOutsource cmcOutsource);
+
+    /**
+     * 删除项目委外
+     * 
+     * @param outsoureId 项目委外主键
+     * @return 结果
+     */
+    public int deleteCmcOutsourceByOutsoureId(String outsoureId);
+
+    /**
+     * 批量删除项目委外
+     * 
+     * @param outsoureIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteCmcOutsourceByOutsoureIds(String[] outsoureIds);
+}

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

@@ -0,0 +1,61 @@
+package com.ruoyi.oa.service;
+
+import java.util.List;
+import com.ruoyi.oa.domain.CmcOutsource;
+
+/**
+ * 项目委外Service接口
+ * 
+ * @author cmc
+ * @date 2024-09-19
+ */
+public interface ICmcOutsourceService 
+{
+    /**
+     * 查询项目委外
+     * 
+     * @param outsoureId 项目委外主键
+     * @return 项目委外
+     */
+    public CmcOutsource selectCmcOutsourceByOutsoureId(String outsoureId);
+
+    /**
+     * 查询项目委外列表
+     * 
+     * @param cmcOutsource 项目委外
+     * @return 项目委外集合
+     */
+    public List<CmcOutsource> selectCmcOutsourceList(CmcOutsource cmcOutsource);
+
+    /**
+     * 新增项目委外
+     * 
+     * @param cmcOutsource 项目委外
+     * @return 结果
+     */
+    public int insertCmcOutsource(CmcOutsource cmcOutsource);
+
+    /**
+     * 修改项目委外
+     * 
+     * @param cmcOutsource 项目委外
+     * @return 结果
+     */
+    public int updateCmcOutsource(CmcOutsource cmcOutsource);
+
+    /**
+     * 批量删除项目委外
+     * 
+     * @param outsoureIds 需要删除的项目委外主键集合
+     * @return 结果
+     */
+    public int deleteCmcOutsourceByOutsoureIds(String[] outsoureIds);
+
+    /**
+     * 删除项目委外信息
+     * 
+     * @param outsoureId 项目委外主键
+     * @return 结果
+     */
+    public int deleteCmcOutsourceByOutsoureId(String outsoureId);
+}

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcOutsourceServiceImpl.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.CmcOutsourceMapper;
+import com.ruoyi.oa.domain.CmcOutsource;
+import com.ruoyi.oa.service.ICmcOutsourceService;
+
+/**
+ * 项目委外Service业务层处理
+ * 
+ * @author cmc
+ * @date 2024-09-19
+ */
+@Service
+public class CmcOutsourceServiceImpl implements ICmcOutsourceService 
+{
+    @Autowired
+    private CmcOutsourceMapper cmcOutsourceMapper;
+
+    /**
+     * 查询项目委外
+     * 
+     * @param outsoureId 项目委外主键
+     * @return 项目委外
+     */
+    @Override
+    public CmcOutsource selectCmcOutsourceByOutsoureId(String outsoureId)
+    {
+        return cmcOutsourceMapper.selectCmcOutsourceByOutsoureId(outsoureId);
+    }
+
+    /**
+     * 查询项目委外列表
+     * 
+     * @param cmcOutsource 项目委外
+     * @return 项目委外
+     */
+    @Override
+    public List<CmcOutsource> selectCmcOutsourceList(CmcOutsource cmcOutsource)
+    {
+        return cmcOutsourceMapper.selectCmcOutsourceList(cmcOutsource);
+    }
+
+    /**
+     * 新增项目委外
+     * 
+     * @param cmcOutsource 项目委外
+     * @return 结果
+     */
+    @Override
+    public int insertCmcOutsource(CmcOutsource cmcOutsource)
+    {
+        return cmcOutsourceMapper.insertCmcOutsource(cmcOutsource);
+    }
+
+    /**
+     * 修改项目委外
+     * 
+     * @param cmcOutsource 项目委外
+     * @return 结果
+     */
+    @Override
+    public int updateCmcOutsource(CmcOutsource cmcOutsource)
+    {
+        return cmcOutsourceMapper.updateCmcOutsource(cmcOutsource);
+    }
+
+    /**
+     * 批量删除项目委外
+     * 
+     * @param outsoureIds 需要删除的项目委外主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcOutsourceByOutsoureIds(String[] outsoureIds)
+    {
+        return cmcOutsourceMapper.deleteCmcOutsourceByOutsoureIds(outsoureIds);
+    }
+
+    /**
+     * 删除项目委外信息
+     * 
+     * @param outsoureId 项目委外主键
+     * @return 结果
+     */
+    @Override
+    public int deleteCmcOutsourceByOutsoureId(String outsoureId)
+    {
+        return cmcOutsourceMapper.deleteCmcOutsourceByOutsoureId(outsoureId);
+    }
+}

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

@@ -0,0 +1,113 @@
+<?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.CmcOutsourceMapper">
+    
+    <resultMap type="CmcOutsource" id="CmcOutsourceResult">
+        <result property="outsoureId"    column="outsoure_id"    />
+        <result property="applyReason"    column="apply_reason"    />
+        <result property="projectId"    column="project_id"    />
+        <result property="partnerId"    column="partner_id"    />
+        <result property="applier"    column="applier"    />
+        <result property="applyDept"    column="apply_dept"    />
+        <result property="applyTime"    column="apply_time"    />
+        <result property="managerUserId"    column="manager_user_id"    />
+        <result property="managerComment"    column="manager_comment"    />
+        <result property="managerTime"    column="manager_time"    />
+        <result property="zjlUserId"    column="zjl_user_id"    />
+        <result property="zjlComment"    column="zjl_comment"    />
+        <result property="zjlTime"    column="zjl_time"    />
+    </resultMap>
+
+    <sql id="selectCmcOutsourceVo">
+        select outsoure_id, apply_reason, project_id, partner_id, applier, apply_dept, apply_time, manager_user_id, manager_comment, manager_time, zjl_user_id, zjl_comment, zjl_time from cmc_outsource
+    </sql>
+
+    <select id="selectCmcOutsourceList" parameterType="CmcOutsource" resultMap="CmcOutsourceResult">
+        <include refid="selectCmcOutsourceVo"/>
+        <where>  
+            <if test="applyReason != null  and applyReason != ''"> and apply_reason = #{applyReason}</if>
+            <if test="projectId != null  and projectId != ''"> and project_id = #{projectId}</if>
+            <if test="partnerId != null  and partnerId != ''"> and partner_id = #{partnerId}</if>
+            <if test="applier != null "> and applier = #{applier}</if>
+            <if test="applyDept != null "> and apply_dept = #{applyDept}</if>
+            <if test="applyTime != null "> and apply_time = #{applyTime}</if>
+            <if test="managerUserId != null "> and manager_user_id = #{managerUserId}</if>
+            <if test="managerComment != null  and managerComment != ''"> and manager_comment = #{managerComment}</if>
+            <if test="managerTime != null "> and manager_time = #{managerTime}</if>
+            <if test="zjlUserId != null "> and zjl_user_id = #{zjlUserId}</if>
+            <if test="zjlComment != null  and zjlComment != ''"> and zjl_comment = #{zjlComment}</if>
+            <if test="zjlTime != null "> and zjl_time = #{zjlTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectCmcOutsourceByOutsoureId" parameterType="String" resultMap="CmcOutsourceResult">
+        <include refid="selectCmcOutsourceVo"/>
+        where outsoure_id = #{outsoureId}
+    </select>
+        
+    <insert id="insertCmcOutsource" parameterType="CmcOutsource">
+        insert into cmc_outsource
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="outsoureId != null">outsoure_id,</if>
+            <if test="applyReason != null">apply_reason,</if>
+            <if test="projectId != null">project_id,</if>
+            <if test="partnerId != null">partner_id,</if>
+            <if test="applier != null">applier,</if>
+            <if test="applyDept != null">apply_dept,</if>
+            <if test="applyTime != null">apply_time,</if>
+            <if test="managerUserId != null">manager_user_id,</if>
+            <if test="managerComment != null">manager_comment,</if>
+            <if test="managerTime != null">manager_time,</if>
+            <if test="zjlUserId != null">zjl_user_id,</if>
+            <if test="zjlComment != null">zjl_comment,</if>
+            <if test="zjlTime != null">zjl_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="outsoureId != null">#{outsoureId},</if>
+            <if test="applyReason != null">#{applyReason},</if>
+            <if test="projectId != null">#{projectId},</if>
+            <if test="partnerId != null">#{partnerId},</if>
+            <if test="applier != null">#{applier},</if>
+            <if test="applyDept != null">#{applyDept},</if>
+            <if test="applyTime != null">#{applyTime},</if>
+            <if test="managerUserId != null">#{managerUserId},</if>
+            <if test="managerComment != null">#{managerComment},</if>
+            <if test="managerTime != null">#{managerTime},</if>
+            <if test="zjlUserId != null">#{zjlUserId},</if>
+            <if test="zjlComment != null">#{zjlComment},</if>
+            <if test="zjlTime != null">#{zjlTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmcOutsource" parameterType="CmcOutsource">
+        update cmc_outsource
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="applyReason != null">apply_reason = #{applyReason},</if>
+            <if test="projectId != null">project_id = #{projectId},</if>
+            <if test="partnerId != null">partner_id = #{partnerId},</if>
+            <if test="applier != null">applier = #{applier},</if>
+            <if test="applyDept != null">apply_dept = #{applyDept},</if>
+            <if test="applyTime != null">apply_time = #{applyTime},</if>
+            <if test="managerUserId != null">manager_user_id = #{managerUserId},</if>
+            <if test="managerComment != null">manager_comment = #{managerComment},</if>
+            <if test="managerTime != null">manager_time = #{managerTime},</if>
+            <if test="zjlUserId != null">zjl_user_id = #{zjlUserId},</if>
+            <if test="zjlComment != null">zjl_comment = #{zjlComment},</if>
+            <if test="zjlTime != null">zjl_time = #{zjlTime},</if>
+        </trim>
+        where outsoure_id = #{outsoureId}
+    </update>
+
+    <delete id="deleteCmcOutsourceByOutsoureId" parameterType="String">
+        delete from cmc_outsource where outsoure_id = #{outsoureId}
+    </delete>
+
+    <delete id="deleteCmcOutsourceByOutsoureIds" parameterType="String">
+        delete from cmc_outsource where outsoure_id in 
+        <foreach item="outsoureId" collection="array" open="(" separator="," close=")">
+            #{outsoureId}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="applyReason"    column="apply_reason"    />
         <result property="applier"    column="applier"    />
         <result property="applyDept"    column="apply_dept"    />
+        <result property="applyTime"    column="apply_time"    />
         <result property="managerUserId"    column="manager_user_id"    />
         <result property="managerComment"    column="manager_comment"    />
         <result property="managerTime"    column="manager_time"    />
@@ -21,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmcProcureApprovalVo">
-        select procure_apply_id, apply_reason, applier, apply_dept, manager_user_id, manager_comment, manager_time, zjl_user_id, zjl_comment, zjl_time, plan_user_id, plan_time, plan_comment from cmc_procure_approval
+        select procure_apply_id, apply_reason, applier, apply_dept, apply_time, manager_user_id, manager_comment, manager_time, zjl_user_id, zjl_comment, zjl_time, plan_user_id, plan_time, plan_comment from cmc_procure_approval
     </sql>
 
     <select id="selectCmcProcureApprovalList" parameterType="CmcProcureApproval" resultMap="CmcProcureApprovalResult">
@@ -30,6 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="applyReason != null  and applyReason != ''"> and apply_reason = #{applyReason}</if>
             <if test="applier != null "> and applier = #{applier}</if>
             <if test="applyDept != null "> and apply_dept = #{applyDept}</if>
+            <if test="applyTime != null "> and apply_time = #{applyTime}</if>
             <if test="managerUserId != null "> and manager_user_id = #{managerUserId}</if>
             <if test="managerComment != null  and managerComment != ''"> and manager_comment = #{managerComment}</if>
             <if test="managerTime != null "> and manager_time = #{managerTime}</if>
@@ -54,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="applyReason != null">apply_reason,</if>
             <if test="applier != null">applier,</if>
             <if test="applyDept != null">apply_dept,</if>
+            <if test="applyTime != null">apply_time,</if>
             <if test="managerUserId != null">manager_user_id,</if>
             <if test="managerComment != null">manager_comment,</if>
             <if test="managerTime != null">manager_time,</if>
@@ -69,6 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="applyReason != null">#{applyReason},</if>
             <if test="applier != null">#{applier},</if>
             <if test="applyDept != null">#{applyDept},</if>
+            <if test="applyTime != null">#{applyTime},</if>
             <if test="managerUserId != null">#{managerUserId},</if>
             <if test="managerComment != null">#{managerComment},</if>
             <if test="managerTime != null">#{managerTime},</if>
@@ -87,6 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="applyReason != null">apply_reason = #{applyReason},</if>
             <if test="applier != null">applier = #{applier},</if>
             <if test="applyDept != null">apply_dept = #{applyDept},</if>
+            <if test="applyTime != null">apply_time = #{applyTime},</if>
             <if test="managerUserId != null">manager_user_id = #{managerUserId},</if>
             <if test="managerComment != null">manager_comment = #{managerComment},</if>
             <if test="managerTime != null">manager_time = #{managerTime},</if>

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

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询项目委外列表
+export function listOutsource(query) {
+  return request({
+    url: '/oa/outsource/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询项目委外详细
+export function getOutsource(outsoureId) {
+  return request({
+    url: '/oa/outsource/' + outsoureId,
+    method: 'get'
+  })
+}
+
+// 新增项目委外
+export function addOutsource(data) {
+  return request({
+    url: '/oa/outsource',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改项目委外
+export function updateOutsource(data) {
+  return request({
+    url: '/oa/outsource',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除项目委外
+export function delOutsource(outsoureId) {
+  return request({
+    url: '/oa/outsource/' + outsoureId,
+    method: 'delete'
+  })
+}

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

@@ -0,0 +1,426 @@
+<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="applyReason">
+        <el-input
+          v-model="queryParams.applyReason"
+          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="合作单位id" prop="partnerId">
+        <el-input
+          v-model="queryParams.partnerId"
+          placeholder="请输入合作单位id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <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="申请时间" prop="applyTime">
+        <el-date-picker clearable
+          v-model="queryParams.applyTime"
+          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="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="zjlUserId">
+        <el-input
+          v-model="queryParams.zjlUserId"
+          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>
+        <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:outsource: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:outsource: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:outsource: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:outsource:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="outsourceList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="委外id" align="center" prop="outsoureId" />
+      <el-table-column label="委外说明" align="center" prop="applyReason" />
+      <el-table-column label="项目id" align="center" prop="projectId" />
+      <el-table-column label="合作单位id" align="center" prop="partnerId" />
+      <el-table-column label="申请人" align="center" prop="applier" />
+      <el-table-column label="申请部门" align="center" prop="applyDept" />
+      <el-table-column label="申请时间" align="center" prop="applyTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.applyTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="分管审核人" align="center" prop="managerUserId" />
+      <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="zjlUserId" />
+      <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" 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:outsource:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['oa:outsource: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"
+    />
+
+    <!-- 添加或修改项目委外对话框 -->
+    <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="applyReason">
+          <el-input v-model="form.applyReason" 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="合作单位id" prop="partnerId">
+          <el-input v-model="form.partnerId" placeholder="请输入合作单位id" />
+        </el-form-item>
+        <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="申请时间" prop="applyTime">
+          <el-date-picker clearable
+            v-model="form.applyTime"
+            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="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="zjlUserId">
+          <el-input v-model="form.zjlUserId" 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>
+      <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 { listOutsource, getOutsource, delOutsource, addOutsource, updateOutsource } from "@/api/oa/outsource/outsource";
+
+export default {
+  name: "Outsource",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 项目委外表格数据
+      outsourceList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        applyReason: null,
+        projectId: null,
+        partnerId: null,
+        applier: null,
+        applyDept: null,
+        applyTime: null,
+        managerUserId: null,
+        managerComment: null,
+        managerTime: null,
+        zjlUserId: null,
+        zjlComment: null,
+        zjlTime: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询项目委外列表 */
+    getList() {
+      this.loading = true;
+      listOutsource(this.queryParams).then(response => {
+        this.outsourceList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        outsoureId: null,
+        applyReason: null,
+        projectId: null,
+        partnerId: null,
+        applier: null,
+        applyDept: null,
+        applyTime: null,
+        managerUserId: null,
+        managerComment: null,
+        managerTime: null,
+        zjlUserId: null,
+        zjlComment: 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.outsoureId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加项目委外";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const outsoureId = row.outsoureId || this.ids
+      getOutsource(outsoureId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改项目委外";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.outsoureId != null) {
+            updateOutsource(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addOutsource(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const outsoureIds = row.outsoureId || this.ids;
+      this.$modal.confirm('是否确认删除项目委外编号为"' + outsoureIds + '"的数据项？').then(function() {
+        return delOutsource(outsoureIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('oa/outsource/export', {
+        ...this.queryParams
+      }, `outsource_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>