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

农民工统计

dev_kxc
zth 10 months ago
parent
3282bbd5e5
commit
23daa113e3
2 changed files with 17 additions and 9 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. 7
      jwtech-system/src/main/java/com/kms/statistics/domain/BsSgcJsjdNmgStatisticVo.java
  2. 19
      jwtech-system/src/main/java/com/kms/statistics/service/BsSgcJsjdBuiNmgStatisticsService.java

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

@ -39,6 +39,13 @@ public class BsSgcJsjdNmgStatisticVo {
public BsSgcJsjdNmgStatisticVo() {
this.id = UUID.randomUUID().toString();
this.totalNum="0";
this.presentNum="0";
this.exitNum="0";
this.totalSalary="0";
this.unpaidWages="0";
this.unpaidWagesAmount="0";
}
}

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

@ -103,7 +103,7 @@ public class BsSgcJsjdBuiNmgStatisticsService {
o.setExitNum(String.valueOf(Integer.parseInt(o.getExitNum())+1));
}
if (ObjectUtil.isNotEmpty(bsSgcJsjdBuiRealName.getAdmissionTime())){
o.setPresentNum(String.valueOf(Integer.parseInt(o.getPresentNum()+1)));
o.setPresentNum(String.valueOf(Integer.parseInt(o.getPresentNum())+1));
}
childrenMap.put(yearMonth,o);
}else {
@ -130,7 +130,7 @@ public class BsSgcJsjdBuiNmgStatisticsService {
if (ObjectUtil.isNotEmpty(bsSgcJsjdBuiRealName.getExitTime())){
long l = DateUtil.betweenYear(bsSgcJsjdBuiRealName.getAdmissionTime(), bsSgcJsjdBuiRealName.getExitTime(), true);
Integer yearValue=Integer.valueOf(year);
for (int i=1;l>i;i++){
for (int i=1;l>=i;i++){
yearValue=yearValue+1;
if (map.containsKey(String.valueOf(yearValue))){
BsSgcJsjdNmgStatisticVo o = (BsSgcJsjdNmgStatisticVo) map.get(String.valueOf(yearValue));
@ -139,7 +139,7 @@ public class BsSgcJsjdBuiNmgStatisticsService {
o.setExitNum(String.valueOf(Integer.parseInt(o.getExitNum())+1));
}
if (ObjectUtil.isNotEmpty(bsSgcJsjdBuiRealName.getAdmissionTime())){
o.setPresentNum(String.valueOf(Integer.parseInt(o.getPresentNum()+1)));
o.setPresentNum(String.valueOf(Integer.parseInt(o.getPresentNum())+1));
}
map.put(String.valueOf(yearValue),o);
}else {
@ -165,8 +165,9 @@ public class BsSgcJsjdBuiNmgStatisticsService {
if (ObjectUtil.isNotEmpty(bsSgcJsjdBuiRealName.getExitTime())){
long l = DateUtil.betweenMonth(bsSgcJsjdBuiRealName.getAdmissionTime(), bsSgcJsjdBuiRealName.getExitTime(), true);
int monthValue=Integer.parseInt(month);
Integer yearValue=Integer.valueOf(year);
for (int i=1;l>i;i++){
for (int i=1;l>=i;i++){
monthValue=monthValue+1;
if (monthValue>12){
yearValue=yearValue+1;
@ -180,7 +181,7 @@ public class BsSgcJsjdBuiNmgStatisticsService {
o.setExitNum(String.valueOf(Integer.parseInt(o.getExitNum())+1));
}
if (ObjectUtil.isNotEmpty(bsSgcJsjdBuiRealName.getAdmissionTime())){
o.setPresentNum(String.valueOf(Integer.parseInt(o.getPresentNum()+1)));
o.setPresentNum(String.valueOf(Integer.parseInt(o.getPresentNum())+1));
}
childrenMap.put(yearMonth,o);
}else {
@ -224,9 +225,9 @@ public class BsSgcJsjdBuiNmgStatisticsService {
o.setUnpaidWagesAmount(bsSgcJsjdBuiSalaryPayable.getMonthlySalaryDeduct());
}
if (!o.getUnpaidWagesAmount().equals("0")){
o.setUnpaidWages("0");
}else {
o.setUnpaidWages("1");
}else {
o.setUnpaidWages("0");
}
map.put(year,o);
}else {
@ -236,9 +237,9 @@ public class BsSgcJsjdBuiNmgStatisticsService {
bsSgcJsjdNmgStatisticVo1.setTotalSalary(bsSgcJsjdBuiSalaryPayable.getMonthlySalaryCurrent());
bsSgcJsjdNmgStatisticVo1.setUnpaidWagesAmount(bsSgcJsjdBuiSalaryPayable.getMonthlySalaryDeduct());
if (!bsSgcJsjdNmgStatisticVo1.getUnpaidWagesAmount().equals("0")){
bsSgcJsjdNmgStatisticVo1.setUnpaidWages("0");
}else {
bsSgcJsjdNmgStatisticVo1.setUnpaidWages("1");
}else {
bsSgcJsjdNmgStatisticVo1.setUnpaidWages("0");
}
map.put(bsSgcJsjdNmgStatisticVo1.getCurrentTime(),bsSgcJsjdNmgStatisticVo1);
}

Write Preview
Loading…
Cancel
Save