From 8724f0406541a7b844690182d93ed196b32096a7 Mon Sep 17 00:00:00 2001 From: zth <1205836521@qq.com> Date: Fri, 31 May 2024 11:53:35 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BD=E5=90=8D=E5=8D=95=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...sjdBuiAttendanceInformationController.java | 1 + .../domain/vo/BsSgcjsjdBuiProInfoVo.java | 271 ++++++++++++++++++ .../BsSgcJsjdBuiRegulatoryInspections.java | 20 ++ ...gcJsjdBuiRegulatoryInspectionsService.java | 44 +++ ...sSgcJsjdBuiRegulatoryInspectionsMapper.xml | 43 ++- 5 files changed, 374 insertions(+), 5 deletions(-) create mode 100644 jwtech-system/src/main/java/com/kms/build/domain/vo/BsSgcjsjdBuiProInfoVo.java diff --git a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiAttendanceInformationController.java b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiAttendanceInformationController.java index 5bb85d9f..0fc6cac1 100644 --- a/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiAttendanceInformationController.java +++ b/jwtech-system/src/main/java/com/kms/build/controller/BsSgcJsjdBuiAttendanceInformationController.java @@ -56,6 +56,7 @@ public class BsSgcJsjdBuiAttendanceInformationController extends BaseController @Autowired private BsSgcJsjdBuiRealNameService bsSgcJsjdBuiRealNameService; + /** * 查询农民工人员考勤信息列表 */ diff --git a/jwtech-system/src/main/java/com/kms/build/domain/vo/BsSgcjsjdBuiProInfoVo.java b/jwtech-system/src/main/java/com/kms/build/domain/vo/BsSgcjsjdBuiProInfoVo.java new file mode 100644 index 00000000..5a98653b --- /dev/null +++ b/jwtech-system/src/main/java/com/kms/build/domain/vo/BsSgcjsjdBuiProInfoVo.java @@ -0,0 +1,271 @@ +package com.kms.build.domain; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import com.jianwei.common.annotation.Excel; + +import com.baomidou.mybatisplus.annotation.TableName; + + +import com.jianwei.common.core.domain.BaseEntity; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +/** + * 项目基本信息管理对象 bs_sgc_ jsjd_bui_pro_info + * + * @author kms + * @date 2023-10-20 + */ +@TableName("bs_sgc_jsjd_bui_pro_info") +@Data +@ApiModel("项目基本信息管理") +public class BsSgcjsjdBuiProInfoVo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 项目名称 */ + @Excel(name = "项目名称") + @ApiModelProperty("项目名称") + @TableField(exist = false) + private String projectName; + + /** 项目法人 */ + @Excel(name = "项目法人") + @ApiModelProperty("项目法人") + private String projectLegalPerson; + + @Excel(name = "单位负责人电话") + @ApiModelProperty("单位负责人电话") + private String projectLegalPhone; + + @Excel(name = "项目负责人") + @ApiModelProperty("项目负责人") + private String projectSuperintendent; + + @Excel(name = "项目负责人电话") + @ApiModelProperty("项目负责人电话") + private String projectSuperintendentPhone; + + @Excel(name = "单位法定代表人") + @ApiModelProperty("项目法定代表人") + private String projectUnitLegal; + + @Excel(name = "单位法定代表人电话") + @ApiModelProperty("单位法定代表人电话") + private String projectUnitLegalPhone; + + /** 工程等别 */ + @Excel(name = "工程等别") + @ApiModelProperty("工程等别") + private String engineeringGrade; + + + /** 工程用途 */ + @Excel(name = "工程用途") + @ApiModelProperty("工程用途") + private String engineeringPurposes; + + /** 项目建设地址 */ + @Excel(name = "项目建设地址") + @ApiModelProperty("项目建设地址") + private String constructionAddress; + + /** 建设模式 */ + @Excel(name = "建设模式") + @ApiModelProperty("建设模式") + private String constructionMode; + + /** 建设性质 */ + @Excel(name = "建设性质") + @ApiModelProperty("建设性质") + private String constructionNature; + + /** 建设内容 */ + @Excel(name = "建设内容") + @ApiModelProperty("建设内容") + private String constructionContent; + + /** 行政区划 */ + @Excel(name = "行政区划") + @ApiModelProperty("行政区划") + @TableField(exist = false) + private String adcd; + + /** 所属流域 */ + @Excel(name = "所属流域") + @ApiModelProperty("所属流域") + private String basin; + + /** 项目类型 */ + @Excel(name = "项目类型") + @ApiModelProperty("项目类型") + private String projectType; + + /** 资金来源 */ + /*@Excel(name = "资金来源") + @ApiModelProperty("资金来源") + private String fundingSource;*/ + @Excel(name = "中央资金") + @ApiModelProperty("中央资金") + private BigDecimal centralArrangedFunds; + + @Excel(name = "中央资金比例") + @ApiModelProperty("中央资金比例") + private String centralArrangedFundsRate; + + @Excel(name = "省级资金") + @ApiModelProperty("省级资金") + private BigDecimal provincialFunding; + + @Excel(name = "省级资金比例") + @ApiModelProperty("省级资金比例") + private String provincialFundingRate; + + @Excel(name = "地市资金") + @ApiModelProperty("地市资金") + private BigDecimal cityLevelFunds; + + @Excel(name = "地市资金比例") + @ApiModelProperty("地市资金比例") + private String cityLevelFundsRate; + + @Excel(name = "区县资金") + @ApiModelProperty("区县资金") + private BigDecimal countyLevelFunds; + + @Excel(name = "区县资金比例") + @ApiModelProperty("区县资金比例") + private String countyLevelFundsRate; + + @Excel(name = "乡镇及群众自筹和其他投资") + @ApiModelProperty("乡镇及群众自筹和其他投资") + private BigDecimal townshipInvestments; + + @Excel(name = "乡镇及群众自筹和其他投资比例") + @ApiModelProperty("乡镇及群众自筹和其他投资比例") + private String townshipInvestmentsRate; + + /** 是否172项重大水利工程 */ + @Excel(name = "是否172项重大水利工程") + @ApiModelProperty("是否172项重大水利工程") + private String isMajorProject; + + /** 项目投资主体 */ + @Excel(name = "项目投资主体") + @ApiModelProperty("项目投资主体") + private String investmentSubject; + + /** 建设阶段 */ + @Excel(name = "建设阶段") + @ApiModelProperty("建设阶段") + private String constructionPhase; + + /** 资金下达文号 */ + @Excel(name = "资金下达文号") + @ApiModelProperty("资金下达文号") + private String fundingNumber; + + /** 项目编码 */ + @Excel(name = "项目编码") + @ApiModelProperty("项目编码") + private String proCode; + + /** 项目编号 */ + @Excel(name = "项目编号") + @ApiModelProperty("项目编号") + private String proNo; + + /** 创建人 */ + @Excel(name = "创建人") + @ApiModelProperty("创建人") + private String createUid; + + /** 更新人 */ + @Excel(name = "更新人") + @ApiModelProperty("更新人") + private String updateUid; + + /** 数源部门 */ + @Excel(name = "数源部门") + @ApiModelProperty("数源部门") + private String owerDept; + + @Excel(name = "工程类别") + @ApiModelProperty("工程类别") + private String workCategory; + + private String isMajor; + + + private String total; + + @TableField(exist = false) + private BigDecimal contractPayment; + + + @Excel(name = "下达总金额") + @ApiModelProperty("下达总金额") + private BigDecimal releaseFunds; + + + @TableField(exist = false) + private List enterpriseInfoList; + + + private String projectDivision; + + private String supervisionCompany; + + private String supervisionPerson; + + private String supervisionPhone; + + private String isEvaluate; + + @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8") + private Date evaluateTime; + + private String qualityLevel; + + + private String projectStatus; + + private String projectDivisionAttachment; + + //开工日期 + @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8") + private Date commencementDate; + + //计划竣工日期 + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date plannedCompletionDate; + + + @TableField(exist = false) + private String unit; + + @TableField(exist = false) + private String isBelong; + + @TableField(exist = false) + private String projectPhase; + + private String bindStatus; + + private String pointLatitudeLongitudeList; + + private String lineLatitudeLongitudeList; + + private String allLatitudeLongitudeList; + + private String isApproval; + + private String alertType; + +} diff --git a/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdBuiRegulatoryInspections.java b/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdBuiRegulatoryInspections.java index ef98a458..04723915 100644 --- a/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdBuiRegulatoryInspections.java +++ b/jwtech-system/src/main/java/com/kms/warn/domain/BsSgcJsjdBuiRegulatoryInspections.java @@ -95,4 +95,24 @@ public class BsSgcJsjdBuiRegulatoryInspections extends BaseEntity @TableField(exist = false) private String adcd; +// 检查次数 + @TableField(exist = false) + private String checkNum; + +// 问题总数 + @TableField(exist = false) + private String problemTotal; + +// 未整改数 + @TableField(exist = false) + private String notRectifiedNum; + + +// 涉及责任单位数 + @TableField(exist = false) + private String liabilityUnitsNum; + + @TableField(exist = false) + private String projectCode; + } diff --git a/jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdBuiRegulatoryInspectionsService.java b/jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdBuiRegulatoryInspectionsService.java index 55d8f4d9..b88e3425 100644 --- a/jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdBuiRegulatoryInspectionsService.java +++ b/jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdBuiRegulatoryInspectionsService.java @@ -6,18 +6,25 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jianwei.common.core.domain.SearchParam; import com.jianwei.common.core.domain.entity.SysDept; import com.jianwei.common.core.domain.entity.SysUser; +import com.kms.build.domain.BsSgcJsjdBuiEnteInfo; +import com.kms.build.service.BsSgcJsjdBuiEnteInfoService; import com.kms.common.utils.UserUtils; import com.kms.earlyStage.domain.SpecialProjectPlanInfo; import com.kms.system.service.SysDeptService; import com.kms.system.service.SysXzqhService; +import com.kms.warn.domain.BsSgcJsjdBuiRectification; +import com.kms.warn.domain.dto.RectificationDto; +import com.kms.warn.mapper.BsSgcJsjdBuiRectificationMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.jianwei.common.core.service.BaseService; import com.kms.warn.mapper.BsSgcJsjdBuiRegulatoryInspectionsMapper; import com.kms.warn.domain.BsSgcJsjdBuiRegulatoryInspections; +import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * 监管检查Service接口 @@ -36,6 +43,11 @@ public class BsSgcJsjdBuiRegulatoryInspectionsService extends BaseService selectPage(SearchParam sp) { SysUser sysUser = UserUtils.getUser(); @@ -63,6 +75,38 @@ public class BsSgcJsjdBuiRegulatoryInspectionsService extends BaseService rlist = page.getRecords(); + for (RectificationDto rectificationDto : rlist) { + if(rectificationDto==null){ + continue; + } + String unit = rectificationDto.getUnit(); + if (unit != null) { + String[] split = unit.split(","); + List bsSgcJsjdBuiEnteInfos = bsSgcJsjdBuiEnteInfoService.listByIds(Arrays.asList(split)); + List stringList = bsSgcJsjdBuiEnteInfos.stream().map(BsSgcJsjdBuiEnteInfo::getEnterpriseName).collect(Collectors.toList()); + rectificationDto.setUnitArray(stringList); + unitNum=rectificationDto.getUnitArray().size(); + } + String rectificationSituation = rectificationDto.getRectificationSituation(); + if (rectificationSituation != null) { + String[] split = rectificationSituation.split(","); + rectificationDto.setIsFinish("1"); + for (String s : split) { + if (s.equals("未完成")) { + rectificationDto.setIsFinish("0"); + num++; + } + } + } + } + bs.setNotRectifiedNum(String.valueOf(num)); + bs.setLiabilityUnitsNum(String.valueOf(unitNum)); + } Page infoPage = new Page<>(); infoPage.setRecords(list); infoPage.setTotal(list.size()); diff --git a/jwtech-system/src/main/resources/mapper/warn/BsSgcJsjdBuiRegulatoryInspectionsMapper.xml b/jwtech-system/src/main/resources/mapper/warn/BsSgcJsjdBuiRegulatoryInspectionsMapper.xml index 522cefe3..d29621cd 100644 --- a/jwtech-system/src/main/resources/mapper/warn/BsSgcJsjdBuiRegulatoryInspectionsMapper.xml +++ b/jwtech-system/src/main/resources/mapper/warn/BsSgcJsjdBuiRegulatoryInspectionsMapper.xml @@ -5,10 +5,14 @@ - select ri.*, - pp.project_name - from bs_sgc_jsjd_bui_regulatory_inspections ri - left join bs_slgc_qqjd_spe_pro_proposal pp on ri.pro_no = pp.pro_no and ri.pro_code = pp.project_code + SELECT + pp.project_name, + pp.PROJECT_CODE, + pp.ADCD, + ri.checkNum, + br.problemTotal + FROM + bs_slgc_qqjd_spe_pro_proposal pp @@ -24,12 +28,41 @@ + + +