diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmzskController.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmzskController.java index 618a5b3..da799ad 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmzskController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/controller/XmzskController.java @@ -25,7 +25,7 @@ import java.util.List; @Api(tags = "项目知识库") @RestController @RequestMapping("/gysl/xmzsk") -@PreAuthorize("@ss.hasAnyRoles('admin,common')") +//@PreAuthorize("@ss.hasAnyRoles('admin,common')") public class XmzskController extends BaseController { /** * 服务对象 @@ -51,7 +51,7 @@ public class XmzskController extends BaseController { * @param id 主键 * @return 单条数据 */ - @GetMapping("{id}") + @GetMapping("/{id}") @ApiOperation("通过主键查询单条数据") public AjaxResult selectOne(@PathVariable Serializable id) { return success(xmzskService.getById(id)); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BasicInformation.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BasicInformation.java index fa4322a..c3537b9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BasicInformation.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/BasicInformation.java @@ -149,5 +149,8 @@ public class BasicInformation extends BaseModel { @ApiModelProperty("状态 1待填报 2待审核 3审核通过") private Integer status; + @ApiModelProperty("0非负面清单 1是负面清单") + private Integer isFmqd; + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/BasicInformationPageReq.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/BasicInformationPageReq.java index 9889a7a..7d0d702 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/BasicInformationPageReq.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/entity/request/BasicInformationPageReq.java @@ -38,4 +38,7 @@ public class BasicInformationPageReq { @ApiModelProperty("统一社会信用代码") private String tyshxydm; + + @ApiModelProperty("0非负面清单 1是负面清单") + private Integer isFmqd; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/WysmxInformationService.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/WysmxInformationService.java index 2debfdf..b5a3c76 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/WysmxInformationService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/WysmxInformationService.java @@ -7,8 +7,6 @@ import com.ruoyi.gysl.entity.response.WysmxResponse; import java.util.List; -import java.util.List; - /** * 五要素模型信息(WysmxInformation)表服务接口 * @@ -24,5 +22,17 @@ public interface WysmxInformationService extends IService { * @return 所有数据 */ List list(ZwIdPageReq zwIdPageReq); + + /** + * 判断是否允许上楼 + * + * @param materialLevel 危化品等级 + * @param fireRiskLevel 生产火灾危险等级 + * @param environmentalProtection 环境保护是否达标 + * @return + */ + boolean canGoUpstairs(String materialLevel, + String fireRiskLevel, + String environmentalProtection); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/BasicInformationServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/BasicInformationServiceImpl.java index 2f33065..091a681 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/BasicInformationServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/BasicInformationServiceImpl.java @@ -30,6 +30,7 @@ import java.io.Serializable; import java.lang.reflect.Field; import java.util.List; import java.util.Objects; +import java.util.stream.Collectors; /** * 基本信息(BasicInformation)表服务实现类 @@ -282,29 +283,38 @@ public class BasicInformationServiceImpl extends ServiceImpl collect1 = req.getWysmxInformations().stream().filter(x -> + "危化品等级".equals(x.getZdname()) + ) + .collect(Collectors.toList()); + List collect2 = req.getWysmxInformations().stream().filter(x -> + "生产火灾危险等级".equals(x.getZdname()) + ) + .collect(Collectors.toList()); + List collect3 = req.getWysmxInformations().stream().filter(x -> + "环境保护".equals(x.getZdname())) + .collect(Collectors.toList()); + if(!collect1.isEmpty() && !collect2.isEmpty() && !collect3.isEmpty()){ + req.getBasicInformation().setIsFmqd(wysmxInformationService.canGoUpstairs( + collect1.get(0).getZdinfor(), + collect2.get(0).getZdinfor(), + collect3.get(0).getZdinfor()) ? 1 : 0); + } updateById(req.getBasicInformation()); //修改项目规划信息 planInformationService.updateById(req.getPlanInformation()); //修改企业入驻信息 qyrzInformationService.updateById(req.getQyrzInformation()); //修改五要素模型信息 - wysmxInformationService.lambdaUpdate() - .eq(WysmxInformation::getXmId, req.getBasicInformation().getId()) - .remove(); + wysmxInformationService.lambdaUpdate().eq(WysmxInformation::getXmId, req.getBasicInformation().getId()).remove(); wysmxInformationService.saveBatch(req.getWysmxInformations()); //修改其他信息 - otherInfoService.lambdaUpdate() - .eq(ProjectOtherInfo::getXmId, req.getBasicInformation().getId()) - .remove(); + otherInfoService.lambdaUpdate().eq(ProjectOtherInfo::getXmId, req.getBasicInformation().getId()).remove(); otherInfoService.saveBatch(req.getProjectOtherInfos()); if (status == 2) { - userService.getAllZwUser("关于" + req.getBasicInformation().getName() + "项目,待审核的通知", - req.getBasicInformation().getId(), - null, - null - ); + userService.getAllZwUser("关于" + req.getBasicInformation().getName() + "项目,待审核的通知", req.getBasicInformation().getId(), null, null); } if (status == 3) { SmartDeclaration sd = new SmartDeclaration(); @@ -329,13 +339,9 @@ public class BasicInformationServiceImpl extends ServiceImpl idList) { idList.forEach(x -> { //删除项目基本信息 - lambdaUpdate() - .eq(BasicInformation::getId, x) - .remove(); + lambdaUpdate().eq(BasicInformation::getId, x).remove(); //删除项目规划信息 - planInformationService.lambdaUpdate() - .eq(PlanInformation::getXmId, x) - .remove(); + planInformationService.lambdaUpdate().eq(PlanInformation::getXmId, x).remove(); //删除项目建筑信息 - buildingInformationService.lambdaUpdate() - .eq(BuildingInformation::getXmId, x) - .remove(); + buildingInformationService.lambdaUpdate().eq(BuildingInformation::getXmId, x).remove(); //删除五要素模型信息 - wysmxInformationService.lambdaUpdate() - .eq(WysmxInformation::getXmId, x) - .remove(); + wysmxInformationService.lambdaUpdate().eq(WysmxInformation::getXmId, x).remove(); //删除月度进展信息 // projectMonthInfoService.lambdaUpdate() // .eq(ProjectMonthInfo::getXmId,x) // .remove(); //删除企业入驻信息 - qyrzInformationService.lambdaUpdate() - .eq(QyrzInformation::getXmId, x) - .remove(); + qyrzInformationService.lambdaUpdate().eq(QyrzInformation::getXmId, x).remove(); //删除项目图例 - projectLegendService.lambdaUpdate() - .eq(ProjectLegend::getXmId, x) - .remove(); + projectLegendService.lambdaUpdate().eq(ProjectLegend::getXmId, x).remove(); //删除项目巡礼 - xmxlService.lambdaUpdate() - .eq(Xmxl::getXmId, x) - .remove(); + xmxlService.lambdaUpdate().eq(Xmxl::getXmId, x).remove(); //删除项目备忘录 - projectRemarkService.lambdaUpdate() - .eq(ProjectRemark::getXmId, x) - .remove(); + projectRemarkService.lambdaUpdate().eq(ProjectRemark::getXmId, x).remove(); //删除其他信息 - otherInfoService.lambdaUpdate() - .eq(ProjectOtherInfo::getXmId, x) - .remove(); + otherInfoService.lambdaUpdate().eq(ProjectOtherInfo::getXmId, x).remove(); }); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/WysmxInformationServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/WysmxInformationServiceImpl.java index d58d66f..bb43f07 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/WysmxInformationServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/gysl/service/impl/WysmxInformationServiceImpl.java @@ -23,6 +23,27 @@ import java.util.stream.Collectors; @Service("wysmxInformationService") public class WysmxInformationServiceImpl extends ServiceImpl implements WysmxInformationService { + /** + * 判断是否允许上楼 + * + * @param materialLevel 危化品等级 + * @param fireRiskLevel 生产火灾危险等级 + * @param environmentalProtection 环境保护是否达标 + * @return + */ + public boolean canGoUpstairs(String materialLevel, + String fireRiskLevel, + String environmentalProtection) { + // 检查危化品等级：一级或二级禁止上楼 + boolean isHazardousForbidden = "一级".equals(materialLevel) || "二级".equals(materialLevel); + // 检查火灾危险等级：甲类或乙类禁止上楼 + boolean isFireRiskForbidden = "甲".equals(fireRiskLevel) || "乙".equals(fireRiskLevel); + // 环境保护未达标禁止上楼 + boolean isEnvironmentForbidden = "否".equals(environmentalProtection); + return isHazardousForbidden || isFireRiskForbidden || isEnvironmentForbidden; + } + + /** * 根据项目id查询该项目的五要素模型信息 * diff --git a/ruoyi-admin/src/main/resources/mapper/BasicInformationMapper.xml b/ruoyi-admin/src/main/resources/mapper/BasicInformationMapper.xml index a945eb1..61302b1 100644 --- a/ruoyi-admin/src/main/resources/mapper/BasicInformationMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/BasicInformationMapper.xml @@ -78,6 +78,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND a.tyshxydm = #{req.tyshxydm} + + AND a.is_fmqd = #{req.isFmqd} +