diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index bbba5e85..cdac96c3 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -49,7 +49,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://cd-cynosdbmysql-grp-9rqrhxsm.sql.tencentcdb.com:27981/yanzhu_jh_test?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8
+                url: jdbc:mysql://cd-cynosdbmysql-grp-9rqrhxsm.sql.tencentcdb.com:27981/yanzhu_jh?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8
                 username: root
                 password: Sxyanzhu@cf
                 #url: jdbc:mysql://192.168.126.19:3306/yanzhu_jh?useSSL=false&characterEncoding=UTF-8&serverTimezone=GMT%2B8
diff --git a/ruoyi-ui/src/views/project/costOutput/costOutputDrawer.vue b/ruoyi-ui/src/views/project/costOutput/costOutputDrawer.vue
index 2d6d74ce..bbad650f 100644
--- a/ruoyi-ui/src/views/project/costOutput/costOutputDrawer.vue
+++ b/ruoyi-ui/src/views/project/costOutput/costOutputDrawer.vue
@@ -217,21 +217,9 @@ export default {
         },
         doAddYearSuccess() {
             this.loadData();
-        },
-        resetData(tmps) {
-            if (this.oldData.length == 0) {
-                return;
-            }
-            tmps.forEach(it => {
-                let objs = this.oldData.filter(d => d.id == it.id);
-                if (objs.length > 0) {
-                    it.money = objs[0].money;
-                }
-            });
-
-        },
+        },      
         loadData(init) {
-            listByProjectId(this.prj.id).then((d) => {                
+            listByProjectId(this.prj.id).then((d) => {   
                 let tmps = (d.data || []).map(it => {
                     it.money = it.money ? it.money / 10000.0 : 0;
                     it.money2 = it.money2 ? it.money2 / 10000.0 : 0;
@@ -239,8 +227,7 @@ export default {
                     it.isErr = false;
                     it.date1 = this.$dt(it.date1)
                     return it;
-                });
-                this.resetData(tmps);
+                });                
                 this.oldData = tmps;
                 this.form.totalInv = this.getValue(tmps, 1);
                 this.yearInv = tmps.filter(it => it.costType == 2);
diff --git a/ruoyi-ui/src/views/project/projectCommittee/projectCommitteeDrawer.vue b/ruoyi-ui/src/views/project/projectCommittee/projectCommitteeDrawer.vue
index 308e75a3..6c79cc0d 100644
--- a/ruoyi-ui/src/views/project/projectCommittee/projectCommitteeDrawer.vue
+++ b/ruoyi-ui/src/views/project/projectCommittee/projectCommitteeDrawer.vue
@@ -18,8 +18,8 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="10">
-                                <el-form-item label="支付金额">
-                                    <el-input v-model="dataItem.money" placeholder="请输支付金额" :class="checkRow(dataItem,2)"
+                                <el-form-item label="申报金额">
+                                    <el-input v-model="dataItem.money" placeholder="请输申报金额" :class="checkRow(dataItem,2)"
                                         @blur="v => formatAmount(dataItem)" maxlength="200">
                                         <template slot="append">万元</template>
                                     </el-input>
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectCostOutputController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectCostOutputController.java
index 71c12d90..d2345660 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectCostOutputController.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectCostOutputController.java
@@ -208,5 +208,15 @@ public class SurProjectCostOutputController extends BaseController
             return 0l;
         }
     }
+    /**
+     * 项目详情-项目分类汇总
+     * @param where
+     * @return
+     */
+    @PostMapping("/groupBYProject")
+    public AjaxResult groupBYProject(@RequestBody SurProjectCostOutput where){
+        return AjaxResult.success(surProjectCostOutputService.groupBYProject(where));
+    }
+
 
 }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectCostOutputMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectCostOutputMapper.java
index 60c630f2..5af9921c 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectCostOutputMapper.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectCostOutputMapper.java
@@ -78,4 +78,11 @@ public interface SurProjectCostOutputMapper
      * @return
      */
     public List<SurProjectCostOutput> selectForBigEnginList(SurProjectCostOutput where);
+
+    /**
+     * 项目详情-项目分类汇总
+     * @param where
+     * @return
+     */
+    public List<SurProjectCostOutput> groupBYProject(SurProjectCostOutput where);
 }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCostOutputService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCostOutputService.java
index 1aa33609..8ee4eae3 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCostOutputService.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectCostOutputService.java
@@ -94,4 +94,10 @@ public interface ISurProjectCostOutputService
      * @return
      */
     public Map<String,List<List<SurProjectCostOutput>>> selectForBigEnginList(SurProjectCostOutput where);
+    /**
+     * 项目详情-项目分类汇总
+     * @param where
+     * @return
+     */
+    public List<SurProjectCostOutput> groupBYProject(SurProjectCostOutput where);
 }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCostOutputServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCostOutputServiceImpl.java
index 4f25da60..f5e77ef3 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCostOutputServiceImpl.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCostOutputServiceImpl.java
@@ -245,5 +245,14 @@ public class SurProjectCostOutputServiceImpl implements ISurProjectCostOutputSer
         }
         return map;
     }
+    /**
+     * 项目详情-项目分类汇总
+     * @param where
+     * @return
+     */
+    @Override
+    public List<SurProjectCostOutput> groupBYProject(SurProjectCostOutput where) {
+        return surProjectCostOutputMapper.groupBYProject(where);
+    }
 }
 
diff --git a/yanzhu-jh/src/main/resources/mapper/flow/FlowLabourInfoMapper.xml b/yanzhu-jh/src/main/resources/mapper/flow/FlowLabourInfoMapper.xml
index a4d34c21..652fbed1 100644
--- a/yanzhu-jh/src/main/resources/mapper/flow/FlowLabourInfoMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/flow/FlowLabourInfoMapper.xml
@@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <!-- 查询条件-项目部门 -->
             <if test="projectDeptId != null "> and sp.deptId = #{projectDeptId}</if>
             <if test="prjIds !=null and prjIds.size()>0">
-                and spc.project_id in
+                and fl.project_id in
                 <foreach collection="prjIds"  item="item" index="index" open="(" close=")" separator=",">
                     #{item}
                 </foreach>
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCostOutputMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCostOutputMapper.xml
index 55fee15d..bab03b41 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCostOutputMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCostOutputMapper.xml
@@ -294,4 +294,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         ORDER BY a.create_time
     </select>
+    <select id="groupBYProject" parameterType="SurProjectCostOutput" resultMap="SurProjectCostOutputResult">
+        select  x.id,x.remark,x.money,y.money money2,x.month from (
+            select a.dict_value id,  a.dict_label remark,sum(b.money) money,count(a.id) month ,'总投资' cost_type from (                                                                                                                                                           SELECT a.id,c.dict_label,c.dict_value
+            FROM sur_project a,sys_dict_data c
+            where a.isDel=0
+            <if test="costType==1">
+                 and a.projectType=c.dict_value and c.dict_type='project_category'
+            </if>
+            <if test="costType==2">
+                 and a.projiectLevel=c.dict_value and c.dict_type='project_level'
+            </if>
+            <if test="id!=null and id>0"> and a.deptId = #{id}</if>
+            ) a
+            left join (select  project_id,money from sur_project_cost_output where cost_type=1) b on a.id=b.project_id
+            group by a.dict_value,a.dict_label ) x,
+            (
+            select a.dict_value id,  a.dict_label remark,sum(b.money) money,count(a.id) month ,'年度' cost_type from (
+                SELECT a.id,c.dict_label,c.dict_value
+                FROM sur_project a,sys_dict_data c
+                where a.isDel=0
+                <if test="costType==1">
+                    and a.projectType=c.dict_value and c.dict_type='project_category'
+                </if>
+                <if test="costType==2">
+                    and a.projiectLevel=c.dict_value and c.dict_type='project_level'
+                </if>
+                <if test="id!=null and id>0"> and a.deptId = #{id}</if>
+                ) a
+                left join (select  project_id,money from sur_project_cost_output where cost_type=2 and year=#{year}) b on a.id=b.project_id
+                group by a.dict_value,a.dict_label
+            )y where x.id=y.id
+    </select>
 </mapper>
\ No newline at end of file