修改课题

research-admin/src/main/java/com/research/web/controller/client/project/GroupController.java

@@ -135,12 +135,12 @@ public class GroupController {
         return JsonResponse.ok();
     }
 
-    @PostMapping("/member/del")
+    @PostMapping("/config/add")
     public JsonResponse<Integer> configAdd(@RequestBody @Validated GroupDto.ConfigAdd dto) {
         return JsonResponse.ok(ktsGroupService.configAdd(dto));
     }
 
-    @PostMapping("/config/add")
+    @PostMapping("/config/query")
     public JsonResponse<GroupVO.ConfigResult> configQuery() {
         return JsonResponse.ok(ktsGroupService.configQuery());
     }

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

@@ -25,6 +25,8 @@ public class GroupDto {
         private Byte ktGroupStatus;
         @ApiModelProperty("课题组名称")
         private String ktGroupName;
+        private Byte planStatus;
+        private Byte developStatus;
     }
 
     @Data

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

@@ -71,6 +71,14 @@ public class GroupVO {
         private Byte developStatus;
 
         private List<Result> childrenList;
+
+        private Integer planTotal;
+
+        private Long planIng;
+
+        private Integer cgTotal;
+
+        private Long cgIng;
     }
 
     @Data

research-system/src/main/java/com/research/system/service/impl/KtsGroupServiceImpl.java

@@ -59,7 +59,28 @@ public class KtsGroupServiceImpl implements KtsGroupService {
 
     @Override
     public List<GroupVO.Result> queryGroupList(GroupDto.Query query) {
-        return ktsGroupDao.queryGroupList(query);
+        List<GroupVO.Result> groupList = ktsGroupDao.queryGroupList(query);
+        if (CollUtil.isNotEmpty(groupList)) {
+            for (GroupVO.Result result : groupList) {
+                //查询内容
+                KtResearchContentExample ktResearchContentExample = new KtResearchContentExample();
+                ktResearchContentExample.createCriteria().andKtGroupIdEqualTo(result.getId()).andDelFlagEqualTo((byte) 0);
+                List<KtResearchContent> ktResearchContents = ktResearchContentMapper.selectByExample(ktResearchContentExample);
+                if (CollUtil.isNotEmpty(ktResearchContents)) {
+                    result.setPlanTotal(ktResearchContents.size());
+                    result.setPlanIng(ktResearchContents.stream().filter(ktResearchContent -> ktResearchContent.getStatus() == 1).count());
+                }
+                //查询成果
+                KtExpectedOutcomesExample ktExpectedOutcomesExample = new KtExpectedOutcomesExample();
+                ktExpectedOutcomesExample.createCriteria().andKtGroupIdEqualTo(result.getId()).andDelFlagEqualTo((byte) 0);
+                List<KtExpectedOutcomes> ktExpectedOutcomes = ktExpectedOutcomesMapper.selectByExample(ktExpectedOutcomesExample);
+                if (CollUtil.isNotEmpty(ktExpectedOutcomes)) {
+                    result.setCgTotal(ktExpectedOutcomes.size());
+                    result.setCgIng(ktExpectedOutcomes.stream().filter(ktExpectedOutcomes1 -> ktExpectedOutcomes1.getStatus() == 1).count());
+                }
+            }
+        }
+        return groupList;
     }
 
     @Override

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

@@ -36,6 +36,12 @@
         <if test="dto.ktGroupName != null and dto.ktGroupName != ''">
             and g.kt_group_name like concat('%',#{dto.ktGroupName},'%')
         </if>
+        <if test="dto.planStatus != null">
+            and g.plan_status = #{dto.planStatus}
+        </if>
+        <if test="dto.developStatus != null">
+            and g.develop_status = #{dto.developStatus}
+        </if>
         group by g.id
         order by g.parent_kt_id,g.id
     </select>