diff --git a/src/main/java/com/zhgd/xmgl/modules/project/entity/bo/ProjectStatisticsCountBo.java b/src/main/java/com/zhgd/xmgl/modules/project/entity/bo/ProjectStatisticsCountBo.java new file mode 100644 index 000000000..57fa69ea9 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/project/entity/bo/ProjectStatisticsCountBo.java @@ -0,0 +1,9 @@ +package com.zhgd.xmgl.modules.project.entity.bo; + +import lombok.Data; + +@Data +public class ProjectStatisticsCountBo { + private Integer projectNum; + private Double saleAcreageTotal; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectMapper.java b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectMapper.java index 2a3d5b4f5..537cbe9ee 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/ProjectMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.basicdata.entity.vo.CompanyProjectTypeCountVo; import com.zhgd.xmgl.modules.project.entity.Project; +import com.zhgd.xmgl.modules.project.entity.bo.ProjectStatisticsCountBo; import com.zhgd.xmgl.modules.project.entity.vo.ConstructionStageVo; import com.zhgd.xmgl.modules.project.entity.vo.GroupByProjectProgressVo; import com.zhgd.xmgl.modules.project.entity.vo.GroupByProjectTypeVo; @@ -51,7 +52,7 @@ public interface ProjectMapper extends BaseMapper { Map selectDevStatisticsCount(Map map); - Map selectProjectStatisticsCount(Map map); + ProjectStatisticsCountBo selectProjectStatisticsCount(Map map); List selectDevCoordinateList(Map map); diff --git a/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectMapper.xml b/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectMapper.xml index 2c9103db0..3987a7aa0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/project/mapper/xml/ProjectMapper.xml @@ -337,7 +337,8 @@ - SELECT COUNT(1) projectNum, IFNULL(SUM(a.sale_acreage), 0) saleAcreageTotal FROM project a @@ -345,6 +346,9 @@ Left JOIN company b ON cp.parent_id = b.company_id Left JOIN company f ON b.parent_id = f.company_id + + and a.project_name like CONCAT(CONCAT('%', #{projectName}), '%') + and f.headquarters_sn = #{sn} @@ -354,6 +358,9 @@ and b.company_sn = #{sn} + + and a.project_sn = #{sn} + and cp.company_sn = #{sn} diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java index 1d44f7af4..b493588c1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java @@ -15,8 +15,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.gexin.fastjson.JSON; -import com.gexin.fastjson.JSONArray; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.mybatis.EntityMap; @@ -29,6 +27,7 @@ import com.zhgd.xmgl.modules.basicdata.service.UploadFileService; import com.zhgd.xmgl.modules.govtapi.GovtOpenApiService; import com.zhgd.xmgl.modules.project.entity.Project; import com.zhgd.xmgl.modules.project.entity.ProjectEnterprise; +import com.zhgd.xmgl.modules.project.entity.bo.ProjectStatisticsCountBo; import com.zhgd.xmgl.modules.project.mapper.ProjectEnterpriseMapper; import com.zhgd.xmgl.modules.project.mapper.ProjectMapper; import com.zhgd.xmgl.modules.project.service.IProjectUfaceConfigService; @@ -399,7 +398,7 @@ public class WorkerInfoServiceImpl extends ServiceImpl devcount = projectMapper.selectDevStatisticsCount(map); - Map projectcount = projectMapper.selectProjectStatisticsCount(map); + ProjectStatisticsCountBo projectcount = projectMapper.selectProjectStatisticsCount(map); WorkerManageStatisticsVo.WorkerCount workercount = workerInfoMapper.getProjectWorkerStatistics(map); WorkerManageStatisticsVo.PresenceCount presencecount = workerInfoMapper.getWorkerPresenceStatistics(map); map.put("timeType", 1); @@ -412,7 +411,7 @@ public class WorkerInfoServiceImpl extends ServiceImpl devcount = projectMapper.selectDevStatisticsCount(map); - Map projectcount = projectMapper.selectProjectStatisticsCount(map); + ProjectStatisticsCountBo projectcount = projectMapper.selectProjectStatisticsCount(map); WorkerManageStatisticsVo.WorkerCount workercount = workerInfoMapper.getProjectWorkerStatistics(map); WorkerManageStatisticsVo.PresenceCount presencecount = workerInfoMapper.getWorkerPresenceStatistics(map); map.put("timeType", 1); @@ -644,6 +643,8 @@ public class WorkerInfoServiceImpl extends ServiceImpl