上报咨询员功能修改

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

@@ -131,10 +131,10 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 			workInvoice.setWorkReceiptList(receiptList);
 
 			if (workInvoice != null) {
-				if (workInvoice.getProject() != null) {
+				/*if (workInvoice.getProject() != null) {
 					ProjectRecords project = projectRecordsService.getRuralInfo(workInvoice.getProject().getId());
 					workInvoice.setProject(project);
-				}
+				}*/
 				if (StringUtils.isNotBlank(workInvoice.getId())) {
 					WorkInvoiceDetail workInvoiceDetail = new WorkInvoiceDetail();
 					workInvoiceDetail.setInvoiceId(workInvoice.getId());
@@ -149,7 +149,7 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 					//无合同查找委托方信息
 					RuralProjectRecords records1 = ruralProjectRecordsService.get(projectRelation.getProjectId());
 					//无合同状态下，获取委托方的名称
-					if (records1.getWorkContractInfo() == null) {
+					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);
@@ -230,6 +230,7 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 			if (StringUtils.isBlank(projectRelation.getProjectId())){
 				continue;
 			}
+			projectRelation.setInvoiceId(workInvoice.getId());
 			//新增开票和项目关联信息
 			dao.insertProjectRelation(projectRelation);
 		}
@@ -479,7 +480,7 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 		//项目名称获取
 		List<String> projectNameList = getProjectNameList(workInvoice);
 		String projectNameStr = String.join(",", projectNameList);
-		ProjectRecords projectRecords = projectRecordsService.getRuralMasters(workInvoice.getProject().getId());
+		//ProjectRecords projectRecords = projectRecordsService.getRuralMasters(workInvoice.getProject().getId());
 		String title = "项目【"+ projectNameStr +"】发票申请待审批";
 		str = "项目【"+ projectNameStr +"】发票申请待审批，发票申请编号："+workInvoice.getNumber();
 
@@ -1160,7 +1161,7 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 			boolean state = actTaskService.isProcessEnd(workInvoice.getAct().getProcInsId());
 			List<User> users = new ArrayList<>();
 			List<User> userList = new ArrayList<>();
-			ProjectRecords projectRecords = projectRecordsService.getRuralMasters(workInvoice.getProject().getId());
+			//ProjectRecords projectRecords = projectRecordsService.getRuralMasters(workInvoice.getProject().getId());
 		if (!state) {
 				users.add(workInvoice.getCreateBy());
 				if ("yes".equals(workInvoice.getAct().getFlag())) {

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

@@ -321,10 +321,10 @@ public class WorkInvoiceController extends BaseController {
 		}
 //		try {
 			Map<String, Object> variables = Maps.newHashMap();
-			WorkClientInfo workClientInfo =workClientInfoService.get(workInvoice.getClient().getId());
+			/*WorkClientInfo workClientInfo =workClientInfoService.get(workInvoice.getClient().getId());
 			ProjectRecords workProject =projectRecordsService.getRuralProjectRecodes(workInvoice.getProject().getId());
 			workInvoice.setClient(workClientInfo);
-			workInvoice.setProject(workProject);
+			workInvoice.setProject(workProject);*/
 			workInvoice.setCompanyId(UserUtils.getSelectCompany().getId());
 			workInvoice.setOfficeId(UserUtils.getSelectOffice().getId());
 			String str = "";
@@ -422,10 +422,10 @@ public class WorkInvoiceController extends BaseController {
 		}
 //		try {
 			Map<String, Object> variables = Maps.newHashMap();
-			WorkClientInfo workClientInfo =workClientInfoService.get(workInvoice.getClient().getId());
+			/*WorkClientInfo workClientInfo =workClientInfoService.get(workInvoice.getClient().getId());
 			ProjectRecords workProject =projectRecordsService.getRuralProjectRecodes(workInvoice.getProject().getId());
 			workInvoice.setClient(workClientInfo);
-			workInvoice.setProject(workProject);
+			workInvoice.setProject(workProject);*/
 			workInvoice.setCompanyId(UserUtils.getSelectCompany().getId());
 			workInvoice.setOfficeId(UserUtils.getSelectOffice().getId());
 			String str = "";
@@ -539,10 +539,10 @@ public class WorkInvoiceController extends BaseController {
 			MyBeanUtils.copyBeanNotNull2Bean(workInvoice, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
 			workInvoiceService.save(t);//保存
 		}else{//新增表单保存
-			WorkClientInfo workClientInfo =workClientInfoService.get(workInvoice.getClient().getId());
+			/*WorkClientInfo workClientInfo =workClientInfoService.get(workInvoice.getClient().getId());
 			ProjectRecords workProject =projectRecordsService.getRuralProjectRecodes(workInvoice.getProject().getId());
 			workInvoice.setClient(workClientInfo);
-			workInvoice.setProject(workProject);
+			workInvoice.setProject(workProject);*/
 			workInvoice.setCompanyId(UserUtils.getSelectCompany().getId());
 			workInvoice.setOffice(UserUtils.getSelectOffice());
 			workInvoice.setInvoiceState("1");
@@ -866,7 +866,7 @@ public class WorkInvoiceController extends BaseController {
 		ProjectRecords projectRecords = projectRecordsService.getRuralInfo(obj);
 		map.put("projectNum",projectRecords.getProjectId());//项目编号
 		map.put("reportDataNum",projectRecords.getReportData().getNumber());//报告号
-		if(projectRecords.getWorkContractInfo() == null || StringUtils.isBlank(projectRecords.getWorkContractInfo().getClient().getName())){
+		if(projectRecords.getWorkContractInfo() == null || null == projectRecords.getWorkContractInfo().getClient() || StringUtils.isBlank(projectRecords.getWorkContractInfo().getClient().getName())){
 			//无合同状态下，获取委托方的名称
 			projectRecordsService.queryLinkmanInfos(projectRecords);
 			if (projectRecords.getWorkClientLinkmanList() != null && projectRecords.getWorkClientLinkmanList().size() > 0) {

src/main/resources/mappings/modules/workinvoice/WorkInvoiceDao.xml

@@ -625,7 +625,7 @@
 		  rpr.project_name as 'projectName',
 		  rpr.project_id as 'projectNum',
 		  wci.name as 'workContractName',
-		  prd.number as 'projectNum',
+		  prd.number as 'reportDataNum',
 		  wct.name as 'clientName'
 		from work_invoice_project_relation a
 		left join rural_project_records rpr on a.project_id = rpr.id