|
@@ -158,19 +158,19 @@ public class WorkInvoiceTwoController extends BaseController {
|
|
|
Page<WorkInvoice> page = workInvoiceService.findPage(new Page<WorkInvoice>(request, response), workInvoice);
|
|
|
|
|
|
//查询所有和当前登陆人有关的项目的审核
|
|
|
- WorkProjectNotify workProjectNotify = new WorkProjectNotify();
|
|
|
+ /*WorkProjectNotify workProjectNotify = new WorkProjectNotify();
|
|
|
workProjectNotify.setUser(UserUtils.getUser());
|
|
|
workProjectNotify.setCompanyId(UserUtils.getSelectCompany().getId());
|
|
|
workProjectNotify.setRemarks("待审批");
|
|
|
//添加发票对应编号WorkStaffCertificate.java
|
|
|
- workProjectNotify.setType("21");
|
|
|
+ workProjectNotify.setType("21");*/
|
|
|
//查询所有需要当前登录人进行处理的项目信息
|
|
|
- List<WorkProjectNotify> notifyList = workProjectNotifyService.findList(workProjectNotify);
|
|
|
+ //List<WorkProjectNotify> notifyList = workProjectNotifyService.findList(workProjectNotify);
|
|
|
//查询已通过的所有发票的开票金额总和
|
|
|
String getSumMoney = workInvoiceService.getSumMoney(workInvoice);
|
|
|
List<WorkInvoice> workInvoiceList = page.getList();
|
|
|
for (WorkInvoice invoice: workInvoiceList) {
|
|
|
- for (WorkProjectNotify notify: notifyList) {
|
|
|
+ /*for (WorkProjectNotify notify: notifyList) {
|
|
|
if(notify.getNotifyId().equals(invoice.getId())){
|
|
|
invoice.setNotifyId(notify.getId());
|
|
|
if("待审批".equals(notify.getRemarks()) && !"1".equals(notify.getStatus())){
|
|
@@ -178,7 +178,7 @@ public class WorkInvoiceTwoController extends BaseController {
|
|
|
}
|
|
|
break;
|
|
|
}
|
|
|
- }
|
|
|
+ }*/
|
|
|
invoice.setWorkInvoiceProjectRelationList(workInvoiceService.getProjectRelation(invoice));
|
|
|
List<String> projectNameList = workInvoiceService.getProjectNameList(invoice);
|
|
|
String projectNameStr = String.join(",", projectNameList);
|