From f72ed71b80621c778285c83adbe8ee0a31511940 Mon Sep 17 00:00:00 2001 From: zhuyulei <1843199800@qq.com> Date: Fri, 8 Mar 2024 10:16:25 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=A2=84=E8=AD=A6=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SpecialProjectGainController.java | 10 +++ .../SpecialProjectInfoController.java | 6 ++ .../BsSgcJsjdWarnResultHandleController.java | 11 ++++ .../domain/BsSgcJsjdWarnResultHandle.java | 16 +++++ .../BsSgcJsjdWarnResultHandleService.java | 65 +++++++++++++++++++ 5 files changed, 108 insertions(+) diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectGainController.java b/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectGainController.java index d8676cc8..bf058757 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectGainController.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectGainController.java @@ -2,7 +2,9 @@ package com.kms.earlyStage.controller; import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.jianwei.common.core.controller.BaseController; import com.jianwei.common.core.domain.SearchParam; import com.jianwei.common.utils.poi.ExcelUtil; @@ -86,6 +88,14 @@ public class SpecialProjectGainController extends BaseController public AjaxResult add(@RequestBody SpecialProjectGain specialProjectGain) { BaseEntityUtils.preInsert(specialProjectGain); + String evaluationName = specialProjectGain.getEvaluationName(); + List list = specialProjectGainService.list(Wrappers.lambdaQuery(SpecialProjectGain.class) + .eq(SpecialProjectGain::getProNo,specialProjectGain.getProNo())); + List collect = list.stream().filter(e -> e.getEvaluationName().equals(evaluationName)).collect(Collectors.toList()); + if (collect.size() > 0) { + return AjaxResult.error("该评价规划名称已存在"); + } + return toAjax(specialProjectGainService.save(specialProjectGain)); } diff --git a/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectInfoController.java b/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectInfoController.java index 8cea6f49..90f8dfc3 100644 --- a/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectInfoController.java +++ b/jwtech-system/src/main/java/com/kms/earlyStage/controller/SpecialProjectInfoController.java @@ -164,6 +164,12 @@ public class SpecialProjectInfoController extends BaseController { public AjaxResult add(@RequestBody SpecialProjectInfo specialProjectInfo) { BaseEntityUtils.preInsert(specialProjectInfo); String adcd = specialProjectInfo.getAdcd(); + String projectName = specialProjectInfo.getProjectName(); + List list = specialProjectInfoService.list(); + List infoList = list.stream().filter(x -> x.getProjectName().equals(projectName)).collect(Collectors.toList()); + if (infoList.size() > 0) { + return AjaxResult.error("该项目已存在"); + } if (adcd == null) { SysUser user = UserUtils.getUser(); String deptId = user.getDeptId(); diff --git a/jwtech-system/src/main/java/com/kms/warn/controller/BsSgcJsjdWarnResultHandleController.java b/jwtech-system/src/main/java/com/kms/warn/controller/BsSgcJsjdWarnResultHandleController.java index 39dd4a17..c220ecd1 100644 --- a/jwtech-system/src/main/java/com/kms/warn/controller/BsSgcJsjdWarnResultHandleController.java +++ b/jwtech-system/src/main/java/com/kms/warn/controller/BsSgcJsjdWarnResultHandleController.java @@ -45,6 +45,17 @@ public class BsSgcJsjdWarnResultHandleController extends BaseController @Autowired private BsSgcJsjdWarnResultHandleService bsSgcJsjdWarnResultHandleService; + + + @PostMapping("/listById") + @ApiOperation("预警处理列表") + public BsSgcJsjdWarnResultHandle listById(@RequestBody SearchParam sp) + { + return bsSgcJsjdWarnResultHandleService.listById(sp); + } + + + /** * 查询预警处理列表 */ diff --git a/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdWarnResultHandle.java b/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdWarnResultHandle.java index 3f07bad0..e906b2f5 100644 --- a/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdWarnResultHandle.java +++ b/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdWarnResultHandle.java @@ -80,4 +80,20 @@ public class BsSgcJsjdWarnResultHandle extends BaseEntity @ApiModelProperty("${comment}") private String checkPhone; + + private String projectName; + + private String unit; + + private String adcd; + + private String warnType; + + private String warnResult; + + + + + + } diff --git a/jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdWarnResultHandleService.java b/jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdWarnResultHandleService.java index cf3db70f..8a00eeba 100644 --- a/jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdWarnResultHandleService.java +++ b/jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdWarnResultHandleService.java @@ -1,10 +1,25 @@ package com.kms.warn.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.jianwei.common.core.domain.SearchParam; +import com.kms.build.domain.BsSgcJsjdBuiEnteInfo; +import com.kms.build.mapper.BsSgcJsjdBuiEnteInfoMapper; +import com.kms.build.mapper.BsSgcjsjdBuiProInfoMapper; +import com.kms.earlyStage.domain.SpecialProjectProposal; +import com.kms.earlyStage.mapper.SpecialProjectProposalMapper; +import com.kms.warn.domain.BsSgcJsjdWarnResult; +import com.kms.warn.mapper.BsSgcJsjdWarnResultMapper; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.jianwei.common.core.service.BaseService; import com.kms.warn.mapper.BsSgcJsjdWarnResultHandleMapper; import com.kms.warn.domain.BsSgcJsjdWarnResultHandle; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + /** * 预警处理Service接口 * @@ -14,4 +29,54 @@ import com.kms.warn.domain.BsSgcJsjdWarnResultHandle; @Service public class BsSgcJsjdWarnResultHandleService extends BaseService{ + @Autowired + private BsSgcJsjdWarnResultHandleMapper bsSgcJsjdWarnResultHandleMapper; + + @Autowired + private BsSgcJsjdWarnResultMapper bsSgcJsjdWarnResultMapper; + + + @Autowired + private BsSgcjsjdBuiProInfoMapper bsSgcjsjdBuiProInfoMapper; + + + @Autowired + private SpecialProjectProposalMapper specialProjectProposalMapper; + + @Autowired + private BsSgcJsjdBuiEnteInfoMapper bsSgcJsjdBuiEnteInfoMapper; + + public BsSgcJsjdWarnResultHandle listById(SearchParam sp) { + BsSgcJsjdWarnResultHandle data = sp.getData(); + + BsSgcJsjdWarnResult bsSgcJsjdWarnResult = bsSgcJsjdWarnResultMapper.selectById(data.getResultId()); + + SpecialProjectProposal specialProjectProposal = specialProjectProposalMapper.selectOne(Wrappers.lambdaQuery(SpecialProjectProposal.class) + .eq(SpecialProjectProposal::getProNo, data.getProNo()) + .eq(SpecialProjectProposal::getProjectCode, data.getProCode())); + + String projectName = specialProjectProposal.getProjectName(); + String adcd = specialProjectProposal.getAdcd(); + + List bsSgcJsjdBuiEnteInfos = bsSgcJsjdBuiEnteInfoMapper.selectList(Wrappers.lambdaQuery(BsSgcJsjdBuiEnteInfo.class) + .eq(BsSgcJsjdBuiEnteInfo::getProNo, data.getProNo()) + .eq(BsSgcJsjdBuiEnteInfo::getProCode, data.getProCode())); + + List collect = bsSgcJsjdBuiEnteInfos.stream().filter(x -> x.getEnterpriseType().equals("1")).collect(Collectors.toList()); + String enterpriseName = ""; + if (collect.size() > 0) { + enterpriseName = collect.get(0).getEnterpriseName(); + } + + BsSgcJsjdWarnResultHandle bsSgcJsjdWarnResultHandle = new BsSgcJsjdWarnResultHandle(); + bsSgcJsjdWarnResultHandle.setWarnResult(bsSgcJsjdWarnResult.getWarnResult()); + bsSgcJsjdWarnResultHandle.setWarnType(bsSgcJsjdWarnResult.getWarnType()); + bsSgcJsjdWarnResultHandle.setCreateTime(bsSgcJsjdWarnResult.getCreateTime()); + + bsSgcJsjdWarnResultHandle.setAdcd(adcd); + bsSgcJsjdWarnResultHandle.setProjectName(projectName); + bsSgcJsjdWarnResultHandle.setUnit(enterpriseName); + return bsSgcJsjdWarnResultHandle; + + } }