diff --git a/src/main/java/com/zhgd/xmgl/base/entity/vo/CityAndDistrictDeviceCountVo.java b/src/main/java/com/zhgd/xmgl/base/entity/vo/CityAndDistrictDeviceCountVo.java index 9f7fdcb..2286447 100644 --- a/src/main/java/com/zhgd/xmgl/base/entity/vo/CityAndDistrictDeviceCountVo.java +++ b/src/main/java/com/zhgd/xmgl/base/entity/vo/CityAndDistrictDeviceCountVo.java @@ -15,6 +15,9 @@ import java.util.HashMap; import java.util.List; import java.util.Objects; +/** + * 项目工程表拓展 + */ @Data public class CityAndDistrictDeviceCountVo extends Engineering { @ApiModelProperty("政务名称") diff --git a/src/main/java/com/zhgd/xmgl/base/entity/vo/MultiTrendOne.java b/src/main/java/com/zhgd/xmgl/base/entity/vo/MultiTrendOne.java index 121e1dd..2f8edf5 100644 --- a/src/main/java/com/zhgd/xmgl/base/entity/vo/MultiTrendOne.java +++ b/src/main/java/com/zhgd/xmgl/base/entity/vo/MultiTrendOne.java @@ -6,7 +6,9 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.util.List; - +/** + * 单列图表y轴 + */ @Data @AllArgsConstructor @NoArgsConstructor diff --git a/src/main/java/com/zhgd/xmgl/base/entity/vo/MultiTrendVo.java b/src/main/java/com/zhgd/xmgl/base/entity/vo/MultiTrendVo.java index df8e5ed..b3775e9 100644 --- a/src/main/java/com/zhgd/xmgl/base/entity/vo/MultiTrendVo.java +++ b/src/main/java/com/zhgd/xmgl/base/entity/vo/MultiTrendVo.java @@ -11,7 +11,7 @@ import java.util.function.Function; import java.util.stream.Collectors; /** - * 多列图表 + * 多列图表带总数 */ @Data public class MultiTrendVo { diff --git a/src/main/java/com/zhgd/xmgl/base/entity/vo/SectorVo.java b/src/main/java/com/zhgd/xmgl/base/entity/vo/SectorVo.java index 1c9e906..810e2bf 100644 --- a/src/main/java/com/zhgd/xmgl/base/entity/vo/SectorVo.java +++ b/src/main/java/com/zhgd/xmgl/base/entity/vo/SectorVo.java @@ -13,6 +13,9 @@ import java.util.Map; import java.util.function.Function; import java.util.stream.Collectors; +/** + * 扇形图表带总数 + */ @Data @AllArgsConstructor @NoArgsConstructor diff --git a/src/main/java/com/zhgd/xmgl/base/entity/vo/TrendVo.java b/src/main/java/com/zhgd/xmgl/base/entity/vo/TrendVo.java index 9d34c79..3091be2 100644 --- a/src/main/java/com/zhgd/xmgl/base/entity/vo/TrendVo.java +++ b/src/main/java/com/zhgd/xmgl/base/entity/vo/TrendVo.java @@ -19,6 +19,13 @@ public class TrendVo { private String x; private String y; + /** + * 获取折线和柱形图列表 + * + * @param list + * @param governmentMapper + * @return + */ public static List getTrendVosForGovernment(List list, GovernmentMapper governmentMapper) { Map map = list.stream().collect(Collectors.toMap(TrendVo::getX, Function.identity(), (o1, o2) -> o1)); List myGovernments = governmentMapper.getMyUnderGovernments(SecurityUtil.getUser().getSn()); diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntAppIndexController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntAppIndexController.java index 8b43e99..f38c915 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntAppIndexController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntAppIndexController.java @@ -8,7 +8,7 @@ import com.zhgd.xmgl.modules.basicdata.dto.AppIndexDeviceDto; import com.zhgd.xmgl.modules.basicdata.dto.AppIndexTopStatDto; import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.city.worker.entity.WorkerInfo; -import com.zhgd.xmgl.modules.wisdom.service.ICompanyService; +import com.zhgd.xmgl.modules.city.company.service.ICompanyService; import com.zhgd.xmgl.modules.city.monitor.service.IMonitorDevService; import com.zhgd.xmgl.modules.city.monitor.service.IMonitorQuestionService; import com.zhgd.xmgl.modules.city.worker.service.IWorkerInfoService; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntCompanyController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntCompanyController.java index 049ea88..7792529 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntCompanyController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/enterprise/EntCompanyController.java @@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.xmgl.modules.wisdom.entity.Company; -import com.zhgd.xmgl.modules.wisdom.service.ICompanyService; +import com.zhgd.xmgl.modules.city.company.entity.Company; +import com.zhgd.xmgl.modules.city.company.service.ICompanyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovCompanyController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovCompanyController.java index 69626e0..fe0f352 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovCompanyController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovCompanyController.java @@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.annotation.OperLog; import com.zhgd.jeecg.common.api.vo.Result; -import com.zhgd.xmgl.modules.wisdom.entity.Company; -import com.zhgd.xmgl.modules.wisdom.service.ICompanyService; +import com.zhgd.xmgl.modules.city.company.entity.Company; +import com.zhgd.xmgl.modules.city.company.service.ICompanyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/AppIndexController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/AppIndexController.java index 244d5a0..1ade8ce 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/AppIndexController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/AppIndexController.java @@ -8,7 +8,7 @@ import com.zhgd.xmgl.modules.basicdata.dto.AppIndexDeviceDto; import com.zhgd.xmgl.modules.basicdata.dto.AppIndexTopStatDto; import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; import com.zhgd.xmgl.modules.city.worker.entity.WorkerInfo; -import com.zhgd.xmgl.modules.wisdom.service.ICompanyService; +import com.zhgd.xmgl.modules.city.company.service.ICompanyService; import com.zhgd.xmgl.modules.city.monitor.service.IMonitorDevService; import com.zhgd.xmgl.modules.city.monitor.service.IMonitorQuestionService; import com.zhgd.xmgl.modules.city.worker.service.IWorkerInfoService; diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/CompanyController.java b/src/main/java/com/zhgd/xmgl/modules/city/company/controller/CompanyController.java similarity index 81% rename from src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/CompanyController.java rename to src/main/java/com/zhgd/xmgl/modules/city/company/controller/CompanyController.java index 2eb2651..8bb334b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/project/CompanyController.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/company/controller/CompanyController.java @@ -1,19 +1,15 @@ -package com.zhgd.xmgl.modules.basicdata.controller.project; +package com.zhgd.xmgl.modules.city.company.controller; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.basicdata.constant.ParamConstants; -import com.zhgd.xmgl.modules.wisdom.entity.Company; -import com.zhgd.xmgl.modules.wisdom.service.ICompanyService; -import com.zhgd.xmgl.security.SecurityUser; -import com.zhgd.xmgl.security.SecurityUtil; +import com.zhgd.xmgl.modules.city.company.entity.Company; +import com.zhgd.xmgl.modules.city.company.service.ICompanyService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -42,7 +38,7 @@ import java.util.Map; @RequestMapping("/project/company") @Slf4j @Api(tags = "参建单位管理") -public class CompanyController { +public class CompanyController { @Autowired private ICompanyService companyService; @@ -55,23 +51,20 @@ public class CompanyController { @ApiOperation(value = "分页列表查询参建单位信息", notes = "分页列表查询参建单位信息", httpMethod = "POST") @ApiImplicitParams({ @ApiImplicitParam(name = "type", value = "参建单位类型", paramType = "body", dataType = "String"), - @ApiImplicitParam(name = "companyName", value = "单位名称 ", paramType = "body", dataType = "String"), + @ApiImplicitParam(name = "companyName", value = "单位名称", paramType = "body", dataType = "String"), + @ApiImplicitParam(name = "enterpriseSn", value = "企业唯一标识", paramType = "body", dataType = "String"), + @ApiImplicitParam(name = "workerInfoId", value = "劳务人员id", paramType = "body", dataType = "String"), @ApiImplicitParam(name = "pageNo", value = "页数", paramType = "body", required = true, defaultValue = "1", dataType = "Integer"), @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "body", required = true, defaultValue = "10", dataType = "Integer") - }) + }) @PostMapping(value = "/page") public Result> queryPageList(@ApiIgnore @RequestBody Map map) { - QueryWrapper wrapper = QueryGenerator.initPageQueryWrapper(Company.class, map); - if (StringUtils.isNotBlank(MapUtils.getString(map, ParamConstants.PROJECT_SN))) { - wrapper.lambda().eq(Company::getEngineeringSn, StrUtil.EMPTY); - } - Page page = PageUtil.getPage(map); - IPage pageList = companyService.page(page, wrapper); - return Result.success(pageList); + return Result.success(companyService.queryPageList(map)); } /** * 列表查询 + * * @return */ @OperLog(operModul = "参建单位管理", operType = "列表查询", operDesc = "列表查询参建单位信息") @@ -87,9 +80,9 @@ public class CompanyController { } - /** * 通过id查询 + * * @return */ @OperLog(operModul = "参建单位管理", operType = "查询", operDesc = "通过id查询参建单位信息") diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/entity/Company.java b/src/main/java/com/zhgd/xmgl/modules/city/company/entity/Company.java similarity index 98% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/entity/Company.java rename to src/main/java/com/zhgd/xmgl/modules/city/company/entity/Company.java index 63fae31..9cbda12 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/entity/Company.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/company/entity/Company.java @@ -1,4 +1,4 @@ -package com.zhgd.xmgl.modules.wisdom.entity; +package com.zhgd.xmgl.modules.city.company.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/com/zhgd/xmgl/modules/city/company/mapper/CompanyMapper.java b/src/main/java/com/zhgd/xmgl/modules/city/company/mapper/CompanyMapper.java new file mode 100644 index 0000000..985c601 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/city/company/mapper/CompanyMapper.java @@ -0,0 +1,24 @@ +package com.zhgd.xmgl.modules.city.company.mapper; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.annotation.DataScope; +import com.zhgd.xmgl.modules.city.company.entity.Company; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @Description: 参建单位 + * @author： pengj + * @date： 2023-03-13 + * @version： V1.0 + */ +@Mapper +@DataScope +public interface CompanyMapper extends BaseMapper { + + IPage queryPageList(Page page,@Param(Constants.WRAPPER) QueryWrapper wrapper); +} diff --git a/src/main/java/com/zhgd/xmgl/modules/city/company/mapper/xml/CompanyMapper.xml b/src/main/java/com/zhgd/xmgl/modules/city/company/mapper/xml/CompanyMapper.xml new file mode 100644 index 0000000..7a46bc1 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/city/company/mapper/xml/CompanyMapper.xml @@ -0,0 +1,11 @@ + + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/ICompanyService.java b/src/main/java/com/zhgd/xmgl/modules/city/company/service/ICompanyService.java similarity index 52% rename from src/main/java/com/zhgd/xmgl/modules/wisdom/service/ICompanyService.java rename to src/main/java/com/zhgd/xmgl/modules/city/company/service/ICompanyService.java index 9a3ee12..b77ebf5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/ICompanyService.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/company/service/ICompanyService.java @@ -1,8 +1,11 @@ -package com.zhgd.xmgl.modules.wisdom.service; +package com.zhgd.xmgl.modules.city.company.service; -import com.zhgd.xmgl.modules.wisdom.entity.Company; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.zhgd.xmgl.modules.city.company.entity.Company; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.Map; + /** * @Description: 参建单位 * @author： pengj @@ -12,4 +15,6 @@ import com.baomidou.mybatisplus.extension.service.IService; public interface ICompanyService extends IService { boolean saveInfo(Company company); + + IPage queryPageList(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/city/company/service/impl/CompanyServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/city/company/service/impl/CompanyServiceImpl.java new file mode 100644 index 0000000..aaefdff --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/city/company/service/impl/CompanyServiceImpl.java @@ -0,0 +1,53 @@ +package com.zhgd.xmgl.modules.city.company.service.impl; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.jeecg.common.util.PageUtil; +import com.zhgd.xmgl.modules.basicdata.constant.ParamConstants; +import com.zhgd.xmgl.modules.city.company.entity.Company; +import com.zhgd.xmgl.modules.city.company.mapper.CompanyMapper; +import com.zhgd.xmgl.modules.city.company.service.ICompanyService; +import com.zhgd.xmgl.util.CommonUtil; +import org.apache.commons.collections.MapUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** + * @Description: 参建单位 + * @author： pengj + * @date： 2023-03-13 + * @version： V1.0 + */ +@Service +public class CompanyServiceImpl extends ServiceImpl implements ICompanyService { + + @Override + public boolean saveInfo(Company company) { + company.setCompanySn(CommonUtil.getUUid()); + return this.save(company); + } + + @Override + public IPage queryPageList(Map map) { + QueryWrapper wrapper = QueryGenerator.initPageQueryWrapper(Company.class, map); + if (StringUtils.isNotBlank(MapUtils.getString(map, ParamConstants.PROJECT_SN))) { + wrapper.lambda().eq(Company::getEngineeringSn, StrUtil.EMPTY); + } + String enterpriseSn = MapUtils.getString(map, "enterpriseSn"); + if (StrUtil.isNotBlank(enterpriseSn)) { + wrapper.eq("em.enterprise_sn", enterpriseSn); + } + String workerInfoId = MapUtils.getString(map, "workerInfoId"); + if (StrUtil.isNotBlank(workerInfoId)) { + wrapper.eq("wi.id", workerInfoId); + } + Page page = PageUtil.getPage(map); + return baseMapper.queryPageList(page, wrapper); + } +} diff --git a/src/main/java/com/zhgd/xmgl/modules/city/engineering/controller/DangerousEngineeringController.java b/src/main/java/com/zhgd/xmgl/modules/city/engineering/controller/DangerousEngineeringController.java index 1edcb09..56f33e4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/engineering/controller/DangerousEngineeringController.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/engineering/controller/DangerousEngineeringController.java @@ -115,12 +115,14 @@ public class DangerousEngineeringController { @OperLog(operModul = "危大工程管理", operType = "统计", operDesc = "危大工程排名") @ApiOperation(value = "危大工程排名", notes = "危大工程排名", httpMethod = "POST") @ApiImplicitParams({ - @ApiImplicitParam(name = "dangerType", value = "是否超危，0否，1是", paramType = "body", required = true, dataType = "Integer"), - @ApiImplicitParam(name = "size", value = "查前面几条", paramType = "body", required = false, dataType = "Integer") + @ApiImplicitParam(name = "dangerType", value = "是否超危，0否，1是", paramType = "body", required = false, dataType = "Integer"), + @ApiImplicitParam(name = "size", value = "查前面几条", paramType = "body", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "type", value = "排序类型1不同区域2公司", paramType = "body", required = true, dataType = "Integer"), }) @PostMapping(value = "/countDangerousEngineeringRank") public Result> countDangerousEngineeringRank(@ApiIgnore @RequestBody HashMap paramMap) { return Result.success(dangerousEngineeringService.countDangerousEngineeringRank(paramMap)); } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/city/engineering/controller/EngineeringController.java b/src/main/java/com/zhgd/xmgl/modules/city/engineering/controller/EngineeringController.java index c5dcb7e..0eaca89 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/engineering/controller/EngineeringController.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/engineering/controller/EngineeringController.java @@ -17,6 +17,7 @@ import com.zhgd.xmgl.modules.basicdata.statistics.EngineeringStat; import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; import com.zhgd.xmgl.modules.city.engineering.entity.EngineeringSingle; import com.zhgd.xmgl.modules.city.engineering.entity.vo.CountEngineeringVo; +import com.zhgd.xmgl.modules.city.engineering.entity.vo.EngineeringEveryDistrictAndStateVo; import com.zhgd.xmgl.modules.city.engineering.entity.vo.EngineeringTrendProgressVo; import com.zhgd.xmgl.modules.city.engineering.entity.vo.EngineeringTrendVo; import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService; @@ -66,6 +67,8 @@ public class EngineeringController { @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "body", required = true, defaultValue = "10", dataType = "Integer"), @ApiImplicitParam(name = "newThisYear", value = "是否今年新增1是0否", paramType = "body", required = false, dataType = "Integer"), @ApiImplicitParam(name = "endThisYear", value = "是否今年竣工合格1是0否", paramType = "body", required = false, dataType = "Integer"), + @ApiImplicitParam(name = "type", value = "1年度新建工程(项)2在建工程(项)3停工工程(项)4重点工程(项)5停开工", paramType = "body", required = false, dataType = "Integer"), + @ApiImplicitParam(name = "year", value = "年份", paramType = "body", required = false, dataType = "Integer"), @ApiImplicitParam(name = "notMonitor", value = "未接入视频工程（1未接入0已接入）", paramType = "body", required = false, dataType = "Integer"), @ApiImplicitParam(name = "engineeringCost_begin", value = "工程造价(万元)开始", paramType = "body", required = false, dataType = "Double"), @ApiImplicitParam(name = "engineeringCost_end", value = "工程造价(万元)结束", paramType = "body", required = false, dataType = "Double"), @@ -76,10 +79,11 @@ public class EngineeringController { @ApiImplicitParam(name = "designEntSn", value = "设计单位SN", paramType = "body", required = false, dataType = "String"), @ApiImplicitParam(name = "supervisorEntSn", value = "监理单位SN", paramType = "body", required = false, dataType = "String"), @ApiImplicitParam(name = "surveyEntSn", value = "勘察单位SN", paramType = "body", required = false, dataType = "String"), + @ApiImplicitParam(name = "idCard", value = "身份证号", paramType = "body", dataType = "String"), }) @PostMapping(value = "/page") public Result> queryPageList(@ApiIgnore @RequestBody Map map) { - String alias = "engineering."; + String alias = "e."; QueryWrapper wrapper = QueryGenerator.initPageQueryWrapper(Engineering.class, map, alias); String buildEntSn = MapUtils.getString(map, "buildEntSn"); String opEntSn = MapUtils.getString(map, "opEntSn"); @@ -92,7 +96,7 @@ public class EngineeringController { if (Objects.equals(MapUtils.getInteger(map, "newThisYear"), 1)) { wrapper.ge(alias + RefUtil.fieldNameUlc(Engineering::getStartTime), dateTime); } - if (Objects.equals(MapUtils.getInteger(map, "endThisYear"), 1)) { + if (Objects.equals(MapUtils.getInteger(map, "endThisYear"), 1)) { wrapper.ge(alias + RefUtil.fieldNameUlc(Engineering::getEndTime), dateTime); } String existsSql = "(\n" + @@ -119,8 +123,30 @@ public class EngineeringController { if (StrUtil.isNotBlank(surveyEntSn)) { wrapper.eq("em5.enterprise_sn", surveyEntSn); } + String idCard = MapUtils.getString(map, "idCard"); + if (StrUtil.isNotBlank(idCard)) { + wrapper.eq("wi.id_card", idCard); + } + Integer type = MapUtils.getInteger(map, "type"); + String year = MapUtils.getString(map, "year"); + if (StrUtil.isNotBlank(year)) { + wrapper.eq("date_format(e.create_time, '%Y')", year); + } + if (Objects.equals(type, 2)) { + wrapper.eq("e.state", 2); + } else if (Objects.equals(type, 3)) { + wrapper.and(w -> w.eq("e.state", 3).or().eq("e.state", 4)); + } else if (Objects.equals(type, 4)) { + wrapper.eq("e.examine_state", 3); + wrapper.eq("e.is_important", 1); + } else if (Objects.equals(type, 5)) { + wrapper.and(w -> w.eq("e.state", 1).or().eq("e.state", 3).or().eq("e.state", 4)); + } IPage pageList = engineeringService.getPageList(page, wrapper, map); + if (StrUtil.isNotBlank(idCard)) { + pageList.getRecords().stream().sorted((o1, o2) -> o2.getEntryTime() != null ? o2.getEntryTime().compareTo(o1.getEntryTime()) : 1); + } return Result.success(pageList); } @@ -198,9 +224,10 @@ public class EngineeringController { @OperLog(operModul = "工程管理", operType = "统计", operDesc = "统计工程") @ApiOperation(value = "统计工程", notes = "统计工程", httpMethod = "POST") + @ApiImplicitParam(name = "year", value = "年份：如2020", paramType = "body", required = false, dataType = "String") @PostMapping(value = "/countEngineering") - public Result countEngineering() { - return Result.success(engineeringService.countEngineering()); + public Result countEngineering(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(engineeringService.countEngineering(paramMap)); } @OperLog(operModul = "工程管理", operType = "统计", operDesc = "统计工程进度") @@ -303,4 +330,15 @@ public class EngineeringController { public Result countEngineeringEveryDistrictAndType() { return Result.success(engineeringService.countEngineeringEveryDistrictAndType()); } + + @OperLog(operModul = "工程管理", operType = "查询", operDesc = "统计工程每个区在建和停工数量") + @ApiOperation(value = "统计工程每个区在建和停工数量", notes = "统计工程每个区在建和停工数量", httpMethod = "POST") + @ApiImplicitParams({ + }) + @PostMapping(value = "/countEngineeringEveryDistrictAndState") + public Result countEngineeringEveryDistrictAndState() { + return Result.success(engineeringService.countEngineeringEveryDistrictAndState()); + } + + } diff --git a/src/main/java/com/zhgd/xmgl/modules/city/engineering/entity/Engineering.java b/src/main/java/com/zhgd/xmgl/modules/city/engineering/entity/Engineering.java index 8a15367..17ab24d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/engineering/entity/Engineering.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/engineering/entity/Engineering.java @@ -360,4 +360,7 @@ public class Engineering implements Serializable { @TableField(exist = false) private String surveyEnt; + @TableField(exist = false) + @ApiModelProperty(value = "入场时间") + private Date entryTime; } diff --git a/src/main/java/com/zhgd/xmgl/modules/city/engineering/entity/vo/CountEngineeringVo.java b/src/main/java/com/zhgd/xmgl/modules/city/engineering/entity/vo/CountEngineeringVo.java index 06be5f6..6bcb3e7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/engineering/entity/vo/CountEngineeringVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/engineering/entity/vo/CountEngineeringVo.java @@ -19,4 +19,11 @@ public class CountEngineeringVo { private Double totalEngineeringLength; @ApiModelProperty(value = "工程总面积(㎡)") private Double totalEngineeringArea; + @ApiModelProperty(value = "年度新建工程（项）") + private Integer newYearConstructionCount; + @ApiModelProperty(value = "在建工程（项）") + private Integer constructionInProgressCount; + @ApiModelProperty(value = "停工工程（项）") + private Integer workStoppageCount; + } diff --git a/src/main/java/com/zhgd/xmgl/modules/city/engineering/entity/vo/EngineeringEveryDistrictAndStateVo.java b/src/main/java/com/zhgd/xmgl/modules/city/engineering/entity/vo/EngineeringEveryDistrictAndStateVo.java new file mode 100644 index 0000000..1dd6fd9 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/city/engineering/entity/vo/EngineeringEveryDistrictAndStateVo.java @@ -0,0 +1,16 @@ +package com.zhgd.xmgl.modules.city.engineering.entity.vo; + +import com.zhgd.xmgl.base.entity.vo.SectorOneVo; +import com.zhgd.xmgl.base.entity.vo.TrendVo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class EngineeringEveryDistrictAndStateVo { + @ApiModelProperty("新建") + private List newBuilds; + @ApiModelProperty("停工") + private List shutDowns; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/city/engineering/mapper/DangerousEngineeringMapper.java b/src/main/java/com/zhgd/xmgl/modules/city/engineering/mapper/DangerousEngineeringMapper.java index bb08467..b749f9a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/engineering/mapper/DangerousEngineeringMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/engineering/mapper/DangerousEngineeringMapper.java @@ -27,4 +27,6 @@ public interface DangerousEngineeringMapper extends BaseMapper countDangerousEngineeringType(HashMap map); List countDangerousEngineeringRank(HashMap paramMap); + + List countDangerousEngineeringDistrictRank(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/city/engineering/mapper/EngineeringMapper.java b/src/main/java/com/zhgd/xmgl/modules/city/engineering/mapper/EngineeringMapper.java index de4ba8d..72406e7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/engineering/mapper/EngineeringMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/engineering/mapper/EngineeringMapper.java @@ -14,6 +14,7 @@ import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -49,7 +50,7 @@ public interface EngineeringMapper extends BaseMapper { Integer getCompletedThisYearCount(); - Integer getKeyProjectCount(); + Integer getKeyProjectCount(HashMap paramMap); Double getTotalEngineeringArea(); @@ -69,9 +70,15 @@ public interface EngineeringMapper extends BaseMapper { List countEngineeringDistrictCost(Map paramMap); - List countEngineeringType(); + List countEngineeringType(HashMap paramMap); List countEngineeringEveryDistrictAndType(); Page getPageList(Page page, @Param(Constants.WRAPPER) Wrapper wrapper, @Param("map") Map map); + + Integer getNewYearConstructionCount(HashMap paramMap); + + Integer getConstructionInProgressCount(HashMap paramMap); + + Integer getWorkStoppageCount(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/city/engineering/mapper/xml/DangerousEngineeringMapper.xml b/src/main/java/com/zhgd/xmgl/modules/city/engineering/mapper/xml/DangerousEngineeringMapper.xml index 87eecac..34157a9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/engineering/mapper/xml/DangerousEngineeringMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/city/engineering/mapper/xml/DangerousEngineeringMapper.xml @@ -41,4 +41,20 @@ group by g.government_sn + + diff --git a/src/main/java/com/zhgd/xmgl/modules/city/engineering/mapper/xml/EngineeringMapper.xml b/src/main/java/com/zhgd/xmgl/modules/city/engineering/mapper/xml/EngineeringMapper.xml index 4c424af..6332b81 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/engineering/mapper/xml/EngineeringMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/city/engineering/mapper/xml/EngineeringMapper.xml @@ -101,6 +101,9 @@ from engineering where examine_state = 3 and is_important = 1 + + and date_format(create_time,'%Y') = #{year} + select engineering_type, count(*) count from engineering + where 1=1 + + and state = #{state} + + + and (state = 3 or state = 4) + group by engineering_type @@ -237,24 +247,55 @@ + + + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/city/engineering/service/IDangerousEngineeringService.java b/src/main/java/com/zhgd/xmgl/modules/city/engineering/service/IDangerousEngineeringService.java index c40559b..9a7a496 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/engineering/service/IDangerousEngineeringService.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/engineering/service/IDangerousEngineeringService.java @@ -22,4 +22,6 @@ public interface IDangerousEngineeringService extends IService countDangerousEngineeringRank(HashMap paramMap); + + } diff --git a/src/main/java/com/zhgd/xmgl/modules/city/engineering/service/IEngineeringService.java b/src/main/java/com/zhgd/xmgl/modules/city/engineering/service/IEngineeringService.java index 65be65d..67d40d3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/engineering/service/IEngineeringService.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/engineering/service/IEngineeringService.java @@ -13,6 +13,7 @@ import com.zhgd.xmgl.modules.basicdata.statistics.EngineeringStat; import com.zhgd.xmgl.modules.basicdata.vo.EngineeringVo; import com.zhgd.xmgl.modules.city.engineering.entity.Engineering; import com.zhgd.xmgl.modules.city.engineering.entity.vo.CountEngineeringVo; +import com.zhgd.xmgl.modules.city.engineering.entity.vo.EngineeringEveryDistrictAndStateVo; import com.zhgd.xmgl.modules.city.engineering.entity.vo.EngineeringTrendProgressVo; import com.zhgd.xmgl.modules.city.engineering.entity.vo.EngineeringTrendVo; @@ -62,7 +63,7 @@ public interface IEngineeringService extends IService { List querySingle(Engineering engineering); - CountEngineeringVo countEngineering(); + CountEngineeringVo countEngineering(HashMap paramMap); List countEngineeringState(HashMap paramMap); @@ -81,4 +82,7 @@ public interface IEngineeringService extends IService { List countEngineeringType(); MultiTrendVo countEngineeringEveryDistrictAndType(); + + EngineeringEveryDistrictAndStateVo countEngineeringEveryDistrictAndState(); + } diff --git a/src/main/java/com/zhgd/xmgl/modules/city/engineering/service/impl/DangerousEngineeringServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/city/engineering/service/impl/DangerousEngineeringServiceImpl.java index e9783a6..8b02952 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/engineering/service/impl/DangerousEngineeringServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/engineering/service/impl/DangerousEngineeringServiceImpl.java @@ -1,8 +1,10 @@ package com.zhgd.xmgl.modules.city.engineering.service.impl; +import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.xmgl.base.entity.vo.*; +import com.zhgd.xmgl.constant.CommonConstant; import com.zhgd.xmgl.modules.basicdata.entity.SystemDictData; import com.zhgd.xmgl.modules.basicdata.mapper.SystemDictDataMapper; import com.zhgd.xmgl.modules.basicdata.service.ISystemDictDataService; @@ -11,6 +13,7 @@ import com.zhgd.xmgl.modules.city.engineering.mapper.DangerousEngineeringMapper; import com.zhgd.xmgl.modules.city.engineering.service.IDangerousEngineeringService; import com.zhgd.xmgl.modules.city.government.entity.Government; import com.zhgd.xmgl.modules.city.government.mapper.GovernmentMapper; +import com.zhgd.xmgl.modules.city.project.mapper.ProjectMapper; import com.zhgd.xmgl.security.SecurityUtil; import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -19,6 +22,7 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -35,6 +39,8 @@ public class DangerousEngineeringServiceImpl extends ServiceImpl countDangerousEngineeringRank(HashMap paramMap) { - Integer size = MapUtils.getInteger(paramMap, "size"); - List sectorOneVos = baseMapper.countDangerousEngineeringRank(paramMap); - List sectorOneVosForGovernments = SectorOneVo.getSectorOneVosForGovernment(sectorOneVos, governmentMapper); - sectorOneVosForGovernments.sort((o1, o2) -> o2.getCount().compareTo(o1.getCount())); - if (size != null) { - sectorOneVosForGovernments = sectorOneVosForGovernments.stream().limit(size).collect(Collectors.toList()); + Integer type = MapUtils.getInteger(paramMap, "type"); + if (Objects.equals(type, 1)) { + Integer size = MapUtils.getInteger(paramMap, "size"); + List sectorOneVos = baseMapper.countDangerousEngineeringRank(paramMap); + List sectorOneVosForGovernments = SectorOneVo.getSectorOneVosForGovernment(sectorOneVos, governmentMapper); + sectorOneVosForGovernments.sort((o1, o2) -> o2.getCount().compareTo(o1.getCount())); + if (size != null) { + sectorOneVosForGovernments = sectorOneVosForGovernments.stream().limit(size).collect(Collectors.toList()); + } + return sectorOneVosForGovernments; + } else { + paramMap.put(CommonConstant.IGNORE_DATA_SCOPE,CommonConstant.IGNORE_DATA_SCOPE); + String sn = SecurityUtil.getUser().getSn(); + List projectSnList = projectMapper.getSnListForCity(sn); + if (CollUtil.isEmpty(projectSnList)) { + return null; + } + paramMap.put("projectSnList", projectSnList); + return baseMapper.countDangerousEngineeringDistrictRank(paramMap); } - return sectorOneVosForGovernments; } } diff --git a/src/main/java/com/zhgd/xmgl/modules/city/engineering/service/impl/EngineeringServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/city/engineering/service/impl/EngineeringServiceImpl.java index 894ff0d..80f481e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/city/engineering/service/impl/EngineeringServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/city/engineering/service/impl/EngineeringServiceImpl.java @@ -33,6 +33,7 @@ import com.zhgd.xmgl.modules.city.engineering.entity.EngineeringMain; import com.zhgd.xmgl.modules.city.engineering.entity.EngineeringMainPerson; import com.zhgd.xmgl.modules.city.engineering.entity.EngineeringSingle; import com.zhgd.xmgl.modules.city.engineering.entity.vo.CountEngineeringVo; +import com.zhgd.xmgl.modules.city.engineering.entity.vo.EngineeringEveryDistrictAndStateVo; import com.zhgd.xmgl.modules.city.engineering.entity.vo.EngineeringTrendProgressVo; import com.zhgd.xmgl.modules.city.engineering.entity.vo.EngineeringTrendVo; import com.zhgd.xmgl.modules.city.engineering.mapper.EngineeringMapper; @@ -96,7 +97,7 @@ public class EngineeringServiceImpl extends ServiceImpl getPageList(Page page, Wrapper wrapper, Map map) { - Page pageList = baseMapper.getPageList(page, wrapper,map); + Page pageList = baseMapper.getPageList(page, wrapper, map); List engineeringTypes = systemDictDataService.getByType(ParamEnum.SysDictType.ENGINEERING_TYPE.getValue()); List engineeringStates = systemDictDataService.getByType(ParamEnum.SysDictType.ENGINEERING_STATE.getValue()); pageList.getRecords().stream().forEach(s -> { @@ -285,15 +286,18 @@ public class EngineeringServiceImpl extends ServiceImpl paramMap) { CountEngineeringVo vo = new CountEngineeringVo(); vo.setProjectUnderSupervisionCount(baseMapper.getProjectUnderSupervisionCount()); vo.setTotalProjectCost(baseMapper.getTotalProjectCost()); vo.setNewThisYearCount(baseMapper.getNewThisYearCount()); vo.setCompletedThisYearCount(baseMapper.getCompletedThisYearCount()); - vo.setKeyProjectCount(baseMapper.getKeyProjectCount()); + vo.setKeyProjectCount(baseMapper.getKeyProjectCount(paramMap)); vo.setTotalEngineeringArea(baseMapper.getTotalEngineeringArea()); vo.setTotalEngineeringLength(baseMapper.getTotalEngineeringLength()); + vo.setNewYearConstructionCount(baseMapper.getNewYearConstructionCount(paramMap)); + vo.setConstructionInProgressCount(baseMapper.getConstructionInProgressCount(paramMap)); + vo.setWorkStoppageCount(baseMapper.getWorkStoppageCount(paramMap)); return vo; } @@ -388,7 +392,8 @@ public class EngineeringServiceImpl extends ServiceImpl countEngineeringType() { - List list = baseMapper.countEngineeringType(); + HashMap paramMap = new HashMap<>(); + List list = baseMapper.countEngineeringType(paramMap); List rtList = new ArrayList<>(); Map map = list.stream().collect(Collectors.toMap(SectorOneVo::getEngineeringType, Function.identity())); for (ParamEnum.EngineeringType type : ParamEnum.EngineeringType.values()) { @@ -425,6 +430,18 @@ public class EngineeringServiceImpl extends ServiceImpl paramMap = new HashMap<>(); + EngineeringEveryDistrictAndStateVo vo = new EngineeringEveryDistrictAndStateVo(); + paramMap.put("state", 1); + vo.setNewBuilds(SectorOneVo.getSectorOneVosForGovernment(baseMapper.countEngineeringType(paramMap), governmentMapper)); + paramMap.put("state", null); + paramMap.put("stop", true); + vo.setShutDowns(SectorOneVo.getSectorOneVosForGovernment(baseMapper.countEngineeringType(paramMap), governmentMapper)); + return vo; + } + private List getData(List names, ParamEnum.EngineeringType type, List list) { List rtList = new ArrayList<>(); for (String name : names) { diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/CompanyMapper.java b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/CompanyMapper.java deleted file mode 100644 index 3d62e9d..0000000 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/CompanyMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.zhgd.xmgl.modules.wisdom.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zhgd.annotation.DataScope; -import com.zhgd.xmgl.modules.wisdom.entity.Company; -import org.apache.ibatis.annotations.Mapper; - -/** - * @Description: 参建单位 - * @author： pengj - * @date： 2023-03-13 - * @version： V1.0 - */ -@Mapper -@DataScope -public interface CompanyMapper extends BaseMapper { - -} diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/CompanyMapper.xml b/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/CompanyMapper.xml deleted file mode 100644 index 83bbb85..0000000 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/mapper/xml/CompanyMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/CompanyServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/CompanyServiceImpl.java deleted file mode 100644 index 2f16e8e..0000000 --- a/src/main/java/com/zhgd/xmgl/modules/wisdom/service/impl/CompanyServiceImpl.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.zhgd.xmgl.modules.wisdom.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.zhgd.xmgl.modules.wisdom.entity.Company; -import com.zhgd.xmgl.modules.wisdom.mapper.CompanyMapper; -import com.zhgd.xmgl.modules.wisdom.service.ICompanyService; -import com.zhgd.xmgl.util.CommonUtil; -import org.springframework.stereotype.Service; - -/** - * @Description: 参建单位 - * @author： pengj - * @date： 2023-03-13 - * @version： V1.0 - */ -@Service -public class CompanyServiceImpl extends ServiceImpl implements ICompanyService { - - @Override - public boolean saveInfo(Company company) { - company.setCompanySn(CommonUtil.getUUid()); - return this.save(company); - } -} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 7e75c1f..41980f9 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -44,7 +44,7 @@ spring.servlet.multipart.max-file-size=1024MB spring.servlet.multipart.max-request-size=1024MB spring.servlet.multipart.resolve-lazily=false # mqtt服务器配置 -mqtt.url=tcp://jxj.zhgdyun.com:1883 +mqtt.host=tcp://jxj.zhgdyun.com:1883 mqtt.clientId=mqttx_babd9e97 mqtt.username=admin mqtt.password=JXJ@admin