核销支持情况查询；修复预算异常

src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java

@@ -118,6 +118,7 @@ public interface SeeYonOperationService extends SeeYonBaseService{
         addNodeDTO.setUserCode(sysUser.getAccount());
         addNodeDTO.setUserSyId(sysUser.getSyUserId());
         addNodeDTO.setTemplateCode(getTemplateCode());
+        addNodeDTO.setComment(param.getComment());
         R<String> result = getRequestService().addNode(addNodeDTO);
         if(result.getData()!=null&&result.getData().toLowerCase(Locale.ROOT).contains("ok")){
             return R.ok();

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeServiceImpl.java

@@ -153,6 +153,16 @@ public class TbsBudgetChangeServiceImpl extends ServiceImpl<TbsBudgetChangeMappe
                 Assert.throwEx("不可添加品类条件");
             }
         }
+        //防止多种情况申请修改而导致金额异常
+        Long countExist = this.count(
+                new LambdaQueryWrapper<TbsBudgetChange>()
+                        .in(TbsBudgetChange::getBudgetId,budget.getId())
+                        .eq(TbsBudgetChange::getBudgetCheckState,TbsBudgetCheckState.State_1_apply)
+        );
+        if(countExist>0){
+            Assert.throwEx("当前预算已存在修改审批");
+        }
+
         if(param.getOrgChangeId()!=null){
             TbsBudgetChange orgBudgetChange = this.getById(param.getOrgChangeId());
             if(orgBudgetChange.getBudgetCheckState().equals(TbsBudgetCheckState.State_3_setback)){

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java

@@ -329,7 +329,7 @@ public class TbsBudgetServiceImpl extends ServiceImpl<TbsBudgetMapper,TbsBudget>
         budget.setBudgetState(1);
         budget.setBudgetCheckState(TbsBudgetCheckState.State_2_finished);
         this.updateById(budget);
-        SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId());
+        SysUser sysUser = sysUserService.getById(budget.getUserId());
         LambdaQueryWrapper<TbsScheduleItemBudget> lqw = new LambdaQueryWrapper<>();
         lqw.eq(TbsScheduleItemBudget::getBudgetId,id);
         List<TbsScheduleItemBudget> scheduleItemBudgets = scheduleItemBudgetService.list(lqw);

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

@@ -2,6 +2,7 @@ package com.qs.serve.modules.vtb.controller;
 
 import com.qs.serve.common.model.dto.PageVo;
 import com.qs.serve.common.model.dto.R;
+import com.qs.serve.common.util.PageUtil;
 import com.qs.serve.modules.vtb.entity.dto.VtbActivityCheckDTO;
 import com.qs.serve.modules.vtb.entity.dto.VtbVerificationDTO;
 import com.qs.serve.modules.vtb.entity.so.VtbActivityCheckSo;
@@ -37,6 +38,7 @@ public class VtbVerificationDataController {
     public R<PageVo<VtbActivityCheckDTO>> getActivityData(VtbActivityCheckSo query){
         Long count = verReportMapper.countActivityCheck(query);
         if(count>0){
+            query.setStartRow(PageUtil.getStartRow());
             List<VtbActivityCheckDTO> list = verReportMapper.pageActivityCheck(query);
             PageVo<VtbActivityCheckDTO> page = new PageVo<>();
             page.initPageByTotal(count);
@@ -52,9 +54,10 @@ public class VtbVerificationDataController {
      * @return
      */
     @GetMapping("pageVerificationCheck")
-    public R<?> getVerificationData(VtbVerificationCheckSo query){
+    public R<PageVo<VtbVerificationDTO>> getVerificationData(VtbVerificationCheckSo query){
         Long count = verReportMapper.countVerificationCheck(query);
         if(count>0){
+            query.setStartRow(PageUtil.getStartRow());
             List<VtbVerificationDTO> list = verReportMapper.pageVerificationCheck(query);
             PageVo<VtbVerificationDTO> page = new PageVo<>();
             page.initPageByTotal(count);

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

@@ -39,17 +39,17 @@ public class VtbActivityCheckSo {
     /** 提交结束时间 */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    private LocalDateTime queryEndSubmitTime;
+    private String queryEndSubmitTime;
 
     /** 核销开始时间 */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    private LocalDateTime queryStartCheckTime;
+    private String queryStartCheckTime;
 
     /** 核销开始时间 */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    private LocalDateTime queryEndCheckTime;
+    private String queryEndCheckTime;
 
     private Integer pageSize;
 

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

@@ -27,6 +27,7 @@ public class VtbVerificationCheckSo {
     /** 活动内容 */
     private String actTitle;
 
+    /** 开始核销时间 */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private LocalDateTime startCheckTime;
@@ -35,6 +36,7 @@ public class VtbVerificationCheckSo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private LocalDateTime endCheckTime;
 
+    /** 开始支付时间 */
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private LocalDateTime startPayTime;
@@ -43,4 +45,7 @@ public class VtbVerificationCheckSo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private LocalDateTime endPayTime;
 
+    private Integer pageSize;
+
+    private Integer startRow;
 }

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

@@ -20,6 +20,10 @@
         <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,
@@ -79,8 +83,22 @@
         <include refid="baseSelectCheckWhere"></include>
     </select>
 
+    <resultMap id="verificationCheckMap" type="com.qs.serve.modules.vtb.entity.dto.VtbVerificationDTO">
+        <result property="verificationCode"  column="verification_code"/>
+        <result property="supplierCode"  column="supplier_code"/>
+        <result property="supplierName"  column="supplier_name"/>
+        <result property="wayTitle"  column="way_title"/>
+        <result property="amount"  column="amount"/>
+        <result property="payAmt"  column="pay_amt"/>
+        <result property="notPayAmt"  column="not_pay_amt"/>
+        <result property="costApplyCode"  column="code"/>
+        <result property="chargeTheme"  column="charge_theme"/>
+        <result property="submitTime"  column="submit_time"/>
+        <result property="activityCode"  column="activity_code"/>
+        <result property="actTitle"  column="act_title"/>
+    </resultMap>
 
-    <select id="pageVerificationCheck" resultType="com.qs.serve.modules.vtb.entity.dto.VtbVerificationDTO">
+    <select id="pageVerificationCheck" resultType="com.qs.serve.modules.vtb.entity.dto.VtbVerificationDTO" resultMap="verificationCheckMap">
         select
                 vtb.verification_code ,
                 vtb.supplier_code ,
@@ -123,6 +141,7 @@
             left join tbs_activity act on act.id = vtb.activity_id
         where
           vtb.del_flag = 0
+          and vtb.verification_state = 1
           and act.del_flag = 0
           and act.cancel_flag = 0
           and cost.del_flag = 0
@@ -136,6 +155,7 @@
         <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}
     </select>
 
     <select id="countVerificationCheck" resultType="java.lang.Long">