公司业绩管理，分包商管理，分包人员管理

2025-04-24 10:11:36 +08:00 · 2025-04-24 10:11:36 +08:00 · d1a4770177
parent 06681250d6
commit d1a4770177
7 changed files with 43 additions and 20 deletions
--- a/search-tool/src/main/java/com/bonus/tool/controller/search/TbSubPeopleController.java
+++ b/search-tool/src/main/java/com/bonus/tool/controller/search/TbSubPeopleController.java
@ -144,8 +144,8 @@ public class TbSubPeopleController extends BaseController {
     */
    @ApiOperation(value = "分包商人员信息导出")
 //    @PreAuthorize("@ss.hasPermi('key:people:del')")
-    @PostMapping("/tbSubExport")
-    public void tbSubExport(HttpServletResponse response, TbSubPeopleVo tbSubPeopleVo) {
+    @PostMapping("/tbSubPeopleExport")
+    public void tbSubPeopleExport(HttpServletResponse response, TbSubPeopleVo tbSubPeopleVo) {
        try {
            List<TbSubPeopleVo> tbSubPeopleList = tbSubPeopleService.getTbSubPeopleList(tbSubPeopleVo);
            ExcelUtil<TbSubPeopleVo> util = new ExcelUtil<>(TbSubPeopleVo.class);
--- a/search-tool/src/main/java/com/bonus/tool/dto/TbCompanyPerfRelVo.java
+++ b/search-tool/src/main/java/com/bonus/tool/dto/TbCompanyPerfRelVo.java
@ -46,6 +46,11 @@ public class TbCompanyPerfRelVo {
     */
    private Long perfId;

+    /**
+     * 数据来源  1：公司业绩关键人员  2：分包业绩关键人员
+     */
+    private String source;
+
    /***
     * 附件集合
     */
--- a/search-tool/src/main/java/com/bonus/tool/mapper/TbCompanyPerfRelMapper.java
+++ b/search-tool/src/main/java/com/bonus/tool/mapper/TbCompanyPerfRelMapper.java
@ -5,9 +5,9 @@ import com.bonus.tool.dto.TbCompanyPerfRelVo;
 import java.util.List;

 public interface TbCompanyPerfRelMapper {
-    List<TbCompanyPerfRelVo> getTbCompanyPerRelByPerfId(Long perfId);
+    List<TbCompanyPerfRelVo> getTbCompanyPerRelByPerfId(Long perfId,String source);

    void addTbCompanyPerRel(TbCompanyPerfRelVo tbCompanyPerfRelVo);

-    void delTbCompanyPerRelByPerfId(Long perfId);
+    void delTbCompanyPerRelByPerfId(Long perfId,String source);
 }
--- a/search-tool/src/main/java/com/bonus/tool/service/TbCompanyPerfRelService.java
+++ b/search-tool/src/main/java/com/bonus/tool/service/TbCompanyPerfRelService.java
@ -10,7 +10,7 @@ public interface TbCompanyPerfRelService {
     * @param perfId
     * @return
     */
-    List<TbCompanyPerfRelVo> getTbCompanyPerRelByPerfId(Long perfId);
+    List<TbCompanyPerfRelVo> getTbCompanyPerRelByPerfId(Long perfId,String source);

    /**
     * 保存关键人员
@ -18,11 +18,11 @@ public interface TbCompanyPerfRelService {
     * @param tbCompanyPerfRelList
     * @param perfId
     */
-    void addTbCompanyPerRelList(List<TbCompanyPerfRelVo> tbCompanyPerfRelList, Long perfId);
+    void addTbCompanyPerRelList(List<TbCompanyPerfRelVo> tbCompanyPerfRelList, Long perfId,String source);

    /**
     * 删除业绩表关联关键人员
     * @param perfId
     */
-    void delTbCompanyPerRelByPerfId(Long perfId) throws Exception;
+    void delTbCompanyPerRelByPerfId(Long perfId,String source) throws Exception;
 }
--- a/search-tool/src/main/java/com/bonus/tool/service/impl/TbCompanyPerfRelServiceImpl.java
+++ b/search-tool/src/main/java/com/bonus/tool/service/impl/TbCompanyPerfRelServiceImpl.java
@ -32,9 +32,14 @@ public class TbCompanyPerfRelServiceImpl implements TbCompanyPerfRelService {
    @Resource
    private ISysFileService iSysFileService;

+    /**
+     * 获取业绩表关联关键人员
+     * @param perfId
+     * @return
+     */
    @Override
-    public List<TbCompanyPerfRelVo> getTbCompanyPerRelByPerfId(Long perfId) {
-        List<TbCompanyPerfRelVo> tbCompanyPerfRelList = tbCompanyPerfRelMapper.getTbCompanyPerRelByPerfId(perfId);
+    public List<TbCompanyPerfRelVo> getTbCompanyPerRelByPerfId(Long perfId,String source) {
+        List<TbCompanyPerfRelVo> tbCompanyPerfRelList = tbCompanyPerfRelMapper.getTbCompanyPerRelByPerfId(perfId,source);
        if (!tbCompanyPerfRelList.isEmpty()){
            for (TbCompanyPerfRelVo tbCompanyPerfRelVo:tbCompanyPerfRelList) {
                //获取附件信息
@ -45,20 +50,31 @@ public class TbCompanyPerfRelServiceImpl implements TbCompanyPerfRelService {
        return tbCompanyPerfRelList;
    }

+    /**
+     * 保存关键人员
+     *
+     * @param tbCompanyPerfRelList
+     * @param perfId
+     */
    @Override
    @Transactional
-    public void addTbCompanyPerRelList(List<TbCompanyPerfRelVo> tbCompanyPerfRelList, Long perfId) {
+    public void addTbCompanyPerRelList(List<TbCompanyPerfRelVo> tbCompanyPerfRelList, Long perfId,String source) {
        for (TbCompanyPerfRelVo tbCompanyPerfRelVo:tbCompanyPerfRelList) {
            tbCompanyPerfRelVo.setPerfId(perfId);
+            tbCompanyPerfRelVo.setSource(source);
            tbCompanyPerfRelMapper.addTbCompanyPerRel(tbCompanyPerfRelVo);
            //保存附件信息
            tbFileSourceService.addTbFileSource(tbCompanyPerfRelVo.getTbFileSourceVoList(),tbCompanyPerfRelVo.getId(), TableType.TB_COMPANY_PERF_REL.getCode());
        }
    }

+    /**
+     * 删除业绩表关联关键人员
+     * @param perfId
+     */
    @Override
-    public void delTbCompanyPerRelByPerfId(Long perfId) throws Exception {
+    public void delTbCompanyPerRelByPerfId(Long perfId,String source) {
        //获取公司业绩下的关键人员信息
-        tbCompanyPerfRelMapper.delTbCompanyPerRelByPerfId(perfId);
+        tbCompanyPerfRelMapper.delTbCompanyPerRelByPerfId(perfId,source);
    }
 }
--- a/search-tool/src/main/java/com/bonus/tool/service/impl/TbCompanyPerfServiceImpl.java
+++ b/search-tool/src/main/java/com/bonus/tool/service/impl/TbCompanyPerfServiceImpl.java
@ -52,7 +52,7 @@ public class TbCompanyPerfServiceImpl implements TbCompanyPerfService {
        if(!tbCompanyPerfList.isEmpty()){
            for (TbCompanyPerfVo tbCompanyPerf:tbCompanyPerfList) {
                //获取项目关键人员信息
-                List<TbCompanyPerfRelVo> tbCompanyPerfRelList = tbCompanyPerfRelService.getTbCompanyPerRelByPerfId(tbCompanyPerf.getId());
+                List<TbCompanyPerfRelVo> tbCompanyPerfRelList = tbCompanyPerfRelService.getTbCompanyPerRelByPerfId(tbCompanyPerf.getId(),"1");
                tbCompanyPerf.setTbCompanyPerfRelList(tbCompanyPerfRelList);
                //获取附件信息
                List<TbFileSourceVo> tbFileSourceVoList = tbFileSourceService.getTbFileSourceList(tbCompanyPerf.getId(), TableType.TB_COMPANY_PERF.getCode());
@ -71,7 +71,7 @@ public class TbCompanyPerfServiceImpl implements TbCompanyPerfService {
    public TbCompanyPerfVo getTbCompanyPerfById(TbCompanyPerfVo tbCompanyPerfVo) {
        TbCompanyPerfVo tbCompanyPerf = tbCompanyPerfMapper.getTbCompanyPerfById(tbCompanyPerfVo);
        //获取项目关键人员信息
-        List<TbCompanyPerfRelVo> tbCompanyPerfRelList = tbCompanyPerfRelService.getTbCompanyPerRelByPerfId(tbCompanyPerf.getId());
+        List<TbCompanyPerfRelVo> tbCompanyPerfRelList = tbCompanyPerfRelService.getTbCompanyPerRelByPerfId(tbCompanyPerf.getId(),"1");
        tbCompanyPerf.setTbCompanyPerfRelList(tbCompanyPerfRelList);
        //获取附件信息
        List<TbFileSourceVo> tbFileSourceVoList = tbFileSourceService.getTbFileSourceList(tbCompanyPerf.getId(), TableType.TB_COMPANY_PERF.getCode());
@ -96,7 +96,7 @@ public class TbCompanyPerfServiceImpl implements TbCompanyPerfService {
        tbCompanyPerfMapper.addTbCompanyPerf(tbCompanyPerfVo);
        tbFileSourceService.addTbFileSource(tbCompanyPerfVo.getTbFileSourceVoList(),tbCompanyPerfVo.getId(), TableType.TB_COMPANY_PERF.getCode());
        //保存关键人信息
-        tbCompanyPerfRelService.addTbCompanyPerRelList(tbCompanyPerfVo.getTbCompanyPerfRelList(),tbCompanyPerfVo.getId());
+        tbCompanyPerfRelService.addTbCompanyPerRelList(tbCompanyPerfVo.getTbCompanyPerfRelList(),tbCompanyPerfVo.getId(),"1");
    }

    /**
@ -116,9 +116,9 @@ public class TbCompanyPerfServiceImpl implements TbCompanyPerfService {
            tbFileSourceService.delTbFileSource(tbCompanyPerfVo.getId(),TableType.TB_COMPANY_PERF.getCode());
            tbFileSourceService.addTbFileSource(tbCompanyPerfVo.getTbFileSourceVoList(),tbCompanyPerfVo.getId(),TableType.TB_COMPANY_PERF.getCode());
            //删除关键人信息
-            tbCompanyPerfRelService.delTbCompanyPerRelByPerfId(tbCompanyPerfVo.getId());
+            tbCompanyPerfRelService.delTbCompanyPerRelByPerfId(tbCompanyPerfVo.getId(),"1");
            //保存关键人信息
-            tbCompanyPerfRelService.addTbCompanyPerRelList(tbCompanyPerfVo.getTbCompanyPerfRelList(),tbCompanyPerfVo.getId());
+            tbCompanyPerfRelService.addTbCompanyPerRelList(tbCompanyPerfVo.getTbCompanyPerfRelList(),tbCompanyPerfVo.getId(),"1");
        }catch (Exception e){
            log.error("公司业绩管理修改失败{}",e.getMessage());
            throw  new ServiceException(e.getMessage());
@ -147,6 +147,6 @@ public class TbCompanyPerfServiceImpl implements TbCompanyPerfService {
        //删除附件信息
        tbFileSourceService.delTbFileSource(tbCompanyPerfVo.getId(),TableType.TB_COMPANY_PERF.getCode());
        //删除关键人信息
-        tbCompanyPerfRelService.delTbCompanyPerRelByPerfId(tbCompanyPerfVo.getId());
+        tbCompanyPerfRelService.delTbCompanyPerRelByPerfId(tbCompanyPerfVo.getId(),"1");
    }
 }
--- a/search-tool/src/main/resources/mapper/TbCompanyPerfRelMapper.xml
+++ b/search-tool/src/main/resources/mapper/TbCompanyPerfRelMapper.xml
@ -9,16 +9,18 @@
            <if test="workContent != null and workContent != ''">work_content,</if>
            <if test="keyUser != null">key_user,</if>
            <if test="perfId != null ">perf_id,</if>
+            <if test="source != null ">source,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="title != null and title != ''">#{title},</if>
            <if test="workContent != null and workContent != ''">#{workContent},</if>
            <if test="keyUser != null ">#{keyUser},</if>
            <if test="perfId != null ">#{perfId},</if>
+            <if test="source != null ">#{source},</if>
        </trim>
    </insert>
    <delete id="delTbCompanyPerRelByPerfId">
-        delete from tb_company_perf_rel where perf_id = #{perfId}
+        delete from tb_company_perf_rel where perf_id = #{perfId} and source = #{source}
    </delete>


@ -27,6 +29,6 @@
               tcpr.perf_id as perfId,tkp.user_name as userName,tkp.id_card as idCard
            from tb_company_perf_rel tcpr
            left join tb_key_people tkp on tcpr.key_user = tkp.id
-            where tcpr.perf_id = #{perfId}
+            where tcpr.perf_id = #{perfId} and tcpr.source = #{source}
    </select>
 </mapper>