苏州分公司调整

src/main/java/com/jeeplus/modules/szCenterservice/controller/szCloud/CpaFinanceInvoiceController.java

@@ -81,6 +81,14 @@ public class CpaFinanceInvoiceController {
         } else {
             addMessage(redirectAttributes, "操作失败");
         }
+        //当审核成功时,将开票时间和领票时间进行同步到本系统
+        if (StringUtils.isNotBlank(workInvoice.getAct().getFlag()) && "yes".equals(workInvoice.getAct().getFlag())){
+            WorkInvoice invoice = new WorkInvoice();
+            invoice.setInvoiceDate(workInvoice.getInvoiceDate());
+            invoice.setTakeDate(workInvoice.getTakeDate());
+            invoice.setId(workInvoice.getId());
+            workInvoiceDao.updateDate(invoice);
+        }
         if (StringUtils.isNotBlank(workInvoice.getHome()) && "home".equals(workInvoice.getHome())) {
             return "redirect:" + Global.getAdminPath() + "/home/?repage";
         }else if (StringUtils.isNotBlank(workInvoice.getHome()) && "notifyList".equals(workInvoice.getHome())){

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

@@ -388,90 +388,92 @@ public class WorkInvoiceAllController extends BaseController {
 				workClientInfo.setName(workInvoice.getClient().getId());
 				workInvoice.setClient(workClientInfo);
 			}
-
-		}
-		if("1".equals(tabId)){
-			List<MainDictDetail> billingContentList = DictUtils.getMainDictList("billing_content");
-			for (MainDictDetail dictDetail: billingContentList) {
-				if(workInvoice.getBillingContent().equals(dictDetail.getValue())){
-					workInvoice.setBillingContent(dictDetail.getLabel());
-					break;
+			view = "workInvoiceView";
+		}else {
+			if("1".equals(tabId)){
+				List<MainDictDetail> billingContentList = DictUtils.getMainDictList("billing_content");
+				for (MainDictDetail dictDetail: billingContentList) {
+					if(workInvoice.getBillingContent().equals(dictDetail.getValue())){
+						workInvoice.setBillingContent(dictDetail.getLabel());
+						break;
+					}
 				}
-			}
-			List<MainDictDetail> receiptTypeList = DictUtils.getMainDictList("receipt_type");
-			for (MainDictDetail dictDetail: receiptTypeList) {
-				if(workInvoice.getChargeType().equals(dictDetail.getValue())){
-					workInvoice.setChargeType(dictDetail.getLabel());
-					break;
+				List<MainDictDetail> receiptTypeList = DictUtils.getMainDictList("receipt_type");
+				for (MainDictDetail dictDetail: receiptTypeList) {
+					if(workInvoice.getChargeType().equals(dictDetail.getValue())){
+						workInvoice.setChargeType(dictDetail.getLabel());
+						break;
+					}
 				}
-			}
-			//获取发票开户银行信息
-			String bankName = invoiceService.getBankNameByNameOrId(workInvoice.getBank());
-			if(StringUtils.isNotBlank(bankName)){
-				workInvoice.setBank(bankName);
-			}
-			//判定 项目是否是非项目，如果是非项目 是否存在合同名称，如果没有关联合同，则合同名称处以-----进行展示
-			if(workInvoice.getWorkInvoiceProjectRelationList().size()>0){
-				List<WorkInvoiceProjectRelation> workInvoiceProjectRelationList = workInvoice.getWorkInvoiceProjectRelationList();
-				for (WorkInvoiceProjectRelation workInvoiceProjectRelation : workInvoiceProjectRelationList) {
-					if(2 == workInvoiceProjectRelation.getIsProject()){
-						//判定是否存在合同信息，若不存在，则合同名称展示------
-						if(StringUtils.isBlank(workInvoiceProjectRelation.getWorkContractName())){
-							workInvoiceProjectRelation.setWorkContractName("————————————");
+				//获取发票开户银行信息
+				String bankName = invoiceService.getBankNameByNameOrId(workInvoice.getBank());
+				if(StringUtils.isNotBlank(bankName)){
+					workInvoice.setBank(bankName);
+				}
+				//判定 项目是否是非项目，如果是非项目 是否存在合同名称，如果没有关联合同，则合同名称处以-----进行展示
+				if(workInvoice.getWorkInvoiceProjectRelationList().size()>0){
+					List<WorkInvoiceProjectRelation> workInvoiceProjectRelationList = workInvoice.getWorkInvoiceProjectRelationList();
+					for (WorkInvoiceProjectRelation workInvoiceProjectRelation : workInvoiceProjectRelationList) {
+						if(2 == workInvoiceProjectRelation.getIsProject()){
+							//判定是否存在合同信息，若不存在，则合同名称展示------
+							if(StringUtils.isBlank(workInvoiceProjectRelation.getWorkContractName())){
+								workInvoiceProjectRelation.setWorkContractName("————————————");
+							}
 						}
 					}
 				}
-			}
-			view = "workInvoiceView";
-		}else if("3".equals(tabId)){
-			List<MainDictDetail> billingContentList = DictUtils.getMainDictList("billing_content");
-			for (MainDictDetail dictDetail: billingContentList) {
-				if(workInvoice.getBillingContent().equals(dictDetail.getValue())){
-					workInvoice.setBillingContent(dictDetail.getLabel());
-					break;
+				view = "workInvoiceView";
+			}else if("3".equals(tabId)){
+				List<MainDictDetail> billingContentList = DictUtils.getMainDictList("billing_content");
+				for (MainDictDetail dictDetail: billingContentList) {
+					if(workInvoice.getBillingContent().equals(dictDetail.getValue())){
+						workInvoice.setBillingContent(dictDetail.getLabel());
+						break;
+					}
 				}
-			}
-			List<MainDictDetail> receiptTypeList = DictUtils.getMainDictList("receipt_type");
-			for (MainDictDetail dictDetail: receiptTypeList) {
-				if(workInvoice.getChargeType().equals(dictDetail.getValue())){
-					workInvoice.setChargeType(dictDetail.getLabel());
-					break;
+				List<MainDictDetail> receiptTypeList = DictUtils.getMainDictList("receipt_type");
+				for (MainDictDetail dictDetail: receiptTypeList) {
+					if(workInvoice.getChargeType().equals(dictDetail.getValue())){
+						workInvoice.setChargeType(dictDetail.getLabel());
+						break;
+					}
 				}
-			}
-			ProcessInstance processInstance = actTaskService.getProcIns(workInvoice.getProcessInstanceId());
-			if (processInstance!=null) {
-				Task taskInfok = actTaskService.getCurrentTaskInfo(processInstance);
-				Act act = new Act();
-				act.setTaskId(taskInfok.getId());
-				act.setTaskName(taskInfok.getName());
-				act.setTaskDefKey(taskInfok.getTaskDefinitionKey());
-				act.setProcDefId(taskInfok.getProcessDefinitionId());
-				act.setProcInsId(taskInfok.getProcessInstanceId());
-				act.setTask(taskInfok);
-				workInvoice.setAct(act);
-				view = "workInvoiceAllModify";
-			}
-			//获取发票项目信息
-			List<WorkInvoiceProjectRelation> workInvoiceProjectRelationList = workInvoice.getWorkInvoiceProjectRelationList();
-			List<String> projectIdList = Lists.newArrayList();
-			//获取项目id并查询所有包含项目id的项目信息
-			for (WorkInvoiceProjectRelation projectInfo: workInvoiceProjectRelationList) {
-				if(StringUtils.isNotBlank(projectInfo.getProjectId())){
-					projectIdList.add(projectInfo.getProjectId());
+				ProcessInstance processInstance = actTaskService.getProcIns(workInvoice.getProcessInstanceId());
+				if (processInstance!=null) {
+					Task taskInfok = actTaskService.getCurrentTaskInfo(processInstance);
+					Act act = new Act();
+					act.setTaskId(taskInfok.getId());
+					act.setTaskName(taskInfok.getName());
+					act.setTaskDefKey(taskInfok.getTaskDefinitionKey());
+					act.setProcDefId(taskInfok.getProcessDefinitionId());
+					act.setProcInsId(taskInfok.getProcessInstanceId());
+					act.setTask(taskInfok);
+					workInvoice.setAct(act);
+					view = "workInvoiceAllModify";
+				}
+				//获取发票项目信息
+				List<WorkInvoiceProjectRelation> workInvoiceProjectRelationList = workInvoice.getWorkInvoiceProjectRelationList();
+				List<String> projectIdList = Lists.newArrayList();
+				//获取项目id并查询所有包含项目id的项目信息
+				for (WorkInvoiceProjectRelation projectInfo: workInvoiceProjectRelationList) {
+					if(StringUtils.isNotBlank(projectInfo.getProjectId())){
+						projectIdList.add(projectInfo.getProjectId());
+					}
 				}
-			}
 
-			if(projectIdList.size()>0){
-				//根据项目id查询项目信息中的项目类别
-				String projectSortCostInfo = ruralProjectRecordsService.getProjectSortCostInfo(projectIdList);
-				//如果项目类别中包含审定（内）即 8 则需要进行部门主任审核
-				if(null != projectSortCostInfo && projectSortCostInfo.contains("8")){
-					view = "workInvoiceExamineModify";
+				if(projectIdList.size()>0){
+					//根据项目id查询项目信息中的项目类别
+					String projectSortCostInfo = ruralProjectRecordsService.getProjectSortCostInfo(projectIdList);
+					//如果项目类别中包含审定（内）即 8 则需要进行部门主任审核
+					if(null != projectSortCostInfo && projectSortCostInfo.contains("8")){
+						view = "workInvoiceExamineModify";
+					}
+				}else{
+					view = "workInvoiceNotProjectModify";
 				}
-			}else{
-				view = "workInvoiceNotProjectModify";
 			}
 		}
+
 		// 环节编号
 		/*String taskDefKey = workInvoice.getAct().getTaskDefKey();
 		if (StringUtils.isNotBlank(taskDefKey) && ("bmzr".equals(taskDefKey) ||
@@ -942,8 +944,33 @@ public class WorkInvoiceAllController extends BaseController {
 				}
 			}
 			for (WorkInvoice invoice: workInvoiceList) {
+				if (StringUtils.isNotBlank(invoice.getIsSzCloud()) && invoice.getIsSzCloud().equals("sz")){
+					List<WorkInvoiceCloud> workInvoiceCloud = workInvoiceService.getByInvoiceId(invoice.getId());
+					if (workInvoiceCloud != null){
+						ArrayList<String> names = new ArrayList<>();
+						ArrayList<String> nums = new ArrayList<>();
+						for (WorkInvoiceCloud cloud : workInvoiceCloud) {
+							names.add(cloud.getProjectName());
+							if (StringUtils.isNotBlank(cloud.getReportNo())){
+								nums.add(cloud.getReportNo());
+							}
+
+						}
+						String projectNameStr = String.join(",", names);
+						invoice.setProjectName(projectNameStr);
+						String reprotNos = String.join(",", nums);
+						invoice.setReportNumber(reprotNos);
+						WorkClientInfo workClientInfo = new WorkClientInfo();
+						workClientInfo.setName(Objects.nonNull(invoice.getClient()) ? invoice.getClient().getId() : null);
+						invoice.setClient(workClientInfo);
+
+						if (Objects.nonNull(invoice.getArea())) {
+							invoice.setAccountCheckingArea(invoice.getArea().getId());
+						}
+					}
+				}
 				for (MainDictDetail dictDetail: billingContentList) {
-					if(invoice.getBillingContent().equals(dictDetail.getValue())){
+					if(StringUtils.isNotBlank(invoice.getBillingContent()) && invoice.getBillingContent().equals(dictDetail.getValue())){
 						invoice.setBillingContent(dictDetail.getLabel());
 						break;
 					}

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

@@ -906,6 +906,32 @@ public class WorkInvoiceTwoController extends BaseController {
 				}
 			}
 			for (WorkInvoice invoice: workInvoiceList) {
+				if (StringUtils.isNotBlank(invoice.getIsSzCloud()) && invoice.getIsSzCloud().equals("sz")){
+					List<WorkInvoiceCloud> workInvoiceCloud = workInvoiceService.getByInvoiceId(invoice.getId());
+					if (workInvoiceCloud != null){
+						ArrayList<String> names = new ArrayList<>();
+						ArrayList<String> nums = new ArrayList<>();
+						for (WorkInvoiceCloud cloud : workInvoiceCloud) {
+							names.add(cloud.getProjectName());
+							if (StringUtils.isNotBlank(cloud.getReportNo())){
+								nums.add(cloud.getReportNo());
+							}
+
+						}
+						String projectNameStr = String.join(",", names);
+						invoice.setProjectName(projectNameStr);
+						String reprotNos = String.join(",", nums);
+						invoice.setReportNumber(reprotNos);
+						WorkClientInfo workClientInfo = new WorkClientInfo();
+						workClientInfo.setName(Objects.nonNull(invoice.getClient()) ? invoice.getClient().getId() : null);
+						invoice.setClient(workClientInfo);
+
+						if (Objects.nonNull(invoice.getArea())) {
+							invoice.setAccountCheckingArea(invoice.getArea().getId());
+						}
+					}
+				}
+
 				for (MainDictDetail dictDetail: billingContentList) {
 					if(invoice.getBillingContent().equals(dictDetail.getValue())){
 						invoice.setBillingContent(dictDetail.getLabel());

src/main/resources/mappings/modules/ruralprojectrecords/RuralProjectRecordsDao.xml

@@ -6777,6 +6777,7 @@ GROUP BY
 			sua.NAME AS "createName",
 			sua.mobile AS "createNamePhone",
 			a.submit_money AS "submitMoney",
+			a.submit_scale AS "submitScale",
 			a.project_type AS projectType,
 			wci.NAME AS "workContractInfo.name",
 			wct.id AS "workContractInfo.client.id",

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

@@ -1110,6 +1110,7 @@
 		a.area_id as "area.id",
 		a.new_drawer_id as "newDrawerId",
 		a.new_drawer as "newDrawer",
+		a.is_sz_cloud as "isSzCloud",
 		a.actual_drawer_id as "actualDrawerId"
 		,wid.number as "widNumber"
 		,wid.total_money as "widTotalMoney",

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

@@ -693,8 +693,10 @@
 					<%--return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.projectId +"','95%', '95%')\">" + d.projName + "</a>";--%>
 					}}
                 ,{field:'invoiceNum',align:'center', sort:true,title: '发票申请编号', minWidth:130,templet:function(d){
-                        return "<a class=\"attention-info\" title=\""+ d.invoiceNum +"\"href=\"javascript:void(0);\" onclick=\"openDialogListView('查看发票信息', '${ctx}/workinvoiceAll/workInvoiceAll/form?id=" + d.id + "&tabId=1','"+ d.id +"','95%', '95%')\">" + d.invoiceNum + "</a>";
-                    }}
+                        <%--return "<a class=\"attention-info\" title=\""+ d.invoiceNum +"\"href=\"javascript:void(0);\" onclick=\"openDialogListView('查看发票信息', '${ctx}/workinvoiceAll/workInvoiceAll/form?id=" + d.id + "&tabId=1','"+ d.id +"','95%', '95%')\">" + d.invoiceNum + "</a>";--%>
+						return "<a class=\"attention-info\" title=\"" + d.invoiceNum + "\" href=\"javascript:void(0);\" onclick=\"openDialogListView('查看发票信息', '" + '${ctx}/workinvoiceAll/workInvoiceAll/form?id=' + d.id + '&tabId=1' + '&isSzCloud=' + d.isSzCloud + "','"+ d.id +"', '95%', '95%')\">" + d.invoiceNum + "</a>";
+
+					}}
 				,{field:'widNumber',align:'center', title: '发票号',  width:90,templet:function(d){
 						return "<span title='"+ d.widNumber +"'>" + d.widNumber + "</span>";
 					}}

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

@@ -817,7 +817,8 @@
 						<%--return "<a class=\"attention-info\" title=\"" + d.projName + "\" href=\"javascript:void(0);\" onclick=\"openDialogView('查看项目', '${ctx}/ruralProject/ruralProjectRecords/view?id=" + d.projectId +"','95%', '95%')\">" + d.projName + "</a>";--%>
 					}}
 				,{field:'invoiceNum',align:'center', sort:true,title: '发票申请编号', minWidth:130,templet:function(d){
-						return "<a class=\"attention-info\" title=\""+ d.invoiceNum +"\"href=\"javascript:void(0);\" onclick=\"openDialogListView('查看发票信息', '${ctx}/workinvoiceAll/workInvoiceAll/form?id=" + d.id + "&tabId=1','"+ d.id +"','95%', '95%')\">" + d.invoiceNum + "</a>";
+						<%--return "<a class=\"attention-info\" title=\""+ d.invoiceNum +"\"href=\"javascript:void(0);\" onclick=\"openDialogListView('查看发票信息', '${ctx}/workinvoiceAll/workInvoiceAll/form?id=" + d.id + "&tabId=1','"+ d.id +"','95%', '95%')\">" + d.invoiceNum + "</a>";--%>
+						return "<a class=\"attention-info\" title=\"" + d.invoiceNum + "\" href=\"javascript:void(0);\" onclick=\"openDialogListView('查看发票信息', '" + '${ctx}/workinvoiceAll/workInvoiceAll/form?id=' + d.id + '&tabId=1' + '&isSzCloud=' + d.isSzCloud + "','"+ d.id +"', '95%', '95%')\">" + d.invoiceNum + "</a>";
 					}}
 				,{field:'widNumber',align:'center', title: '发票号',  width:90,templet:function(d){
 						return "<span title='"+ d.widNumber +"'>" + d.widNumber + "</span>";