Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/projectrecord/service/ProjectRecordsService.java

@@ -583,10 +583,7 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 		//保存项目负责人(新添代码start)
 		List<User> lds = projectRecords.getProjectLeaders();
 		User user2=new User();
-		if(null!=lds&&lds.size()>0){
-			this.saveProjectUsers(projectRecords.getId(), lds, true);
-			user2.setId(lds.get(0).getId());
-		}
+
 		//(end)
     	int projectStatus = projectRecords.getProjectStatus();
 		String taskDefKey = projectRecords.getAct().getTaskDefKey();
@@ -745,19 +742,27 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 				notify.setNotifyId(projectRecords.getId());
 				userList = workProjectNotifyService.readByNotifyId(notify);
 				users.add(projectRecords.getCreateBy());
+				//新增代码----------
+				if(null!=lds&&lds.size()>0){
+					this.saveProjectUsers(projectRecords.getId(), lds, true);
+					for(int i=0;i<lds.size();i++){
+						user2.setId(lds.get(i).getId());
+						workProjectNotifyService
+								.save(UtilNotify
+										.saveNotify(projectRecords.getId(),
+												/*projectRecords.getCreateBy(),*/
+												user2,
+												projectRecords.getCompany().getId(),
+												titleStr,
+												notifyStr,
+												"39",
+												"0",
+												"待通知",
+												notifyRole));
+					}
+
+				}
 
-				workProjectNotifyService
-						.save(UtilNotify
-								.saveNotify(projectRecords.getId(),
-										/*projectRecords.getCreateBy(),*/
-										user2,
-										projectRecords.getCompany().getId(),
-										titleStr,
-										notifyStr,
-										"39",
-										"0",
-										"待通知",
-										notifyRole));
 			} else {
 				WorkProjectNotify notify = new WorkProjectNotify();
 				notify.setNotifyId(projectRecords.getId());
@@ -765,7 +770,7 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 				users.add(projectRecords.getCreateBy());
 				if (projectRecords.getProjectStatus()!= ProjectStatusEnum.RECALL.getValue()){
 					projectRecords.setProjectStatus(ProjectStatusEnum.REJECTED.getValue());
-					workProjectNotifyService
+					/*workProjectNotifyService
 							.save(UtilNotify
 									.saveNotify(projectRecords.getId(),
 											projectRecords.getCreateBy(),
@@ -775,7 +780,27 @@ public class ProjectRecordsService extends CrudService<ProjectRecordsDao, Projec
 											"39",
 											"0",
 											"待通知",
-											notifyRole));
+											notifyRole));*/
+					//新增代码----------
+					if(null!=lds&&lds.size()>0){
+						this.saveProjectUsers(projectRecords.getId(), lds, true);
+						for(int i=0;i<lds.size();i++){
+							user2.setId(lds.get(i).getId());
+							workProjectNotifyService
+									.save(UtilNotify
+											.saveNotify(projectRecords.getId(),
+													/*projectRecords.getCreateBy(),*/
+													user2,
+													projectRecords.getCompany().getId(),
+													titleStr,
+													notifyStr,
+													"39",
+													"0",
+													"待通知",
+													notifyRole));
+						}
+
+					}
 				}
 			}
 			workActivityProcessService.deleteProcessIdAuditUsers(projectRecords.getProcessInstanceId());

src/main/java/com/jeeplus/modules/workcontent/web/WorkContentCompleteAccountController.java

@@ -29,7 +29,7 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * 工程分部结算Controller
+ * 竣工分部结算Controller
  * @author ssrh
  * @version 2018-06-05
  */

src/main/webapp/webpage/modules/projectcontentinfo/workContentForm.jsp

@@ -1201,10 +1201,7 @@
             case '411':
                 $("#contentDetail").load("${ctx}/fiveDirectionsAffirm/workFiveDirectionsAffirm/list",param2);
                 break;
-            /*新加代码*/
-            case '412':
-                $("#contentDetail").load("${ctx}/workcontentbranchaccount/workcontentBranchAccount/list",param2);
-                break;
+
             /*新加代码*/
             case '412':
                 $("#contentDetail").load("${ctx}/workcontentbranchaccount/workcontentBranchAccount/list",param2);

src/main/webapp/webpage/modules/workcontent/workContentCompleteAccountList.jsp

@@ -11,7 +11,6 @@
 
             <table id="contentTable" class="table table-bordered table-condensed can-edit">
                 <thead>
-
                     <tr>
                         <th colspan="9" style="font-size: 20px">输变电工程竣工结算审核单</th>
                     </tr>
@@ -67,7 +66,7 @@
             </td>
 
             <td class="text-center op-td">
-                        <a href="#" onclick="delRow(this, '#investmentCostList{{idx}}')"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i> 取消</a>
+                        <a href="#" onclick="delRow(this, '#investmentCostList{{idx}}')"   class="op-btn op-btn-delete"><i class="fa fa-trash"></i>取消</a>
             </td>
         </tr>//-->
     </script>