案卷时间

blade-service-api/blade-control-api/src/main/java/org/springblade/control/vo/BudgetAndPracticalByDeptVO.java

@@ -0,0 +1,48 @@
+package org.springblade.control.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @Param
+ * @Author wangwl
+ * @Date 2023/7/24 14:22
+ **/
+@Data
+public class BudgetAndPracticalByDeptVO {
+
+    @ApiModelProperty(value = "时间")
+    private String time;
+
+    @ApiModelProperty(value = "市场预算")
+    private BigDecimal budget1;
+
+    @ApiModelProperty(value = "市场实际")
+    private BigDecimal practical1;
+
+    @ApiModelProperty(value = "研发预算")
+    private BigDecimal budget2;
+
+    @ApiModelProperty(value = "研发实际")
+    private BigDecimal practical2;
+
+    @ApiModelProperty(value = "实施预算")
+    private BigDecimal budget3;
+
+    @ApiModelProperty(value = "实施实际")
+    private BigDecimal practical3;
+
+    @ApiModelProperty(value = "维护预算")
+    private BigDecimal budget4;
+
+    @ApiModelProperty(value = "维护实际")
+    private BigDecimal practical4;
+
+    @ApiModelProperty(value = "管理预算")
+    private BigDecimal budget5;
+
+    @ApiModelProperty(value = "管理实际")
+    private BigDecimal practical5;
+}

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchivesAutoMapper.xml

@@ -610,7 +610,7 @@
     </select>
 
     <select id="pageByArchivesAuto3" resultMap="archivesAutoResultMap">
-        select uaa.id,uaa.name,uaa.file_number,uaa.unit,uaa.storage_time,uaa.secret_level
+        select uaa.id,uaa.name,uaa.file_number,uaa.unit,uaa.storage_time,uaa.secret_level,uaa.start_date,uaa.end_date
         from
         (SELECT id FROM m_archive_tree_contract WHERE project_id =#{vo.projectId}
         and  ancestors like concat('%',#{vo.nodeId},'%')

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

@@ -237,4 +237,14 @@ public class AnnualBudgetController {
         return R.data(budgetService.budgetAndPracticalByMonth(year));
     }
 
+    /**
+     * 预算与实际统计-部门支出统计
+     */
+    @GetMapping("/budgetAndPracticalByDept")
+    @ApiOperationSupport(order = 16)
+    @ApiOperation(value = "预算与实际统计-部门支出统计",notes = "传入年：2023年")
+    public R<List<BudgetAndPracticalByDeptVO>> budgetAndPracticalByDept(String year) {
+        return R.data(budgetService.budgetAndPracticalByDept(year));
+    }
+
 }

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

@@ -52,4 +52,6 @@ public interface IAnnualBudgetService extends BaseService<AnnualBudget> {
     List<ProjectServiceProcessVO> portalProjectProcess(Long projectId);
 
     List<BudgetAndPracticalByMonthVO> budgetAndPracticalByMonth(String year);
+
+    List<BudgetAndPracticalByDeptVO> budgetAndPracticalByDept(String year);
 }

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

@@ -1064,6 +1064,14 @@ public class AnnualBudgetServiceImpl extends BaseServiceImpl<AnnualBudgetMapper,
         return list;
     }
 
+    /**
+     * 预算与实际统计-部门支出统计
+     */
+    @Override
+    public List<BudgetAndPracticalByDeptVO> budgetAndPracticalByDept(String year) {
+        return null;
+    }
+
     /**
      * 统计支出 1支出总和2工资总和
      */