qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

领悦，不同步考勤班次

This commit is contained in:
Harryxzy 2024-11-19 20:45:03 +08:00
parent a933d60aaf
commit 038cb81514
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/engine/salary/remote/attend/service/impl/RemoteAttend4SalaryServiceImpl.java
View File

@ -12,7 +12,6 @@ import com.engine.salary.util.SalaryDateUtil;
import com.engine.salary.util.SalaryEntityUtil;
import com.engine.salary.util.db.MapperProxyFactory;
import com.engine.salary.util.valid.ValidUtil;
import com.google.common.base.Joiner;
import com.google.common.collect.Maps;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
@ -37,14 +36,14 @@ public class RemoteAttend4SalaryServiceImpl extends Service implements RemoteAtt
public List<Map<String, String>> getColumns() {
//兼容获取班次信息字段
List<String> attendanceSerials = getAttendQuoteFieldMapper().getAttendanceSerials();
String attendanceSerial = Joiner.on(",").join((Iterable<?>) attendanceSerials);
// List<String> attendanceSerials = getAttendQuoteFieldMapper().getAttendanceSerials();
// String attendanceSerial = Joiner.on(",").join((Iterable<?>) attendanceSerials);
Map<String, Object> paramsMap = new HashMap<String, Object>();
paramsMap.put("typeselect", "3");
paramsMap.put("viewScope", "0");
paramsMap.put("isNoAccount", "1");
paramsMap.put("attendanceSerial", attendanceSerial);
// paramsMap.put("attendanceSerial", attendanceSerial);
paramsMap.put("isFromMyAttendance", "1");
Map<String, Object> temp = new HashMap<String, Object>();
temp.put("data", JSONObject.toJSONString(paramsMap));

2
src/com/engine/salary/service/impl/LyPZServiceImpl.java
View File

@ -952,6 +952,8 @@ public class LyPZServiceImpl extends Service implements LyPZService {
String errorMsg = lyNCVoucherReturn.getSendresult().getResultdescription();
pushParam.setStatus(NumberUtils.INTEGER_ZERO);
pushParam.setPushMsg(errorMsg);
baseBean.writeLog("push detail1" + errorMsg);
baseBean.writeLog("push detail2" + xml);
} else {
pushParam.setStatus(NumberUtils.INTEGER_ONE);
pushParam.setPushMsg("推送成功");