yangjun
/
yhjz_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

出勤已修正提交BUG处理

This commit is contained in:
曹磊 2024-04-02 13:48:28 +08:00
parent e0a9af96b7
commit 134212bd1b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/io/renren/modules/business/controller/BusinessWorkerCqController.java
View File

@ -107,7 +107,7 @@ public class BusinessWorkerCqController {
if (item.get("userId") != null && !item.get("userId").toString().equals("")) {
businessWorkerCqEntity.setUserId(Integer.parseInt(item.get("userId").toString()));
}
if (!"".equals(item.get("fixDay").toString().trim())) {
if (item.get("fixDay")!=null && !"".equals(item.get("fixDay").toString().trim())) {
businessWorkerCqEntity.setFixDay(item.get("fixDay").toString());
}
if (!Objects.isNull(item.get("remark"))) {

2
src/main/java/io/renren/modules/business/service/impl/BusinessWorkerCqServiceImpl.java
View File

@ -163,8 +163,10 @@ public class BusinessWorkerCqServiceImpl extends ServiceImpl<BusinessWorkerCqDao
BigDecimal fixBg = BigDecimal.ZERO;
if(item.get("fix_day")!=null) {
if(!"".equals(item.get("fix_day").toString().trim())){
fixBg = new BigDecimal(item.get("fix_day").toString());
}
}
resultMap.put("outWorkDay",statusBg.add(fixBg));
resultList.add(resultMap);