|
@@ -119,14 +119,15 @@ public class TApproveReserveInvoiceController extends BaseController {
|
|
Long userid = getUserId();
|
|
Long userid = getUserId();
|
|
tApproveReserveInvoice.setUserId(userid);
|
|
tApproveReserveInvoice.setUserId(userid);
|
|
tApproveReserveInvoice.setApNo(DateUtils.dateTimeNow() + userid);
|
|
tApproveReserveInvoice.setApNo(DateUtils.dateTimeNow() + userid);
|
|
- Authentication.setAuthenticatedUserId(userid.toString());
|
|
|
|
tApproveReserveInvoiceService.insertTApproveReserveInvoice(tApproveReserveInvoice);
|
|
tApproveReserveInvoiceService.insertTApproveReserveInvoice(tApproveReserveInvoice);
|
|
long bussniseeKey = tApproveReserveInvoice.getId();
|
|
long bussniseeKey = tApproveReserveInvoice.getId();
|
|
String[] ids;
|
|
String[] ids;
|
|
ids = tApproveReserveInvoice.getInvoiceId().split(",");
|
|
ids = tApproveReserveInvoice.getInvoiceId().split(",");
|
|
String devSupId = "";
|
|
String devSupId = "";
|
|
|
|
+ String applyUser = "";
|
|
for (String id : ids) {
|
|
for (String id : ids) {
|
|
TInvoiceBookingworkticket invoice = workService.getById(id);
|
|
TInvoiceBookingworkticket invoice = workService.getById(id);
|
|
|
|
+ applyUser=invoice.getCreaterCode().toString();
|
|
invoice.setStatus(0L);
|
|
invoice.setStatus(0L);
|
|
workService.updateById(invoice);
|
|
workService.updateById(invoice);
|
|
switch (invoice.getWorkArea()) {
|
|
switch (invoice.getWorkArea()) {
|
|
@@ -166,8 +167,9 @@ public class TApproveReserveInvoiceController extends BaseController {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
//开始工作流、监听
|
|
//开始工作流、监听
|
|
|
|
+ Authentication.setAuthenticatedUserId(applyUser);
|
|
Map<String, Object> variables = new HashMap<>();
|
|
Map<String, Object> variables = new HashMap<>();
|
|
- variables.put("applyUser", userid.toString());
|
|
|
|
|
|
+ variables.put("applyUser", applyUser);
|
|
variables.put("yhzgusers", tApproveReserveInvoice.getUserSupId().toString());//用户主管
|
|
variables.put("yhzgusers", tApproveReserveInvoice.getUserSupId().toString());//用户主管
|
|
variables.put("zzzgusers", devSupId);//装置主管
|
|
variables.put("zzzgusers", devSupId);//装置主管
|
|
SysUser sysUser = new SysUser();
|
|
SysUser sysUser = new SysUser();
|