|
@@ -32,7 +32,6 @@ import com.uas.platform.b2b.mobile.model.WorkOvertimeDet;
|
|
|
import com.uas.platform.b2b.mobile.service.WorkOvertimeService;
|
|
import com.uas.platform.b2b.mobile.service.WorkOvertimeService;
|
|
|
import com.uas.platform.b2b.model.FlowNode;
|
|
import com.uas.platform.b2b.model.FlowNode;
|
|
|
import com.uas.platform.b2b.service.ApprovalFlowService;
|
|
import com.uas.platform.b2b.service.ApprovalFlowService;
|
|
|
-import com.uas.platform.b2b.support.SystemSession;
|
|
|
|
|
import com.uas.platform.core.model.PageInfo;
|
|
import com.uas.platform.core.model.PageInfo;
|
|
|
import com.uas.platform.core.model.PageParams;
|
|
import com.uas.platform.core.model.PageParams;
|
|
|
|
|
|
|
@@ -66,14 +65,14 @@ public class WorkOvertimeServiceImpl implements WorkOvertimeService {
|
|
|
workOvertime.setWo_code("WO" + sdf.format(new Date()));
|
|
workOvertime.setWo_code("WO" + sdf.format(new Date()));
|
|
|
workOvertime.setWo_status(MobileStatus.ENTERING.getPhrase());
|
|
workOvertime.setWo_status(MobileStatus.ENTERING.getPhrase());
|
|
|
workOvertime.setWo_statuscode(MobileStatus.ENTERING.name());
|
|
workOvertime.setWo_statuscode(MobileStatus.ENTERING.name());
|
|
|
- workOvertime.setWo_recorder(SystemSession.getUser().getUserName());
|
|
|
|
|
|
|
+ workOvertime.setWo_recorder(userBaseInfoDao.findByUserUU(workOvertime.getEmcode()).getUserName());
|
|
|
workOvertime.setWo_date(new Date());
|
|
workOvertime.setWo_date(new Date());
|
|
|
Set<WorkOvertimeDet> workOvertimeDetails = new HashSet<WorkOvertimeDet>();
|
|
Set<WorkOvertimeDet> workOvertimeDetails = new HashSet<WorkOvertimeDet>();
|
|
|
if (!CollectionUtils.isEmpty(workOvertimeDets)) {
|
|
if (!CollectionUtils.isEmpty(workOvertimeDets)) {
|
|
|
for (WorkOvertimeDet workOvertimeDet : workOvertimeDets) {
|
|
for (WorkOvertimeDet workOvertimeDet : workOvertimeDets) {
|
|
|
- workOvertimeDet.setEmpcode(workOvertimeDet.getEmpcode());
|
|
|
|
|
|
|
+ workOvertimeDet.setEmcode(workOvertime.getEmcode());
|
|
|
workOvertimeDet
|
|
workOvertimeDet
|
|
|
- .setWod_empname(userBaseInfoDao.findByUserUU(workOvertimeDet.getEmpcode()).getUserName());
|
|
|
|
|
|
|
+ .setWod_empname(userBaseInfoDao.findByUserUU(workOvertime.getEmcode()).getUserName());
|
|
|
workOvertimeDet.setWorkOvertime(workOvertime);
|
|
workOvertimeDet.setWorkOvertime(workOvertime);
|
|
|
workOvertimeDetails.add(workOvertimeDet);
|
|
workOvertimeDetails.add(workOvertimeDet);
|
|
|
}
|
|
}
|