diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiEnteInfo.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiEnteInfo.java index fab0aed3..41c72f3e 100644 --- a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiEnteInfo.java +++ b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiEnteInfo.java @@ -76,4 +76,5 @@ public class BsSgcJsjdBuiEnteInfo extends BaseEntity @ApiModelProperty("所属单位统一社会信用代码") private String socialCreditCode; + private String sectionName; } diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiProInspect.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiProInspect.java index 742098f0..c567c222 100644 --- a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiProInspect.java +++ b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiProInspect.java @@ -83,4 +83,5 @@ public class BsSgcJsjdBuiProInspect extends BaseEntity @ApiModelProperty("整改落实情况") private String proNo; + private String sectionName; } diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiSafeFilings.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiSafeFilings.java index 135d9a90..3dd0932c 100644 --- a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiSafeFilings.java +++ b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiSafeFilings.java @@ -88,4 +88,5 @@ public class BsSgcJsjdBuiSafeFilings extends BaseEntity private String attachment; + private String sectionName; } diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiSourceFunds.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiSourceFunds.java index fa151403..80c6e0ce 100644 --- a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiSourceFunds.java +++ b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiSourceFunds.java @@ -122,6 +122,5 @@ public class BsSgcJsjdBuiSourceFunds extends BaseEntity @ApiModelProperty("下达金额") private BigDecimal releaseFunds; - - + private String sectionName; } diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiUnitProject.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiUnitProject.java index bfc585dc..3579cde2 100644 --- a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiUnitProject.java +++ b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiUnitProject.java @@ -88,4 +88,5 @@ public class BsSgcJsjdBuiUnitProject extends BaseEntity @ApiModelProperty("分部工程优良率") private String owerDept; + private String sectionName; } diff --git a/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java b/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java index 79dc40f5..987394ac 100644 --- a/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java +++ b/jwtech-system/src/main/java/com/kms/build/service/BsSgcjsjdBuiProInfoService.java @@ -187,9 +187,8 @@ public class BsSgcjsjdBuiProInfoService extends BaseService total = bsSgcjsjdBuiProInfoMapper.selectList(null); page.setRecords(records); - page.setTotal(total.size()); + page.setTotal(records.size()); return page; } diff --git a/jwtech-system/src/main/java/com/kms/statistics/controller/BsSgcJsjdBuiNmgStatisticsController.java b/jwtech-system/src/main/java/com/kms/statistics/controller/BsSgcJsjdBuiNmgStatisticsController.java index d6ebd01a..fca3b044 100644 --- a/jwtech-system/src/main/java/com/kms/statistics/controller/BsSgcJsjdBuiNmgStatisticsController.java +++ b/jwtech-system/src/main/java/com/kms/statistics/controller/BsSgcJsjdBuiNmgStatisticsController.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.jianwei.common.core.domain.SearchParam; import com.kms.build.domain.BsSgcJsjdBuiDedicatedAccount; import com.kms.build.domain.BsSgcJsjdBuiRealNamePro; +import com.kms.statistics.domain.BsSgcJsjdNmgStatisticVo; import com.kms.statistics.service.BsSgcJsjdBuiNmgStatisticsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -18,7 +19,7 @@ public class BsSgcJsjdBuiNmgStatisticsController { BsSgcJsjdBuiNmgStatisticsService bsSgcJsjdBuiNmgStatisticsService; @GetMapping - public IPageselectPage(SearchParamsp){ + public IPageselectPage(SearchParamsp){ return bsSgcJsjdBuiNmgStatisticsService.selectPage(sp); } } diff --git a/jwtech-system/src/main/java/com/kms/statistics/domain/BsSgcJsjdNmgStatisticVo.java b/jwtech-system/src/main/java/com/kms/statistics/domain/BsSgcJsjdNmgStatisticVo.java index 288a4cb5..f1ed1809 100644 --- a/jwtech-system/src/main/java/com/kms/statistics/domain/BsSgcJsjdNmgStatisticVo.java +++ b/jwtech-system/src/main/java/com/kms/statistics/domain/BsSgcJsjdNmgStatisticVo.java @@ -3,9 +3,32 @@ package com.kms.statistics.domain; import lombok.Data; +import java.util.Date; +import java.util.List; + @Data public class BsSgcJsjdNmgStatisticVo { private String project_name; + private Date currentTime; + + //总多少农民工数量 + private String totalNum; + + //在场的农民工数量 + private String presentNum; + + //退场的农民工数量 + private String exitNum; + + //发放工资总数 + private String totalSalary; + + //是否有拖欠工资 0是 1否 + private String unpaidWages; + + //总拖欠工资 + private String unpaidWagesAmount; + private Listchildren; } diff --git a/jwtech-system/src/main/java/com/kms/statistics/service/BsSgcJsjdBuiNmgStatisticsService.java b/jwtech-system/src/main/java/com/kms/statistics/service/BsSgcJsjdBuiNmgStatisticsService.java index 1302193a..665293de 100644 --- a/jwtech-system/src/main/java/com/kms/statistics/service/BsSgcJsjdBuiNmgStatisticsService.java +++ b/jwtech-system/src/main/java/com/kms/statistics/service/BsSgcJsjdBuiNmgStatisticsService.java @@ -1,18 +1,38 @@ package com.kms.statistics.service; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jianwei.common.core.domain.SearchParam; import com.kms.build.domain.BsSgcJsjdBuiDedicatedAccount; import com.kms.build.domain.BsSgcJsjdBuiRealNamePro; +import com.kms.build.mapper.BsSgcJsjdBuiRealNameMapper; +import com.kms.build.mapper.BsSgcJsjdBuiRealNameProMapper; +import com.kms.statistics.domain.BsSgcJsjdNmgStatisticVo; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + + @Service public class BsSgcJsjdBuiNmgStatisticsService { + @Autowired + BsSgcJsjdBuiRealNameProMapper bsSgcJsjdBuiRealNameProMapper; + + @Autowired + BsSgcJsjdBuiRealNameMapper bsSgcJsjdBuiRealNameMapper; - public IPage selectPage(SearchParam sp){ + public IPage selectPage(SearchParam sp){ Pagepage=new Page<>(sp.getPageNum(),sp.getPageSize()); + LambdaQueryWrapperlw=new LambdaQueryWrapper<>(); + Page bsSgcJsjdBuiRealNameProPage = bsSgcJsjdBuiRealNameProMapper.selectPage(page, null); + List records = bsSgcJsjdBuiRealNameProPage.getRecords(); + for (BsSgcJsjdBuiRealNamePro bs:records){ + + } return null; } }