Explorar o código

上报页面处理

user5 %!s(int64=4) %!d(string=hai) anos
pai
achega
e6140ffe37

+ 2 - 0
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageController.java

@@ -1991,6 +1991,8 @@ public class RuralCostProjectMessageController extends BaseController {
 
         if (StringUtils.isNotBlank(reported.getHome()) && "home".equals(reported.getHome())){
             return "redirect:" + Global.getAdminPath() + "/home/?repage";
+        }else if (StringUtils.isNotBlank(reported.getHome()) && "notifyList".equals(reported.getHome())){
+            return "redirect:" + Global.getAdminPath() + "/workprojectnotify/workProjectNotify/list/?repage";
         }else {
             return "redirect:"+Global.getAdminPath()+"/ruralProject/ruralCostProjectMessage/?repage";
         }

+ 2 - 0
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageNewController.java

@@ -1479,6 +1479,8 @@ public class RuralCostProjectMessageNewController extends BaseController {
         RuralProjectRecords ruralProjectRecords = projectRecordsService.get(reported.getProjectId());
         if (StringUtils.isNotBlank(reported.getHome()) && "home".equals(reported.getHome())){
             return "redirect:" + Global.getAdminPath() + "/home/?repage";
+        }else if (StringUtils.isNotBlank(reported.getHome()) && "notifyList".equals(reported.getHome())){
+            return "redirect:" + Global.getAdminPath() + "/workprojectnotify/workProjectNotify/list/?repage";
         }else {
             if("1".equals(ruralProjectRecords.getProjectType())){
                 return "redirect:" + Global.getAdminPath() + "/ruralProject/ruralProjectMessage/?repage";

+ 3 - 1
src/main/webapp/webpage/modules/sys/gridinvoiceproject.jsp

@@ -156,7 +156,8 @@
 								<th>项目名称</th>
 								<th>项目编号</th>
 								<th>项目报告号</th>
-								<th>负责人</th>
+								<th>登记人</th>
+								<th>责任人</th>
 								<th>委托方</th>
 								<th>是否开票</th>
 							</c:forEach>
@@ -171,6 +172,7 @@
 									<td class="codelabel">${obj.projectName}</td>
 									<td class="codelabel">${obj.projectId}</td>
 									<td class="codenumber">${obj.reportData.number}</td>
+									<td class="codelabel">${obj.projectRegistrant}</td>
 									<td class="codelabel">${obj.leaderNameStr}</td>
 									<td class="codelabel">${obj.workContractInfo.client.name}</td>
 									<td class="codelabel">${obj.invoiceFlag}</td>