diff --git a/jwtech-quartz/src/main/java/com/jwtech/quartz/task/evaluateTask.java b/jwtech-quartz/src/main/java/com/jwtech/quartz/task/evaluateTask.java index a7030757..f08769f4 100644 --- a/jwtech-quartz/src/main/java/com/jwtech/quartz/task/evaluateTask.java +++ b/jwtech-quartz/src/main/java/com/jwtech/quartz/task/evaluateTask.java @@ -396,6 +396,14 @@ public class evaluateTask { } } + //若在工程施工合同签订之日起30日后未开设 + public void noOpenAccount(){ + List bsSgcjsjdBuiProInfos = bsSgcjsjdBuiProInfoMapper.selectList(null); + for(BsSgcjsjdBuiProInfo bs:bsSgcjsjdBuiProInfos){ + + } + } + //年度度汛方案未备案 @Scheduled(cron="0 0 0 15 4 ?") //每年4月15日秒执行一次 diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiChange.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiChange.java index 167b242e..4a159eb4 100644 --- a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiChange.java +++ b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiChange.java @@ -94,4 +94,6 @@ public class BsSgcJsjdBuiChange extends BaseEntity @ApiModelProperty("数源部门") private String owerDept; + private String sectionName; + } diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiConstrMeas.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiConstrMeas.java index 47b762a3..47a16c6c 100644 --- a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiConstrMeas.java +++ b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiConstrMeas.java @@ -114,5 +114,6 @@ public class BsSgcJsjdBuiConstrMeas extends BaseEntity @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8") private Date approvalTime5; + private String sectionName; } diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiMeetRecord.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiMeetRecord.java index f4f6bea2..e100cf15 100644 --- a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiMeetRecord.java +++ b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiMeetRecord.java @@ -78,4 +78,5 @@ public class BsSgcJsjdBuiMeetRecord extends BaseEntity @ApiModelProperty("数源部门") private String owerDept; + private String sectionName; } diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiProSupervision.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiProSupervision.java index 6b83c971..66ec39e1 100644 --- a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiProSupervision.java +++ b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiProSupervision.java @@ -78,4 +78,6 @@ public class BsSgcJsjdBuiProSupervision extends BaseEntity @ApiModelProperty("监督结果") private String proNo; + private String sectionName; + } diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiProgressPlan.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiProgressPlan.java index 151347a4..5df4ec90 100644 --- a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiProgressPlan.java +++ b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiProgressPlan.java @@ -187,4 +187,6 @@ public class BsSgcJsjdBuiProgressPlan extends BaseEntity private String isMajor; + private String sectionName; + } diff --git a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiEnteInfoService.java b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiEnteInfoService.java index a6f1a2fb..eb6e2c65 100644 --- a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiEnteInfoService.java +++ b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiEnteInfoService.java @@ -42,8 +42,6 @@ public class BsSgcJsjdBuiEnteInfoService extends BaseService queryWrapper = new QueryWrapper<>(); queryWrapper.eq(proCode != null, "pro_code", proCode); queryWrapper.eq(proNo != null, "pro_no", proNo); 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 fca3b044..9d319006 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 @@ -9,6 +9,7 @@ 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; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -18,7 +19,7 @@ public class BsSgcJsjdBuiNmgStatisticsController { @Autowired BsSgcJsjdBuiNmgStatisticsService bsSgcJsjdBuiNmgStatisticsService; - @GetMapping + @PostMapping("/getNum") 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 f1ed1809..7c01d724 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 @@ -8,9 +8,9 @@ import java.util.List; @Data public class BsSgcJsjdNmgStatisticVo { - private String project_name; + private String projectName; - private Date currentTime; + private String currentTime; //总多少农民工数量 private String totalNum; 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 665293de..8ea8f227 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 @@ -3,18 +3,28 @@ package com.kms.statistics.service; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +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.jianwei.common.core.domain.SearchParam; +import com.jwtech.util.StringUtil; import com.kms.build.domain.BsSgcJsjdBuiDedicatedAccount; +import com.kms.build.domain.BsSgcJsjdBuiRealName; import com.kms.build.domain.BsSgcJsjdBuiRealNamePro; +import com.kms.build.domain.BsSgcJsjdBuiSalaryPayable; import com.kms.build.mapper.BsSgcJsjdBuiRealNameMapper; import com.kms.build.mapper.BsSgcJsjdBuiRealNameProMapper; +import com.kms.build.mapper.BsSgcJsjdBuiSalaryPayableMapper; import com.kms.statistics.domain.BsSgcJsjdNmgStatisticVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.time.LocalDate; +import java.time.ZoneId; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; @Service @@ -25,13 +35,62 @@ public class BsSgcJsjdBuiNmgStatisticsService { @Autowired BsSgcJsjdBuiRealNameMapper bsSgcJsjdBuiRealNameMapper; + @Autowired + BsSgcJsjdBuiSalaryPayableMapper bsSgcJsjdBuiSalaryPayableMapper; 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(); + Listlist=new ArrayList<>(); for (BsSgcJsjdBuiRealNamePro bs:records){ - + BsSgcJsjdNmgStatisticVo bsSgcJsjdNmgStatisticVo=new BsSgcJsjdNmgStatisticVo(); + LambdaQueryWrapperrnlw=new LambdaQueryWrapper<>(); + List bsSgcJsjdBuiRealNames = bsSgcJsjdBuiRealNameMapper.selectList(rnlw.eq(BsSgcJsjdBuiRealName::getProNo, bs.getProNo()) + .eq(BsSgcJsjdBuiRealName::getProCode, bs.getProCode())); + bsSgcJsjdNmgStatisticVo.setProjectName(bs.getProjectName()); + + LambdaQueryWrappersplw=new LambdaQueryWrapper<>(); + List bsSgcJsjdBuiSalaryPayables = bsSgcJsjdBuiSalaryPayableMapper.selectList(splw.eq(BsSgcJsjdBuiSalaryPayable::getProNo, bs.getProNo()) + .eq(BsSgcJsjdBuiSalaryPayable::getProCode, bs.getProCode())); + + Mapmap=new HashMap<>(); + for (BsSgcJsjdBuiRealName bsSgcJsjdBuiRealName:bsSgcJsjdBuiRealNames){ + if (ObjectUtil.isNotEmpty(bsSgcJsjdBuiRealName.getAdmissionTime())){ + LocalDate localDate = bsSgcJsjdBuiRealName.getAdmissionTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); + String year= String.valueOf(localDate.getYear()); + BsSgcJsjdNmgStatisticVo bsSgcJsjdNmgStatisticVo1=new BsSgcJsjdNmgStatisticVo(); + if (map.containsKey(year)){ + BsSgcJsjdNmgStatisticVo o = (BsSgcJsjdNmgStatisticVo) map.get(year); + o.setTotalNum(String.valueOf(Integer.parseInt(o.getTotalNum())+1)); + if (ObjectUtil.isNotEmpty(bsSgcJsjdBuiRealName.getExitTime())){ + o.setExitNum(String.valueOf(Integer.parseInt(o.getExitNum())+1)); + } + if (ObjectUtil.isNotEmpty(bsSgcJsjdBuiRealName.getAdmissionTime())){ + o.setPresentNum(String.valueOf(Integer.parseInt(o.getPresentNum()+1))); + } + map.put(year,o); + }else { + bsSgcJsjdNmgStatisticVo1.setProjectName(bs.getProjectName()); + bsSgcJsjdNmgStatisticVo1.setTotalNum("1"); + if (ObjectUtil.isNotEmpty(bsSgcJsjdBuiRealName.getExitTime())){ + bsSgcJsjdNmgStatisticVo1.setExitNum("1"); + }else { + bsSgcJsjdNmgStatisticVo1.setExitNum("0"); + } + if (ObjectUtil.isNotEmpty(bsSgcJsjdBuiRealName.getAdmissionTime())){ + bsSgcJsjdNmgStatisticVo1.setPresentNum("1"); + }else { + bsSgcJsjdNmgStatisticVo1.setPresentNum("0"); + } + map.put(year,bsSgcJsjdNmgStatisticVo1); + } + } + } + + for (BsSgcJsjdBuiSalaryPayable bsSgcJsjdBuiSalaryPayable:bsSgcJsjdBuiSalaryPayables){ + + } } return null; }