From 932d97af93590073bf7671d979e29fc1571e1cd3 Mon Sep 17 00:00:00 2001
From: zhc077 <565291854@qq.com>
Date: Thu, 31 Oct 2024 18:04:29 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=AE=97=E4=B9=A6-=E8=B4=A2=E6=94=BF?=
 =?UTF-8?q?=E6=8B=A8=E6=AC=BE=E3=80=81=E5=B9=B4=E5=BA=A6=E9=A2=84=E7=AE=97?=
 =?UTF-8?q?=E8=A1=A8=20=E5=8A=9F=E8=83=BD=E6=B7=BB=E5=8A=A0=2010.31?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectAnnualBudgetController.java        | 15 +++-
 .../entity/ProjectAnnualBudget.java           | 24 +++++-
 .../yusuanshu/NianDuYuSuanDemo.vue            | 74 +++++++++++++------
 3 files changed, 83 insertions(+), 30 deletions(-)

diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/controller/ProjectAnnualBudgetController.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/controller/ProjectAnnualBudgetController.java
index 13f87bf..edfbd16 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/controller/ProjectAnnualBudgetController.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/controller/ProjectAnnualBudgetController.java
@@ -79,12 +79,11 @@ public class ProjectAnnualBudgetController extends JeecgController<ProjectAnnual
     @ApiOperation(value = "财政拨款分单位年度预算-添加", notes = "财政拨款分单位年度预算-添加")
 //    @RequiresPermissions("projectAnnualBudget:project_annual_budget:add")
     @PostMapping(value = "/add/{projectId}")
-    public Result<String> add(@PathVariable("projectId") String projectId, @RequestBody List<ProjectAnnualBudget> list) {
+    public Result<String> add(@PathVariable("projectId") String projectId, @RequestBody ProjectAnnualBudget projectAnnualBudget) {
         Project project = iProjectService.getById(projectId);
         Optional.ofNullable(project).orElseThrow(() -> new JeecgBootException("项目不存在"));
-        BigDecimal sumFee = Optional.ofNullable(list).orElse(new LinkedList<>()).stream().map(ProjectAnnualBudget::getTotalAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
         projectAnnualBudgetService.remove(new LambdaQueryWrapper<ProjectAnnualBudget>().eq(ProjectAnnualBudget::getProjectId, projectId));
-        projectAnnualBudgetService.saveBatch(list);
+        projectAnnualBudgetService.save(projectAnnualBudget);
         return Result.OK("添加成功！");
     }
 
@@ -151,6 +150,16 @@ public class ProjectAnnualBudgetController extends JeecgController<ProjectAnnual
         return Result.OK(projectAnnualBudget);
     }
 
+    @ApiOperation(value = "财政拨款分单位年度预算-通过id查询", notes = "财政拨款分单位年度预算-通过id查询")
+    @GetMapping(value = "/queryByProjectId/{projectId}")
+    public Result<ProjectAnnualBudget> queryByProjectId(@PathVariable("projectId") String projectId) {
+        ProjectAnnualBudget projectAnnualBudget = projectAnnualBudgetService.getOne(new LambdaQueryWrapper<ProjectAnnualBudget>().eq(ProjectAnnualBudget::getProjectId,projectId));
+        if (projectAnnualBudget == null) {
+            return Result.error("未找到对应数据");
+        }
+        return Result.OK(projectAnnualBudget);
+    }
+
     /**
      * 导出excel
      *
diff --git a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/entity/ProjectAnnualBudget.java b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/entity/ProjectAnnualBudget.java
index 584d6c5..ed66020 100644
--- a/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/entity/ProjectAnnualBudget.java
+++ b/jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/projectAnnualBudget/entity/ProjectAnnualBudget.java
@@ -71,24 +71,40 @@ public class ProjectAnnualBudget implements Serializable {
     @Excel(name = "项目id", width = 15)
     @ApiModelProperty(value = "项目id")
     private String projectId;
+
+    @Excel(name = "年度1", width = 15)
+    @ApiModelProperty(value = "年度1")
+    private String year1;
+    /**
+     * 年度2
+     */
+    @Excel(name = "年度2", width = 15)
+    @ApiModelProperty(value = "年度2")
+    private String year2;
     /**
-     * 年度1
+     * 年度3
      */
+    @Excel(name = "年度3", width = 15)
+    @ApiModelProperty(value = "年度3")
+    private String year3;
+
     @Excel(name = "年度1", width = 15)
     @ApiModelProperty(value = "年度1")
-    private String annual1;
+    private String year1Value;
     /**
      * 年度2
      */
     @Excel(name = "年度2", width = 15)
     @ApiModelProperty(value = "年度2")
-    private String annual2;
+    private String year2Value;
     /**
      * 年度3
      */
     @Excel(name = "年度3", width = 15)
     @ApiModelProperty(value = "年度3")
-    private String annual3;
+    private String year3Value;
+
+
     /**
      * 部门名称
      */
diff --git a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/yusuanshu/NianDuYuSuanDemo.vue b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/yusuanshu/NianDuYuSuanDemo.vue
index c954208..c118d31 100644
--- a/jeecgboot-vue3/src/views/projectApplication/kejigongguan/yusuanshu/NianDuYuSuanDemo.vue
+++ b/jeecgboot-vue3/src/views/projectApplication/kejigongguan/yusuanshu/NianDuYuSuanDemo.vue
@@ -28,17 +28,17 @@
       </thead>
       <tbody>
       <tr>
-        <td><a-input v-model:value="data.name" /></td>
+        <td><a-input v-model:value="data.departName" /></td>
         <td><a-input prefix="￥" suffix="RMB" v-model:value="data.year1Value" /></td>
         <td><a-input prefix="￥" suffix="RMB" v-model:value="data.year2Value" /></td>
         <td><a-input prefix="￥" suffix="RMB" v-model:value="data.year3Value" /></td>
-        <td>{{sum}}</td>
+        <td>{{Amount}}</td>
       </tr>
       </tbody>
     </table>
   </div>
   <div class="button-container">
-    <a-button type="primary" @click="save">保存</a-button>
+    <a-button type="primary" @click="handleSubmit">保存</a-button>
     <a-button type="primary"  @click="router.back();">返回</a-button>
   </div>
 </template>
@@ -46,7 +46,10 @@
 <script setup>
 import {ref,onMounted,computed} from 'vue'
 import {useRoute, useRouter} from "vue-router";
-import {saveOrUpdate} from "@/views/projectApplication/project/Project.api";
+import {saveOrUpdate} from "@/views/projectAnnualBudget/ProjectAnnualBudget.api";
+import {defHttp} from "@/utils/http/axios";
+import {useMessage} from "@/hooks/web/useMessage";
+const { createMessage } = useMessage();
 
 const router = useRouter();
 const route = useRoute();
@@ -58,25 +61,14 @@ const data = ref({
   year1Value:0,
   year2Value:0,
   year3Value:0,
-  name:'',
-  sum:''
+  departName:'',
+  totalAmount:''
 })
 onMounted(()=> {
-  // data.value.year1 = '2025'
-
+  loadData();
 })
 
-async function handleSubmit() {
-  let val = await validate();
-  console.log('val----------',JSON.stringify(val))
-  // let data = getFieldsValue();
-  // let params = Object.assign({}, formData, data);
-  val.id = route.query.id;
-  console.log('表单数据', val)
-  await saveOrUpdate(val, true)
-}
-
-const save = () => {
+const handleSubmit =  async () =>  {
   let params = {
     year1:data.value.year1.$y,
     year2:data.value.year2.$y,
@@ -84,12 +76,48 @@ const save = () => {
     year1Value:data.value.year1Value,
     year2Value:data.value.year2Value,
     year3Value:data.value.year3Value,
-    name:data.value.name,
-    sum:data.value.sum,
+    departName:data.value.departName,
+    totalAmount:Number(data.value.year1Value) + Number(data.value.year2Value) + Number(data.value.year3Value),
   }
-  console.log(JSON.stringify(params))
+  params.projectId = route.query.id;
+  defHttp
+    .post({
+      url: '/projectAnnualBudget/projectAnnualBudget/add/'+route.query.id,
+      params: params,
+    })
+    /*.then(() => {
+      // createMessage.success(`保存成功！`);
+      // loadData();
+    })
+    .finally(() => {
+      // loading.value = false;
+    });*/
 }
-const sum = computed(() => {
+
+// 加载数据
+async function loadData() {
+  // loading.value = true;
+  // 调用查询数据接口
+  await defHttp
+    .get({
+      // 请求地址
+      url: '/projectAnnualBudget/projectAnnualBudget/queryByProjectId/'+route.query.id,
+    }).then((result) => {
+      data.value.year1Value = result.year1Value
+      data.value.year2Value = result.year2Value
+      data.value.year3Value = result.year3Value
+      data.value.departName = result.departName
+      console.log("the data()",JSON.stringify(result))
+      // 后台查询回来的 total，数据总数量
+      // pagination.total = result.total;
+      // 将查询的数据赋值给 dataSource
+      // dataSource.value = result.records;
+      // // 重置选择
+      // selectedRows.value = [];
+    })
+}
+
+const Amount = computed(() => {
   return Number(data.value.year1Value) + Number(data.value.year2Value) + Number(data.value.year3Value)
 })
 </script>