经营看板修改添加年份

zjugis-business/src/main/java/com/zjugis/business/controller/ManageController.java

@@ -24,17 +24,17 @@ public class ManageController {
     ManageService manageService;
 
     @GetMapping("/manage/segment")
-    public CommonResult<List<ManageSegmentDto>> segment() {
-        return CommonResult.success( manageService.segment() );
+    public CommonResult<List<ManageSegmentDto>> segment(String year) {
+        return CommonResult.success( manageService.segment(year) );
     }
 
     @GetMapping("/manage/person")
-    public CommonResult<List<ManagePersonDto>> person() {
-        return CommonResult.success( manageService.person() );
+    public CommonResult<List<ManagePersonDto>> person(String year) {
+        return CommonResult.success( manageService.person(year) );
     }
 
     @GetMapping("/manage/dept")
-    public CommonResult<List<ManageDeptDto>> dept() {
-        return CommonResult.success( manageService.dept() );
+    public CommonResult<List<ManageDeptDto>> dept(String year) {
+        return CommonResult.success( manageService.dept(year) );
     }
 }

zjugis-business/src/main/java/com/zjugis/business/service/ContractService.java

@@ -78,9 +78,9 @@ public interface ContractService{
 
     List<ContractExcelResponse> excelList(ContractDto contractDto);
 
-    List<ManageSegmentDto> infoGroupBySegment();
+    List<ManageSegmentDto> infoGroupBySegment(String year);
 
-    List<ManageDeptDto> infoGroupByDept();
+    List<ManageDeptDto> infoGroupByDept(String year);
 
-    List<ManagePersonDto> infoGroupByPerson();
+    List<ManagePersonDto> infoGroupByPerson(String year);
 }

zjugis-business/src/main/java/com/zjugis/business/service/ManageService.java

@@ -13,9 +13,9 @@ import java.util.List;
  */
 public interface ManageService {
 
-    List<ManageSegmentDto> segment();
+    List<ManageSegmentDto> segment(String year);
 
-    List<ManageDeptDto> dept();
+    List<ManageDeptDto> dept(String year);
 
-    List<ManagePersonDto> person();
+    List<ManagePersonDto> person(String year);
 }

zjugis-business/src/main/java/com/zjugis/business/service/impl/ContractServiceImpl.java

@@ -420,9 +420,11 @@ public class ContractServiceImpl implements ContractService{
     }
 
     @Override
-    public List<ManageSegmentDto> infoGroupBySegment() {
-        Calendar calendar = Calendar.getInstance();
-        String year = String.valueOf(calendar.get(Calendar.YEAR));
+    public List<ManageSegmentDto> infoGroupBySegment(String year) {
+        if(StringUtils.isBlank(year)) {
+            Calendar calendar = Calendar.getInstance();
+            year = String.valueOf(calendar.get(Calendar.YEAR));
+        }
         List<ManageSegmentDto> returnDtos = contractMapper.returnGroupBySegment(year);
         List<ManageSegmentDto> signDtos = contractMapper.signGroupBySegment(year);
         List<ManageSegmentDto> newDtos = contractMapper.newGroupBySegment(year);
@@ -448,9 +450,11 @@ public class ContractServiceImpl implements ContractService{
     }
 
     @Override
-    public List<ManageDeptDto> infoGroupByDept() {
-        Calendar calendar = Calendar.getInstance();
-        String year = String.valueOf(calendar.get(Calendar.YEAR));
+    public List<ManageDeptDto> infoGroupByDept(String year) {
+        if(StringUtils.isBlank(year)) {
+            Calendar calendar = Calendar.getInstance();
+            year = String.valueOf(calendar.get(Calendar.YEAR));
+        }
         List<ManageDeptDto> returnDtos = contractMapper.returnGroupByDept(year);
         List<ManageDeptDto> signDtos = contractMapper.signGroupByDept(year);
         List<ManageDeptDto> newDtos = contractMapper.newGroupByDept(year);
@@ -476,9 +480,11 @@ public class ContractServiceImpl implements ContractService{
     }
 
     @Override
-    public List<ManagePersonDto> infoGroupByPerson() {
-        Calendar calendar = Calendar.getInstance();
-        String year = String.valueOf(calendar.get(Calendar.YEAR));
+    public List<ManagePersonDto> infoGroupByPerson(String year) {
+        if(StringUtils.isBlank(year)) {
+            Calendar calendar = Calendar.getInstance();
+            year = String.valueOf(calendar.get(Calendar.YEAR));
+        }
         List<ManagePersonDto> manageDtos = contractMapper.signGroupByPerson(year);
         List<ManagePersonDto> returnDtos = contractMapper.returnGroupByPerson(year);
         List<ManagePersonDto> newDtos = contractMapper.newGroupByPerson(year);

zjugis-business/src/main/java/com/zjugis/business/service/impl/ManageServiceImpl.java

@@ -29,8 +29,8 @@ public class ManageServiceImpl implements ManageService {
 
 
     @Override
-    public List<ManageSegmentDto> segment() {
-        List<ManageSegmentDto> manageDtos = contractService.infoGroupBySegment();
+    public List<ManageSegmentDto> segment(String year) {
+        List<ManageSegmentDto> manageDtos = contractService.infoGroupBySegment(year);
         List<ManageSegmentDto> subDtos = contractApplyService.infoGroupBySegment();
         for (ManageSegmentDto manageDto : manageDtos) {
             for (ManageSegmentDto subDto : subDtos) {
@@ -45,14 +45,14 @@ public class ManageServiceImpl implements ManageService {
     }
 
     @Override
-    public List<ManageDeptDto> dept() {
-        List<ManageDeptDto> manageDtos = contractService.infoGroupByDept();
+    public List<ManageDeptDto> dept(String year) {
+        List<ManageDeptDto> manageDtos = contractService.infoGroupByDept(year);
         return manageDtos;
     }
 
     @Override
-    public List<ManagePersonDto> person() {
-        List<ManagePersonDto> manageDtos = contractService.infoGroupByPerson();
+    public List<ManagePersonDto> person(String year) {
+        List<ManagePersonDto> manageDtos = contractService.infoGroupByPerson(year);
         return manageDtos;
     }
 }