diff --git a/search-tool/src/main/java/com/bonus/tool/controller/search/TbSubPerfController.java b/search-tool/src/main/java/com/bonus/tool/controller/search/TbSubPerfController.java index 4f930ca..eb7a751 100644 --- a/search-tool/src/main/java/com/bonus/tool/controller/search/TbSubPerfController.java +++ b/search-tool/src/main/java/com/bonus/tool/controller/search/TbSubPerfController.java @@ -136,4 +136,22 @@ public class TbSubPerfController extends BaseController { log.info("导出失败{}",e.getMessage()); } } + + /** + * 根据人员查询分包业绩管理列表 + * @param + * @return + */ + @ApiOperation(value = "分包业绩管理列表查询") + // @PreAuthorize("@ss.hasPermi('key:people:list')") + @GetMapping("/getTbSubPerfListByPersonId") + public List getTbSubPerfListByPersonId(TbSubPerfVo tbSubPerfVo) { + try { + return tbSubPerfService.getTbSubPerfListByPersonId(tbSubPerfVo); + }catch (Exception e){ + log.info("分包业绩管理列表失败{}",e.getMessage()); + return null; + } + } + } diff --git a/search-tool/src/main/java/com/bonus/tool/dto/TbSubPerfVo.java b/search-tool/src/main/java/com/bonus/tool/dto/TbSubPerfVo.java index f727780..6fc38e8 100644 --- a/search-tool/src/main/java/com/bonus/tool/dto/TbSubPerfVo.java +++ b/search-tool/src/main/java/com/bonus/tool/dto/TbSubPerfVo.java @@ -100,4 +100,9 @@ public class TbSubPerfVo { * 附件集合 */ private List tbFileSourceVoList; + + /** + * 人员 + */ + private Long personId; } diff --git a/search-tool/src/main/java/com/bonus/tool/mapper/TbSubPerfMapper.java b/search-tool/src/main/java/com/bonus/tool/mapper/TbSubPerfMapper.java index 44666bb..901cf48 100644 --- a/search-tool/src/main/java/com/bonus/tool/mapper/TbSubPerfMapper.java +++ b/search-tool/src/main/java/com/bonus/tool/mapper/TbSubPerfMapper.java @@ -16,4 +16,6 @@ public interface TbSubPerfMapper { void updateTbSubPerf(TbSubPerfVo tbSubPerfVo); void delTbSubPerf(TbSubPerfVo tbSubPerfVo); + + List getTbSubPerfListByPersonId(TbSubPerfVo tbSubPerfVo); } diff --git a/search-tool/src/main/java/com/bonus/tool/service/TbSubPerfService.java b/search-tool/src/main/java/com/bonus/tool/service/TbSubPerfService.java index 54a8fe5..fba776b 100644 --- a/search-tool/src/main/java/com/bonus/tool/service/TbSubPerfService.java +++ b/search-tool/src/main/java/com/bonus/tool/service/TbSubPerfService.java @@ -39,4 +39,6 @@ public interface TbSubPerfService { * @return */ void delTbSubPerf(TbSubPerfVo tbSubPerfVo) throws Exception; + + List getTbSubPerfListByPersonId(TbSubPerfVo tbSubPerfVo); } diff --git a/search-tool/src/main/java/com/bonus/tool/service/impl/TbSubPerfServiceImpl.java b/search-tool/src/main/java/com/bonus/tool/service/impl/TbSubPerfServiceImpl.java index 8bd4c3f..bb62d74 100644 --- a/search-tool/src/main/java/com/bonus/tool/service/impl/TbSubPerfServiceImpl.java +++ b/search-tool/src/main/java/com/bonus/tool/service/impl/TbSubPerfServiceImpl.java @@ -153,4 +153,9 @@ public class TbSubPerfServiceImpl implements TbSubPerfService { //删除关键人信息 tbCompanyPerfRelService.delTbCompanyPerRelByPerfId(tbSubPerfVo.getId(),"2"); } + + @Override + public List getTbSubPerfListByPersonId(TbSubPerfVo tbSubPerfVo) { + return tbSubPerfMapper.getTbSubPerfListByPersonId(tbSubPerfVo); + } } diff --git a/search-tool/src/main/resources/mapper/TbCompanyPerfMapper.xml b/search-tool/src/main/resources/mapper/TbCompanyPerfMapper.xml index 3034ba8..fc443ee 100644 --- a/search-tool/src/main/resources/mapper/TbCompanyPerfMapper.xml +++ b/search-tool/src/main/resources/mapper/TbCompanyPerfMapper.xml @@ -64,7 +64,7 @@ from tb_company_perf where del_flag =0 and pro_name = #{proName} and voltage = #{voltage} - + and start_time BETWEEN STR_TO_DATE(#{startTime}, '%Y-%m-%d') AND STR_TO_DATE(#{endTime}, '%Y-%m-%d') @@ -81,20 +81,19 @@ diff --git a/search-tool/src/main/resources/mapper/TbSubPerfMapper.xml b/search-tool/src/main/resources/mapper/TbSubPerfMapper.xml index 118a1fb..b1ff4f8 100644 --- a/search-tool/src/main/resources/mapper/TbSubPerfMapper.xml +++ b/search-tool/src/main/resources/mapper/TbSubPerfMapper.xml @@ -56,7 +56,9 @@ end_time as endTime,ht_remark as htRemark,money as money,voltage as voltage from tb_sub_perf where del_flag=0 and pro_name = #{proName} - + and sub_id = #{subId} + and voltage = #{voltage} + and start_time BETWEEN STR_TO_DATE(#{startTime}, '%Y-%m-%d') AND STR_TO_DATE(#{endTime}, '%Y-%m-%d') @@ -70,4 +72,23 @@ end_time as endTime,ht_remark as htRemark,money as money,voltage as voltage from tb_sub_perf where pro_name=#{proName} and sub_id=#{subId} and del_flag=0 +