Merge remote-tracking branch 'origin/master'

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

@@ -163,6 +163,16 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 		return workInvoice;
 	}
 
+	/**
+	 * 根据开票id查询关联项目
+	 * @param workInvoice
+	 * @return
+	 */
+	public List<WorkInvoiceProjectRelation> getProjectRelation(WorkInvoice workInvoice) {
+		List<WorkInvoiceProjectRelation> projectRelationList = dao.getProjectRelation(workInvoice.getId());
+		return projectRelationList;
+	}
+
 	public List<WorkInvoice> findList(WorkInvoice workInvoice) {
 		return super.findList(workInvoice);
 	}
@@ -244,11 +254,13 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 	public List<String> getProjectNameList(WorkInvoice workInvoice){
 		//项目名称获取
 		List<String> projectNameList = Lists.newArrayList();
-		for (WorkInvoiceProjectRelation projectRelation : workInvoice.getWorkInvoiceProjectRelationList()) {
-			if(StringUtils.isNotBlank(projectRelation.getProjectId())){
-				ProjectRecords projectRecords = projectRecordsService.getRuralMasters(projectRelation.getProjectId());
-				if(null != projectRecords){
-					projectNameList.add(projectRecords.getProjectName());
+		if(null != workInvoice.getWorkInvoiceProjectRelationList()){
+			for (WorkInvoiceProjectRelation projectRelation : workInvoice.getWorkInvoiceProjectRelationList()) {
+				if(StringUtils.isNotBlank(projectRelation.getProjectId())){
+					ProjectRecords projectRecords = projectRecordsService.getRuralMasters(projectRelation.getProjectId());
+					if(null != projectRecords){
+						projectNameList.add(projectRecords.getProjectName());
+					}
 				}
 			}
 		}

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

@@ -157,6 +157,10 @@ public class WorkInvoiceController extends BaseController {
 					break;
 				}
 			}
+			invoice.setWorkInvoiceProjectRelationList(workInvoiceService.getProjectRelation(invoice));
+			List<String> projectNameList = workInvoiceService.getProjectNameList(invoice);
+			String projectNameStr = String.join(",", projectNameList);
+			invoice.setProjectName(projectNameStr);
 		}
 		model.addAttribute("page", page);
 		model.addAttribute("workInvoiceShow", workInvoice);

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

@@ -708,7 +708,7 @@
                     ,"projectId":"${workInvoice.project.id}"
                     ,"areaName":"${workInvoice.project.county}"
                     ,"reportNumber":"${workInvoice.project.reportData.number}"
-                    ,"projName":"${workInvoice.project.projectName}"
+                    ,"projName":"${workInvoice.projectName}"
                     ,"clientName":"${workInvoice.client.name}"
                     ,"officeName":"${workInvoice.office.name}"
                     ,"responsibleName":"${workInvoice.createBy.name}"
@@ -779,4 +779,4 @@
 </script>
 
 </body>
-</html>
+</html>