导出接口;编码区分测试数据;调整日志输出

src/main/java/com/qs/serve/common/framework/mvc/HttpServletRequestFilter.java

@@ -1,5 +1,6 @@
 package com.qs.serve.common.framework.mvc;
 
+import com.qs.serve.common.config.DevEnvironmentConfig;
 import com.qs.serve.common.framework.security.model.LoginUser;
 import com.qs.serve.common.util.AuthContextUtils;
 import com.qs.serve.common.util.DateUtils;
@@ -76,10 +77,10 @@ public class HttpServletRequestFilter implements Filter{
         if(!StringUtils.isEmpty(queryStr)){
             buffer.append("\n参数: "+queryStr);
         }
-//        if(!StringUtils.isEmpty(reqBody)){
-//            buffer.append("\n请求体: "+reqBody);
-//        }
-        if(diffTime>1){
+        if(DevEnvironmentConfig.isDev() &&!StringUtils.isEmpty(reqBody)){
+            buffer.append("\n请求体: "+reqBody);
+        }
+        if(diffTime>0.6D){
             buffer.append("\n耗时: "+diffTime+"秒");
         }
         try {

src/main/java/com/qs/serve/common/util/CodeGenUtil.java

@@ -1,6 +1,7 @@
 package com.qs.serve.common.util;
 
 import cn.hutool.core.util.IdUtil;
+import com.qs.serve.common.config.DevEnvironmentConfig;
 import com.qs.serve.common.framework.redis.RedisService;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -94,7 +95,9 @@ public class CodeGenUtil {
         for (int i = (appendStr+digitsNum).length(); i < 3; i++) {
             appendZeros.append("0");
         }
-        return digitsNum + appendZeros + appendStr;
+        //用于区分测试环境数据
+        String subflex = DevEnvironmentConfig.isDev()?"T":"";
+        return digitsNum + appendZeros + appendStr+subflex;
     }
 
     public static String getDataCode(SourceDataKey dataKey){

src/main/java/com/qs/serve/modules/tbs/controller/TbsCostTodoController.java

@@ -80,14 +80,13 @@ public class TbsCostTodoController {
      * @return
      */
     @PostMapping("/updateById")
-    public R<?> updateById(@RequestBody @Valid TbsCostTodoBo param){
-        TbsCostTodo entity = CopierUtil.copy(param,new TbsCostTodo());
+    public R<?> updateById(@RequestBody @Valid TbsCostTodo param){
         String userId = AuthContextUtils.getSysUserId();
         TbsCostTodo tbsCostTodo = tbsCostTodoService.getById(param.getId());
         if(!tbsCostTodo.getCreateBy().equals(userId)){
             return R.ok();
         }
-        boolean result = tbsCostTodoService.updateById(entity);
+        boolean result = tbsCostTodoService.updateById(param);
         return R.isTrue(result);
     }
 
@@ -97,9 +96,8 @@ public class TbsCostTodoController {
     * @return
     */
     @PostMapping("/save")
-    public R<?> save(@RequestBody @Valid TbsCostTodoBo param){
-        TbsCostTodo entity = CopierUtil.copy(param,new TbsCostTodo());
-        boolean result = tbsCostTodoService.save(entity);
+    public R<?> save(@RequestBody @Valid TbsCostTodo param){
+        boolean result = tbsCostTodoService.save(param);
         return R.isTrue(result);
     }
 

src/main/java/com/qs/serve/modules/third/PortalOfCostController.java

@@ -60,6 +60,9 @@ public class PortalOfCostController {
             return R.error(e.getMessage());
         }
         sysSyncLogService.save(syncLog);
+        if(syncLog.getSuccessStatus()!=null&&syncLog.getSuccessStatus().equals(1)){
+            return R.ok();
+        }
         return R.error("支付异常");
     }
 

src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationDataController.java

@@ -38,6 +38,7 @@ public class VtbVerificationDataController {
     public R<PageVo<VtbActivityCheckDTO>> getActivityData(VtbActivityCheckSo query){
         Long count = verReportMapper.countActivityCheck(query);
         if(count>0){
+            query.setOpenPage(1);
             query.setStartRow(PageUtil.getStartRow());
             List<VtbActivityCheckDTO> list = verReportMapper.pageActivityCheck(query);
             PageVo<VtbActivityCheckDTO> page = new PageVo<>();
@@ -48,6 +49,17 @@ public class VtbVerificationDataController {
         return R.byEmptyList();
     }
 
+    /**
+     * 获取活动的核销情况(导出)
+     * @param query
+     * @return
+     */
+    @GetMapping("exportActivityCheck")
+    public R<List<VtbActivityCheckDTO>> exportActivityData(VtbActivityCheckSo query){
+        List<VtbActivityCheckDTO> list = verReportMapper.pageActivityCheck(query);
+        return R.ok(list);
+    }
+
     /**
      * 获取核销的支付信息
      * @param query
@@ -57,6 +69,7 @@ public class VtbVerificationDataController {
     public R<PageVo<VtbVerificationDTO>> getVerificationData(VtbVerificationCheckSo query){
         Long count = verReportMapper.countVerificationCheck(query);
         if(count>0){
+            query.setOpenPage(1);
             query.setStartRow(PageUtil.getStartRow());
             List<VtbVerificationDTO> list = verReportMapper.pageVerificationCheck(query);
             PageVo<VtbVerificationDTO> page = new PageVo<>();
@@ -67,5 +80,15 @@ public class VtbVerificationDataController {
         return R.byEmptyList();
     }
 
+    /**
+     * 获取核销的支付信息(导出)
+     * @param query
+     * @return
+     */
+    @GetMapping("exportVerificationCheck")
+    public R<List<VtbVerificationDTO>> exportVerificationCheck(VtbVerificationCheckSo query){
+        List<VtbVerificationDTO> list = verReportMapper.pageVerificationCheck(query);
+        return R.ok(list);
+    }
 
 }

src/main/java/com/qs/serve/modules/vtb/entity/so/VtbActivityCheckSo.java

@@ -55,4 +55,9 @@ public class VtbActivityCheckSo {
 
     private Integer startRow;
 
+    /**
+     * 当openPage=1时,进行翻页(后台维护)
+     */
+    private Integer openPage;
+
 }

src/main/java/com/qs/serve/modules/vtb/entity/so/VtbVerificationCheckSo.java

@@ -48,4 +48,9 @@ public class VtbVerificationCheckSo {
     private Integer pageSize;
 
     private Integer startRow;
+
+    /**
+     * 当openPage=1时,进行翻页(后台维护)
+     */
+    private Integer openPage;
 }

src/main/resources/mapper/vtb/VtbVerReportMapper.xml

@@ -20,49 +20,51 @@
         <if test="query.costTitle != null and query.costTitle != ''"> and `tbs_cost_apply`.`charge_theme` like concat('%',#{query.costTitle},'%') </if>
     </sql>
 
-    <resultMap id="vtbActivityCheckDTOMap" type="com.qs.serve.modules.vtb.entity.dto.VtbActivityCheckDTO">
-
-    </resultMap>
-
     <select id="pageActivityCheck" resultType="com.qs.serve.modules.vtb.entity.dto.VtbActivityCheckDTO">
         select
-            tbs_cost_apply.`id` as costApplyId,
-            tbs_cost_apply.`code` as costApplyCode,
-            tbs_cost_apply.charge_theme as costTitle,
-            tbs_cost_apply.supplier_id ,
-            tbs_cost_apply.supplier_code ,
-            tbs_cost_apply.supplier_name ,
-            tbs_cost_apply.submit_time ,
-            tbs_activity.activity_code,
-            tbs_activity.act_title as activity_title,
-            tbs_activity.total_amount as activity_amount,
-            vvtb.act_check_amt as check_amount,
-            vvtb.vtb_finished_date as check_finished_date,
-            tbs_activity.`release_flag`,
-            tbs_activity.`release_amount`,
-            tbs_activity.`release_time`,
-            tbs_activity.`release_user_id`,
-            tbs_activity.`release_user_name`
+        tbs_cost_apply.`id` as costApplyId,
+        tbs_cost_apply.`code` as costApplyCode,
+        tbs_cost_apply.charge_theme as costTitle,
+        tbs_cost_apply.supplier_id ,
+        tbs_cost_apply.supplier_code ,
+        tbs_cost_apply.supplier_name ,
+        tbs_cost_apply.submit_time ,
+        tbs_activity.activity_code,
+        tbs_activity.act_title as activity_title,
+        tbs_activity.total_amount as activity_amount,
+        vvtb.act_check_amt as check_amount,
+        vvtb.vtb_finished_date as check_finished_date,
+        tbs_activity.`release_flag`,
+        tbs_activity.`release_amount`,
+        tbs_activity.`release_time`,
+        tbs_activity.`release_user_id`,
+        tbs_activity.`release_user_name`
         from tbs_activity
         left join tbs_cost_apply on tbs_activity.cost_apply_id = tbs_cost_apply.id
         left join (
-            select
-                vtb.activity_id,
-                sum(vtb.amount) as act_check_amt,
-                max(vtb.finished_time) as vtb_finished_date
-            from vtb_verification vtb
-            where
-                vtb.del_flag = 0
-                <if test="query.queryStartCheckTime != null and query.queryStartCheckTime != ''">
-                    and vtb.finished_time &gt;= #{query.queryStartCheckTime} </if>
-                <if test="query.queryEndSubmitTime != null and query.queryEndSubmitTime != ''">
-                    and vtb.finished_time &lt;= #{query.queryEndSubmitTime} </if>
+        select
+        vtb.activity_id,
+        sum(vtb.amount) as act_check_amt,
+        max(vtb.finished_time) as vtb_finished_date
+        from vtb_verification vtb
+        where
+        vtb.del_flag = 0
+        <if test="query.queryStartCheckTime != null and query.queryStartCheckTime != ''">
+            and vtb.finished_time &gt;= #{query.queryStartCheckTime} </if>
+        <if test="query.queryEndSubmitTime != null and query.queryEndSubmitTime != ''">
+            and vtb.finished_time &lt;= #{query.queryEndSubmitTime} </if>
         group by vtb.activity_id
         ) vvtb on vvtb.activity_id = tbs_activity.id
         <include refid="baseSelectCheckWhere"></include>
-        limit #{query.startRow},#{query.pageSize}
+        <if test="query.openPage!=null and query.openPage==1">
+            limit #{query.startRow},#{query.pageSize}
+        </if>
     </select>
 
+    <resultMap id="vtbActivityCheckDTOMap" type="com.qs.serve.modules.vtb.entity.dto.VtbActivityCheckDTO">
+
+    </resultMap>
+
     <select id="countActivityCheck" resultType="java.lang.Long">
         select
             count(1)
@@ -155,7 +157,9 @@
         <if test="query.chargeTheme != null and query.chargeTheme != ''"> and `cost`.`charge_theme` like concat('%',#{query.chargeTheme},'%')</if>
         <if test="query.startCheckTime != null and query.startCheckTime != ''"> and `vtb`.`finished_time` &gt;= #{query.startCheckTime}</if>
         <if test="query.startCheckTime != null and query.startCheckTime != ''"> and `vtb`.`finished_time` &lt;= #{query.endCheckTime}</if>
-        limit #{query.startRow},#{query.pageSize}
+        <if test="query.openPage!=null and query.openPage==1">
+            limit #{query.startRow},#{query.pageSize}
+        </if>
     </select>
 
     <select id="countVerificationCheck" resultType="java.lang.Long">