From 8f5b72605efde657a900312bf982175f51af4f68 Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Mon, 14 Aug 2023 14:12:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=95=E8=B5=84=E6=94=AF=E4=BB=98=E7=BC=96?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GovInvestmentApplyController.java | 25 +++++++++++++++++++ .../GovInvestmentPaymentController.java | 5 ++-- .../GovInvestmentPaymentDetailController.java | 24 ++++++++++++++++++ .../GovInvestmentPaymentItemController.java | 25 +++++++++++++++++++ .../GovInvestmentPaymentStatController.java | 25 +++++++++++++++++++ .../project/InvestmentApplyController.java | 1 - .../safety/dto/InvestmentPaymentDto.java | 16 ++++++++++++ .../service/IInvestmentPaymentService.java | 5 ++++ .../impl/InspectRecordServiceImpl.java | 1 + .../impl/InvestmentPaymentServiceImpl.java | 18 +++++++++++++ 10 files changed, 142 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/zhgd/xmgl/modules/safety/dto/InvestmentPaymentDto.java diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentApplyController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentApplyController.java index a7ce988..f589942 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentApplyController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentApplyController.java @@ -154,4 +154,29 @@ public class GovInvestmentApplyController { } return result; } + + /** + * 编辑 + * + * @param investmentApply + * @return + */ + @OperLog(operModul = "投资支付申报管理", operType = "修改", operDesc = "编辑投资支付申报信息") + @ApiOperation(value = "编辑投资支付申报信息", notes = "编辑投资支付申报信息", httpMethod = "POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody InvestmentApply investmentApply) { + Result result = new Result(); + InvestmentApply investmentApplyEntity = investmentApplyService.getById(investmentApply.getId()); + if (investmentApplyEntity == null) { + result.error500("未找到对应实体"); + } else { + boolean ok = investmentApplyService.updateById(investmentApply); + if (ok) { + result.success("修改成功!"); + } else { + result.success("操作失败!"); + } + } + return result; + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentPaymentController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentPaymentController.java index 71841f9..ae5c6ad 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentPaymentController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentPaymentController.java @@ -7,6 +7,7 @@ import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.PageUtil; +import com.zhgd.xmgl.modules.safety.dto.InvestmentPaymentDto; import com.zhgd.xmgl.modules.safety.entity.InvestmentPayment; import com.zhgd.xmgl.modules.safety.service.IInvestmentPaymentService; import com.zhgd.xmgl.modules.safety.vo.InvestmentPaymentVo; @@ -58,10 +59,10 @@ public class GovInvestmentPaymentController { @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "body", required = true, defaultValue = "10", dataType = "Integer") }) @PostMapping(value = "/page") - public Result> queryPageList(@ApiIgnore @RequestBody Map map) { + public Result> queryPageList(@ApiIgnore @RequestBody Map map) { QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(InvestmentPayment.class, map); Page page = PageUtil.getPage(map); - IPage pageList = investmentPaymentService.page(page, queryWrapper); + IPage pageList = investmentPaymentService.pageList(page, queryWrapper); return Result.success(pageList); } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentPaymentDetailController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentPaymentDetailController.java index a1eca17..5d4d7b3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentPaymentDetailController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentPaymentDetailController.java @@ -98,4 +98,28 @@ public class GovInvestmentPaymentDetailController { return result; } + /** + * 编辑 + * + * @param investmentPaymentDetail + * @return + */ + @OperLog(operModul = "投资支付子项详细管理", operType = "修改", operDesc = "编辑投资支付子项详细信息") + @ApiOperation(value = "编辑投资支付子项详细信息", notes = "编辑投资支付子项详细信息", httpMethod = "POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody InvestmentPaymentDetail investmentPaymentDetail) { + Result result = new Result(); + InvestmentPaymentDetail investmentPaymentDetailEntity = investmentPaymentDetailService.getById(investmentPaymentDetail.getId()); + if (investmentPaymentDetailEntity == null) { + result.error500("未找到对应实体"); + } else { + boolean ok = investmentPaymentDetailService.updateById(investmentPaymentDetail); + if (ok) { + result.success("修改成功!"); + } else { + result.success("操作失败!"); + } + } + return result; + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentPaymentItemController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentPaymentItemController.java index f4fff97..d4ce4f1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentPaymentItemController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentPaymentItemController.java @@ -97,4 +97,29 @@ public class GovInvestmentPaymentItemController { } return result; } + + /** + * 编辑 + * + * @param investmentPaymentItem + * @return + */ + @OperLog(operModul = "投资支付子项管理", operType = "修改", operDesc = "编辑投资支付子项信息") + @ApiOperation(value = "编辑投资支付子项信息", notes = "编辑投资支付子项信息", httpMethod = "POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody InvestmentPaymentItem investmentPaymentItem) { + Result result = new Result(); + InvestmentPaymentItem investmentPaymentItemEntity = investmentPaymentItemService.getById(investmentPaymentItem.getId()); + if (investmentPaymentItemEntity == null) { + result.error500("未找到对应实体"); + } else { + boolean ok = investmentPaymentItemService.updateById(investmentPaymentItem); + if (ok) { + result.success("修改成功!"); + } else { + result.success("操作失败!"); + } + } + return result; + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentPaymentStatController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentPaymentStatController.java index 80b7d6a..d31739c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentPaymentStatController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentPaymentStatController.java @@ -74,4 +74,29 @@ public class GovInvestmentPaymentStatController { } return result; } + + /** + * 编辑 + * + * @param investmentPaymentStat + * @return + */ + @OperLog(operModul = "投资支付统计管理", operType = "修改", operDesc = "编辑投资支付统计信息") + @ApiOperation(value = "编辑投资支付统计信息", notes = "编辑投资支付统计信息", httpMethod = "POST") + @PostMapping(value = "/edit") + public Result edit(@RequestBody InvestmentPaymentStat investmentPaymentStat) { + Result result = new Result(); + InvestmentPaymentStat investmentPaymentStatEntity = investmentPaymentStatService.getById(investmentPaymentStat.getId()); + if (investmentPaymentStatEntity == null) { + result.error500("未找到对应实体"); + } else { + boolean ok = investmentPaymentStatService.updateById(investmentPaymentStat); + if (ok) { + result.success("修改成功!"); + } else { + result.success("操作失败!"); + } + } + return result; + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/InvestmentApplyController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/InvestmentApplyController.java index bc50d5c..d574ee7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/InvestmentApplyController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/InvestmentApplyController.java @@ -115,7 +115,6 @@ public class InvestmentApplyController { result.success("操作失败!"); } } - return result; } diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/dto/InvestmentPaymentDto.java b/src/main/java/com/zhgd/xmgl/modules/safety/dto/InvestmentPaymentDto.java new file mode 100644 index 0000000..46ca26e --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/safety/dto/InvestmentPaymentDto.java @@ -0,0 +1,16 @@ +package com.zhgd.xmgl.modules.safety.dto; + +import com.zhgd.xmgl.modules.safety.entity.InvestmentPayment; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +@ApiModel(value = "投资支付支付记录信息(DTO)", description = "InvestmentPaymentDto") +public class InvestmentPaymentDto extends InvestmentPayment { + + @ApiModelProperty(value="申报列表") + private List applyIdList; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/IInvestmentPaymentService.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/IInvestmentPaymentService.java index 93b0f2b..eeb6c93 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/IInvestmentPaymentService.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/IInvestmentPaymentService.java @@ -1,6 +1,9 @@ package com.zhgd.xmgl.modules.safety.service; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.zhgd.xmgl.modules.safety.dto.InvestmentPaymentDto; import com.zhgd.xmgl.modules.safety.entity.InvestmentPayment; import com.zhgd.xmgl.modules.safety.vo.InvestmentPaymentVo; @@ -12,6 +15,8 @@ import com.zhgd.xmgl.modules.safety.vo.InvestmentPaymentVo; */ public interface IInvestmentPaymentService extends IService { + Page pageList(Page page, Wrapper wrapper); + Long saveInfo(InvestmentPaymentVo investmentPaymentVo); boolean updateInfo(InvestmentPaymentVo investmentPaymentVo); diff --git a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectRecordServiceImpl.java index 468532c..ae449cf 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InspectRecordServiceImpl.java @@ -238,6 +238,7 @@ public class InspectRecordServiceImpl extends ServiceImpl pageList(Page page, Wrapper wrapper) { + Page investmentPaymentVoPage = PageUtil.copyProperties(baseMapper.selectPage(page, wrapper), InvestmentPaymentDto.class); + List investmentIds = investmentPaymentVoPage.getRecords().stream().map(i -> i.getId()).collect(Collectors.toList()); + if (investmentIds.size() > 0) { + List investmentApplyList = investmentApplyService.list(Wrappers.lambdaQuery().in(InvestmentApply::getInvestmentPaymentId, investmentIds)) + .stream().map(InvestmentApply::getInvestmentPaymentId).collect(Collectors.toList()); + for (InvestmentPaymentDto investmentApply : investmentPaymentVoPage.getRecords()) { + investmentApply.setApplyIdList(investmentApplyList.stream().filter(i -> i.equals(investmentApply.getId())).collect(Collectors.toList())); + } + } + return investmentPaymentVoPage; + } + @Override public Long saveInfo(InvestmentPaymentVo investmentPaymentVo) { if (StringUtils.isNotBlank(investmentPaymentVo.getEngineeringSn())) {