fix: 党组织工作经费管理导出数据调整

lib/数据更新脚本.txt

@@ -660,4 +660,9 @@ INSERT INTO `cf_menu` VALUES ('10a57810-b11a-4f00-a983-57a2d907c777', 'f0c4fa7f9
 INSERT INTO `cf_menu` VALUES ('10a57810-b11a-4f00-a983-57a2d907c778', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', 'f237844c-5594-430f-bef7-ea68469c9f33', NULL, 1, 'checkData.btnEdit', '编辑', NULL, NULL, NULL, 0, 1, NULL);
 INSERT INTO `cf_menu` VALUES ('10a57810-b11a-4f00-a983-57a2d907c779', 'f0c4fa7f9f3c4fb6bd56aac608b7ad3f', 'f237844c-5594-430f-bef7-ea68469c9f33', NULL, 1, 'checkData.btnDel', '删除', NULL, NULL, NULL, 0, 1, NULL);
 
+-- 2025-04-10 党组织活动经费管理金额字段类型调整
+ALTER TABLE dj_fundsbudget MODIFY COLUMN ACTIVITYFUNDS DOUBLE;
+ALTER TABLE dj_fundsbudget MODIFY COLUMN REWARDFUNDS DOUBLE;
+ALTER TABLE dj_fundsuse MODIFY COLUMN EXPENDMONEY DOUBLE;
+
 

src/main/java/com/ghsc/partybuild/controller/FundsController.java

@@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
 import java.util.*;
 
 /**
@@ -243,13 +244,15 @@ public class FundsController {
         List<List<Object>> rows = new ArrayList();
         int index=0;
         for (HashMap<String, Object> item : dataList) {
+            System.out.println("数据");
+            System.out.println(item);
             List<Object> row = new ArrayList();
             row.add(++index);
             row.add(item.get("DZZMC"));
-            row.add(item.get("总预算"));
-            row.add(item.get("活动经费"));
-            row.add(item.get("双创经费"));
-            row.add(item.get("总支出"));
+            row.add(item.get("总预算") + "");
+            row.add(item.get("活动经费") + "");
+            row.add(item.get("双创经费") + "");
+            row.add(item.get("总支出") + "");
             row.add(item.get("活动支出")+"("+item.get("活动支出占比")+"%"+")");
             row.add(item.get("学习教育活动")+"("+item.get("学习教育活动占比")+"%"+")");
             row.add(item.get("党内主题活动")+"("+item.get("党内主题活动占比")+"%"+")");

src/main/java/com/ghsc/partybuild/controller/PartyTwoController.java

@@ -1074,7 +1074,7 @@ public class PartyTwoController {
     @RequestMapping("/savefundsBudget")
     public RequsetData<String> savefundsBudget(@RequestBody DjFundsbudget model) {
 
-        RequsetData<String> res = partyTwoService.savefundsBudget(model);
+        RequsetData<String> res = partyTwoService.savefundsBudget(model, userService.getLoginUser().getUserid(), userService.getLoginUser().getUsername());
 
         return res;
     }
@@ -1125,12 +1125,12 @@ public class PartyTwoController {
         for (HashMap<String, Object> item : dataList) {
             List<Object> row = new ArrayList();
             row.add(item.get("DZZMC"));
-            row.add(item.get("YEAR"));
-            row.add(item.get("BUDGETFUNDS"));
-            row.add(item.get("ACTIVITYFUNDS"));
-            row.add(item.get("REWARDFUNDS"));
-            row.add(item.get("ACTUALEXPEND"));
-            row.add(item.get("GRDATION"));
+            row.add(item.get("YEAR") == null ? "" : item.get("YEAR") + "");
+            row.add(item.get("BUDGETFUNDS") == null ? "" : item.get("BUDGETFUNDS") + "");
+            row.add(item.get("ACTIVITYFUNDS") == null ? "" : item.get("ACTIVITYFUNDS") + "");
+            row.add(item.get("REWARDFUNDS") == null ? "" : item.get("REWARDFUNDS") + "");
+            row.add(item.get("ACTUALEXPEND") == null ? "" : item.get("ACTUALEXPEND") + "");
+            row.add(item.get("GRDATION") == null ? "" : item.get("GRDATION") + "");
             rows.add(row);
         }
         data.setRows(rows);

src/main/java/com/ghsc/partybuild/controller/app/AppFundsController.java

@@ -147,7 +147,7 @@ public class AppFundsController {
             model.setCreateusername(userName);
             model.setCreatetime(new Date());
         }
-        res = partyTwoService.savefundsBudget(model);
+        res = partyTwoService.savefundsBudget(model, userService.getLoginUser().getUserid(), userService.getLoginUser().getUsername());
 
         return res;
     }

src/main/java/com/ghsc/partybuild/service/PartyTwoService.java

@@ -99,7 +99,7 @@ public interface PartyTwoService {
 
     DjFundsbudget getfundsBudget(String id);
 
-    RequsetData<String> savefundsBudget(DjFundsbudget model);
+    RequsetData<String> savefundsBudget(DjFundsbudget model,String userId, String userName);
 
     int delfundsBudget(String id);
 

src/main/java/com/ghsc/partybuild/service/impl/PartyTwoServiceImpl.java

@@ -829,7 +829,7 @@ public class PartyTwoServiceImpl implements PartyTwoService {
     }
 
     @Override
-    public RequsetData<String> savefundsBudget(DjFundsbudget model) {
+    public RequsetData<String> savefundsBudget(DjFundsbudget model,String userId, String userName) {
         RequsetData<String> res = new RequsetData<String>();
         int result;
         //同步数据
@@ -848,8 +848,14 @@ public class PartyTwoServiceImpl implements PartyTwoService {
             return res;
         }
         if (djFundsbudgetMapper.selectByPrimaryKey(model.getFundsbudgetid()) == null) {
+            model.setCreateuserid(userId);
+            model.setCreateusername(userName);
+            model.setCreatetime(new Date());
             result = djFundsbudgetMapper.insert(model);
         } else {
+            model.setUpdateuserid(userId);
+            model.setUpdateusername(userName);
+            model.setUpdatetime(new Date());
             result = djFundsbudgetMapper.updateByPrimaryKey(model);
         }
         if (result > 0) {

src/main/resources/mapping/FundsCQuery.xml

@@ -36,7 +36,7 @@
         select *from (
         select zz.DZZDM PARTYCODE,zz.DZZMC,
         ut.双创经费 双创经费,ut.活动经费 活动经费,ut.总预算 总预算,
-        ur.双创支出/10000 双创支出,ur.活动支出/10000 活动支出,ur.总支出/10000 总支出,
+        ROUND(ur.双创支出 / 10000, 6) 双创支出,ROUND(ur.活动支出 / 10000, 6) 活动支出,ROUND(ur.总支出 / 10000, 6) 总支出,
         case ur.总支出 when 0 then '0.00' ELSE round((ur.双创支出/ur.总支出),4)*100 END 双创支出占比,
         case ur.总支出 when 0 then '0.00' ELSE round((ur.活动支出/ur.总支出),4)*100 END 活动支出占比
         from ZZ_ZZQKXX zz
@@ -126,22 +126,22 @@
         )ut on zz.DZZDM=ut.DZZDM
         left join (
             select z.DZZDM,
-        ifnull(sum(u.学习教育活动),0)/10000 学习教育活动,
-        ifnull(sum(u.党内主题活动),0)/10000 党内主题活动,
-        ifnull(sum(u.宣传活动),0)/10000 宣传活动,
-        ifnull(sum(u.会议活动),0)/10000 会议活动,
-        ifnull(sum(u.党建日常工作),0)/10000 党建日常工作,
-        ifnull(sum(u.走访慰问活动),0)/10000 走访慰问活动,
-        ifnull(sum(u.设备设施),0)/10000 设备设施,
-        ifnull(sum(u.其他),0)/10000 其他,
-        ifnull(sum(u.培训党员),0)/10000 培训党员,
-        ifnull(sum(u.订阅或购买用于开展党员教育的报刊),0)/10000 订阅或购买用于开展党员教育的报刊,
-        ifnull(sum(u.资料),0)/10000 资料,
-        ifnull(sum(u.音像制品和设备),0)/10000 音像制品和设备,
-        ifnull(sum(u.补助生活困难的党员,0)/10000 补助生活困难的党员,
-            (ifnull(sum(u.学习教育活动),0)+ifnull(sum(u.党内主题活动),0)+ ifnull(sum(u.宣传活动),0)+ ifnull(sum(u.会议活动),0)+ ifnull(sum(u.党建日常工作),0)+ ifnull(sum(u.走访慰问活动),0)+
-        ifnull(sum(u.设备设施),0)+ ifnull(sum(u.其他),0))/10000 活动支出,
-            (ifnull(sum(u.培训党员),0)+ifnull(sum(u.订阅或购买用于开展党员教育的报刊),0)+ifnull(sum(u.资料),0)+ifnull(sum(u.音像制品和设备),0)+ifnull(sum(u.补助生活困难的党员),0))/10000 双创支出
+        ROUND(ifnull(sum(u.学习教育活动),0)/10000, 6) 学习教育活动,
+        ROUND(ifnull(sum(u.党内主题活动),0)/10000, 6) 党内主题活动,
+        ROUND(ifnull(sum(u.宣传活动),0)/10000, 6) 宣传活动,
+        ROUND(ifnull(sum(u.会议活动),0)/10000, 6) 会议活动,
+        ROUND(ifnull(sum(u.党建日常工作),0)/10000, 6) 党建日常工作,
+        ROUND(ifnull(sum(u.走访慰问活动),0)/10000, 6) 走访慰问活动,
+        ROUND(ifnull(sum(u.设备设施),0)/10000, 6) 设备设施,
+        ROUND(ifnull(sum(u.其他),0)/10000, 6) 其他,
+        ROUND(ifnull(sum(u.培训党员),0)/10000, 6) 培训党员,
+        ROUND(ifnull(sum(u.订阅或购买用于开展党员教育的报刊),0)/10000, 6) 订阅或购买用于开展党员教育的报刊,
+        ROUND(ifnull(sum(u.资料),0)/10000, 6) 资料,
+        ROUND(ifnull(sum(u.音像制品和设备),0)/10000, 6) 音像制品和设备,
+        ROUND(ifnull(sum(u.补助生活困难的党员),0)/10000, 6) 补助生活困难的党员,
+        ROUND((ifnull(sum(u.学习教育活动),0)+ifnull(sum(u.党内主题活动),0)+ ifnull(sum(u.宣传活动),0)+ ifnull(sum(u.会议活动),0)+ ifnull(sum(u.党建日常工作),0)+ ifnull(sum(u.走访慰问活动),0)+
+        ifnull(sum(u.设备设施),0)+ ifnull(sum(u.其他),0))/10000, 6) 活动支出,
+        ROUND((ifnull(sum(u.培训党员),0)+ifnull(sum(u.订阅或购买用于开展党员教育的报刊),0)+ifnull(sum(u.资料),0)+ifnull(sum(u.音像制品和设备),0)+ifnull(sum(u.补助生活困难的党员),0))/10000, 6) 双创支出
 
             from ZZ_ZZQKXX z
             left join(