pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeGeneralMapper.xml
@@ -271,7 +271,7 @@ SUM(count) AS totalCount, SUM(received) AS totalReceived, SUM(gift) AS totalGift FROM v_transactionstatistics2 FROM v_trade_summary <where> <if test = "tradeDate != null and tradeDate !=''"> AND tradeDate = #{tradeDate} @@ -287,7 +287,7 @@ <select id="getToAuditRecordCount" parameterType="java.util.Map" resultType="java.lang.Long"> SELECT COUNT(*) AS recordCount FROM v_transactionstatistics2 FROM v_trade_summary <where> <if test = "cashierId != null and cashierId > 0"> AND cashierId = ${cashierId} @@ -301,7 +301,7 @@ <!--财务对账审核页,收银员+日期+类型分组,排除交易类型分组--> <select id="getToAudit" resultType="com.dy.pipIrrGlobal.voSe.VoTransactionStatistics"> SELECT * FROM v_transactionstatistics2 SELECT * FROM v_trade_summary <where> <if test = "cashierId != null and cashierId > 0"> AND cashierId = ${cashierId} pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/general/GeneralCtrl.java
@@ -166,6 +166,11 @@ return BaseResponseUtils.buildSuccess() ; } /** * 获得待审核交易汇总记录 * @param vo * @return */ @Operation(summary = "获得待审核交易汇总记录", description = "返回待审核交易汇总记录") @ApiResponses(value = { @ApiResponse( pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/general/GeneralSv.java
@@ -198,14 +198,13 @@ rsVo.pageSize = queryVo.pageSize ; rsVo.pageCurr = queryVo.pageCurr ; rsVo.calculateAndSet(itemTotal, params); //rsVo.obj = seGeneralMapper.getTradeDetails(params); List<VoTradeDetails> list = Optional.ofNullable(seGeneralMapper.getTradeDetails(params)).orElse(new ArrayList<>()); if(list.size() == 0) { return new HashMap(); } // 遍历交易明细记录,汇总交易金额 Double totalTradeAmount = 0.0; JSONArray array= JSONArray.parseArray(JSON.toJSONString(list)); for(int i = 0; i < array.size(); i++) {