|
|
@@ -63,6 +63,7 @@ public class YsRyrgfyServiceImpl extends BaseServiceImpl<YsRyrgfyMapper, YsRyrgf
|
|
|
if (Func.notNull(vo.getTechnician())) {
|
|
|
vo.getTechnician().setForeign(!"在职".equals(vo.getTechnician().getNature()));
|
|
|
}
|
|
|
+ vo.setPjrgfy(vo.getPjrgfy() / 10000);
|
|
|
}
|
|
|
return page.setRecords(dataList);
|
|
|
}
|
|
|
@@ -109,7 +110,7 @@ public class YsRyrgfyServiceImpl extends BaseServiceImpl<YsRyrgfyMapper, YsRyrgf
|
|
|
// List<Long> list = dbTechnicianList.stream()
|
|
|
// .filter(technician -> Func.equals(technician.getNumber(), excel.getNumber()) || Func.equals(technician.getIdCard(), excel.getIdCard()))
|
|
|
// .map(TechnicianEntity::getId).toList();
|
|
|
- if (technicianId == null) {
|
|
|
+ if (technicianId == null) {
|
|
|
throw new ServiceException("[" + excel.getName() + "]不存在");
|
|
|
}
|
|
|
|
|
|
@@ -144,11 +145,12 @@ public class YsRyrgfyServiceImpl extends BaseServiceImpl<YsRyrgfyMapper, YsRyrgf
|
|
|
TechnicianEntity technician = temp.getTechnician();
|
|
|
JSONObject obj = new JSONObject();
|
|
|
obj.put("xh", index.getAndIncrement() + "");
|
|
|
- obj.put("name", Func.notNull(technician)?technician.getName():"");
|
|
|
- obj.put("number", Func.notNull(technician)?technician.getNumber():"");
|
|
|
- obj.put("idCard", Func.notNull(technician)?technician.getIdCard():"");
|
|
|
+ obj.put("name", Func.notNull(technician) ? technician.getName() : "");
|
|
|
+ obj.put("number", Func.notNull(technician) ? technician.getNumber() : "");
|
|
|
+ obj.put("idCard", Func.notNull(technician) ? technician.getIdCard() : "");
|
|
|
obj.put("zzsc", temp.getZzsc());
|
|
|
- obj.put("pjrgfy", temp.getPjrgfy() / 10000);
|
|
|
+ temp.setPjrgfy(temp.getPjrgfy() / 10000);
|
|
|
+ obj.put("pjrgfy", temp.getPjrgfy());
|
|
|
obj.put("total", BigDecimal.valueOf(temp.getZzsc() * temp.getPjrgfy()));
|
|
|
obj.put("foreignStr", Func.notNull(temp.getTechnician()) ? (temp.getTechnician().isForeign() ? "是" : "否") : "");
|
|
|
results.add(obj);
|