diff --git a/bonus-common/src/main/java/com/bonus/common/enums/TableType.java b/bonus-common/src/main/java/com/bonus/common/enums/TableType.java index ac67885..5bfcd25 100644 --- a/bonus-common/src/main/java/com/bonus/common/enums/TableType.java +++ b/bonus-common/src/main/java/com/bonus/common/enums/TableType.java @@ -3,16 +3,33 @@ package com.bonus.common.enums; public enum TableType { /** - * 关键人员信息表 + * 关键人员信息 */ - TB_KEY_PEOPLE("tb_key_people", "关键人员信息表"), + TB_KEY_PEOPLE("tb_key_people", "关键人员信息"), /** * 项目其他人员管理 */ - TB_OTHER_PEOPLE("tb_other_people", "项目其他人员管理"); + TB_OTHER_PEOPLE("tb_other_people", "项目其他人员管理"), + /** + * 公司业绩管理 + */ + TB_COMPANY_PERF("tb_company_perf", "公司业绩管理"), + /** + * 业绩关键人员信息 + */ + TB_COMPANY_PERF_REL("tb_company_perf_rel", "业绩关键人员信息"), + /** + * 分包商 + */ + TB_SUB("tb_sub", "分包商"), + + /** + * 分包商人员信息 + */ + TB_SUB_PEOPLE("tb_sub_people", "分包商人员信息"); private final String code; private final String info; diff --git a/search-tool/src/main/java/com/bonus/tool/controller/search/TbCompanyPerfController.java b/search-tool/src/main/java/com/bonus/tool/controller/search/TbCompanyPerfController.java index 3d65211..a430a8c 100644 --- a/search-tool/src/main/java/com/bonus/tool/controller/search/TbCompanyPerfController.java +++ b/search-tool/src/main/java/com/bonus/tool/controller/search/TbCompanyPerfController.java @@ -1,8 +1,138 @@ package com.bonus.tool.controller.search; +import com.bonus.common.core.controller.BaseController; +import com.bonus.common.core.domain.AjaxResult; +import com.bonus.common.core.page.TableDataInfo; +import com.bonus.common.utils.poi.ExcelUtil; +import com.bonus.tool.dto.TbCompanyPerfVo; +import com.bonus.tool.service.TbCompanyPerfService; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.util.List; + /** + * 公司业绩管理 * @author 马三炮 * @date 2025/4/22 */ -public class TbCompanyPerfController { +@RestController +@Slf4j +@RequestMapping("/tbCompanyPerf") +public class TbCompanyPerfController extends BaseController { + + @Resource + private TbCompanyPerfService tbCompanyPerfService; + + /** + * 公司业绩管理列表查询 + * @param + * @return + */ + @ApiOperation(value = "公司业绩管理列表查询") + // @PreAuthorize("@ss.hasPermi('key:people:list')") + @GetMapping("/getTbCompanyPerfList") + public TableDataInfo getTbCompanyPerfList(TbCompanyPerfVo tbCompanyPerfVo) { + try { + startPage(); + List tbCompanyPerfList = tbCompanyPerfService.getTbCompanyPerfList(tbCompanyPerfVo); + return getDataTable(tbCompanyPerfList); + }catch (Exception e){ + log.info("公司业绩管理列表失败{}",e.getMessage()); + return getDataTableError(null); + } + } + + /** + * 公司业绩管理详情 + * @param + * @return + */ + @ApiOperation(value = "公司业绩管理详情") + // @PreAuthorize("@ss.hasPermi('key:people:query')") + @PostMapping("/getTbCompanyPerfById") + public AjaxResult getTbCompanyPerfById(@RequestBody TbCompanyPerfVo tbCompanyPerfVo) { + try { + TbCompanyPerfVo tbCompanyPerf = tbCompanyPerfService.getTbCompanyPerfById(tbCompanyPerfVo); + return success(tbCompanyPerf); + }catch (Exception e){ + log.info("公司业绩管理详情失败{}",e.getMessage()); + return error("公司业绩管理详情失败"); + } + } + + /** + * 公司业绩管理新增 + * @param + * @return + */ + @ApiOperation(value = "公司业绩管理新增") + // @PreAuthorize("@ss.hasPermi('key:people:add')") + @PostMapping("/addTbCompanyPerf") + public AjaxResult addTbCompanyPerf(@RequestBody TbCompanyPerfVo tbCompanyPerfVo) { + try { + tbCompanyPerfService.addTbCompanyPerf(tbCompanyPerfVo); + return success("新增公司业绩管理成功"); + }catch (Exception e){ + log.info("新增公司业绩管理失败{}",e.getMessage()); + return error(e.getMessage()); + } + } + + /** + * 公司业绩管理修改 + * @param + * @return + */ + @ApiOperation(value = "公司业绩管理修改") + // @PreAuthorize("@ss.hasPermi('key:people:add')") + @PostMapping("/updateTbCompanyPerf") + public AjaxResult updateTbCompanyPerf(@RequestBody TbCompanyPerfVo tbCompanyPerfVo) { + try { + tbCompanyPerfService.updateTbCompanyPerf(tbCompanyPerfVo); + return success("修改公司业绩管理成功"); + }catch (Exception e){ + log.info("修改公司业绩管理失败{}",e.getMessage()); + return error(e.getMessage()); + } + } + + /** + * 公司业绩管理删除 + * @param + * @return + */ + @ApiOperation(value = "公司业绩管理删除") + // @PreAuthorize("@ss.hasPermi('key:people:add')") + @PostMapping("/delTbCompanyPerf") + public AjaxResult delTbCompanyPerf(@RequestBody TbCompanyPerfVo tbCompanyPerfVo) { + try { + tbCompanyPerfService.delTbCompanyPerf(tbCompanyPerfVo); + return success("删除公司业绩管理成功"); + }catch (Exception e){ + log.info("删除公司业绩管理失败{}",e.getMessage()); + return error(e.getMessage()); + } + } + + /** + * 公司业绩管理导出 + * @param + * @return + */ + @ApiOperation(value = "公司业绩管理导出") +// @PreAuthorize("@ss.hasPermi('key:people:del')") + @PostMapping("/tbCompanyPerfExport") + public void tbCompanyPerfExport(HttpServletResponse response, TbCompanyPerfVo tbCompanyPerfVo) { + try { + List tbCompanyPerfList = tbCompanyPerfService.getTbCompanyPerfList(tbCompanyPerfVo); + ExcelUtil util = new ExcelUtil<>(TbCompanyPerfVo.class); + util.exportExcel(response, tbCompanyPerfList, "公司业绩管理"); + }catch (Exception e){ + log.info("导出失败{}",e.getMessage()); + } + } } diff --git a/search-tool/src/main/java/com/bonus/tool/controller/search/TbKeyPeopleController.java b/search-tool/src/main/java/com/bonus/tool/controller/search/TbKeyPeopleController.java index 60888ac..521ddea 100644 --- a/search-tool/src/main/java/com/bonus/tool/controller/search/TbKeyPeopleController.java +++ b/search-tool/src/main/java/com/bonus/tool/controller/search/TbKeyPeopleController.java @@ -100,7 +100,7 @@ public class TbKeyPeopleController extends BaseController { return success("关键人员修改成功"); }catch (Exception e){ log.info("关键人员修改失败{}",e.getMessage()); - return error(null); + return error("关键人员修改失败"); } } @@ -118,7 +118,7 @@ public class TbKeyPeopleController extends BaseController { return success("关键人员删除成功"); }catch (Exception e){ log.info("关键人员删除失败{}",e.getMessage()); - return error(null); + return error("关键人员删除失败"); } } @@ -129,15 +129,33 @@ public class TbKeyPeopleController extends BaseController { */ @ApiOperation(value = "关键人员导出") // @PreAuthorize("@ss.hasPermi('key:people:del')") - @PostMapping("/TbKeyPeopleExport") - public void TbKeyPeopleExport(HttpServletResponse response,TbKeyPeopleVo tbKeyPeopleVo) { + @PostMapping("/tbKeyPeopleExport") + public void tbKeyPeopleExport(HttpServletResponse response,TbKeyPeopleVo tbKeyPeopleVo) { try { List tbKeyPeopleVoList = tbKeyPeopleServcie.getTbKeyPeopleList(tbKeyPeopleVo); - ExcelUtil util = new ExcelUtil(TbKeyPeopleVo.class); + ExcelUtil util = new ExcelUtil<>(TbKeyPeopleVo.class); util.exportExcel(response, tbKeyPeopleVoList, "关键人员信息"); }catch (Exception e){ log.info("导出失败{}",e.getMessage()); } } + /** + * 关键人员查询所有 + * @param + * @return + */ + @ApiOperation(value = "关键人员查询所有") + // @PreAuthorize("@ss.hasPermi('key:people:list')") + @GetMapping("/getTbKeyPeopleAll") + public TableDataInfo getTbKeyPeopleAll(TbKeyPeopleVo tbKeyPeopleVo) { + try { + List tbKeyPeopleVoList = tbKeyPeopleServcie.getTbKeyPeopleList(tbKeyPeopleVo); + return getDataTable(tbKeyPeopleVoList); + }catch (Exception e){ + log.info("关键人员查询所有失败{}",e.getMessage()); + return getDataTableError(null); + } + } + } diff --git a/search-tool/src/main/java/com/bonus/tool/controller/search/TbOtherPeopleController.java b/search-tool/src/main/java/com/bonus/tool/controller/search/TbOtherPeopleController.java index 01fba73..627225a 100644 --- a/search-tool/src/main/java/com/bonus/tool/controller/search/TbOtherPeopleController.java +++ b/search-tool/src/main/java/com/bonus/tool/controller/search/TbOtherPeopleController.java @@ -4,7 +4,6 @@ import com.bonus.common.core.controller.BaseController; import com.bonus.common.core.domain.AjaxResult; import com.bonus.common.core.page.TableDataInfo; import com.bonus.common.utils.poi.ExcelUtil; -import com.bonus.tool.dto.TbKeyPeopleVo; import com.bonus.tool.dto.TbOtherPeopleVo; import com.bonus.tool.service.TbOtherPeopleService; import io.swagger.annotations.ApiOperation; @@ -61,7 +60,7 @@ public class TbOtherPeopleController extends BaseController { return success(tbKeyPeople); }catch (Exception e){ log.info("其他人员详情失败{}",e.getMessage()); - return error(null); + return error("其他人员详情失败"); } } @@ -97,7 +96,7 @@ public class TbOtherPeopleController extends BaseController { return success("关键人员修改成功"); }catch (Exception e){ log.info("关键人员修改失败{}",e.getMessage()); - return error(null); + return error("其他人员删除失败"); } } @@ -115,7 +114,7 @@ public class TbOtherPeopleController extends BaseController { return success("其他人员删除成功"); }catch (Exception e){ log.info("其他人员删除失败{}",e.getMessage()); - return error(null); + return error("其他人员删除失败"); } } @@ -126,11 +125,11 @@ public class TbOtherPeopleController extends BaseController { */ @ApiOperation(value = "关键人员导出") // @PreAuthorize("@ss.hasPermi('key:people:del')") - @PostMapping("/TbOtherPeopleExport") - public void TbOtherPeopleExport(HttpServletResponse response, TbOtherPeopleVo tbOtherPeopleVo) { + @PostMapping("/tbOtherPeopleExport") + public void tbOtherPeopleExport(HttpServletResponse response, TbOtherPeopleVo tbOtherPeopleVo) { try { List tbKeyPeopleVoList = tbOtherPeopleService.getTbOtherPeopleList(tbOtherPeopleVo); - ExcelUtil util = new ExcelUtil(TbOtherPeopleVo.class); + ExcelUtil util = new ExcelUtil<>(TbOtherPeopleVo.class); util.exportExcel(response, tbKeyPeopleVoList, "其他人员信息"); }catch (Exception e){ log.info("导出失败{}",e.getMessage()); diff --git a/search-tool/src/main/java/com/bonus/tool/controller/search/TbSubController.java b/search-tool/src/main/java/com/bonus/tool/controller/search/TbSubController.java new file mode 100644 index 0000000..41257a0 --- /dev/null +++ b/search-tool/src/main/java/com/bonus/tool/controller/search/TbSubController.java @@ -0,0 +1,138 @@ +package com.bonus.tool.controller.search; + +import com.bonus.common.core.controller.BaseController; +import com.bonus.common.core.domain.AjaxResult; +import com.bonus.common.core.page.TableDataInfo; +import com.bonus.common.utils.poi.ExcelUtil; +import com.bonus.tool.dto.TbSubVo; +import com.bonus.tool.service.TbSubService; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 分包商表 + * @author 马三炮 + * @date 2025/4/23 + */ +@RestController +@Slf4j +@RequestMapping("/tbSub") +public class TbSubController extends BaseController { + + @Resource + private TbSubService tbSubService; + + /** + * 分包商列表查询 + * @param + * @return + */ + @ApiOperation(value = "分包商列表查询") + // @PreAuthorize("@ss.hasPermi('key:people:list')") + @GetMapping("/getTbSubList") + public TableDataInfo getTbSubList(TbSubVo tbSubVo) { + try { + startPage(); + List tbSubVoList = tbSubService.getTbSubList(tbSubVo); + return getDataTable(tbSubVoList); + }catch (Exception e){ + log.info("分包商列表失败{}",e.getMessage()); + return getDataTableError(null); + } + } + + /** + * 分包商详情 + * @param + * @return + */ + @ApiOperation(value = "分包商详情") + // @PreAuthorize("@ss.hasPermi('key:people:list')") + @PostMapping("/getTbSubById") + public AjaxResult getTbSubById(@RequestBody TbSubVo tbSubVo) { + try { + TbSubVo tbSub = tbSubService.getTbSubById(tbSubVo); + return success(tbSub); + }catch (Exception e){ + log.info("分包商详情失败{}",e.getMessage()); + return error("分包商详情失败"); + } + } + + /** + * 分包商新增 + * @param + * @return + */ + @ApiOperation(value = "分包商新增") + // @PreAuthorize("@ss.hasPermi('key:people:list')") + @PostMapping("/addTbSub") + public AjaxResult addTbSub(@RequestBody TbSubVo tbSubVo) { + try { + tbSubService.addTbSub(tbSubVo); + return success("分包商新增成功"); + }catch (Exception e){ + log.info("分包商新增失败{}",e.getMessage()); + return error(e.getMessage()); + } + } + + /** + * 分包商修改 + * @param + * @return + */ + @ApiOperation(value = "分包商修改") + // @PreAuthorize("@ss.hasPermi('key:people:list')") + @PostMapping("/updateTbSub") + public AjaxResult updateTbSub(@RequestBody TbSubVo tbSubVo) { + try { + tbSubService.updateTbSub(tbSubVo); + return success("分包商修改成功"); + }catch (Exception e){ + log.info("分包商修改失败{}",e.getMessage()); + return error(e.getMessage()); + } + } + + /** + * 分包商删除 + * @param + * @return + */ + @ApiOperation(value = "分包商删除") + // @PreAuthorize("@ss.hasPermi('key:people:list')") + @PostMapping("/delTbSub") + public AjaxResult delTbSub(@RequestBody TbSubVo tbSubVo) { + try { + tbSubService.delTbSub(tbSubVo); + return success("分包商删除成功"); + }catch (Exception e){ + log.info("分包商删除失败{}",e.getMessage()); + return error(e.getMessage()); + } + } + + /** + * 分包商管理导出 + * @param + * @return + */ + @ApiOperation(value = "分包商管理导出") +// @PreAuthorize("@ss.hasPermi('key:people:del')") + @PostMapping("/tbSubExport") + public void tbSubExport(HttpServletResponse response, TbSubVo tbSubVo) { + try { + List tbSubVoList = tbSubService.getTbSubList(tbSubVo); + ExcelUtil util = new ExcelUtil<>(TbSubVo.class); + util.exportExcel(response, tbSubVoList, "分包商管理"); + }catch (Exception e){ + log.info("导出失败{}",e.getMessage()); + } + } +} 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 new file mode 100644 index 0000000..619a7dd --- /dev/null +++ b/search-tool/src/main/java/com/bonus/tool/controller/search/TbSubPeopleController.java @@ -0,0 +1,157 @@ +package com.bonus.tool.controller.search; + +import com.bonus.common.core.controller.BaseController; +import com.bonus.common.core.domain.AjaxResult; +import com.bonus.common.core.page.TableDataInfo; +import com.bonus.common.utils.poi.ExcelUtil; +import com.bonus.tool.dto.TbSubPeopleVo; +import com.bonus.tool.service.TbSubPeopleService; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 分包商人员信息 + * @author 马三炮 + * @date 2025/4/23 + */ +@RestController +@Slf4j +@RequestMapping("/tbSubPeople") +public class TbSubPeopleController extends BaseController { + + + @Resource + private TbSubPeopleService tbSubPeopleService; + + /** + * 分包商人员信息列表查询 + * @param + * @return + */ + @ApiOperation(value = "分包商人员信息列表查询") + // @PreAuthorize("@ss.hasPermi('key:people:list')") + @GetMapping("/getTbSubPeopleList") + public TableDataInfo getTbSubPeopleList(TbSubPeopleVo tbSubPeopleVo) { + try { + startPage(); + List tbSubPeopleList = tbSubPeopleService.getTbSubPeopleList(tbSubPeopleVo); + return getDataTable(tbSubPeopleList); + }catch (Exception e){ + log.info("分包商人员信息列表失败{}",e.getMessage()); + return getDataTableError(null); + } + } + + /** + * 分包商人员信息详情 + * @param + * @return + */ + @ApiOperation(value = "分包商人员信息详情") + // @PreAuthorize("@ss.hasPermi('key:people:list')") + @PostMapping("/getTbSubPeopleById") + public AjaxResult getTbSubPeopleById(@RequestBody TbSubPeopleVo tbSubPeopleVo) { + try { + TbSubPeopleVo tbSubPeople = tbSubPeopleService.getTbSubPeopleById(tbSubPeopleVo); + return success(tbSubPeople); + }catch (Exception e){ + log.info("分包商人员信息详情失败{}",e.getMessage()); + return error("分包商人员信息详情失败"); + } + } + + /** + * 分包商人员信息新增 + * @param + * @return + */ + @ApiOperation(value = "分包商人员信息新增") + // @PreAuthorize("@ss.hasPermi('key:people:list')") + @PostMapping("/addTbSubPeople") + public AjaxResult addTbSubPeople(@RequestBody TbSubPeopleVo tbSubPeopleVo) { + try { + tbSubPeopleService.addTbSubPeople(tbSubPeopleVo); + return success("分包商人员信息成功"); + }catch (Exception e){ + log.info("分包商人员信息失败{}",e.getMessage()); + return error(e.getMessage()); + } + } + + /** + * 分包商人员信息修改 + * @param + * @return + */ + @ApiOperation(value = "分包商人员信息修改") + // @PreAuthorize("@ss.hasPermi('key:people:list')") + @PostMapping("/updateTbSubPeople") + public AjaxResult updateTbSubPeople(@RequestBody TbSubPeopleVo tbSubPeopleVo) { + try { + tbSubPeopleService.updateTbSubPeople(tbSubPeopleVo); + return success("分包商人员信息修改成功"); + }catch (Exception e){ + log.info("分包商人员信息修改失败{}",e.getMessage()); + return error(e.getMessage()); + } + } + + /** + * 分包商人员信息删除 + * @param + * @return + */ + @ApiOperation(value = "分包商人员信息删除") + // @PreAuthorize("@ss.hasPermi('key:people:list')") + @PostMapping("/delTbSubPeople") + public AjaxResult delTbSubPeople(@RequestBody TbSubPeopleVo tbSubPeopleVo) { + try { + tbSubPeopleService.delTbSubPeople(tbSubPeopleVo); + return success("分包商人员信息删除成功"); + }catch (Exception e){ + log.info("分包商人员信息删除失败{}",e.getMessage()); + return error(e.getMessage()); + } + } + + /** + * 分包商人员信息列表查询全部 + * @param + * @return + */ + @ApiOperation(value = "分包商人员信息列表查询全部") + // @PreAuthorize("@ss.hasPermi('key:people:list')") + @GetMapping("/getTbSubPeopleAll") + public TableDataInfo getTbSubPeopleAll(TbSubPeopleVo tbSubPeopleVo) { + try { + List tbSubPeopleList = tbSubPeopleService.getTbSubPeopleList(tbSubPeopleVo); + return getDataTable(tbSubPeopleList); + }catch (Exception e){ + log.info("分包商人员信息列表失败{}",e.getMessage()); + return getDataTableError(null); + } + } + + /** + * 分包商人员信息导出 + * @param + * @return + */ + @ApiOperation(value = "分包商人员信息导出") +// @PreAuthorize("@ss.hasPermi('key:people:del')") + @PostMapping("/tbSubExport") + public void tbSubExport(HttpServletResponse response, TbSubPeopleVo tbSubPeopleVo) { + try { + List tbSubPeopleList = tbSubPeopleService.getTbSubPeopleList(tbSubPeopleVo); + ExcelUtil util = new ExcelUtil<>(TbSubPeopleVo.class); + util.exportExcel(response, tbSubPeopleList, "分包商人员信息"); + }catch (Exception e){ + log.info("导出失败{}",e.getMessage()); + } + } +} 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 81a60fe..d85caea 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 @@ -2,6 +2,8 @@ package com.bonus.tool.dto; import lombok.Data; +import java.util.List; + /** * @author 马三炮 * @date 2025/4/22 @@ -29,8 +31,23 @@ public class TbCompanyPerfRelVo { */ private String keyUser; + /** + * 关键人员姓名 + */ + private String userName; + + /** + * 身份证 + */ + private String idCard; + /** * 业绩数据id */ - private String perfId; + private Long perfId; + + /*** + * 附件集合 + */ + private List tbFileSourceVoList; } diff --git a/search-tool/src/main/java/com/bonus/tool/dto/TbCompanyPerfVo.java b/search-tool/src/main/java/com/bonus/tool/dto/TbCompanyPerfVo.java index 98a9f77..a355d8c 100644 --- a/search-tool/src/main/java/com/bonus/tool/dto/TbCompanyPerfVo.java +++ b/search-tool/src/main/java/com/bonus/tool/dto/TbCompanyPerfVo.java @@ -1,6 +1,9 @@ package com.bonus.tool.dto; +import com.bonus.common.annotation.Excel; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; import java.util.List; @@ -20,52 +23,68 @@ public class TbCompanyPerfVo { /** * 工程名称 */ + @Excel(name = "工程名称", sort = 1) private String proName; /** * 电压等级 */ + @Excel(name = "电压等级", sort = 2) private String voltage; /** * 开始时间 */ + @Excel(name = "开始时间", sort = 3) + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private String startTime; /** * 结束时间 */ + @Excel(name = "结束时间", sort = 4) + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private String endTime; /** * 竣工日期 */ + @Excel(name = "结束时间", sort = 5) + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private String stopTime; /** * 变电站座数 */ + @Excel(name = "变电站座数", sort = 6) private String stationNum; /** * 线路建设规模 */ + @Excel(name = "线路建设规模", sort = 7) private String lineScale; /** * 承包范围 */ + @Excel(name = "承包范围", sort = 8) private String contractRang; /** * 业主单位 */ + @Excel(name = "业主单位", sort = 9) private String ownerUnit; /** * 业主联系方式 */ + @Excel(name = "业主联系方式", sort = 10) private String ownerPhone; /** @@ -87,5 +106,10 @@ public class TbCompanyPerfVo { /** * 关键人员列表 */ - List TbCompanyPerfRelList; + List tbCompanyPerfRelList; + + /*** + * 附件集合 + */ + private List tbFileSourceVoList; } diff --git a/search-tool/src/main/java/com/bonus/tool/dto/TbFileSourceVo.java b/search-tool/src/main/java/com/bonus/tool/dto/TbFileSourceVo.java index cc8d74c..cdc6b07 100644 --- a/search-tool/src/main/java/com/bonus/tool/dto/TbFileSourceVo.java +++ b/search-tool/src/main/java/com/bonus/tool/dto/TbFileSourceVo.java @@ -36,6 +36,10 @@ public class TbFileSourceVo { *文件类型 (自己按照每个表进行自己定义 建议统一用数字) * tb_key_people 1:身份证正面，2:身份证反面，3:资格证，4:其他资质 * tb_other_people 1:身份证正面，2:身份证反面，3:资格证，4:其他资质 + * tb_company_perf 1:合同 + * tb_company_perf_rel 1：业绩证明 + * tb_sub 1:公司资质 + * tb_sub_people 1:身份证正面，2:身份证反面，3:资格证，4:其他资质 */ private String fileType; diff --git a/search-tool/src/main/java/com/bonus/tool/dto/TbSubPeopleVo.java b/search-tool/src/main/java/com/bonus/tool/dto/TbSubPeopleVo.java new file mode 100644 index 0000000..0de84fc --- /dev/null +++ b/search-tool/src/main/java/com/bonus/tool/dto/TbSubPeopleVo.java @@ -0,0 +1,87 @@ +package com.bonus.tool.dto; + +import com.bonus.common.annotation.Excel; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** + * @author 马三炮 + * @date 2025/4/23 + */ +@Data +public class TbSubPeopleVo { + + /** + * id + */ + private Long id; + + /** + * 姓名 + */ + @Excel(name = "姓名", sort = 2) + private String userName; + + /** + * 身份证号码 + */ + @Excel(name = "身份证号码", sort = 3) + private String idCard; + + /** + * 职称 + */ + @Excel(name = "职称", sort = 4) + private String title; + + /** + * 资格证书 + */ + @Excel(name = "资格证书", sort = 5) + private String diploma; + + + /** + * 证书编号 + */ + @Excel(name = "证书编号", sort = 6) + private String diplomaNum; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 修改时间 + */ + private Date updateTime; + + /** + * 创建人 + */ + private String createUser; + + /** + * 修改人 + */ + private String updateUser; + + /** + * 分包商id + */ + private Long subId; + + /** + * 分包商名称 + */ + @Excel(name = "分包商名称", sort = 1) + private String subName; + + /*** + * 附件集合 + */ + private List tbFileSourceVoList; +} diff --git a/search-tool/src/main/java/com/bonus/tool/dto/TbSubVo.java b/search-tool/src/main/java/com/bonus/tool/dto/TbSubVo.java new file mode 100644 index 0000000..eac48d0 --- /dev/null +++ b/search-tool/src/main/java/com/bonus/tool/dto/TbSubVo.java @@ -0,0 +1,77 @@ +package com.bonus.tool.dto; + +import com.bonus.common.annotation.Excel; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** + * @author 马三炮 + * @date 2025/4/23 + */ +@Data +public class TbSubVo { + + /** + * id + */ + private Long id; + + /** + * 分包商名称 + */ + @Excel(name = "分包商名称", sort = 1) + private String subName; + + + /** + * 公司地址 + */ + @Excel(name = "公司地址", sort = 4) + private String address; + + /** + * 负责人 + */ + @Excel(name = "负责人", sort = 2) + private String userName; + + /** + * 联系方式 + */ + @Excel(name = "联系方式", sort = 3) + private String userPhone; + + /** + * 公司资质 + */ + private String companyQu; + + /** + * 创建时间 + */ + private Date createTime; + + + /** + * 创建人 + */ + private String createUser; + + /** + * 修改时间 + */ + private Date updateTime; + + + /** + * 修改人 + */ + private String updateUser; + + /*** + * 附件集合 + */ + private List tbFileSourceVoList; +} diff --git a/search-tool/src/main/java/com/bonus/tool/mapper/TbCompanyPerfMapper.java b/search-tool/src/main/java/com/bonus/tool/mapper/TbCompanyPerfMapper.java new file mode 100644 index 0000000..a457aec --- /dev/null +++ b/search-tool/src/main/java/com/bonus/tool/mapper/TbCompanyPerfMapper.java @@ -0,0 +1,19 @@ +package com.bonus.tool.mapper; + +import com.bonus.tool.dto.TbCompanyPerfVo; + +import java.util.List; + +public interface TbCompanyPerfMapper { + List getTbCompanyPerfList(TbCompanyPerfVo tbCompanyPerfVo); + + TbCompanyPerfVo getTbCompanyPerfById(TbCompanyPerfVo tbCompanyPerfVo); + + TbCompanyPerfVo getTbCompanyPerfByProName(TbCompanyPerfVo tbCompanyPerfVo); + + void addTbCompanyPerf(TbCompanyPerfVo tbCompanyPerfVo); + + void updateTbCompanyPerf(TbCompanyPerfVo tbCompanyPerfVo); + + void delTbCompanyPerf(TbCompanyPerfVo tbCompanyPerfVo); +} 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 new file mode 100644 index 0000000..7d1db5b --- /dev/null +++ b/search-tool/src/main/java/com/bonus/tool/mapper/TbCompanyPerfRelMapper.java @@ -0,0 +1,13 @@ +package com.bonus.tool.mapper; + +import com.bonus.tool.dto.TbCompanyPerfRelVo; + +import java.util.List; + +public interface TbCompanyPerfRelMapper { + List getTbCompanyPerRelByPerfId(Long perfId); + + void addTbCompanyPerRel(TbCompanyPerfRelVo tbCompanyPerfRelVo); + + void delTbCompanyPerRelByPerfId(Long perfId); +} diff --git a/search-tool/src/main/java/com/bonus/tool/mapper/TbSubMapper.java b/search-tool/src/main/java/com/bonus/tool/mapper/TbSubMapper.java new file mode 100644 index 0000000..e16512e --- /dev/null +++ b/search-tool/src/main/java/com/bonus/tool/mapper/TbSubMapper.java @@ -0,0 +1,19 @@ +package com.bonus.tool.mapper; + +import com.bonus.tool.dto.TbSubVo; + +import java.util.List; + +public interface TbSubMapper { + List getTbSubList(TbSubVo tbSubVo); + + TbSubVo getTbSubById(TbSubVo tbSubVo); + + TbSubVo addTbSub(TbSubVo tbSubVo); + + TbSubVo getTbSubBySubName(TbSubVo tbSubVo); + + void updateTbSub(TbSubVo tbSubVo); + + void delTbSub(TbSubVo tbSubVo); +} diff --git a/search-tool/src/main/java/com/bonus/tool/mapper/TbSubPeopleMapper.java b/search-tool/src/main/java/com/bonus/tool/mapper/TbSubPeopleMapper.java new file mode 100644 index 0000000..41470ed --- /dev/null +++ b/search-tool/src/main/java/com/bonus/tool/mapper/TbSubPeopleMapper.java @@ -0,0 +1,24 @@ +package com.bonus.tool.mapper; + +import com.bonus.tool.dto.TbSubPeopleVo; + +import java.util.List; + +/** + * @author 马三炮 + * @date 2025/4/23 + */ +public interface TbSubPeopleMapper { + + List getTbSubPeopleList(TbSubPeopleVo tbSubPeopleVo); + + TbSubPeopleVo getTbSubPeopleById(TbSubPeopleVo tbSubPeopleVo); + + TbSubPeopleVo getTbSubByIdCard(TbSubPeopleVo tbSubPeopleVo); + + void addTbSub(TbSubPeopleVo tbSubPeopleVo); + + void updateTbSubPeople(TbSubPeopleVo tbSubPeopleVo); + + void delTbSubPeople(TbSubPeopleVo tbSubPeopleVo); +} 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 new file mode 100644 index 0000000..7d6080d --- /dev/null +++ b/search-tool/src/main/java/com/bonus/tool/service/TbCompanyPerfRelService.java @@ -0,0 +1,28 @@ +package com.bonus.tool.service; + +import com.bonus.tool.dto.TbCompanyPerfRelVo; + +import java.util.List; + +public interface TbCompanyPerfRelService { + /** + * 获取业绩表关联关键人员 + * @param perfId + * @return + */ + List getTbCompanyPerRelByPerfId(Long perfId); + + /** + * 保存关键人员 + * + * @param tbCompanyPerfRelList + * @param perfId + */ + void addTbCompanyPerRelList(List tbCompanyPerfRelList, Long perfId); + + /** + * 删除业绩表关联关键人员 + * @param perfId + */ + void delTbCompanyPerRelByPerfId(Long perfId) throws Exception; +} diff --git a/search-tool/src/main/java/com/bonus/tool/service/TbCompanyPerfService.java b/search-tool/src/main/java/com/bonus/tool/service/TbCompanyPerfService.java new file mode 100644 index 0000000..bf8051a --- /dev/null +++ b/search-tool/src/main/java/com/bonus/tool/service/TbCompanyPerfService.java @@ -0,0 +1,42 @@ +package com.bonus.tool.service; + +import com.bonus.tool.dto.TbCompanyPerfVo; + +import java.util.List; + +public interface TbCompanyPerfService { + /** + * 公司业绩管理列表查询 + * @param + * @return + */ + List getTbCompanyPerfList(TbCompanyPerfVo tbCompanyPerfVo); + + /** + * 公司业绩管理详情 + * @param + * @return + */ + TbCompanyPerfVo getTbCompanyPerfById(TbCompanyPerfVo tbCompanyPerfVo); + + /** + * 公司业绩管理新增 + * @param + * @return + */ + void addTbCompanyPerf(TbCompanyPerfVo tbCompanyPerfVo); + + /** + * 公司业绩管理修改 + * @param + * @return + */ + void updateTbCompanyPerf(TbCompanyPerfVo tbCompanyPerfVo) throws Exception; + + /** + * 公司业绩管理删除 + * @param + * @return + */ + void delTbCompanyPerf(TbCompanyPerfVo tbCompanyPerfVo) throws Exception; +} diff --git a/search-tool/src/main/java/com/bonus/tool/service/TbOtherPeopleService.java b/search-tool/src/main/java/com/bonus/tool/service/TbOtherPeopleService.java index e27de65..5a726c9 100644 --- a/search-tool/src/main/java/com/bonus/tool/service/TbOtherPeopleService.java +++ b/search-tool/src/main/java/com/bonus/tool/service/TbOtherPeopleService.java @@ -1,6 +1,5 @@ package com.bonus.tool.service; -import com.bonus.tool.dto.TbKeyPeopleVo; import com.bonus.tool.dto.TbOtherPeopleVo; import java.util.List; diff --git a/search-tool/src/main/java/com/bonus/tool/service/TbSubPeopleService.java b/search-tool/src/main/java/com/bonus/tool/service/TbSubPeopleService.java new file mode 100644 index 0000000..c9ccd30 --- /dev/null +++ b/search-tool/src/main/java/com/bonus/tool/service/TbSubPeopleService.java @@ -0,0 +1,42 @@ +package com.bonus.tool.service; + +import com.bonus.tool.dto.TbSubPeopleVo; + +import java.util.List; + +public interface TbSubPeopleService { + /** + * 分包商人员信息列表查询 + * @param + * @return + */ + List getTbSubPeopleList(TbSubPeopleVo tbSubPeopleVo); + + /** + * 分包商人员信息详情 + * @param + * @return + */ + TbSubPeopleVo getTbSubPeopleById(TbSubPeopleVo tbSubPeopleVo); + + /** + * 分包商人员信息新增 + * @param + * @return + */ + void addTbSubPeople(TbSubPeopleVo tbSubPeopleVo); + + /** + * 分包商人员信息修改 + * @param + * @return + */ + void updateTbSubPeople(TbSubPeopleVo tbSubPeopleVo); + + /** + * 分包商人员信息删除 + * @param + * @return + */ + void delTbSubPeople(TbSubPeopleVo tbSubPeopleVo) throws Exception; +} diff --git a/search-tool/src/main/java/com/bonus/tool/service/TbSubService.java b/search-tool/src/main/java/com/bonus/tool/service/TbSubService.java new file mode 100644 index 0000000..d9b1f80 --- /dev/null +++ b/search-tool/src/main/java/com/bonus/tool/service/TbSubService.java @@ -0,0 +1,42 @@ +package com.bonus.tool.service; + +import com.bonus.tool.dto.TbSubVo; + +import java.util.List; + +public interface TbSubService { + /** + * 分包商列表查询 + * @param + * @return + */ + List getTbSubList(TbSubVo tbSubVo); + + /** + * 分包商详情 + * @param + * @return + */ + TbSubVo getTbSubById(TbSubVo tbSubVo); + + /** + * 分包商新增 + * @param + * @return + */ + void addTbSub(TbSubVo tbSubVo); + + /** + * 分包商修改 + * @param + * @return + */ + void updateTbSub(TbSubVo tbSubVo); + + /** + * 分包商删除 + * @param + * @return + */ + void delTbSub(TbSubVo tbSubVo) 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 new file mode 100644 index 0000000..b6d5a5f --- /dev/null +++ b/search-tool/src/main/java/com/bonus/tool/service/impl/TbCompanyPerfRelServiceImpl.java @@ -0,0 +1,64 @@ +package com.bonus.tool.service.impl; + +import com.bonus.common.enums.TableType; +import com.bonus.system.service.ISysFileService; +import com.bonus.tool.dto.TbCompanyPerfRelVo; +import com.bonus.tool.dto.TbFileSourceVo; +import com.bonus.tool.mapper.TbCompanyPerfRelMapper; +import com.bonus.tool.service.TbCompanyPerfRelService; +import com.bonus.tool.service.TbFileSourceService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @author 马三炮 + * @date 2025/4/23 + */ +@Service +@Slf4j +public class TbCompanyPerfRelServiceImpl implements TbCompanyPerfRelService { + + @Resource + private TbCompanyPerfRelMapper tbCompanyPerfRelMapper; + + + @Resource + private TbFileSourceService tbFileSourceService; + + @Resource + private ISysFileService iSysFileService; + + @Override + public List getTbCompanyPerRelByPerfId(Long perfId) { + List tbCompanyPerfRelList = tbCompanyPerfRelMapper.getTbCompanyPerRelByPerfId(perfId); + if (!tbCompanyPerfRelList.isEmpty()){ + for (TbCompanyPerfRelVo tbCompanyPerfRelVo:tbCompanyPerfRelList) { + //获取附件信息 + List tbFileSourceVoList = tbFileSourceService.getTbFileSourceList(tbCompanyPerfRelVo.getId(), TableType.TB_COMPANY_PERF_REL.getCode()); + tbCompanyPerfRelVo.setTbFileSourceVoList(tbFileSourceVoList); + } + } + return tbCompanyPerfRelList; + } + + @Override + @Transactional + public void addTbCompanyPerRelList(List tbCompanyPerfRelList, Long perfId) { + for (TbCompanyPerfRelVo tbCompanyPerfRelVo:tbCompanyPerfRelList) { + tbCompanyPerfRelVo.setPerfId(perfId); + tbCompanyPerfRelMapper.addTbCompanyPerRel(tbCompanyPerfRelVo); + //保存附件信息 + tbFileSourceService.addTbFileSource(tbCompanyPerfRelVo.getTbFileSourceVoList(),tbCompanyPerfRelVo.getId(), TableType.TB_COMPANY_PERF_REL.getCode()); + } + } + + @Override + public void delTbCompanyPerRelByPerfId(Long perfId) throws Exception { + //获取公司业绩下的关键人员信息 + tbCompanyPerfRelMapper.delTbCompanyPerRelByPerfId(perfId); + } +} 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 new file mode 100644 index 0000000..21bb96d --- /dev/null +++ b/search-tool/src/main/java/com/bonus/tool/service/impl/TbCompanyPerfServiceImpl.java @@ -0,0 +1,152 @@ +package com.bonus.tool.service.impl; + +import com.bonus.common.enums.TableType; +import com.bonus.common.exception.ServiceException; +import com.bonus.common.utils.SecurityUtils; +import com.bonus.common.utils.StringUtils; +import com.bonus.system.service.ISysFileService; +import com.bonus.tool.dto.TbCompanyPerfRelVo; +import com.bonus.tool.dto.TbCompanyPerfVo; +import com.bonus.tool.dto.TbFileSourceVo; +import com.bonus.tool.mapper.TbCompanyPerfMapper; +import com.bonus.tool.service.TbCompanyPerfRelService; +import com.bonus.tool.service.TbCompanyPerfService; +import com.bonus.tool.service.TbFileSourceService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; + +/** + * @author 马三炮 + * @date 2025/4/23 + */ +@Service +@Slf4j +public class TbCompanyPerfServiceImpl implements TbCompanyPerfService { + + @Resource + private TbCompanyPerfMapper tbCompanyPerfMapper; + + @Resource + private TbCompanyPerfRelService tbCompanyPerfRelService; + + @Resource + private TbFileSourceService tbFileSourceService; + + @Resource + private ISysFileService iSysFileService; + + /** + * 公司业绩管理列表查询 + * @param + * @return + */ + @Override + public List getTbCompanyPerfList(TbCompanyPerfVo tbCompanyPerfVo) { + //获取公司业绩列表 + List tbCompanyPerfList = tbCompanyPerfMapper.getTbCompanyPerfList(tbCompanyPerfVo); + if(!tbCompanyPerfList.isEmpty()){ + for (TbCompanyPerfVo tbCompanyPerf:tbCompanyPerfList) { + //获取项目关键人员信息 + List tbCompanyPerfRelList = tbCompanyPerfRelService.getTbCompanyPerRelByPerfId(tbCompanyPerf.getId()); + tbCompanyPerf.setTbCompanyPerfRelList(tbCompanyPerfRelList); + //获取附件信息 + List tbFileSourceVoList = tbFileSourceService.getTbFileSourceList(tbCompanyPerf.getId(), TableType.TB_COMPANY_PERF.getCode()); + tbCompanyPerf.setTbFileSourceVoList(tbFileSourceVoList); + } + } + return tbCompanyPerfList; + } + + /** + * 公司业绩管理详情 + * @param + * @return + */ + @Override + public TbCompanyPerfVo getTbCompanyPerfById(TbCompanyPerfVo tbCompanyPerfVo) { + TbCompanyPerfVo tbCompanyPerf = tbCompanyPerfMapper.getTbCompanyPerfById(tbCompanyPerfVo); + //获取项目关键人员信息 + List tbCompanyPerfRelList = tbCompanyPerfRelService.getTbCompanyPerRelByPerfId(tbCompanyPerf.getId()); + tbCompanyPerf.setTbCompanyPerfRelList(tbCompanyPerfRelList); + //获取附件信息 + List tbFileSourceVoList = tbFileSourceService.getTbFileSourceList(tbCompanyPerf.getId(), TableType.TB_COMPANY_PERF.getCode()); + tbCompanyPerf.setTbFileSourceVoList(tbFileSourceVoList); + return tbCompanyPerf; + } + + /** + * 公司业绩管理新增 + * @param + * @return + */ + @Override + @Transactional + public void addTbCompanyPerf(TbCompanyPerfVo tbCompanyPerfVo) { + TbCompanyPerfVo tbCompanyPerfOld = tbCompanyPerfMapper.getTbCompanyPerfByProName(tbCompanyPerfVo); + if (StringUtils.isNotNull(tbCompanyPerfOld)){ + throw new ServiceException("工程已存在"); + } + tbCompanyPerfVo.setCreateUser(SecurityUtils.getLoginUser().getUsername()); + tbCompanyPerfVo.setCreateTime(new Date()); + tbCompanyPerfMapper.addTbCompanyPerf(tbCompanyPerfVo); + tbFileSourceService.addTbFileSource(tbCompanyPerfVo.getTbFileSourceVoList(),tbCompanyPerfVo.getId(), TableType.TB_COMPANY_PERF.getCode()); + //保存关键人信息 + tbCompanyPerfRelService.addTbCompanyPerRelList(tbCompanyPerfVo.getTbCompanyPerfRelList(),tbCompanyPerfVo.getId()); + } + + /** + * 公司业绩管理修改 + * @param + * @return + */ + @Override + @Transactional + public void updateTbCompanyPerf(TbCompanyPerfVo tbCompanyPerfVo) { + try { + TbCompanyPerfVo tbCompanyPerfOld = tbCompanyPerfMapper.getTbCompanyPerfByProName(tbCompanyPerfVo); + if (StringUtils.isNotNull(tbCompanyPerfOld) && !tbCompanyPerfOld.getId().equals(tbCompanyPerfVo.getId()) ){ + throw new ServiceException("工程已存在"); + } + tbCompanyPerfMapper.updateTbCompanyPerf(tbCompanyPerfVo); + 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.addTbCompanyPerRelList(tbCompanyPerfVo.getTbCompanyPerfRelList(),tbCompanyPerfVo.getId()); + }catch (Exception e){ + log.error("公司业绩管理修改失败{}",e.getMessage()); + throw new ServiceException(e.getMessage()); + } + + } + + /** + * 公司业绩管理删除 + * @param + * @return + */ + @Override + @Transactional + public void delTbCompanyPerf(TbCompanyPerfVo tbCompanyPerfVo) throws Exception { + //公司业绩管理删除 + tbCompanyPerfMapper.delTbCompanyPerf(tbCompanyPerfVo); + //获取公司业绩管理附件 + List tbFileSourceVoList = tbFileSourceService.getTbFileSourceList(tbCompanyPerfVo.getId(),TableType.TB_COMPANY_PERF.getCode()); + //删除服务器图片 + if (!tbFileSourceVoList.isEmpty()){ + for (TbFileSourceVo tbFileSource:tbFileSourceVoList) { + iSysFileService.deleteFile(tbFileSource.getFilePath()); + } + } + //删除附件信息 + tbFileSourceService.delTbFileSource(tbCompanyPerfVo.getId(),TableType.TB_COMPANY_PERF.getCode()); + //删除关键人信息 + tbCompanyPerfRelService.delTbCompanyPerRelByPerfId(tbCompanyPerfVo.getId()); + } +} diff --git a/search-tool/src/main/java/com/bonus/tool/service/impl/TbKeyPeopleServiceImpl.java b/search-tool/src/main/java/com/bonus/tool/service/impl/TbKeyPeopleServiceImpl.java index cc053ff..304014b 100644 --- a/search-tool/src/main/java/com/bonus/tool/service/impl/TbKeyPeopleServiceImpl.java +++ b/search-tool/src/main/java/com/bonus/tool/service/impl/TbKeyPeopleServiceImpl.java @@ -2,6 +2,7 @@ package com.bonus.tool.service.impl; import com.bonus.common.enums.TableType; +import com.bonus.common.exception.ServiceException; import com.bonus.common.utils.SecurityUtils; import com.bonus.common.utils.StringUtils; import com.bonus.system.service.ISysFileService; @@ -78,7 +79,7 @@ public class TbKeyPeopleServiceImpl implements TbKeyPeopleServcie { public void addTbKeyPeople(TbKeyPeopleVo tbKeyPeopleVo) { TbKeyPeopleVo tbKeyPeopleOld = tbKeyPeopleMapper.getTbKeyPeopleByIdCard(tbKeyPeopleVo); if (StringUtils.isNotNull(tbKeyPeopleOld)){ - throw new RuntimeException("身份证已存在"); + throw new ServiceException("身份证已存在"); } tbKeyPeopleVo.setCreateUser(SecurityUtils.getLoginUser().getUsername()); tbKeyPeopleVo.setCreateTime(new Date()); @@ -94,6 +95,10 @@ public class TbKeyPeopleServiceImpl implements TbKeyPeopleServcie { @Override @Transactional public void updateTbKeyPeople(TbKeyPeopleVo tbKeyPeopleVo) { + TbKeyPeopleVo tbKeyPeopleOld = tbKeyPeopleMapper.getTbKeyPeopleByIdCard(tbKeyPeopleVo); + if (StringUtils.isNotNull(tbKeyPeopleOld)){ + throw new ServiceException("身份证已存在"); + } tbKeyPeopleVo.setUpdateUser(SecurityUtils.getLoginUser().getUsername()); tbKeyPeopleMapper.updateTbKeyPeople(tbKeyPeopleVo); tbFileSourceService.delTbFileSource(tbKeyPeopleVo.getId(),TableType.TB_KEY_PEOPLE.getCode()); @@ -108,8 +113,6 @@ public class TbKeyPeopleServiceImpl implements TbKeyPeopleServcie { @Transactional public void delTbKeyPeople(TbKeyPeopleVo tbKeyPeopleVo) throws Exception { tbKeyPeopleMapper.delTbKeyPeople(tbKeyPeopleVo); - tbFileSourceService.delTbFileSource(tbKeyPeopleVo.getId(),TableType.TB_KEY_PEOPLE.getCode()); - //获取人员附件 List tbFileSourceVoList = tbFileSourceService.getTbFileSourceList(tbKeyPeopleVo.getId(),TableType.TB_KEY_PEOPLE.getCode()); //删除服务器图片 @@ -118,5 +121,7 @@ public class TbKeyPeopleServiceImpl implements TbKeyPeopleServcie { iSysFileService.deleteFile(TbFileSource.getFilePath()); } } + //删除附件信息表中信息 + tbFileSourceService.delTbFileSource(tbKeyPeopleVo.getId(),TableType.TB_KEY_PEOPLE.getCode()); } } diff --git a/search-tool/src/main/java/com/bonus/tool/service/impl/TbOtherPeopleServiceImpl.java b/search-tool/src/main/java/com/bonus/tool/service/impl/TbOtherPeopleServiceImpl.java index e53742d..554943e 100644 --- a/search-tool/src/main/java/com/bonus/tool/service/impl/TbOtherPeopleServiceImpl.java +++ b/search-tool/src/main/java/com/bonus/tool/service/impl/TbOtherPeopleServiceImpl.java @@ -1,11 +1,11 @@ package com.bonus.tool.service.impl; import com.bonus.common.enums.TableType; +import com.bonus.common.exception.ServiceException; import com.bonus.common.utils.SecurityUtils; import com.bonus.common.utils.StringUtils; import com.bonus.system.service.ISysFileService; import com.bonus.tool.dto.TbFileSourceVo; -import com.bonus.tool.dto.TbKeyPeopleVo; import com.bonus.tool.dto.TbOtherPeopleVo; import com.bonus.tool.mapper.TbOtherPeopleMapper; import com.bonus.tool.service.TbFileSourceService; @@ -78,7 +78,7 @@ public class TbOtherPeopleServiceImpl implements TbOtherPeopleService { public void addTbOtherPeople(TbOtherPeopleVo tbOtherPeopleVo) { TbOtherPeopleVo tbOtherPeopleOld = tbOtherPeopleMapper.getTbOtherPeopleByIdCard(tbOtherPeopleVo); if (StringUtils.isNotNull(tbOtherPeopleOld)){ - throw new RuntimeException("身份证已存在"); + throw new ServiceException("身份证已存在"); } tbOtherPeopleVo.setCreateUser(SecurityUtils.getLoginUser().getUsername()); tbOtherPeopleVo.setCreateTime(new Date()); @@ -87,9 +87,18 @@ public class TbOtherPeopleServiceImpl implements TbOtherPeopleService { } + /** + * 其他人员修改 + * @param + * @return + */ @Override @Transactional public void updateTbOtherPeople(TbOtherPeopleVo tbOtherPeopleVo) { + TbOtherPeopleVo tbOtherPeopleOld = tbOtherPeopleMapper.getTbOtherPeopleByIdCard(tbOtherPeopleVo); + if (StringUtils.isNotNull(tbOtherPeopleOld)){ + throw new ServiceException("身份证已存在"); + } tbOtherPeopleVo.setUpdateUser(SecurityUtils.getLoginUser().getUsername()); tbOtherPeopleMapper.updateTbOtherPeople(tbOtherPeopleVo); tbFileSourceService.delTbFileSource(tbOtherPeopleVo.getId(),TableType.TB_OTHER_PEOPLE.getCode()); @@ -106,8 +115,6 @@ public class TbOtherPeopleServiceImpl implements TbOtherPeopleService { @Transactional public void delTbOtherPeople(TbOtherPeopleVo tbOtherPeopleVo) throws Exception { tbOtherPeopleMapper.delTbOtherPeople(tbOtherPeopleVo); - tbFileSourceService.delTbFileSource(tbOtherPeopleVo.getId(),TableType.TB_OTHER_PEOPLE.getCode()); - //获取人员附件 List tbFileSourceVoList = tbFileSourceService.getTbFileSourceList(tbOtherPeopleVo.getId(),TableType.TB_OTHER_PEOPLE.getCode()); //删除服务器图片 @@ -116,5 +123,7 @@ public class TbOtherPeopleServiceImpl implements TbOtherPeopleService { iSysFileService.deleteFile(tbFileSource.getFilePath()); } } + //删除附件信息表中信息 + tbFileSourceService.delTbFileSource(tbOtherPeopleVo.getId(),TableType.TB_OTHER_PEOPLE.getCode()); } } diff --git a/search-tool/src/main/java/com/bonus/tool/service/impl/TbSubPeopleServiceImpl.java b/search-tool/src/main/java/com/bonus/tool/service/impl/TbSubPeopleServiceImpl.java new file mode 100644 index 0000000..72bd5bb --- /dev/null +++ b/search-tool/src/main/java/com/bonus/tool/service/impl/TbSubPeopleServiceImpl.java @@ -0,0 +1,128 @@ +package com.bonus.tool.service.impl; + +import com.bonus.common.enums.TableType; +import com.bonus.common.exception.ServiceException; +import com.bonus.common.utils.SecurityUtils; +import com.bonus.common.utils.StringUtils; +import com.bonus.system.service.ISysFileService; +import com.bonus.tool.dto.TbFileSourceVo; +import com.bonus.tool.dto.TbSubPeopleVo; +import com.bonus.tool.mapper.TbSubPeopleMapper; +import com.bonus.tool.service.TbFileSourceService; +import com.bonus.tool.service.TbSubPeopleService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; + +/** + * @author 马三炮 + * @date 2025/4/23 + */ +@Service +@Slf4j +public class TbSubPeopleServiceImpl implements TbSubPeopleService { + + @Resource + private TbSubPeopleMapper tbSubPeopleMapper; + + @Resource + private TbFileSourceService tbFileSourceService; + + @Resource + private ISysFileService iSysFileService; + + /** + * 分包商人员信息列表查询 + * @param + * @return + */ + @Override + public List getTbSubPeopleList(TbSubPeopleVo tbSubPeopleVo) { + //获取人员信息列表 + List tbSubPeopleList = tbSubPeopleMapper.getTbSubPeopleList(tbSubPeopleVo); + if (tbSubPeopleList.size()>0){ + for (TbSubPeopleVo tbSubPeople: tbSubPeopleList) { + //获取人员附件 + List tbFileSourceVoList = tbFileSourceService.getTbFileSourceList(tbSubPeople.getId(), TableType.TB_SUB_PEOPLE.getCode()); + tbSubPeople.setTbFileSourceVoList(tbFileSourceVoList); + } + } + return tbSubPeopleList; + } + + /** + * 分包商人员信息详情 + * @param + * @return + */ + @Override + public TbSubPeopleVo getTbSubPeopleById(TbSubPeopleVo tbSubPeopleVo) { + TbSubPeopleVo tbSubPeople = tbSubPeopleMapper.getTbSubPeopleById(tbSubPeopleVo); + //获取人员附件 + List tbFileSourceVoList = tbFileSourceService.getTbFileSourceList(tbSubPeople.getId(), TableType.TB_SUB_PEOPLE.getCode()); + tbSubPeople.setTbFileSourceVoList(tbFileSourceVoList); + return tbSubPeople; + } + + /** + * 分包商人员信息新增 + * @param + * @return + */ + @Override + @Transactional + public void addTbSubPeople(TbSubPeopleVo tbSubPeopleVo) { + TbSubPeopleVo tbSubPeopleOld = tbSubPeopleMapper.getTbSubByIdCard(tbSubPeopleVo); + if (StringUtils.isNotNull(tbSubPeopleOld)){ + throw new ServiceException("身份证号码已存在"); + } + tbSubPeopleVo.setCreateUser(SecurityUtils.getLoginUser().getUsername()); + tbSubPeopleVo.setCreateTime(new Date()); + tbSubPeopleMapper.addTbSub(tbSubPeopleVo); + tbFileSourceService.addTbFileSource(tbSubPeopleVo.getTbFileSourceVoList(),tbSubPeopleVo.getId(), TableType.TB_SUB_PEOPLE.getCode()); + + } + + /** + * 分包商人员信息修改 + * @param + * @return + */ + @Override + @Transactional + public void updateTbSubPeople(TbSubPeopleVo tbSubPeopleVo) { + TbSubPeopleVo tbSubPeopleOld = tbSubPeopleMapper.getTbSubByIdCard(tbSubPeopleVo); + if (StringUtils.isNotNull(tbSubPeopleOld)){ + throw new ServiceException("身份证号码已存在"); + } + tbSubPeopleVo.setUpdateUser(SecurityUtils.getLoginUser().getUsername()); + tbSubPeopleMapper.updateTbSubPeople(tbSubPeopleVo); + tbFileSourceService.delTbFileSource(tbSubPeopleVo.getId(),TableType.TB_SUB_PEOPLE.getCode()); + tbFileSourceService.addTbFileSource(tbSubPeopleVo.getTbFileSourceVoList(),tbSubPeopleVo.getId(),TableType.TB_SUB_PEOPLE.getCode()); + } + + /** + * 分包商人员信息删除 + * @param + * @return + */ + @Override + @Transactional + public void delTbSubPeople(TbSubPeopleVo tbSubPeopleVo) throws Exception { + tbSubPeopleMapper.delTbSubPeople(tbSubPeopleVo); + //获取人员附件 + List tbFileSourceVoList = tbFileSourceService.getTbFileSourceList(tbSubPeopleVo.getId(),TableType.TB_SUB_PEOPLE.getCode()); + //删除服务器图片 + if (tbFileSourceVoList.size()>0){ + for (TbFileSourceVo tbFileSource:tbFileSourceVoList) { + iSysFileService.deleteFile(tbFileSource.getFilePath()); + } + } + //删除附件信息表中信息 + tbFileSourceService.delTbFileSource(tbSubPeopleVo.getId(),TableType.TB_SUB_PEOPLE.getCode()); + } +} diff --git a/search-tool/src/main/java/com/bonus/tool/service/impl/TbSubServiceImpl.java b/search-tool/src/main/java/com/bonus/tool/service/impl/TbSubServiceImpl.java new file mode 100644 index 0000000..398efb7 --- /dev/null +++ b/search-tool/src/main/java/com/bonus/tool/service/impl/TbSubServiceImpl.java @@ -0,0 +1,130 @@ +package com.bonus.tool.service.impl; + +import com.bonus.common.enums.TableType; +import com.bonus.common.exception.ServiceException; +import com.bonus.common.utils.SecurityUtils; +import com.bonus.common.utils.StringUtils; +import com.bonus.system.service.ISysFileService; +import com.bonus.tool.dto.TbFileSourceVo; +import com.bonus.tool.dto.TbSubVo; +import com.bonus.tool.mapper.TbSubMapper; +import com.bonus.tool.service.TbFileSourceService; +import com.bonus.tool.service.TbSubService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; + +/** + * @author 马三炮 + * @date 2025/4/23 + */ +@Service +@Slf4j +public class TbSubServiceImpl implements TbSubService { + + @Resource + private TbSubMapper tbSubMapper; + + @Resource + private TbFileSourceService tbFileSourceService; + + @Resource + private ISysFileService iSysFileService; + + + /** + * 分包商列表查询 + * @param + * @return + */ + @Override + public List getTbSubList(TbSubVo tbSubVo) { + //获取人员信息列表 + List tbSubVoList = tbSubMapper.getTbSubList(tbSubVo); + if (tbSubVoList.size()>0){ + for (TbSubVo tbSub: tbSubVoList) { + //获取人员附件 + List tbFileSourceVoList = tbFileSourceService.getTbFileSourceList(tbSub.getId(), TableType.TB_SUB.getCode()); + tbSub.setTbFileSourceVoList(tbFileSourceVoList); + } + } + return tbSubVoList; + } + + /** + * 分包商详情 + * @param + * @return + */ + @Override + public TbSubVo getTbSubById(TbSubVo tbSubVo) { + TbSubVo tbSub = tbSubMapper.getTbSubById(tbSubVo); + //获取人员附件 + List tbFileSourceVoList = tbFileSourceService.getTbFileSourceList(tbSub.getId(), TableType.TB_SUB.getCode()); + tbSub.setTbFileSourceVoList(tbFileSourceVoList); + return tbSub; + } + + /** + * 分包商新增 + * @param + * @return + */ + @Override + @Transactional + public void addTbSub(TbSubVo tbSubVo) { + TbSubVo tbSubOld = tbSubMapper.getTbSubBySubName(tbSubVo); + if (StringUtils.isNotNull(tbSubOld)){ + throw new ServiceException("分包商名称已存在"); + } + tbSubVo.setCreateUser(SecurityUtils.getLoginUser().getUsername()); + tbSubVo.setCreateTime(new Date()); + tbSubMapper.addTbSub(tbSubVo); + tbFileSourceService.addTbFileSource(tbSubVo.getTbFileSourceVoList(),tbSubVo.getId(), TableType.TB_SUB.getCode()); + + } + + /** + * 分包商修改 + * @param + * @return + */ + @Override + @Transactional + public void updateTbSub(TbSubVo tbSubVo) { + TbSubVo tbSubOld = tbSubMapper.getTbSubBySubName(tbSubVo); + if (StringUtils.isNotNull(tbSubOld)){ + throw new ServiceException("分包商名称已存在"); + } + tbSubVo.setUpdateUser(SecurityUtils.getLoginUser().getUsername()); + tbSubMapper.updateTbSub(tbSubVo); + tbFileSourceService.delTbFileSource(tbSubVo.getId(),TableType.TB_SUB.getCode()); + tbFileSourceService.addTbFileSource(tbSubVo.getTbFileSourceVoList(),tbSubVo.getId(),TableType.TB_SUB.getCode()); + + } + + /** + * 分包商删除 + * @param + * @return + */ + @Override + @Transactional + public void delTbSub(TbSubVo tbSubVo) throws Exception { + tbSubMapper.delTbSub(tbSubVo); + //获取人员附件 + List tbFileSourceVoList = tbFileSourceService.getTbFileSourceList(tbSubVo.getId(),TableType.TB_SUB.getCode()); + //删除服务器图片 + if (tbFileSourceVoList.size()>0){ + for (TbFileSourceVo tbFileSource:tbFileSourceVoList) { + iSysFileService.deleteFile(tbFileSource.getFilePath()); + } + } + //删除附件信息表中信息 + tbFileSourceService.delTbFileSource(tbSubVo.getId(),TableType.TB_SUB.getCode()); + } +} diff --git a/search-tool/src/main/resources/mapper/TbCompanyPerfMapper.xml b/search-tool/src/main/resources/mapper/TbCompanyPerfMapper.xml new file mode 100644 index 0000000..d1058c7 --- /dev/null +++ b/search-tool/src/main/resources/mapper/TbCompanyPerfMapper.xml @@ -0,0 +1,79 @@ + + + + + insert into tb_company_perf + + pro_name, + voltage, + start_time, + end_time, + stop_time, + station_num, + line_scale, + contract_rang, + owner_unit, + owner_phone, + create_time, + create_user, + del_flag + + + #{proName}, + #{voltage}, + #{startTime}, + #{endTime}, + #{stopTime}, + #{stationNum}, + #{lineScale}, + #{contractRang}, + #{ownerUnit}, + #{ownerPhone}, + #{createTime}, + #{createUser}, + 0 + + + + update tb_company_perf + + pro_name = #{proName}, + voltage = #{voltage}, + start_time = #{startTime}, + end_time = #{endTime}, + stop_time = #{stopTime}, + station_num = #{stationNum}, + line_scale = #{lineScale}, + contract_rang = #{contractRang}, + owner_unit = #{ownerUnit}, + owner_phone = #{ownerPhone}, + update_time = now() + + where id = #{id} + + + update tb_company_perf set del_flag=1 where id = #{id} + + + + + + diff --git a/search-tool/src/main/resources/mapper/TbCompanyPerfRelMapper.xml b/search-tool/src/main/resources/mapper/TbCompanyPerfRelMapper.xml new file mode 100644 index 0000000..ecd56f9 --- /dev/null +++ b/search-tool/src/main/resources/mapper/TbCompanyPerfRelMapper.xml @@ -0,0 +1,32 @@ + + + + + insert into tb_company_perf_rel + + title, + work_content, + key_user, + perf_id, + + + #{title}, + #{workContent}, + #{keyUser}, + #{perfId}, + + + + delete from tb_company_perf_rel where perf_id = #{perfId} + + + + + diff --git a/search-tool/src/main/resources/mapper/TbKeyPeopleMapper.xml b/search-tool/src/main/resources/mapper/TbKeyPeopleMapper.xml index 11cf968..049aa1e 100644 --- a/search-tool/src/main/resources/mapper/TbKeyPeopleMapper.xml +++ b/search-tool/src/main/resources/mapper/TbKeyPeopleMapper.xml @@ -88,6 +88,6 @@ diff --git a/search-tool/src/main/resources/mapper/TbOtherPeopleMapper.xml b/search-tool/src/main/resources/mapper/TbOtherPeopleMapper.xml index 32d1efe..8023b55 100644 --- a/search-tool/src/main/resources/mapper/TbOtherPeopleMapper.xml +++ b/search-tool/src/main/resources/mapper/TbOtherPeopleMapper.xml @@ -82,6 +82,6 @@ diff --git a/search-tool/src/main/resources/mapper/TbSubMapper.xml b/search-tool/src/main/resources/mapper/TbSubMapper.xml new file mode 100644 index 0000000..b9fc1e0 --- /dev/null +++ b/search-tool/src/main/resources/mapper/TbSubMapper.xml @@ -0,0 +1,55 @@ + + + + + insert into tb_sub + + sub_name, + address, + user_name, + user_phone, + create_time, + create_user, + del_flag + + + #{subName}, + #{address}, + #{userName}, + #{userPhone}, + #{createTime}, + #{createUser}, + 0 + + + + update tb_sub + + sub_name = #{subName}, + address = #{address}, + user_name = #{userName}, + user_phone = #{userPhone}, + update_user = #{updateUser}, + update_time = now() + + where id = #{id} + + + update tb_sub set del_flag = 1 where id =#{id} + + + + + + diff --git a/search-tool/src/main/resources/mapper/TbSubPeopleMapper.xml b/search-tool/src/main/resources/mapper/TbSubPeopleMapper.xml new file mode 100644 index 0000000..a38596e --- /dev/null +++ b/search-tool/src/main/resources/mapper/TbSubPeopleMapper.xml @@ -0,0 +1,66 @@ + + + + + insert into tb_sub + + user_name, + id_card, + title, + diploma, + diploma_num, + create_time, + create_user, + sub_id, + del_flag + + + #{userName}, + #{idCard}, + #{title}, + #{diploma}, + #{diplomaNum}, + #{createTime}, + #{createUser}, + #{subId}, + 0 + + + + update tb_sub_people + + user_name = #{userName}, + id_card = #{idCard}, + title = #{title}, + diploma = #{diploma}, + diploma_num = #{diplomaNum}, + sub_id = #{subId}, + update_user = #{updateUser}, + update_time = now() + + where id = #{id} + + + update tb_sub_people set del_flag = 1 where id = #{id} + + + + + +