计划关联回款2

blade-service/blade-control/src/main/java/org/springblade/control/controller/AnnualBudgetController.java

@@ -107,7 +107,7 @@ public class AnnualBudgetController {
      * 获取项目列表
      */
     @GetMapping("/getProjectList")
-    @ApiOperationSupport(order = 5)
+    @ApiOperationSupport(order = 7)
     @ApiOperation(value = "获取项目列表")
     public R<List<ControlProjectInfoVO>> getProjectList() {
         return R.data(budgetService.getProjectList());
@@ -117,7 +117,7 @@ public class AnnualBudgetController {
      * 获取二级科目
      */
     @GetMapping("/getSecondSubject")
-    @ApiOperationSupport(order = 5)
+    @ApiOperationSupport(order = 8)
     @ApiOperation(value = "获取二级科目")
     public R<List<DictInfoVO>> getSecondSubject() {
         return R.data(budgetService.getSecondSubject());
@@ -127,7 +127,7 @@ public class AnnualBudgetController {
      * 门户-年度指标统计
      */
     @GetMapping("/portalAnnualTarget")
-    @ApiOperationSupport(order = 5)
+    @ApiOperationSupport(order = 9)
     @ApiOperation(value = "门户-年度指标统计")
     public R<AnnualBudgetVO3> portalAnnualTarget() {
         return R.data(budgetService.portalAnnualTarget());
@@ -137,10 +137,23 @@ public class AnnualBudgetController {
      * 门户-年度各项费用统计
      */
     @GetMapping("/portalAnnualCost")
-    @ApiOperationSupport(order = 5)
+    @ApiOperationSupport(order = 10)
     @ApiOperation(value = "门户-年度各项费用统计")
     public R<Map<String, BigDecimal>> portalAnnualCost(String year) {
         return R.data(budgetService.portalAnnualCost(year));
     }
 
+    /**
+     * 年度列表
+     */
+    @GetMapping("/yearList")
+    @ApiOperationSupport(order = 11)
+    @ApiOperation(value = "年度列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "1不包含所有，2包含所有", required = true),
+    })
+    public R<List<String>> yearList(Integer type) {
+        return R.data(budgetService.yearList(type));
+    }
+
 }

blade-service/blade-control/src/main/java/org/springblade/control/controller/DepartmentMonthPlanController.java

@@ -9,6 +9,7 @@ import lombok.AllArgsConstructor;
 import org.springblade.control.dto.ControlContractInfoDTO;
 import org.springblade.control.dto.ProjectCostBudgetDTO;
 import org.springblade.control.entity.DepartmentMonthPlan;
+import org.springblade.control.entity.DictInfo;
 import org.springblade.control.entity.ProjectReimbursement;
 import org.springblade.control.service.IDepartmentMonthPlanService;
 import org.springblade.control.vo.DepartmentMonthPlanVO;
@@ -72,7 +73,7 @@ public class DepartmentMonthPlanController {
      */
     @PostMapping("/updateDepartmentPlan")
     @ApiOperationSupport(order = 2)
-    @ApiOperation(value = "新增部门月计划")
+    @ApiOperation(value = "修改部门月计划")
     public R updateDepartmentPlan(@RequestBody ProjectCostBudgetDTO dto) {
         planService.updateDepartmentPlan(dto);
         return R.success("保存成功");
@@ -84,8 +85,8 @@ public class DepartmentMonthPlanController {
     @GetMapping("/getDepartmentDict")
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "获取部门列表")
-    public R getDepartmentDict() {
-        planService.getDepartmentDict();
-        return R.success("新增成功");
+    public R<List<DictInfo>> getDepartmentDict() {
+        return R.data(planService.getDepartmentDict());
+
     }
 }

blade-service/blade-control/src/main/java/org/springblade/control/controller/DepartmentPlanLogController.java

@@ -99,4 +99,6 @@ public class DepartmentPlanLogController {
         return R.data(logService.updateOpenTime(log));
     }
 
+
+
 }

blade-service/blade-control/src/main/java/org/springblade/control/mapper/AnnualBudgetMapper.java

@@ -37,4 +37,6 @@ public interface AnnualBudgetMapper extends BaseMapper<AnnualBudget> {
     AnnualBudget getThisYearBudget(@Param("year") int year);
 
     List<AnnualBudget> getAllYearBudget(@Param("year") int year);
+
+    List<String> yearList();
 }

blade-service/blade-control/src/main/java/org/springblade/control/mapper/AnnualBudgetMapper.xml

@@ -58,6 +58,12 @@
         select   <include refid="budget_column" />
         from c_annual_budget where is_deleted = 0
     </select>
+    <select id="yearList" resultType="java.lang.String">
+        select DISTINCT CONCAT(DATE_FORMAT(start_time,'%Y'),"年")
+        from c_control_project_info
+        WHERE is_deleted = 0
+        order by start_time
+    </select>
 
 
 </mapper>

blade-service/blade-control/src/main/java/org/springblade/control/service/IAnnualBudgetService.java

@@ -36,4 +36,6 @@ public interface IAnnualBudgetService extends BaseService<AnnualBudget> {
     AnnualBudgetVO3 portalAnnualTarget();
 
     Map<String, BigDecimal> portalAnnualCost(String year);
+
+    List<String> yearList(Integer type);
 }

blade-service/blade-control/src/main/java/org/springblade/control/service/impl/AnnualBudgetServiceImpl.java

@@ -347,7 +347,12 @@ public class AnnualBudgetServiceImpl extends BaseServiceImpl<AnnualBudgetMapper,
      */
     @Override
     public Map<String, BigDecimal> portalAnnualCost(String year) {
-        int y = Integer.parseInt(year);
+        int y;
+        if ("汇总所有".equals(year)){
+            y = 0;
+        }else {
+            y = Integer.parseInt(year.substring(0,4));
+        }
         Map<String,BigDecimal> map = new HashMap<>();
         //总合同：当年所有合同金额
         BigDecimal yearContractMoney = contractInfoService.getYearContractMoney(y);
@@ -380,6 +385,15 @@ public class AnnualBudgetServiceImpl extends BaseServiceImpl<AnnualBudgetMapper,
         return map;
     }
 
+    @Override
+    public List<String> yearList(Integer type) {
+        List<String> list = baseMapper.yearList();
+        if (type != 1) {
+            list.add("汇总所有");
+        }
+        return list;
+    }
+
     /**
      * 统计支出 1支出总和2工资总和
      */