|
@@ -164,13 +164,13 @@ public class SortDayworkController extends BaseController {
|
|
item.setRejectSum(bizDayworkItem.getRejectSum());
|
|
item.setRejectSum(bizDayworkItem.getRejectSum());
|
|
item.setQualifiedNum(bizDayworkItem.getQualifiedNum());
|
|
item.setQualifiedNum(bizDayworkItem.getQualifiedNum());
|
|
item.setRemark(bizDayworkItem.getRemark());
|
|
item.setRemark(bizDayworkItem.getRemark());
|
|
- bizDayworkItem.setStatus("3");
|
|
|
|
- bizDayworkItem.setEndTime(new Date());
|
|
|
|
- if(bizDayworkItem.getStartTime()==null){
|
|
|
|
- bizDayworkItem.setStartTime(new Date());
|
|
|
|
|
|
+ if(item.getStartTime() == null){
|
|
|
|
+ item.setStartTime(new Date());
|
|
}
|
|
}
|
|
- bizDayworkItem.setWorkingHours(bizDayworkItem.getEndTime().getTime() - bizDayworkItem.getStartTime().getTime());
|
|
|
|
- result = result && bizDayworkItemService.updateById(bizDayworkItem);
|
|
|
|
|
|
+ item.setStatus("3");
|
|
|
|
+ item.setEndTime(new Date());
|
|
|
|
+ item.setWorkingHours(item.getEndTime().getTime() - item.getStartTime().getTime());
|
|
|
|
+ result = result && bizDayworkItemService.updateById(item);
|
|
BizDaywork bizDaywork = bizDayworkService.getById(item.getDayworkId());
|
|
BizDaywork bizDaywork = bizDayworkService.getById(item.getDayworkId());
|
|
boolean returnCarrier;
|
|
boolean returnCarrier;
|
|
|
|
|