Merge remote-tracking branch 'origin/master'

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

@@ -540,7 +540,7 @@ public class WorkInvoiceAllService extends CrudService<WorkInvoiceDao, WorkInvoi
 		String projectNameStr = String.join(",", projectNameList);
 		//ProjectRecords projectRecords = projectRecordsService.getRuralMasters(workInvoice.getProject().getId());
 		String title = "项目【"+ projectNameStr +"】发票申请待审批";
-		str = "项目【"+ projectNameStr +"】发票申请待审批，发票申请编号："+workInvoice.getNumber();
+		str = "发票金额：" + workInvoice.getMoney() + "(元)。项目【"+ projectNameStr +"】发票申请待审批，发票申请编号："+workInvoice.getNumber();
 
 		long s4=System.currentTimeMillis();
 		//开票明细处理

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

@@ -642,7 +642,7 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 		String projectNameStr = String.join(",", projectNameList);
 		//ProjectRecords projectRecords = projectRecordsService.getRuralMasters(workInvoice.getProject().getId());
 		String title = "项目【"+ projectNameStr +"】发票申请待审批";
-		str = "项目【"+ projectNameStr +"】发票申请待审批，发票申请编号："+workInvoice.getNumber();
+		str = "发票金额：" + workInvoice.getMoney() + "(元)。项目【"+ projectNameStr +"】发票申请待审批，发票申请编号："+workInvoice.getNumber();
 
 		long s4=System.currentTimeMillis();
 		//开票明细处理
@@ -1000,7 +1000,7 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 		//所属部门
 		Office office = officeService.get(workInvoice.getOffice().getId());
 		String userName = UserUtils.get(workInvoice.getCreateBy().getId()).getName();
-		String str = "发票申请编号："+workInvoice.getNumber()+",实际开票单位："+workInvoice.getClient().getName()+",创建人："+userName+",所属部门:"+office.getName();
+		String str = "发票金额：" + workInvoice.getMoney() + "(元)。发票申请编号："+workInvoice.getNumber()+",实际开票单位："+workInvoice.getClient().getName()+",创建人："+userName+",所属部门:"+office.getName();
 		String title = "实际开票单位:"+workInvoice.getClient().getName();
 		// 对不同环节的业务逻辑进行操作
 		String taskDefKey = workInvoice.getAct().getTaskDefKey();
@@ -1161,7 +1161,7 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 		List<User> users = new ArrayList<>();
 		List<User> userList = new ArrayList<>();
 		if (!state) {
-			str = "发票申请编号："+workInvoice.getNumber()+",实际开票单位："+workInvoice.getClient().getName();
+			str = "发票金额：" + workInvoice.getMoney() + "(元)。发票申请编号："+workInvoice.getNumber()+",实际开票单位："+workInvoice.getClient().getName();
 			title = "实际开票单位:"+workInvoice.getClient().getName();
 			users.add(workInvoice.getCreateBy());
 			if ("yes".equals(workInvoice.getAct().getFlag())) {
@@ -1341,7 +1341,7 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 			//所属部门
 			Office office = officeService.get(workInvoice.getOffice().getId());
 			String userName = UserUtils.get(workInvoice.getCreateBy().getId()).getName();
-			String  str = "发票申请编号："+workInvoice.getNumber() + ",创建人："+userName+",所属部门:"+office.getName();
+			String  str = "发票金额：" + workInvoice.getMoney() + "(元)。发票申请编号："+workInvoice.getNumber() + ",创建人："+userName+",所属部门:"+office.getName();
 			if(null != workInvoice.getClient()){
 				str = str + ",实际开票单位："+workInvoice.getClient().getName();
 			}else{
@@ -1505,7 +1505,7 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 				users.add(workInvoice.getCreateBy());
 				if ("yes".equals(workInvoice.getAct().getFlag())) {
 					title = "项目【"+ projectNameStr +"】发票申请通过";
-					str = "项目【"+ projectNameStr +"】发票申请通过，发票申请编号："+workInvoice.getNumber();
+					str = "发票金额：" + workInvoice.getMoney() + "(元)。项目【"+ projectNameStr +"】发票申请通过，发票申请编号："+workInvoice.getNumber();
 					workInvoice.setInvoiceState("5");
 					WorkProjectNotify notify = new WorkProjectNotify();
 					notify.setNotifyId(workInvoice.getId());
@@ -1589,7 +1589,7 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 				} else {
 					if (!"yes".equals(workInvoice.getAct().getFlag())) {//驳回待办提醒
 						title = "项目【"+ projectNameStr +"】发票申请被驳回";
-						str = "项目【"+ projectNameStr +"】发票申请被驳回，请选择重新申请或作废";
+						str = "发票金额：" + workInvoice.getMoney() + "(元)。项目【"+ projectNameStr +"】发票申请被驳回，请选择重新申请或作废";
 						WorkProjectNotify notify = new WorkProjectNotify();
 						notify.setNotifyId(workInvoice.getId());
 						userList = workProjectNotifyService.readByNotifyId(notify);
@@ -1608,7 +1608,7 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 					} else {
 						if (StringUtils.isNotBlank(enname)) {//驳回重新申请待办
 							title = "项目【"+ projectNameStr +"】发票重新申请，待审批";
-							str = "项目【"+ projectNameStr +"】发票重新申请，待审批，发票申请编号："+workInvoice.getNumber();;
+							str = "发票金额：" + workInvoice.getMoney() + "(元)。项目【"+ projectNameStr +"】发票重新申请，待审批，发票申请编号："+workInvoice.getNumber();;
 							WorkProjectNotify notify = new WorkProjectNotify();
 							notify.setNotifyId(workInvoice.getId());
 							userList = workProjectNotifyService.readByNotifyId(notify);

src/main/webapp/webpage/include/head.jsp

@@ -36,7 +36,7 @@
 
 <!-- jeeplus -->
 <link href="${ctxStatic}/common/jeeplus.css" type="text/css" rel="stylesheet" />
-<script src="${ctxStatic}/common/jeeplus.js?1" type="text/javascript"></script>
+<script src="${ctxStatic}/common/jeeplus.js?2" type="text/javascript"></script>
 
 <!-- jquery ui -->
 <script src="${ctxStatic}/jquery-ui/jquery-ui.min.js"></script>