From ffd7cb75037ec12f7544b2cd6a7631a919153ebe Mon Sep 17 00:00:00 2001 From: zhuyulei Date: Wed, 25 Oct 2023 13:59:28 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BB=BA=E8=AE=AE=E4=B9=A6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BsSgcjsjdBuiProInfoController.java | 49 +++++++++++++++++++ .../kms/build/domain/BsSgcjsjdBuiProInfo.java | 15 ++++-- .../SpecialProjectProposalController.java | 12 +++++ .../domain/SpecialProjectProposal.java | 3 ++ 4 files changed, 74 insertions(+), 5 deletions(-) diff --git a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcjsjdBuiProInfoController.java b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcjsjdBuiProInfoController.java index 491072ea..e14b4a90 100644 --- a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcjsjdBuiProInfoController.java +++ b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcjsjdBuiProInfoController.java @@ -1,8 +1,11 @@ package com.kms.build.controller; +import java.math.BigDecimal; import java.util.Arrays; import java.util.List; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.jianwei.common.core.controller.BaseController; import com.jianwei.common.core.domain.SearchParam; import com.jianwei.common.utils.poi.ExcelUtil; @@ -11,6 +14,8 @@ import com.kms.build.service.BsSgcjsjdBuiProInfoService; import com.kms.common.utils.BaseEntityUtils; +import com.kms.earlyStage.domain.SpecialProjectProposal; +import com.kms.earlyStage.service.SpecialProjectProposalService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -45,6 +50,19 @@ public class BsSgcjsjdBuiProInfoController extends BaseController @Autowired private BsSgcjsjdBuiProInfoService bsSgcjsjdBuiProInfoService; + @Autowired + private SpecialProjectProposalService specialProjectProposalService; + + + @GetMapping("/getProposal") + public AjaxResult getSpecialProjectProposal() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("is_construction", "0"); + List proposalList = specialProjectProposalService.list(queryWrapper); + return AjaxResult.success(proposalList); + + } + /** * 查询项目基本信息管理列表 */ @@ -87,6 +105,37 @@ public class BsSgcjsjdBuiProInfoController extends BaseController public AjaxResult add(@RequestBody BsSgcjsjdBuiProInfo bsSgcjsjdBuiProInfo) { BaseEntityUtils.preInsert(bsSgcjsjdBuiProInfo); + + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.set("is_construction", "1"); + updateWrapper.eq("project_code", bsSgcjsjdBuiProInfo.getProCode()); + updateWrapper.eq("pro_no", bsSgcjsjdBuiProInfo.getProNo()); + specialProjectProposalService.update(updateWrapper); + + + BigDecimal centralArrangedFunds = bsSgcjsjdBuiProInfo.getCentralArrangedFunds(); + BigDecimal cityLevelFunds = bsSgcjsjdBuiProInfo.getCityLevelFunds(); + BigDecimal provincialFunding = bsSgcjsjdBuiProInfo.getProvincialFunding(); + BigDecimal countyLevelFunds = bsSgcjsjdBuiProInfo.getCountyLevelFunds(); + BigDecimal townshipInvestments = bsSgcjsjdBuiProInfo.getTownshipInvestments(); + if (centralArrangedFunds==null){ + centralArrangedFunds = BigDecimal.valueOf(BigDecimal.ROUND_UP); + } + if (cityLevelFunds==null){ + cityLevelFunds = BigDecimal.valueOf(BigDecimal.ROUND_UP); + } + if (provincialFunding==null){ + provincialFunding = BigDecimal.valueOf(BigDecimal.ROUND_UP); + } + if (countyLevelFunds==null){ + countyLevelFunds = BigDecimal.valueOf(BigDecimal.ROUND_UP); + } + if (townshipInvestments==null){ + townshipInvestments = BigDecimal.valueOf(BigDecimal.ROUND_UP); + } + BigDecimal total = centralArrangedFunds.add(cityLevelFunds).add(provincialFunding). + add(countyLevelFunds).add(townshipInvestments); + bsSgcjsjdBuiProInfo.setTotal(total); return toAjax(bsSgcjsjdBuiProInfoService.save(bsSgcjsjdBuiProInfo)); } diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcjsjdBuiProInfo.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcjsjdBuiProInfo.java index 187551b4..1d891fd4 100644 --- a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcjsjdBuiProInfo.java +++ b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcjsjdBuiProInfo.java @@ -10,6 +10,8 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.jianwei.common.core.domain.BaseEntity; +import java.math.BigDecimal; + /** * 项目基本信息管理对象 bs_sgc_ jsjd_bui_pro_info * @@ -99,7 +101,7 @@ public class BsSgcjsjdBuiProInfo extends BaseEntity private String fundingSource;*/ @Excel(name = "中央资金") @ApiModelProperty("中央资金") - private String centralArrangedFunds; + private BigDecimal centralArrangedFunds; @Excel(name = "中央资金比例") @ApiModelProperty("中央资金比例") @@ -107,7 +109,7 @@ public class BsSgcjsjdBuiProInfo extends BaseEntity @Excel(name = "省级资金") @ApiModelProperty("省级资金") - private String provincialFunding; + private BigDecimal provincialFunding; @Excel(name = "省级资金比例") @ApiModelProperty("省级资金比例") @@ -115,7 +117,7 @@ public class BsSgcjsjdBuiProInfo extends BaseEntity @Excel(name = "地市资金") @ApiModelProperty("地市资金") - private String cityLevelFunds; + private BigDecimal cityLevelFunds; @Excel(name = "地市资金比例") @ApiModelProperty("地市资金比例") @@ -123,7 +125,7 @@ public class BsSgcjsjdBuiProInfo extends BaseEntity @Excel(name = "区县资金") @ApiModelProperty("区县资金") - private String countyLevelFunds; + private BigDecimal countyLevelFunds; @Excel(name = "区县资金比例") @ApiModelProperty("区县资金比例") @@ -131,7 +133,7 @@ public class BsSgcjsjdBuiProInfo extends BaseEntity @Excel(name = "乡镇及群众自筹和其他投资") @ApiModelProperty("乡镇及群众自筹和其他投资") - private String townshipInvestments; + private BigDecimal townshipInvestments; @Excel(name = "乡镇及群众自筹和其他投资比例") @ApiModelProperty("乡镇及群众自筹和其他投资比例") @@ -188,4 +190,7 @@ public class BsSgcjsjdBuiProInfo extends BaseEntity private String isMajor; + + private BigDecimal total; + } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectProposalController.java b/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectProposalController.java index 440618f3..7826e394 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectProposalController.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectProposalController.java @@ -3,6 +3,7 @@ package com.kms.earlyStage.controller; import java.util.Arrays; import java.util.List; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jianwei.common.core.controller.BaseController; import com.jianwei.common.core.domain.SearchParam; import com.jianwei.common.utils.poi.ExcelUtil; @@ -102,6 +103,17 @@ public class SpecialProjectProposalController extends BaseController public AjaxResult add(@RequestBody SpecialProjectProposal specialProjectProposal) { BaseEntityUtils.preInsert(specialProjectProposal); + specialProjectProposal.setIsConstruction("0"); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("PRO_NO", specialProjectProposal.getProNo()); + List proposalList = specialProjectProposalService.list(queryWrapper); + if (proposalList.size() > 0) { + for (SpecialProjectProposal projectProposal : proposalList) { + if (projectProposal.getProjectCode().equals(specialProjectProposal.getProjectCode())) { + return AjaxResult.error("项目编码已存在,请重新输入！"); + } + } + } return toAjax(specialProjectProposalService.save(specialProjectProposal)); } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectProposal.java b/jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectProposal.java index 5d51285e..ef0e7d15 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectProposal.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/domain/SpecialProjectProposal.java @@ -109,4 +109,7 @@ public class SpecialProjectProposal extends BaseEntity @ApiModelProperty("数源部门") private String owerDept; + + private String isConstruction; + }