资金日记账

src/main/java/com/dk/mdm/controller/report/ReportController.java

@@ -1,15 +1,10 @@
 package com.dk.mdm.controller.report;
 
-import com.alibaba.fastjson.JSONObject;
-import com.dk.common.controller.BaseController;
 import com.dk.common.model.pojo.PageList;
 import com.dk.common.response.ResponseResultUtil;
 import com.dk.common.response.ResponseResultVO;
-import com.dk.common.service.BaseService;
 import com.dk.common.util.RedisUtil;
-import com.dk.mdm.service.common.CommonService;
 import com.dk.mdm.service.report.ReportService;
-import com.google.gson.JsonObject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -388,6 +383,16 @@ public class ReportController  {
         return reportService.getBusinessOverview(param);
     }
 
+    /**
+     * @desc   : 资金日记账(web)
+     * @author : 姜宁
+     * @date   : 2024/7/19 15:05
+     */
+    @PostMapping("get_fund_report_web")
+    public ResponseResultVO<PageList<Map<String, Object>>> getFundReportWeb(@RequestBody  Map<String, Object> param) {
+        return reportService.getFundReportWeb(param);
+    }
+
 }
 
 

src/main/java/com/dk/mdm/mapper/report/ReportMapper.java

@@ -362,6 +362,13 @@ public interface ReportMapper extends BaseMapper<JSONObject> {
      */
     Map<String, Object> getOrderSummaryItem(Map param);
 
+    /**
+     * @desc   : 资金日记账
+     * @author : 姜宁
+     * @date   : 2024/7/19 15:50
+     */
+    List<Map<String, Object>> getFundReportWeb(Map param);
+
     List<Map<String, Object>> getOutboundAmtByUser(Map<String, Object> params);
 
     Map<String, Object> getStartAmt(Map<String, Object> params);

src/main/java/com/dk/mdm/mapper/report/ReportMapper.xml

@@ -3372,5 +3372,11 @@
         select dkic_b.f_get_order_summary_item(#{cpId}, #{querys, typeHandler=JsonTypeHandler}, #{lang})
     </select>
 
+    <!-- 资金日记账-->
+    <select id="getFundReportWeb" resultType="java.util.Map">
+        SELECT *
+        FROM
+            dkic_b.f_get_fund_report_web(#{accDateStart}::date,#{accDateEnd}::date,#{cpId},#{currentPage},#{pageSize},#{macIds, typeHandler=UuidListTypeHandler}::uuid[])
+    </select>
     <!--endregion-->
 </mapper>

src/main/java/com/dk/mdm/service/report/ReportService.java

@@ -1,7 +1,6 @@
 package com.dk.mdm.service.report;
 
 import cn.afterturn.easypoi.excel.entity.ExportParams;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.dk.common.model.pojo.PageList;
@@ -18,13 +17,21 @@ import com.dk.mdm.mapper.report.ReportMapper;
 import com.dk.mdm.model.report.ExcelDataHandler;
 import com.dk.mdm.model.report.ExcelExportStyleImpl;
 import com.dk.mdm.model.report.ExcelIndex;
-import com.dk.mdm.model.report.analysis.*;
-import com.dk.mdm.model.report.department.*;
-import com.dk.mdm.model.report.from.*;
+import com.dk.mdm.model.report.analysis.BudgetQuotationStaff;
+import com.dk.mdm.model.report.analysis.PotentialCustomerAnalysis;
+import com.dk.mdm.model.report.analysis.PotentialCustomerAnalysisStaff;
+import com.dk.mdm.model.report.department.DepartmentCollectionRanking;
+import com.dk.mdm.model.report.department.DepartmentTransactionRanking;
+import com.dk.mdm.model.report.from.PotentialCustomerAnalysisFrom;
+import com.dk.mdm.model.report.from.Transaction;
 import com.dk.mdm.model.report.product.ProductDistribution;
-import com.dk.mdm.model.report.received.*;
+import com.dk.mdm.model.report.received.ArrearsInfo;
+import com.dk.mdm.model.report.received.ArrearsInfoStaff;
+import com.dk.mdm.model.report.received.ReceivedTask;
+import com.dk.mdm.model.report.received.ReceivedTaskStaff;
 import com.dk.mdm.model.report.sale.*;
-import com.dk.mdm.model.report.staff.*;
+import com.dk.mdm.model.report.staff.StaffCollectionRanking;
+import com.dk.mdm.model.report.staff.StaffTransactionRanking;
 import com.google.common.collect.ImmutableMap;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,14 +42,12 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.rmi.MarshalledObject;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.stream.Collectors;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 /**
  * @author : 常皓宁
@@ -1159,4 +1164,43 @@ public class ReportService {
         return ResponseResultUtil.success(jObject);
     }
 
+    /**
+     * @desc   : 资金日记账
+     * @author : 姜宁
+     * @date   : 2024/7/19 15:27
+     */
+    public ResponseResultVO<PageList<Map<String, Object>>> getFundReportWeb(Map<String, Object> param) {
+        // 校验分页参数
+        if (param.get("pageSize") == null || param.get("currentPage") == null) {
+            return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL, "请检查分页参数!");
+        }
+
+        List<Object> objects = new ArrayList<>();
+        if (param.get("macIds") instanceof ArrayList<?>) {
+            for (Object o : (List<?>) param.get("macIds")) {
+                objects.add(String.class.cast(o));
+            }
+        }
+        if (objects.isEmpty()){
+            param.remove("macIds");
+        }
+        // 获取资金日记账
+        List<Map<String, Object>> list = reportMapper.getFundReportWeb(param);
+        JSONObject jObject = JSONObject.parseObject(list.get(0).get("f_get_fund_report_web").toString());
+        List dataList = jObject.get("data") != null ? JSONObject.parseArray(jObject.get("data").toString())
+                .toJavaList(Map.class) : new ArrayList();
+
+        // 定义返回值
+        PageList data = new PageList<>();
+        data.setPageSize((int) param.get("pageSize")).setCurrentPage((int) param.get("currentPage"))
+                .setTotal(Long.parseLong(jObject.get("pageTotal").toString()))
+                .setList(dataList);
+
+        if ("查询成功".equals(jObject.get("message").toString())) {
+            return ResponseResultUtil.success(data);
+        } else {
+            return ResponseResultUtil.error(666, jObject.get("message").toString());
+        }
+    }
+
 }