Quellcode durchsuchen

新增工作内容时将项目名称带过来

user5 vor 4 Jahren
Ursprung
Commit
073cf24287

+ 4 - 0
src/main/java/com/jeeplus/modules/projectrecord/web/ProjectImplementCompletionController.java

@@ -206,6 +206,7 @@ public class ProjectImplementCompletionController {
     @RequestMapping(value = {"form"})
     public String form(Projectcontentinfo projectcontentinfo, HttpServletRequest request, HttpServletResponse response, Model model, RedirectAttributes attr) {
         String dictType = projectcontentinfo.getDictType();
+        String projectContentDataName = projectcontentinfo.getProjectContentData().getName();
         ProjectRecords records = projectRecordsService.getQueryProjectUsers(projectcontentinfo.getProject().getId());
         projectcontentinfo.setProject(records);
 
@@ -223,6 +224,9 @@ public class ProjectImplementCompletionController {
             projectContentData.setProjectControlTableList(controlData);
             projectContentDataService.queryBasedData(projectContentData);
         }
+        if(StringUtils.isNotBlank(projectContentDataName)){
+            projectContentData.setName(projectContentDataName);
+        }
         projectcontentinfo.setProjectContentData(projectContentData);
         String projectType = projectImplementEarlyService.getProjectType(records.getProjectTypeId(), "竣工阶段");
         projectcontentinfo.setType(projectType);

+ 4 - 0
src/main/java/com/jeeplus/modules/projectrecord/web/ProjectImplementEarlyController.java

@@ -213,6 +213,7 @@ public class ProjectImplementEarlyController {
     @RequestMapping(value = {"form"})
     public String form(Projectcontentinfo projectcontentinfo, HttpServletRequest request, HttpServletResponse response, Model model, RedirectAttributes attr) {
         String dictType = projectcontentinfo.getDictType();
+        String projectContentDataName = projectcontentinfo.getProjectContentData().getName();
         ProjectRecords records = projectRecordsService.getQueryProjectUsers(projectcontentinfo.getProject().getId());
         projectcontentinfo.setProject(records);
         if (projectcontentinfo.getView().contains("before")){
@@ -229,6 +230,9 @@ public class ProjectImplementEarlyController {
                 projectContentData.setProjectControlTableList(controlData);
                 projectContentDataService.queryBasedData(projectContentData);
             }
+            if(StringUtils.isNotBlank(projectContentDataName)){
+                projectContentData.setName(projectContentDataName);
+            }
             projectcontentinfo.setProjectContentData(projectContentData);
             String projectType = projectImplementEarlyService.getProjectType(records.getProjectTypeId(), "实施前期");
             projectcontentinfo.setType(projectType);

+ 1 - 1
src/main/webapp/webpage/modules/projectrecord/implementCompletion/projectImplementCompletionList.jsp

@@ -373,7 +373,7 @@
 			if(d.pid=="0") {
 				if(1 == d.operationSign) {
 					return [
-						'<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增工作内容\', \'${ctx}/project/projectImplementCompletion/form?view=before&dictType=&parentIds=&projectContentId='+d.projectContentId+'&project.id=' + d.id +'\',\'95%\',\'95%\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 新增</a>',
+						'<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增工作内容\', \'${ctx}/project/projectImplementCompletion/form?view=before&dictType=&parentIds=&projectContentId='+d.projectContentId+'&projectContentData.name='+d.projectName+'&project.id=' + d.id +'\',\'95%\',\'95%\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 新增</a>',
 					].join('');
 				}else{
 					return [

+ 1 - 1
src/main/webapp/webpage/modules/projectrecord/implementEarly/projectImplementEarlyList.jsp

@@ -394,7 +394,7 @@
 			if(d.pid=="0") {
 				if(1 == d.operationSign) {
 					return [
-						'<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增工作内容\', \'${ctx}/project/projectImplementEarly/form?view=before&dictType=&parentIds=&projectContentId='+d.projectContentId+'&project.id=' + d.id +'\',\'95%\',\'95%\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 新增</a>',
+						'<a href="javascript:void(0)" onclick="openDialogreAudit(\'新增工作内容\', \'${ctx}/project/projectImplementEarly/form?view=before&dictType=&parentIds=&projectContentData.name='+d.projectName+'&projectContentId='+d.projectContentId+'&project.id=' + d.id +'\',\'95%\',\'95%\')" style=\"color: white;background: darkseagreen\" class="op-btn op-btn-add" ><i class="fa fa-plus"></i> 新增</a>',
 					].join('');
 				}else{
 					return [