发票收款功能修改

src/main/java/com/jeeplus/modules/workinvoice/service/WorkInvoiceAllService.java

@@ -13,6 +13,8 @@ import com.jeeplus.modules.act.service.ActTaskService;
 import com.jeeplus.modules.act.utils.ActUtils;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.projectrecord.service.ProjectRecordsService;
+import com.jeeplus.modules.ruralprojectrecords.entity.RuralProjectRecords;
+import com.jeeplus.modules.ruralprojectrecords.service.RuralProjectRecordsService;
 import com.jeeplus.modules.serialnum.service.SerialNumTplService;
 import com.jeeplus.modules.sys.entity.Office;
 import com.jeeplus.modules.sys.entity.Role;
@@ -28,9 +30,11 @@ import com.jeeplus.modules.workactivitymenu.entity.WorkActivityMenu;
 import com.jeeplus.modules.workactivitymenu.service.WorkActivityMenuService;
 import com.jeeplus.modules.workbidproject.entity.WorkBidProject;
 import com.jeeplus.modules.workclientinfo.entity.WorkClientInfo;
+import com.jeeplus.modules.workclientinfo.entity.WorkClientLinkman;
 import com.jeeplus.modules.workinvoice.dao.WorkInvoiceDao;
 import com.jeeplus.modules.workinvoice.dao.WorkInvoiceReceiptDao;
 import com.jeeplus.modules.workinvoice.entity.WorkInvoice;
+import com.jeeplus.modules.workinvoice.entity.WorkInvoiceProjectRelation;
 import com.jeeplus.modules.workinvoice.entity.WorkInvoiceReceipt;
 import com.jeeplus.modules.workinvoicedetail.dao.WorkInvoiceDetailDao;
 import com.jeeplus.modules.workinvoicedetail.entity.WorkInvoiceDetail;
@@ -101,6 +105,8 @@ public class WorkInvoiceAllService extends CrudService<WorkInvoiceDao, WorkInvoi
 	protected SerialNumTplService serialNumTplService;
 	@Autowired
 	protected WorkProjectNotifyService workProjectNotifyService;
+	@Autowired
+	private RuralProjectRecordsService ruralProjectRecordsService;
 
 	private static byte[] SYN_BYTE = new byte[0];
 
@@ -132,6 +138,23 @@ public class WorkInvoiceAllService extends CrudService<WorkInvoiceDao, WorkInvoi
 					workInvoice.setWorkAccountList(list);
 				}
 			}
+			//根据开票id查询关联项目
+			List<WorkInvoiceProjectRelation> projectRelationList = dao.getProjectRelation(workInvoice.getId());
+			for (WorkInvoiceProjectRelation projectRelation: projectRelationList) {
+				if(StringUtils.isBlank(projectRelation.getClientName())){
+					//无合同查找委托方信息
+					RuralProjectRecords records1 = ruralProjectRecordsService.get(projectRelation.getProjectId());
+					//无合同状态下，获取委托方的名称
+					if (records1.getWorkContractInfo() == null || null == records1.getWorkContractInfo().getClient() ||StringUtils.isBlank(records1.getWorkContractInfo().getClient().getName())){
+						ruralProjectRecordsService.queryLinkmanInfos(records1);
+						if (records1.getWorkClientLinkmanList() != null && records1.getWorkClientLinkmanList().size() > 0) {
+							WorkClientLinkman linkman = records1.getWorkClientLinkmanList().get(0);
+							projectRelation.setClientName(linkman.getClientId().getName());
+						}
+					}
+				}
+			}
+			workInvoice.setWorkInvoiceProjectRelationList(projectRelationList);
 		}
 		return workInvoice;
 	}
@@ -1968,4 +1991,4 @@ public class WorkInvoiceAllService extends CrudService<WorkInvoiceDao, WorkInvoi
 	public void cancellationDelete(WorkInvoice workInvoice) {
 		dao.cancellationDelete(workInvoice);
 	}
-}
+}

src/main/java/com/jeeplus/modules/workinvoice/web/WorkInvoiceAllController.java

@@ -110,6 +110,8 @@ public class WorkInvoiceAllController extends BaseController {
 	private ActTaskService actTaskService;
 	@Autowired
 	private ActivityService activityService;
+	@Autowired
+	private WorkInvoiceService invoiceService;
 
 	@Autowired
 	private HttpServletRequest request;
@@ -124,7 +126,7 @@ public class WorkInvoiceAllController extends BaseController {
 		}
 		return entity;
 	}
-	
+
 	/**
 	 * 开票管理列表页面
 	 */
@@ -133,6 +135,12 @@ public class WorkInvoiceAllController extends BaseController {
 	public String list(WorkInvoice workInvoice, HttpServletRequest request, HttpServletResponse response, Model model) {
 		Page<WorkInvoice> page = workInvoiceService.findPage(new Page<WorkInvoice>(request, response), workInvoice);
 		List<WorkInvoice> workInvoiceList = page.getList();
+		for (WorkInvoice invoice: workInvoiceList) {
+			invoice.setWorkInvoiceProjectRelationList(invoiceService.getProjectRelation(invoice));
+			List<String> projectNameList = invoiceService.getProjectNameList(invoice);
+			String projectNameStr = String.join(",", projectNameList);
+			invoice.setProjectName(projectNameStr);
+		}
 		model.addAttribute("page", page);
 		model.addAttribute("workInvoiceShow", workInvoice);
 		return "modules/workinvoice/workInvoiceAllList";
@@ -568,7 +576,7 @@ public class WorkInvoiceAllController extends BaseController {
 		addMessage(redirectAttributes, "发票收款成功");
 		return "redirect:"+Global.getAdminPath()+"/workinvoiceAll/workInvoiceAll/?repage";
 	}
-	
+
 	/**
 	 * 批量删除开票管理
 	 */
@@ -582,7 +590,7 @@ public class WorkInvoiceAllController extends BaseController {
 		addMessage(redirectAttributes, "作废发票管理成功");
 		return "redirect:"+Global.getAdminPath()+"/workinvoiceAll/workInvoiceAll/?repage";
 	}
-	
+
 	/**
 	 * 导出excel文件
 	 */
@@ -632,7 +640,7 @@ public class WorkInvoiceAllController extends BaseController {
 		}
 		return "redirect:"+Global.getAdminPath()+"/workinvoiceAll/workInvoiceAll/?repage";
     }
-	
+
 	/**
 	 * 下载导入开票管理数据模板
 	 */
@@ -641,7 +649,7 @@ public class WorkInvoiceAllController extends BaseController {
     public String importFileTemplate(HttpServletResponse response, RedirectAttributes redirectAttributes) {
 		try {
             String fileName = "发票管理数据导入模板.xlsx";
-    		List<WorkInvoice> list = Lists.newArrayList(); 
+    		List<WorkInvoice> list = Lists.newArrayList();
     		new ExportExcel("发票管理数据", WorkInvoice.class, 1).setDataList(list).write(response, fileName).dispose();
     		return null;
 		} catch (Exception e) {
@@ -649,8 +657,8 @@ public class WorkInvoiceAllController extends BaseController {
 		}
 		return "redirect:"+Global.getAdminPath()+"/workinvoiceAll/workInvoiceAll/?repage";
     }
-	
-	
+
+
 	/**
 	 * 选择开票单位
 	 */
@@ -1198,4 +1206,4 @@ public class WorkInvoiceAllController extends BaseController {
 		return "redirect:"+Global.getAdminPath()+"/workinvoiceAll/workInvoiceAll/?repage";
 	}
 
-}
+}

src/main/webapp/webpage/modules/workinvoice/workInvoiceAllList.jsp

@@ -716,4 +716,4 @@
 </script>
 
 </body>
-</html>
+</html>