|
@@ -535,6 +535,7 @@ public class WorkOrderCurrentController extends BaseController {
|
|
|
entrustExamineService.saveBatch(entrustExamineList);
|
|
|
return AjaxResult.success();
|
|
|
}
|
|
|
+ @Transactional(rollbackFor = Exception.class)
|
|
|
@PostMapping("/delEntrust")
|
|
|
public AjaxResult delEntrust(@RequestBody BizEntrust bizEntrust) {
|
|
|
List<Long> workOrderIds1 = bizEntrust.getWorkOrderIds();
|
|
@@ -768,6 +769,7 @@ public class WorkOrderCurrentController extends BaseController {
|
|
|
bizWorkOrder.setType(1);
|
|
|
bizWorkOrder.setNoContract(0);
|
|
|
bizWorkOrder.setWorkDate(generateDateTime);
|
|
|
+ bizWorkOrder.setCurrentMonth(generateDateTime);
|
|
|
List<BizWorkOrder> workOrderList = bizWorkOrderService.getList(bizWorkOrder);
|
|
|
BizEntrust bizEntrust = null;
|
|
|
for(BizWorkOrder workOrder :workOrderList){
|