Niko
/
shuili_manager
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

标段名称字段增加

dev_kxc
zth 10 months ago
parent
d8c59482b4
commit
b14c01befe
4 changed files with 62 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiConstrMeas.java
  2. 2
      jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiEnteInfoService.java
  3. 2
      jwtech-system/src/main/java/com/kms/statistics/domain/BsSgcJsjdNmgStatisticVo.java
  4. 61
      jwtech-system/src/main/java/com/kms/statistics/service/BsSgcJsjdBuiNmgStatisticsService.java

1
jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiConstrMeas.java
View File

@ -114,5 +114,6 @@ public class BsSgcJsjdBuiConstrMeas extends BaseEntity
@JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
private Date approvalTime5;
private String sectionName;
}

2
jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiEnteInfoService.java
View File

@ -42,8 +42,6 @@ public class BsSgcJsjdBuiEnteInfoService extends BaseService<BsSgcJsjdBuiEnteInf
BsSgcjsjdBuiProInfo proInfo = bsSgcjsjdBuiProInfoMapper.selectOne(proInfoQueryWrapper);
QueryWrapper<BsSgcJsjdBuiEnteInfo> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(proCode != null, "pro_code", proCode);
queryWrapper.eq(proNo != null, "pro_no", proNo);

2
jwtech-system/src/main/java/com/kms/statistics/domain/BsSgcJsjdNmgStatisticVo.java
View File

@ -8,7 +8,7 @@ import java.util.List;
@Data
public class BsSgcJsjdNmgStatisticVo {
private String project_name;
private String projectName;
private Date currentTime;

61
jwtech-system/src/main/java/com/kms/statistics/service/BsSgcJsjdBuiNmgStatisticsService.java
View File

@ -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<BsSgcJsjdNmgStatisticVo> selectPage(SearchParam<BsSgcJsjdBuiRealNamePro> sp){
Page<BsSgcJsjdBuiRealNamePro>page=new Page<>(sp.getPageNum(),sp.getPageSize());
LambdaQueryWrapper<BsSgcJsjdBuiRealNamePro>lw=new LambdaQueryWrapper<>();
Page<BsSgcJsjdBuiRealNamePro> bsSgcJsjdBuiRealNameProPage = bsSgcJsjdBuiRealNameProMapper.selectPage(page, null);
List<BsSgcJsjdBuiRealNamePro> records = bsSgcJsjdBuiRealNameProPage.getRecords();
List<BsSgcJsjdBuiRealNamePro>list=new ArrayList<>();
for (BsSgcJsjdBuiRealNamePro bs:records){
BsSgcJsjdNmgStatisticVo bsSgcJsjdNmgStatisticVo=new BsSgcJsjdNmgStatisticVo();
LambdaQueryWrapper<BsSgcJsjdBuiRealName>rnlw=new LambdaQueryWrapper<>();
List<BsSgcJsjdBuiRealName> bsSgcJsjdBuiRealNames = bsSgcJsjdBuiRealNameMapper.selectList(rnlw.eq(BsSgcJsjdBuiRealName::getProNo, bs.getProNo())
.eq(BsSgcJsjdBuiRealName::getProCode, bs.getProCode()));
bsSgcJsjdNmgStatisticVo.setProjectName(bs.getProjectName());
LambdaQueryWrapper<BsSgcJsjdBuiSalaryPayable>splw=new LambdaQueryWrapper<>();
List<BsSgcJsjdBuiSalaryPayable> bsSgcJsjdBuiSalaryPayables = bsSgcJsjdBuiSalaryPayableMapper.selectList(splw.eq(BsSgcJsjdBuiSalaryPayable::getProNo, bs.getProNo())
.eq(BsSgcJsjdBuiSalaryPayable::getProCode, bs.getProCode()));
Map<String,Object>map=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;
}

Write Preview
Loading…
Cancel
Save