修改课题提示

research-system/src/main/java/com/research/system/domain/dto/GroupDto.java

@@ -77,6 +77,10 @@ public class GroupDto {
         private String planStatus;
         @ApiModelProperty("开展状态")
         private Byte developStatus;
+        @ApiModelProperty("研究目标")
+        private String target;
+        @ApiModelProperty("研究内容")
+        private String plan;
 
         private List<AddContent> contentList;
 

research-system/src/main/java/com/research/system/domain/vo/GroupVO.java

@@ -97,7 +97,7 @@ public class GroupVO {
         private Long orgId;
         private String orgName;
         private Integer jhn;
-        private Integer jhw;
+        private Integer total;
     }
 
     @Data
@@ -154,6 +154,35 @@ public class GroupVO {
         @ApiModelProperty("预期成果提示语")
         private String promptExpectedResults;
 
+
+        public String getPromptResearchGoal() {
+            //分3部分，每部分主要内容，限{num}字。
+            if (StrUtil.isNotEmpty(promptResearchGoal) && StrUtil.isNotEmpty(researchGoal)) {
+                return promptResearchGoal.replace("{num}", researchGoal);
+            }
+            return promptResearchGoal;
+        }
+
+        public String getPromptResearchContent() {
+            if (StrUtil.isNotEmpty(promptResearchContent) && StrUtil.isNotEmpty(researchContent)) {
+                return promptResearchContent.replace("{num}", researchContent);
+            }
+            return promptResearchContent;
+        }
+
+        public String getPromptResearchPlan() {
+            if (StrUtil.isNotEmpty(promptResearchPlan) && StrUtil.isNotEmpty(researchPlan)) {
+                return promptResearchPlan.replace("{num}", researchPlan);
+            }
+            return promptResearchPlan;
+        }
+
+        public String getPromptExpectedResults() {
+            if (StrUtil.isNotEmpty(promptExpectedResults) && StrUtil.isNotEmpty(expectedResults)) {
+                return promptExpectedResults.replace("{num}", expectedResults);
+            }
+            return promptExpectedResults;
+        }
     }
 
     @Data

research-system/src/main/resources/mapper/dao/KtsGroupDao.xml

@@ -19,7 +19,9 @@
         g.name as name,
         g.phone as phone,
         g.plan_status as planStatus,
-        g.develop_status as developStatus
+        g.develop_status as developStatus,
+        g.target,
+        g.plan
         from kts_kt_group g
         left join
         prj_proj_org o on g.proj_org_id = o.id
@@ -124,7 +126,7 @@
         select o.id as orgId,
                o.org_name      as orgName,
                SUM(CASE WHEN plan_status = '0' THEN 1 ELSE 0 END) AS jhn,
-               SUM(CASE WHEN plan_status = '1' THEN 1 ELSE 0 END) AS jhw
+               count(g.id) as total
         from prj_proj_org o
                  left join
              kts_kt_group g on g.proj_org_id = o.id and g.del_flag = 0