|
@ -1973,15 +1973,18 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit |
|
|
erDto.setHongDeng(79); |
|
|
erDto.setHongDeng(79); |
|
|
erDto.setHuangDeng(39); |
|
|
erDto.setHuangDeng(39); |
|
|
erDto.setLanDeng(1674); |
|
|
erDto.setLanDeng(1674); |
|
|
EventRateResultDTO.Category category = new EventRateResultDTO.Category(); |
|
|
|
|
|
Integer[] rate = new Integer[]{338, 151, 31, 526, 448, 161, 93, 54}; |
|
|
Integer[] rate = new Integer[]{338, 151, 31, 526, 448, 161, 93, 54}; |
|
|
for (int i = 0; i < map.keySet().size(); i++) { |
|
|
int flag = 0; |
|
|
int flag = i; |
|
|
for (String key : map.keySet()) { |
|
|
map.keySet().forEach(key -> { |
|
|
EventRateResultDTO.Category category = new EventRateResultDTO.Category(); |
|
|
category.setCode(key); |
|
|
category.setCode(key); |
|
|
category.setName(map.get(key)); |
|
|
category.setName(map.get(key)); |
|
|
category.setValue(rate[flag]); |
|
|
category.setValue(rate[flag]); |
|
|
}); |
|
|
if (flag == 7) { |
|
|
|
|
|
flag = 0; |
|
|
|
|
|
} else { |
|
|
|
|
|
flag += flag + 1; |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
@ -2000,12 +2003,12 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit |
|
|
total = eventType.equals("0") ? dto.getJiSuJiBan() : eventType.equals("1") ? |
|
|
total = eventType.equals("0") ? dto.getJiSuJiBan() : eventType.equals("1") ? |
|
|
dto.getZhiTongLianBan() : dto.getWangGeHua(); |
|
|
dto.getZhiTongLianBan() : dto.getWangGeHua(); |
|
|
} |
|
|
} |
|
|
if(dto.getJiSuJiBan() < 406){ |
|
|
if (dto.getJiSuJiBan() < 406) { |
|
|
dto.setJiSuJiBan(406); |
|
|
dto.setJiSuJiBan(406); |
|
|
dto.setZhiTongLianBan(72); |
|
|
dto.setZhiTongLianBan(72); |
|
|
dto.setWangGeHua(1320); |
|
|
dto.setWangGeHua(1320); |
|
|
} |
|
|
} |
|
|
if(StringUtils.isEmpty(eventType)){ |
|
|
if (StringUtils.isEmpty(eventType)) { |
|
|
dto.setYiJieAn(1195); |
|
|
dto.setYiJieAn(1195); |
|
|
dto.setYiJieAnRate(0.67); |
|
|
dto.setYiJieAnRate(0.67); |
|
|
dto.setGuiDang(485); |
|
|
dto.setGuiDang(485); |
|
@ -2015,7 +2018,7 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit |
|
|
dto.setChuLiZhong(39); |
|
|
dto.setChuLiZhong(39); |
|
|
dto.setChuLiZhongRate(0.02); |
|
|
dto.setChuLiZhongRate(0.02); |
|
|
} |
|
|
} |
|
|
if(!StringUtils.isEmpty(eventType) && eventType.equals("0")){ |
|
|
if (!StringUtils.isEmpty(eventType) && eventType.equals("0")) { |
|
|
dto.setYiJieAn(99); |
|
|
dto.setYiJieAn(99); |
|
|
dto.setYiJieAnRate(0.23); |
|
|
dto.setYiJieAnRate(0.23); |
|
|
dto.setGuiDang(313); |
|
|
dto.setGuiDang(313); |
|
@ -2025,7 +2028,7 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit |
|
|
dto.setChuLiZhong(0); |
|
|
dto.setChuLiZhong(0); |
|
|
dto.setChuLiZhongRate(0.0); |
|
|
dto.setChuLiZhongRate(0.0); |
|
|
} |
|
|
} |
|
|
if(!StringUtils.isEmpty(eventType) && eventType.equals("1")){ |
|
|
if (!StringUtils.isEmpty(eventType) && eventType.equals("1")) { |
|
|
dto.setYiJieAn(20); |
|
|
dto.setYiJieAn(20); |
|
|
dto.setYiJieAnRate(0.28); |
|
|
dto.setYiJieAnRate(0.28); |
|
|
dto.setGuiDang(52); |
|
|
dto.setGuiDang(52); |
|
@ -2035,7 +2038,7 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit |
|
|
dto.setChuLiZhong(0); |
|
|
dto.setChuLiZhong(0); |
|
|
dto.setChuLiZhongRate(0.0); |
|
|
dto.setChuLiZhongRate(0.0); |
|
|
} |
|
|
} |
|
|
if(!StringUtils.isEmpty(eventType) && eventType.equals("2")){ |
|
|
if (!StringUtils.isEmpty(eventType) && eventType.equals("2")) { |
|
|
dto.setYiJieAn(1082); |
|
|
dto.setYiJieAn(1082); |
|
|
dto.setYiJieAnRate(0.82); |
|
|
dto.setYiJieAnRate(0.82); |
|
|
dto.setGuiDang(120); |
|
|
dto.setGuiDang(120); |
|
@ -2133,8 +2136,8 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public List<IcEventResultDTO> getEventsByStaffId(String staffId,String status) { |
|
|
public List<IcEventResultDTO> getEventsByStaffId(String staffId, String status) { |
|
|
return baseDao.getEventsByStaffId(staffId,status); |
|
|
return baseDao.getEventsByStaffId(staffId, status); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|