From d1a477017745026a2c14411121405ebdd54250b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Thu, 24 Apr 2025 10:11:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=8F=B8=E4=B8=9A=E7=BB=A9=E7=AE=A1?= =?UTF-8?q?=E7=90=86=EF=BC=8C=E5=88=86=E5=8C=85=E5=95=86=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E5=88=86=E5=8C=85=E4=BA=BA=E5=91=98=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../search/TbSubPeopleController.java | 4 +-- .../bonus/tool/dto/TbCompanyPerfRelVo.java | 5 ++++ .../tool/mapper/TbCompanyPerfRelMapper.java | 4 +-- .../tool/service/TbCompanyPerfRelService.java | 6 ++--- .../impl/TbCompanyPerfRelServiceImpl.java | 26 +++++++++++++++---- .../impl/TbCompanyPerfServiceImpl.java | 12 ++++----- .../mapper/TbCompanyPerfRelMapper.xml | 6 +++-- 7 files changed, 43 insertions(+), 20 deletions(-) diff --git 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 index 619a7dd..cafa122 100644 --- 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 tbSubPeopleList = tbSubPeopleService.getTbSubPeopleList(tbSubPeopleVo); ExcelUtil util = new ExcelUtil<>(TbSubPeopleVo.class); diff --git a/search-tool/src/main/java/com/bonus/tool/dto/TbCompanyPerfRelVo.java b/search-tool/src/main/java/com/bonus/tool/dto/TbCompanyPerfRelVo.java index d85caea..6747668 100644 --- 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; + /*** * 附件集合 */ diff --git a/search-tool/src/main/java/com/bonus/tool/mapper/TbCompanyPerfRelMapper.java b/search-tool/src/main/java/com/bonus/tool/mapper/TbCompanyPerfRelMapper.java index 7d1db5b..b9abbab 100644 --- 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 getTbCompanyPerRelByPerfId(Long perfId); + List getTbCompanyPerRelByPerfId(Long perfId,String source); void addTbCompanyPerRel(TbCompanyPerfRelVo tbCompanyPerfRelVo); - void delTbCompanyPerRelByPerfId(Long perfId); + void delTbCompanyPerRelByPerfId(Long perfId,String source); } diff --git a/search-tool/src/main/java/com/bonus/tool/service/TbCompanyPerfRelService.java b/search-tool/src/main/java/com/bonus/tool/service/TbCompanyPerfRelService.java index 7d6080d..e97ba6a 100644 --- 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 getTbCompanyPerRelByPerfId(Long perfId); + List getTbCompanyPerRelByPerfId(Long perfId,String source); /** * 保存关键人员 @@ -18,11 +18,11 @@ public interface TbCompanyPerfRelService { * @param tbCompanyPerfRelList * @param perfId */ - void addTbCompanyPerRelList(List tbCompanyPerfRelList, Long perfId); + void addTbCompanyPerRelList(List tbCompanyPerfRelList, Long perfId,String source); /** * 删除业绩表关联关键人员 * @param perfId */ - void delTbCompanyPerRelByPerfId(Long perfId) throws Exception; + void delTbCompanyPerRelByPerfId(Long perfId,String source) throws Exception; } diff --git 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 index b6d5a5f..7ce9fce 100644 --- 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 getTbCompanyPerRelByPerfId(Long perfId) { - List tbCompanyPerfRelList = tbCompanyPerfRelMapper.getTbCompanyPerRelByPerfId(perfId); + public List getTbCompanyPerRelByPerfId(Long perfId,String source) { + List 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 tbCompanyPerfRelList, Long perfId) { + public void addTbCompanyPerRelList(List 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); } } diff --git 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 index 21bb96d..e924392 100644 --- 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 tbCompanyPerfRelList = tbCompanyPerfRelService.getTbCompanyPerRelByPerfId(tbCompanyPerf.getId()); + List tbCompanyPerfRelList = tbCompanyPerfRelService.getTbCompanyPerRelByPerfId(tbCompanyPerf.getId(),"1"); tbCompanyPerf.setTbCompanyPerfRelList(tbCompanyPerfRelList); //获取附件信息 List 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 tbCompanyPerfRelList = tbCompanyPerfRelService.getTbCompanyPerRelByPerfId(tbCompanyPerf.getId()); + List tbCompanyPerfRelList = tbCompanyPerfRelService.getTbCompanyPerRelByPerfId(tbCompanyPerf.getId(),"1"); tbCompanyPerf.setTbCompanyPerfRelList(tbCompanyPerfRelList); //获取附件信息 List 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"); } } diff --git a/search-tool/src/main/resources/mapper/TbCompanyPerfRelMapper.xml b/search-tool/src/main/resources/mapper/TbCompanyPerfRelMapper.xml index ecd56f9..1e93acc 100644 --- a/search-tool/src/main/resources/mapper/TbCompanyPerfRelMapper.xml +++ b/search-tool/src/main/resources/mapper/TbCompanyPerfRelMapper.xml @@ -9,16 +9,18 @@ work_content, key_user, perf_id, + source, #{title}, #{workContent}, #{keyUser}, #{perfId}, + #{source}, - delete from tb_company_perf_rel where perf_id = #{perfId} + delete from tb_company_perf_rel where perf_id = #{perfId} and source = #{source} @@ -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}