|
@@ -155,7 +155,8 @@ public class SapCheckService extends BaseService {
|
|
update("SapCheckMapper.updateResultOk", checkReport.getId());
|
|
update("SapCheckMapper.updateResultOk", checkReport.getId());
|
|
} else {
|
|
} else {
|
|
// 0.5
|
|
// 0.5
|
|
- if (isOkWorkTime(checkReport) || isOkOffWorkTime(checkReport)) {
|
|
|
|
|
|
+ if (isOkWorkTime(checkReport) || isOkOffWorkTime(checkReport)
|
|
|
|
+ || StringUtils.isNotBlank(checkReport.getBukaDay())) {
|
|
update("SapCheckMapper.updateResultOk", checkReport.getId());
|
|
update("SapCheckMapper.updateResultOk", checkReport.getId());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -228,7 +229,7 @@ public class SapCheckService extends BaseService {
|
|
pd.put("departId", departId);
|
|
pd.put("departId", departId);
|
|
pd.put("name", name);
|
|
pd.put("name", name);
|
|
pd.put("state", state);
|
|
pd.put("state", state);
|
|
- if(pageSize != null) {
|
|
|
|
|
|
+ if (pageSize != null) {
|
|
pd.put("pageCurrent", String.valueOf(pageSize * (pageNumber - 1)));
|
|
pd.put("pageCurrent", String.valueOf(pageSize * (pageNumber - 1)));
|
|
pd.put("pageSize", String.valueOf(pageSize));
|
|
pd.put("pageSize", String.valueOf(pageSize));
|
|
}
|
|
}
|