debug

src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierVisitAddress.java

@@ -46,6 +46,9 @@ public class BmsSupplierVisitAddress implements Serializable {
     @Length(max = 255,message = "详细地址长度不能超过255字")
     private String addressDetail;
 
+    /** 地址类型 */
+    private String addressType;
+
     private String localAddress;
 
     /** 纬度 */

src/main/java/com/qs/serve/modules/seeyon/entity/dto/CtpAffairPageSo.java

@@ -0,0 +1,17 @@
+package com.qs.serve.modules.seeyon.entity.dto;
+
+import lombok.Data;
+
+/**
+ * @author YenHex
+ * @since 2023/4/4
+ */
+@Data
+public class CtpAffairPageSo {
+    /**
+     * 状态：0-未完成与已完成(默认)；1-未完成；2已完成；3-我发起的；其它-被拦截
+     */
+    Integer state;
+    Integer pageNum;
+    Integer pageSize;
+}

src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java

@@ -232,6 +232,10 @@ public class TbsBudgetApplicationService {
             BigDecimal budgetItemAmount = tbsScheduleItemBudgetMapper.totalCostAmountByApplyId(itemBudget.getBudgetId(),itemBudget.getScheduleItemId(),costApplyId);
             //因为结果为负数，需去相反数
             budgetItemAmount = budgetItemAmount==null?BigDecimal.ZERO:budgetItemAmount.negate();
+            BigDecimal budgetItemPolicyAmount = tbsScheduleItemBudgetMapper.totalCostAmountByPolicyId(itemBudget.getBudgetId(),itemBudget.getScheduleItemId(),0L);
+            if(budgetItemPolicyAmount!=null){
+                budgetItemAmount.add(budgetItemPolicyAmount.negate());
+            }
             budgetItemAmountMap.put(itemBudget.getId(),budgetItemAmount);
         }
         //统计当前活动前置项占用预算

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

@@ -10,6 +10,7 @@ import com.qs.serve.common.util.*;
 import com.qs.serve.modules.seeyon.entity.CtpAffair;
 import com.qs.serve.modules.seeyon.entity.CtpAffairCommit;
 import com.qs.serve.modules.seeyon.entity.CtpAffairQo;
+import com.qs.serve.modules.seeyon.entity.dto.CtpAffairPageSo;
 import com.qs.serve.modules.seeyon.service.SeeYonService;
 import com.qs.serve.modules.sys.entity.SysAttach;
 import com.qs.serve.modules.sys.entity.SysUser;
@@ -192,22 +193,24 @@ public class VtbVerificationController {
 
     /**
      * 审批列表(翻页)
-     * @param state 状态：0-未完成与已完成(默认)；1-未完成；2已完成；3-我发起的；其它-被拦截
-     * @param pageNum
-     * @param pageSize
+     * @param pageSo
      * @return
      */
     @GetMapping("/pageMemberAffair")
-    public R<PageVo<CtpAffairVo>> pageMemberAffair(Integer state, Integer pageNum, Integer pageSize){
+    public R<PageVo<CtpAffairVo>> pageMemberAffair(CtpAffairPageSo pageSo,TbsCostApply costApply){
         SysUser sysUser = sysUserService.getById(AuthContextUtils.getSysUserId());
         if(!StringUtils.hasText(sysUser.getSyUserId())||!StringUtils.hasText(sysUser.getSyAccount())){
             return R.error("当前账号未绑定致远用户信息");
         }
         CtpAffairQo param = new CtpAffairQo();
         param.setMemberId(sysUser.getSyUserId());
-        param.setState(state);
-        param.setPageNum(pageNum);
-        param.setPageSize(pageSize);
+        param.setState(pageSo.getState());
+        param.setPageNum(pageSo.getPageNum());
+        param.setPageSize(pageSo.getPageSize());
+        param.setTitle(costApply.getChargeTheme());
+        param.setSupplierName(costApply.getSupplierName());
+        param.setSupplierCode(costApply.getSupplierCode());
+        param.setApplyUserName(costApply.getUserName());
         param.setTemplateCode(TbsSeeYonConst.CostCheckConf.Code());
         R<PageVo<CtpAffair>> syResult = seeYonService.pageMemberAffair(param);
         PageVo<CtpAffair> pageVo = syResult.getData();

src/main/resources/mapper/goods/GoodsSkuMapper.xml

@@ -128,7 +128,7 @@
                 </foreach>
             </if>
         </where>
-        ORDER BY `goods_sku`.`create_date` DESC
+        ORDER BY `goods_sku`.`create_time` DESC
     </select>
 
     <select id="selectByCategoryIds" resultType="com.qs.serve.modules.goods.entity.GoodsSku">

src/main/resources/mapper/goods/GoodsSpuMapper.xml

@@ -63,6 +63,7 @@
         LEFT JOIN `goods_category` `cate2` ON `cate2`.`id` = `goods_spu`.`category_second`
         LEFT JOIN `goods_category` `cate3` ON `cate3`.`id` = `goods_spu`.`category_third`
         <where>
+            and `goods_spu`.`del_flag` = 0
             <if test="query.id != null"> and `goods_spu`.`id` = #{query.id}</if>
             <if test="query.spuCode != null and query.spuCode != ''"> and `goods_spu`.`spu_code` like concat('%', #{query.spuCode},'%')</if>
             <if test="query.name != null and query.name != ''"> and `goods_spu`.`name` like concat('%', #{query.name},'%') </if>