From e0a9af96b7a31ef2dab99817616508f78597640e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Mon, 1 Apr 2024 11:01:27 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E8=B0=83=E6=95=B4=EF=BC=9A=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E3=80=81=E6=80=BB=E7=BB=93=E6=96=BD=E5=B7=A5=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E6=B1=87=E6=80=BB=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=AF=B9?=
 =?UTF-8?q?=EF=BC=9B=E5=A4=8D=E5=88=B6=E9=A2=84=E8=A7=88=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9B=E6=94=AF=E5=87=BA=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?-=E6=94=AF=E5=87=BA=E6=9F=A5=E8=AF=A2=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=90=88=E8=AE=A1=EF=BC=9B=E6=94=AF=E5=87=BA=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?-=E6=94=AF=E5=87=BA=E6=9F=A5=E8=AF=A2=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E4=BA=BA=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6BUG=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BusinessZcmxController.java    | 11 ++++
 .../business/dao/BusinessOutlayDao.java       |  7 +++
 .../service/BusinessOutlayService.java        |  6 ++
 .../impl/BusinessOutlayServiceImpl.java       |  8 +++
 .../service/impl/BusinessPlanServiceImpl.java |  7 ++-
 .../impl/BusinessTotalServiceImpl.java        |  8 ++-
 .../mapper/business/BusinessOutlayDao.xml     | 55 ++++++++++++++++---
 7 files changed, 91 insertions(+), 11 deletions(-)

diff --git a/src/main/java/io/renren/modules/business/controller/BusinessZcmxController.java b/src/main/java/io/renren/modules/business/controller/BusinessZcmxController.java
index 40ef18a..121c537 100644
--- a/src/main/java/io/renren/modules/business/controller/BusinessZcmxController.java
+++ b/src/main/java/io/renren/modules/business/controller/BusinessZcmxController.java
@@ -114,6 +114,17 @@ public class BusinessZcmxController {
         return R.ok().put("page", page);
     }
 
+
+    /**
+     * 列表-支出查询合计
+     */
+    @RequestMapping("/zccxhj")
+    @RequiresPermissions("business:businesszcmx:list")
+    public R zccxhj(@RequestParam Map<String, Object> params){
+        Map<String, Object> page = businessOutlayService.getZccxhj(params);
+        return R.ok().put("page", page);
+    }
+
     /**
      * 列表-支出查询
      */
diff --git a/src/main/java/io/renren/modules/business/dao/BusinessOutlayDao.java b/src/main/java/io/renren/modules/business/dao/BusinessOutlayDao.java
index b2946f1..1528c6d 100644
--- a/src/main/java/io/renren/modules/business/dao/BusinessOutlayDao.java
+++ b/src/main/java/io/renren/modules/business/dao/BusinessOutlayDao.java
@@ -132,4 +132,11 @@ public interface BusinessOutlayDao extends BaseMapper<BusinessOutlayEntity> {
      * @return
      */
     List<Map<String,Object>> yzList(Map<String, Object> params);
+
+
+    /**
+     * 列表-支出查询合计
+     */
+    Map<String,Object> getZccxhj(Map<String, Object> params);
+
 }
diff --git a/src/main/java/io/renren/modules/business/service/BusinessOutlayService.java b/src/main/java/io/renren/modules/business/service/BusinessOutlayService.java
index 98006bc..69d7cfe 100644
--- a/src/main/java/io/renren/modules/business/service/BusinessOutlayService.java
+++ b/src/main/java/io/renren/modules/business/service/BusinessOutlayService.java
@@ -60,6 +60,7 @@ public interface BusinessOutlayService extends IService<BusinessOutlayEntity> {
      */
     Map<String, Object> getLatestTime() throws ParseException;
 
+
     /**
      * 为了传入到 年度总结
      * @param outTime
@@ -98,5 +99,10 @@ public interface BusinessOutlayService extends IService<BusinessOutlayEntity> {
      */
     List<Map<String,Object>> yzList(Map<String, Object> params);
 
+    /**
+     * 列表-支出查询合计
+     */
+    Map<String, Object> getZccxhj(Map<String, Object> params);
+
 }
 
diff --git a/src/main/java/io/renren/modules/business/service/impl/BusinessOutlayServiceImpl.java b/src/main/java/io/renren/modules/business/service/impl/BusinessOutlayServiceImpl.java
index cb89ae5..7115982 100644
--- a/src/main/java/io/renren/modules/business/service/impl/BusinessOutlayServiceImpl.java
+++ b/src/main/java/io/renren/modules/business/service/impl/BusinessOutlayServiceImpl.java
@@ -441,4 +441,12 @@ public class BusinessOutlayServiceImpl extends ServiceImpl<BusinessOutlayDao, Bu
         return baseMapper.yzList(params);
     }
 
+    /**
+     * 列表-支出查询合计
+     */
+    @Override
+    public Map<String, Object> getZccxhj(Map<String, Object> params){
+        return baseMapper.getZccxhj(params);
+    }
+
 }
diff --git a/src/main/java/io/renren/modules/business/service/impl/BusinessPlanServiceImpl.java b/src/main/java/io/renren/modules/business/service/impl/BusinessPlanServiceImpl.java
index f42ba6a..8c4088d 100644
--- a/src/main/java/io/renren/modules/business/service/impl/BusinessPlanServiceImpl.java
+++ b/src/main/java/io/renren/modules/business/service/impl/BusinessPlanServiceImpl.java
@@ -221,9 +221,12 @@ public class BusinessPlanServiceImpl extends ServiceImpl<BusinessPlanDao, Busine
                         copy +="\n\n" +  "立项名称：" + (i.getProjectNewName() != null ? i.getProjectNewName() : i.getProject()) + "\n";
                     }
                 }
+//                copy += "\r" + "1.是否一天：" + j.getOneDay() + "\n" + "2.施工人员：" + (j.getSelectPer() != null?j.getSelectPer():"暂无") + "\n"
+//                        + "3.施工内容：" +(j.getPlanSgSummary() != null?j.getPlanSgSummary():"暂无") + "\n" + "4.材料：" +(j.getPlanCl() != null?j.getPlanCl():"暂无") + "\n"
+//                        + "5.机械：" +(j.getPlanJx() != null?j.getPlanJx():"暂无") + "\n";
                 copy += "\r" + "1.是否一天：" + j.getOneDay() + "\n" + "2.施工人员：" + (j.getSelectPer() != null?j.getSelectPer():"暂无") + "\n"
-                        + "3.施工内容：" +(j.getPlanSgSummary() != null?j.getPlanSgSummary():"暂无") + "\n" + "4.材料：" +(j.getPlanCl() != null?j.getPlanCl():"暂无") + "\n"
-                        + "5.机械：" +(j.getPlanJx() != null?j.getPlanJx():"暂无") + "\n";
+                        + "3.内容：" +(j.getPlanSgSummary() != null?j.getPlanSgSummary():"暂无") + "\n" + "4.材料、机械及工具：" +(j.getPlanCl() != null?j.getPlanCl():"暂无") + "\n"
+                        + "5.自检总结：" +(j.getPlanJx() != null?j.getPlanJx():"暂无") + "\n";
             }
         } else {
 //            copy += "\t\t暂无立项信息\n暂无合同信息\n\n";
diff --git a/src/main/java/io/renren/modules/business/service/impl/BusinessTotalServiceImpl.java b/src/main/java/io/renren/modules/business/service/impl/BusinessTotalServiceImpl.java
index 31c8263..3f943b5 100644
--- a/src/main/java/io/renren/modules/business/service/impl/BusinessTotalServiceImpl.java
+++ b/src/main/java/io/renren/modules/business/service/impl/BusinessTotalServiceImpl.java
@@ -120,10 +120,14 @@ public class BusinessTotalServiceImpl extends ServiceImpl<BusinessTotalDao, Busi
 //                        + "5.施工内容：" +(i.getTotalSgSummary() != null?i.getTotalSgSummary():"暂无") + "\n" + "6.材料：" +(i.getTotalCl() != null?i.getTotalCl():"暂无") + "\n"
 //                        + "7.机械：" +(i.getTotalJx() != null?i.getTotalJx():"暂无") + "\n";
 
+//                copy +="\n\n" +  "立项名称：" + (i.getProjectNewName() != null ? i.getProjectNewName() : i.getProject()) + "\n";
+//                copy += "\r" + "1.是否一天：" + i.getOneDay() + "\n" + "2.施工人员：" + (i.getSelectPer() != null?i.getSelectPer():"暂无") + "\n"
+//                        + "3.施工内容：" +(i.getTotalSgSummary() != null?i.getTotalSgSummary():"暂无") + "\n" + "4.材料：" +(i.getTotalCl() != null?i.getTotalCl():"暂无") + "\n"
+//                        + "5.机械：" +(i.getTotalJx() != null?i.getTotalJx():"暂无") + "\n";
                 copy +="\n\n" +  "立项名称：" + (i.getProjectNewName() != null ? i.getProjectNewName() : i.getProject()) + "\n";
                 copy += "\r" + "1.是否一天：" + i.getOneDay() + "\n" + "2.施工人员：" + (i.getSelectPer() != null?i.getSelectPer():"暂无") + "\n"
-                        + "3.施工内容：" +(i.getTotalSgSummary() != null?i.getTotalSgSummary():"暂无") + "\n" + "4.材料：" +(i.getTotalCl() != null?i.getTotalCl():"暂无") + "\n"
-                        + "5.机械：" +(i.getTotalJx() != null?i.getTotalJx():"暂无") + "\n";
+                        + "3.内容：" +(i.getTotalSgSummary() != null?i.getTotalSgSummary():"暂无") + "\n" + "4.材料、机械及工具：" +(i.getTotalCl() != null?i.getTotalCl():"暂无") + "\n"
+                        + "5.自检总结：" +(i.getTotalJx() != null?i.getTotalJx():"暂无") + "\n";
 
             }
         } else {
diff --git a/src/main/resources/mapper/business/BusinessOutlayDao.xml b/src/main/resources/mapper/business/BusinessOutlayDao.xml
index 3185c7e..3c4f2c6 100644
--- a/src/main/resources/mapper/business/BusinessOutlayDao.xml
+++ b/src/main/resources/mapper/business/BusinessOutlayDao.xml
@@ -59,14 +59,11 @@
                     concat(',',b.project_gclb_id,',') like '%,${item},%'
                 </foreach>
             </if>
-            <if test="start != '' and start != null and start != 'undefined'">
-                and a.out_time >= #{start}
+            <if test="startTime != '' and startTime != null and startTime != 'undefined'">
+                and a.out_time >= #{startTime}
             </if>
-            <if test="end != '' and end != null and end != 'undefined'">
-                and a.out_time &lt;= #{end}
-            </if>
-            <if test="startTime != '' and startTime != null and startTime != 'undefined' and endTime != '' and endTime != null and endTime != 'undefined'">
-                and date_format(a.out_time, '%Y-%m-%d') between #{startTime} and #{endTime}
+            <if test="endTime != '' and endTime != null and endTime != 'undefined'">
+                and a.out_time &lt;= #{endTime}
             </if>
             <if test="gjz != '' and gjz != null and gjz != 'undefined'">
                 and (DATE_FORMAT(a.out_time,'%Y-%m-%d') like CONCAT('%',#{gjz},'%') or a.out_money like CONCAT('%',#{gjz},'%') or a.out_nr like CONCAT('%',#{gjz},'%') or
@@ -831,4 +828,48 @@
         group by outin_date
         order by outin_date
     </select>
+
+    <select id="getZccxhj" parameterType="io.renren.modules.business.entity.BusinessOutlayEntity" resultType="map">
+        select ifnull(sum(a.out_money),0) as zccxhj
+        from (select * from business_outlay where status = 0 order by out_time desc) a
+        left JOIN business_project b on a.out_project = b.project_id
+        left join business_dict c on a.out_way = c.dict_id
+        left join business_dict d on a.out_type = d.dict_id
+        left join business_dict e on a.out_payee = e.dict_id
+        <where>
+            <if test="outTime != '' and outTime != null and outTime != 'undefined'">
+                and (DATE_FORMAT(a.out_time,'%Y-%m-%d') like CONCAT('%',#{outTime},'%')
+            </if>
+            <if test="nowYear != '' and nowYear != null and nowYear != 'undefined'">
+                and date_format(a.out_time, '%Y') like CONCAT('%',#{nowYear},'%')
+            </if>
+            <if test="jsdwId != '' and jsdwId != null and jsdwId != 'undefined'">
+                and b.project_jsdw_id like CONCAT('%',#{jsdwId},'%')
+            </if>
+            <if test="writeUserId != 0 and writeUserId != null and writeUserId != 'undefined' ">
+                and a.write_user_id = #{writeUserId}
+            </if>
+            <if test="gclbId != '' and gclbId != null and gclbId != 'undefined'">
+                AND
+                <foreach collection="gclbId.split(',')" index="index" item="item" open="(" separator="OR"
+                         close=")">
+                    concat(',',b.project_gclb_id,',') like '%,${item},%'
+                </foreach>
+            </if>
+            <if test="startTime != '' and startTime != null and startTime != 'undefined'">
+                and a.out_time >= #{startTime}
+            </if>
+            <if test="endTime != '' and endTime != null and endTime != 'undefined'">
+                and a.out_time &lt;= #{endTime}
+            </if>
+            <if test="gjz != '' and gjz != null and gjz != 'undefined'">
+                and (DATE_FORMAT(a.out_time,'%Y-%m-%d') like CONCAT('%',#{gjz},'%') or a.out_money like CONCAT('%',#{gjz},'%') or a.out_nr like CONCAT('%',#{gjz},'%') or
+                c.name like CONCAT('%',#{gjz},'%') or d.name like CONCAT('%',#{gjz},'%') or b.project like CONCAT('%',#{gjz},'%') or
+                b.project_new_name like CONCAT('%',#{gjz},'%') or a.out_payee like CONCAT('%',#{gjz},'%') or e.name like CONCAT('%',#{gjz},'%') or
+                a.out_payee_address like CONCAT('%',#{gjz},'%') or a.out_payee_phone like CONCAT('%',#{gjz},'%') or a.out_remark like CONCAT('%',#{gjz},'%'))
+            </if>
+        </where>
+        order by a.out_time desc
+    </select>
+
 </mapper>
\ No newline at end of file