更新成本代码

module_kzks/src/main/java/org/jeecg/modules/Index/mapper/IndexZcbMapper.java

@@ -22,7 +22,7 @@ public interface IndexZcbMapper {
      *   des: 统计总成本根据当前用户的部门和日期 部门根据下达部门
      *   date: 2023/9/21
      */
-    public BigDecimal getZcbByXdDepartAndDate(@Param("dep") List<String> dep, @Param("nowDate") String nowDate,@Param("pcList") List<String> pcList);
+    public BigDecimal getZcbByXdDepartAndDate(@Param("dep") List<String> dep, @Param("nowDate") String nowDate);
 
     /**
      *   author: dzc
@@ -30,15 +30,15 @@ public interface IndexZcbMapper {
      *   des: 统计总成本根据当前用户的部门和日期 部门根据责任部门
      *   date: 2023/9/21
      */
-    public BigDecimal getZcbByZrDepartAndDate(@Param("dep") List<String> dep, @Param("nowDate") String nowDate,@Param("pcList") List<String> pcList);
+    public BigDecimal getZcbByZrDepartAndDate(@Param("dep") List<String> dep, @Param("nowDate") String nowDate);
 
     /**
-    *   author: dzc
-    *   version: 1.0
-    *   des: 统计总成本根据当前用户的部门和日期 全部部门
-    *   date: 2023/9/24
-    */
-    public BigDecimal getZcbByDate(@Param("nowDate") String nowDate,@Param("pcList") List<String> pcList);
+     *   author: dzc
+     *   version: 1.0
+     *   des: 统计总成本根据当前用户的部门和日期 全部部门
+     *   date: 2023/9/24
+     */
+    public BigDecimal getZcbByDate(@Param("nowDate") String nowDate);
 
     /**
      *   author: dzc
@@ -49,11 +49,11 @@ public interface IndexZcbMapper {
     public List<String> getDepartByUsername(String username);
 
     /**
-    *   author: dzc
-    *   version: 1.0
-    *   des: 根据用户名 查询 当前登录的用户 的角色
-    *   date: 2023/9/24
-    */
+     *   author: dzc
+     *   version: 1.0
+     *   des: 根据用户名 查询 当前登录的用户 的角色
+     *   date: 2023/9/24
+     */
     public List<String> getRolesByUsername(String username);
 
     /**
@@ -62,7 +62,7 @@ public interface IndexZcbMapper {
      *   des: 查询去年同期总成本  部门根据下达部门
      *   date: 2023/9/21
      */
-    public BigDecimal getZcbByXdDepartAndUpDate(@Param("dep") List<String> dep,@Param("upDateFirst") String upDateFirst, @Param("upDate") String upDate,@Param("pcList") List<String> pcList);
+    public BigDecimal getZcbByXdDepartAndUpDate(@Param("dep") List<String> dep,@Param("upDateFirst") String upDateFirst, @Param("upDate") String upDate);
 
 
     /**
@@ -71,56 +71,112 @@ public interface IndexZcbMapper {
      *   des: 查询去年同期总成本  部门根据责任部门
      *   date: 2023/9/21
      */
-    public BigDecimal getZcbByZrDepartAndUpDate(@Param("dep") List<String> dep,@Param("upDateFirst") String upDateFirst, @Param("upDate") String upDate,@Param("pcList") List<String> pcList);
+    public BigDecimal getZcbByZrDepartAndUpDate(@Param("dep") List<String> dep,@Param("upDateFirst") String upDateFirst, @Param("upDate") String upDate);
+
 
+    /**
+     *   author: dzc
+     *   version: 1.0
+     *   des: 查询去年同期总成本 全部部门
+     *   date: 2023/9/24
+     */
+    public BigDecimal getZcbByUpdate(@Param("upDateFirst") String upDateFirst, @Param("upDate") String upDate);
+
+    /**
+     *   author: dzc
+     *   version: 1.0
+     *   des: 查询指定时间段内的八项成本  部门根据下达部门
+     *   date: 2023/9/22
+     */
+    public List<EightCosts> getEightCostXdDepartByDate(@Param("dep") List<String> dep,@Param("startDate") String startDate,@Param("endDate") String endDate);
+
+    /**
+     *   author: dzc
+     *   version: 1.0
+     *   des: 查询指定时间段内的八项成本 部门根据责任部门
+     *   date: 2023/9/22
+     */
+    public List<EightCosts> getEightCostZrDepartByDate(@Param("dep") List<String> dep,@Param("startDate") String startDate,@Param("endDate") String endDate);
+
+    /**
+     *   author: dzc
+     *   version: 1.0
+     *   des: 查询指定时间段内的八项成本 全部部门
+     *   date: 2023/9/24
+     */
+    public List<EightCosts> getEightCostDepartByDate(@Param("startDate") String startDate,@Param("endDate") String endDate);
+
+
+    /**
+     *   author: dzc
+     *   version: 1.0
+     *   des: 查询出 所有状态为 1 的pccode所对应的任务号（去重）
+     *   date: 2023/9/24
+     */
+    public List<String> getPcTasknoList();
+
+    /**
+     *   author: dzc
+     *   version: 1.0
+     *   des: 查询出所有解组批的子任务
+     *   date: 2023/9/24
+     */
+    public List<String> getPcTasknoSonList();
 
     /**
     *   author: dzc
     *   version: 1.0
-    *   des: 查询去年同期总成本 全部部门
-    *   date: 2023/9/24
+    *   des: 根据年月查询所有的部门的总成本
+    *   date: 2023/10/7
     */
-    public BigDecimal getZcbByUpdate(@Param("upDateFirst") String upDateFirst, @Param("upDate") String upDate,@Param("pcList") List<String> pcList);
-
+    public BigDecimal getZcbByYearMonth(String nowDate);
     /**
     *   author: dzc
     *   version: 1.0
-    *   des: 查询指定时间段内的八项成本  部门根据下达部门
-    *   date: 2023/9/22
+    *   des: 根据年月查询下达部门的总成本
+    *   date: 2023/10/7
     */
-    public List<EightCosts> getEightCostXdDepartByDate(@Param("dep") List<String> dep,@Param("startDate") String startDate,@Param("endDate") String endDate,@Param("pcList") List<String> pcList);
+    public BigDecimal getZcbByXdDepartByYearMonth(@Param("nowDate") String nowDate,@Param("dep") List<String> dep);
 
     /**
     *   author: dzc
     *   version: 1.0
-    *   des: 查询指定时间段内的八项成本 部门根据责任部门
-    *   date: 2023/9/22
+    *   des: 根据年月查询责任部门的总成本
+    *   date: 2023/10/7
     */
-    public List<EightCosts> getEightCostZrDepartByDate(@Param("dep") List<String> dep,@Param("startDate") String startDate,@Param("endDate") String endDate,@Param("pcList") List<String> pcList);
+    public BigDecimal getZcbByZrDepartByYearMonth(@Param("nowDate") String nowDate,@Param("dep") List<String> dep);
 
     /**
     *   author: dzc
     *   version: 1.0
-    *   des: 查询指定时间段内的八项成本 全部部门
-    *   date: 2023/9/24
+    *   des: 根据年查询所有部门的总成本
+    *   date: 2023/10/7
     */
-    public List<EightCosts> getEightCostDepartByDate(@Param("startDate") String startDate,@Param("endDate") String endDate,@Param("pcList") List<String> pcList);
+    public BigDecimal getZcbByYear(String nowDate);
 
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: 根据年查询下达部门的总成本
+    *   date: 2023/10/7
+    */
+    public BigDecimal getZcbByXdDepartByYear(@Param("nowDate") String nowDate,@Param("dep") List<String> dep);
 
     /**
     *   author: dzc
     *   version: 1.0
-    *   des: 查询出 所有状态为 1 的pccode所对应的任务号（去重）
-    *   date: 2023/9/24
+    *   des: 根据年查询责任部门的总成本
+    *   date: 2023/10/7
     */
-    public List<String> getPcTasknoList();
+    public BigDecimal getZcbByZrDepartByYear(@Param("nowDate") String nowDate,@Param("dep") List<String> dep);
+
 
     /**
     *   author: dzc
     *   version: 1.0
-    *   des: 查询出所有解组批的子任务
-    *   date: 2023/9/24
+    *   des: 根据时间段 获取八项成本之和
+    *   date: 2023/10/7
     */
-    public List<String> getPcTasknoSonList();
+    public List<EightCosts> getEightCostByYearMonth(@Param("startDate") String startDate,@Param("endDate") String endDate);
 
 }

module_kzks/src/main/java/org/jeecg/modules/Index/mapper/xml/IndexZcbMapper.xml

@@ -14,11 +14,8 @@
         <foreach collection="dep" item="item" index="index" separator="," open="(" close=")">
             #{item}
         </foreach>
-        and k.sjwcsj like concat('%', #{nowDate}, '%')
-        and c.taskno not in
-        <foreach collection="pcList" item="item" index="index" separator="," open="(" close=")">
-            #{item}
-        </foreach>
+        and k.sjwcsj like CONCAT('%',#{nowDate},'%')
+        AND c.status in ("0","3")
     </select>
 
     <!-- 统计总成本(支出) 部门根据责任部门 -->
@@ -31,24 +28,76 @@
         <foreach collection="dep" item="item" index="index" separator="," open="(" close=")">
             #{item}
         </foreach>
-        and k.sjwcsj like concat('%', #{nowDate}, '%')
-        and c.taskno not in
-        <foreach collection="pcList" item="item" index="index" separator="," open="(" close=")">
-            #{item}
-        </foreach>
+        and k.sjwcsj like CONCAT('%',#{nowDate},'%')
+        AND c.status in ("0","3")
     </select>
 
     <!-- 统计总成本根据当前用户的部门和日期 全部部门 -->
     <select id="getZcbByDate" resultType="BigDecimal">
-        select sum(c.zcb)
-        from kzks_project_cost c
-        left join ky_task_info k
-        on c.taskno = k.taskno
-        where k.sjwcsj like concat('%', #{nowDate}, '%')
-        and c.taskno not in
-        <foreach collection="pcList" item="item" index="index" separator="," open="(" close=")">
+        SELECT SUM(c.zcb)
+        FROM kzks_project_cost c
+                 LEFT JOIN ky_task_info k
+                           ON c.taskno = k.taskno
+        WHERE k.sjwcsj LIKE CONCAT('%',#{nowDate},'%')
+          AND c.status in ("0","3")
+    </select>
+
+    <!-- 根据年月查询所有的部门的总成本 -->
+    <select id="getZcbByYearMonth" resultType="BigDecimal">
+        SELECT SUM(ZCB)
+        FROM kzks_project_cost
+        WHERE TASKNO IN (SELECT TASKNO FROM ky_task_info WHERE yearmonth = #{nowDate}) and status in ("0","3")
+    </select>
+    <!-- 根据年月查询下达部门的总成本 -->
+    <select id="getZcbByXdDepartByYearMonth" resultType="BigDecimal">
+        SELECT SUM(ZCB)
+        FROM kzks_project_cost
+        WHERE TASKNO IN
+        (SELECT TASKNO FROM ky_task_info WHERE yearmonth = #{nowDate} AND jycs in
+        <foreach collection="dep" item="item" index="index" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+        ) and status in ("0","3")
+    </select>
+    <!-- 根据年月查询责任部门的总成本 -->
+    <select id="getZcbByZrDepartByYearMonth" resultType="BigDecimal">
+        SELECT SUM(ZCB)
+        FROM kzks_project_cost
+        WHERE TASKNO IN
+        (SELECT TASKNO FROM ky_task_info WHERE yearmonth = #{nowDate} AND zrbm in
+        <foreach collection="dep" item="item" index="index" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+        ) and status in ("0","3")
+    </select>
+
+    <!-- 根据年查询所有部门的总成本 -->
+    <select id="getZcbByYear" resultType="BigDecimal">
+        SELECT SUM(ZCB)
+        FROM kzks_project_cost
+        WHERE TASKNO IN (SELECT TASKNO FROM ky_task_info WHERE year = #{nowDate}) and status in ("0","3")
+    </select>
+    <!-- 根据年查询下达部门的总成本 -->
+    <select id="getZcbByXdDepartByYear" resultType="BigDecimal">
+        SELECT SUM(ZCB)
+        FROM kzks_project_cost
+        WHERE TASKNO IN
+        (SELECT TASKNO FROM ky_task_info WHERE year = #{nowDate} AND jycs in
+        <foreach collection="dep" item="item" index="index" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+        ) and status in ("0","3")
+    </select>
+    <!-- 根据年查询责任部门的总成本 -->
+    <select id="getZcbByZrDepartByYear" resultType="BigDecimal">
+        SELECT SUM(ZCB)
+        FROM kzks_project_cost
+        WHERE TASKNO IN
+        (SELECT TASKNO FROM ky_task_info WHERE year = #{nowDate} AND zrbm in
+        <foreach collection="dep" item="item" index="index" separator="," open="(" close=")">
             #{item}
         </foreach>
+        ) and status in ("0","3")
     </select>
 
     <resultMap id="DepartMap" type="String">
@@ -59,9 +108,9 @@
         SELECT depart_name
         FROM sys_depart
         WHERE id IN
-        (SELECT dep_id FROM sys_user_depart WHERE user_id IN
-            (SELECT id FROM sys_user WHERE username = #{username})
-        )
+              (SELECT dep_id FROM sys_user_depart WHERE user_id IN
+                                                        (SELECT id FROM sys_user WHERE username = #{username})
+              )
     </select>
 
     <resultMap id="RoleList" type="String">
@@ -86,10 +135,7 @@
             #{item}
         </foreach>
         AND k.sjwcsj >= #{upDateFirst} AND k.sjwcsj <![CDATA[ <= ]]> #{upDate}
-        AND c.taskno NOT IN
-        <foreach collection="pcList" item="item" index="index" separator="," open="(" close=")">
-            #{item}
-        </foreach>
+        AND c.status in ("0","3")
     </select>
 
     <!-- 查询去年同期总成本 部门根据责任部门部门 -->
@@ -103,23 +149,17 @@
             #{item}
         </foreach>
         AND k.sjwcsj >= #{upDateFirst} AND k.sjwcsj <![CDATA[ <= ]]> #{upDate}
-        AND c.taskno NOT IN
-        <foreach collection="pcList" item="item" index="index" separator="," open="(" close=")">
-            #{item}
-        </foreach>
+        AND c.status in ("0","3")
     </select>
 
     <!-- 查询去年同期总成本 全部部门 -->
     <select id="getZcbByUpdate" resultType="BigDecimal">
         SELECT sum(c.zcb)
         FROM kzks_project_cost c
-        LEFT JOIN ky_task_info k
-        ON c.taskno = k.taskno
+                 LEFT JOIN ky_task_info k
+                           ON c.taskno = k.taskno
         WHERE k.sjwcsj >= #{upDateFirst} AND k.sjwcsj <![CDATA[ <= ]]> #{upDate}
-        AND c.taskno NOT IN
-        <foreach collection="pcList" item="item" index="index" separator="," open="(" close=")">
-            #{item}
-        </foreach>
+          AND c.status in ("0","3")
     </select>
 
     <!-- 查询规定时间段内的 材料费、专用费、事务费、外协费、燃料动力费、固定资产折旧费、工资及劳务费、管理费 之和 部门根据下达部门 -->
@@ -135,10 +175,10 @@
     </resultMap>
     <select id="getEightCostXdDepartByDate" resultMap="EigthCostList">
         SELECT
-            sum( c.clf ) AS clf,sum(c.zyf) AS zyf,sum(c.swf) AS swf,sum(c.wxf) AS wxf,
-            sum(c.rldlf) AS rldlf,sum(c.gdzczj) AS gdzczj,sum(c.gzjlwf) AS gzjlwf,sum(c.glf) AS glf
+        sum( c.clf ) AS clf,sum(c.zyf) AS zyf,sum(c.swf) AS swf,sum(c.wxf) AS wxf,
+        sum(c.rldlf) AS rldlf,sum(c.gdzczj) AS gdzczj,sum(c.gzjlwf) AS gzjlwf,sum(c.glf) AS glf
         FROM
-            kzks_project_cost c
+        kzks_project_cost c
         LEFT JOIN ky_task_info k
         ON c.taskno = k.taskno
         WHERE k.jycs IN
@@ -146,10 +186,7 @@
             #{item}
         </foreach>
         AND k.sjwcsj >= #{startDate} AND k.sjwcsj <![CDATA[ < ]]> #{endDate}
-        AND c.taskno NOT IN
-        <foreach collection="pcList" item="item" index="index" separator="," open="(" close=")">
-            #{item}
-        </foreach>
+        AND c.status in ("0","3")
     </select>
 
     <!-- 查询规定时间段内的 材料费、专用费、事务费、外协费、燃料动力费、固定资产折旧费、工资及劳务费、管理费 之和 部门根据责任部门 -->
@@ -166,26 +203,20 @@
             #{item}
         </foreach>
         AND k.sjwcsj >= #{startDate} AND k.sjwcsj <![CDATA[ < ]]> #{endDate}
-        AND c.taskno NOT IN
-        <foreach collection="pcList" item="item" index="index" separator="," open="(" close=")">
-            #{item}
-        </foreach>
+        AND c.status in ("0","3")
     </select>
 
     <!-- 查询规定时间段内的 材料费、专用费、事务费、外协费、燃料动力费、固定资产折旧费、工资及劳务费、管理费 之和 全部部门 -->
     <select id="getEightCostDepartByDate" resultMap="EigthCostList">
         SELECT
-        sum( c.clf ) AS clf,sum(c.zyf) AS zyf,sum(c.swf) AS swf,sum(c.wxf) AS wxf,
-        sum(c.rldlf) AS rldlf,sum(c.gdzczj) AS gdzczj,sum(c.gzjlwf) AS gzjlwf,sum(c.glf) AS glf
+            sum( c.clf ) AS clf,sum(c.zyf) AS zyf,sum(c.swf) AS swf,sum(c.wxf) AS wxf,
+            sum(c.rldlf) AS rldlf,sum(c.gdzczj) AS gdzczj,sum(c.gzjlwf) AS gzjlwf,sum(c.glf) AS glf
         FROM
-        kzks_project_cost c
-        LEFT JOIN ky_task_info k
-        ON c.taskno = k.taskno
+            kzks_project_cost c
+                LEFT JOIN ky_task_info k
+                          ON c.taskno = k.taskno
         WHERE k.sjwcsj >= #{startDate} AND k.sjwcsj <![CDATA[ < ]]> #{endDate}
-        AND c.taskno NOT IN
-        <foreach collection="pcList" item="item" index="index" separator="," open="(" close=")">
-            #{item}
-        </foreach>
+          AND c.status in ("0","3")
     </select>
 
     <resultMap id="PcCodeTasknoList" type="String">
@@ -198,7 +229,21 @@
     <select id="getPcTasknoSonList" resultMap="PcCodeTasknoList">
         SELECT taskno FROM kzks_project_cost
         WHERE reftaskno
-        IN (SELECT DISTINCT(pcCode) FROM kzks_project_cost WHERE status = "1")
-        AND status IN ("0","3")
+            IN (SELECT DISTINCT(pcCode) FROM kzks_project_cost WHERE status = "1")
+          AND status IN ("0","3")
+    </select>
+
+    <select id="getEightCostByYearMonth" resultMap="EigthCostList">
+        SELECT
+        sum( c.clf ) AS clf,sum(c.zyf) AS zyf,sum(c.swf) AS swf,sum(c.wxf) AS wxf,
+        sum(c.rldlf) AS rldlf,sum(c.gdzczj) AS gdzczj,sum(c.gzjlwf) AS gzjlwf,sum(c.glf) AS glf
+        FROM
+        kzks_project_cost c
+        LEFT JOIN ky_task_info k
+        ON c.taskno = k.taskno
+        WHERE k.yearmonth >= #{startDate} AND k.yearmonth  <![CDATA[ <= ]]> #{endDate}
+        AND c.status in ("0","3")
+        group by k.yearmonth
+        ORDER BY k.yearmonth
     </select>
 </mapper>

module_kzks/src/main/java/org/jeecg/modules/Index/service/IndexZcbService.java

@@ -20,20 +20,20 @@ import java.util.List;
 public interface IndexZcbService {
 
     /**
-    *   author: dzc
-    *   version: 1.0
-    *   des: 获取 支出相关信息(给前端的数据) 的service方法
-    *   date: 2023/9/22
-    */
+     *   author: dzc
+     *   version: 1.0
+     *   des: 获取 支出相关信息(给前端的数据) 的service方法
+     *   date: 2023/9/22
+     */
     public List<IndexTotalVo> getZhiChuTotalList();
 
 
     /**
-    *   author: dzc
-    *   version: 1.0
-    *   des: 获取 八项成本相关信息 的service方法
-    *   date: 2023/9/22
-    */
+     *   author: dzc
+     *   version: 1.0
+     *   des: 获取 八项成本相关信息 的service方法
+     *   date: 2023/9/22
+     */
     public List<IndexChartInfoVo> getEightCostsList(IndexInfoParamDto indexInfoParamDto);
 
     /**
@@ -45,27 +45,27 @@ public interface IndexZcbService {
     public List<ResultEightCost> getSumEightCosts(IndexInfoParamDto indexInfoParamDto);
 
     /**
-    *   author: dzc
-    *   version: 1.0
-    *   des: 获取日期范围内 有哪几年
-    *   date: 2023/9/22
-    */
+     *   author: dzc
+     *   version: 1.0
+     *   des: 获取日期范围内 有哪几年
+     *   date: 2023/9/22
+     */
     public List<String> getYears(LocalDate startDate, LocalDate endDate);
 
     /**
-    *   author: dzc
-    *   version: 1.0
-    *   des: 获取日期范围内 有哪几个月
-    *   date: 2023/9/23
-    */
+     *   author: dzc
+     *   version: 1.0
+     *   des: 获取日期范围内 有哪几个月
+     *   date: 2023/9/23
+     */
     public List<YearMonth> getYearMonths(LocalDate startDate, LocalDate endDate);
 
     /**
-    *   author: dzc
-    *   version: 1.0
-    *   des: 格式化 前端传入的年 日期范围  2023 ---> 2023-01-01 00:00:00
-    *   date: 2023/9/23
-    */
+     *   author: dzc
+     *   version: 1.0
+     *   des: 格式化 前端传入的年 日期范围  2023 ---> 2023-01-01 00:00:00
+     *   date: 2023/9/23
+     */
     public String getInitYear(String str);
 
     /**
@@ -77,27 +77,27 @@ public interface IndexZcbService {
     public String getInitYearAdd(String str);
 
     /**
-    *   author: dzc
-    *   version: 1.0
-    *   des: 格式化 前端传入的年月 日期范围 2023-09 ---> 2023-09-01 00:00:00
-    *   date: 2023/9/23
-    */
+     *   author: dzc
+     *   version: 1.0
+     *   des: 格式化 前端传入的年月 日期范围 2023-09 ---> 2023-09-01 00:00:00
+     *   date: 2023/9/23
+     */
     public String getInitYearMonth(String str);
 
     /**
-    *   author: dzc
-    *   version: 1.0
-    *   des: 格式化 前端传入的年月 日期范围 2023-09 ---> 2023-10-01 00:00:00
-    *   date: 2023/9/23
-    */
+     *   author: dzc
+     *   version: 1.0
+     *   des: 格式化 前端传入的年月 日期范围 2023-09 ---> 2023-10-01 00:00:00
+     *   date: 2023/9/23
+     */
     public String getInitYearMonthAdd(String str);
 
     /**
-    *   author: dzc
-    *   version: 1.0
-    *   des: 获取项目成本表中的组批任务及其子任务的任务号
-    *   date: 2023/9/24
-    */
+     *   author: dzc
+     *   version: 1.0
+     *   des: 获取项目成本表中的组批任务及其子任务的任务号
+     *   date: 2023/9/24
+     */
     public void getPcTasknoList();
 
     /**

module_kzks/src/main/java/org/jeecg/modules/dataSourceSwitch/controller/SwitchDataSourceController.java

@@ -47,7 +47,7 @@ public class SwitchDataSourceController extends JeecgController<SwitchDataSource
 	 @GetMapping(value = "/edit1")
 	 public Integer edit1(Integer type) {
 		 switchDataSourceService.updateSwitchDataSource(type);
-		 indexZcbService.getPcTasknoList(); // 切换数据源之后查询新的项目成本表中的组批及其子任务的任务号，存入redis中
+		 //indexZcbService.getPcTasknoList(); // 切换数据源之后查询新的项目成本表中的组批及其子任务的任务号，存入redis中
 		 return type;
 	 }