审批辅助显示修复；替换天翼云；客户查询调整

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

@@ -41,10 +41,12 @@ public class HttpUtil {
             //设post请求
             HttpPost post = new HttpPost(url);
             //创建请求实体传参
+            if(jsonStr!=null){
                 StringEntity postingString = new StringEntity(jsonStr,CHARSET);
                 postingString.setContentEncoding(EN_CONING);
                 //设置post请求参数
                 post.setEntity(postingString);
+            }
             post.addHeader(HTTP.CONTENT_TYPE,CONTENT_TYPE);
             if (headers != null) {
                 for (String key : headers.keySet()) {

src/main/java/com/qs/serve/modules/base/TianYiYunSmsService.java

@@ -0,0 +1,48 @@
+package com.qs.serve.modules.base;
+
+import cn.hutool.crypto.digest.DigestUtil;
+import com.qs.serve.common.util.HttpUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+
+/**
+ * @author YenHex
+ * @since 2024/1/26
+ */
+@Slf4j
+@Service
+public class TianYiYunSmsService {
+
+    private final String url = "http://sms.189ek.com/yktsms/send?";
+
+    @Value("${tianyi.sms.appid}")
+    private String appId;
+
+    @Value("${tianyi.sms.appKey}")
+    private String appKey;
+
+    public void send(String phone,String code){
+        //需要发送的手机号(多个号码以英文逗号 “,”分隔) 一次性最多 100 个号码
+        String mobiles = phone;
+        String content = "【嘉士利】验证码"+code;
+        String sign = DigestUtil.md5Hex(appId+mobiles+content+appKey);
+        try {
+            String msg = URLEncoder.encode(content,"utf-8");
+            String params = "appid="+ appId +
+                    "&mobile="+ mobiles +
+                    "&msg=" +  msg +
+                    "&sign=" + sign +
+                    "&extPort=";
+            String result = HttpUtil.doPost(url+params,"{}",null);
+            log.debug("sms result = > {}",result);
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+    }
+
+}

src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java

@@ -18,14 +18,17 @@ import com.qs.serve.modules.bir.service.*;
 import com.qs.serve.modules.sys.entity.SysDictData;
 import com.qs.serve.modules.sys.service.SysDictDataService;
 import com.qs.serve.modules.tbs.common.TbsCenterType;
+import com.qs.serve.modules.tbs.entity.TbsCostApply;
 import com.qs.serve.modules.tbs.entity.dto.TbsCostSubItem;
 import com.qs.serve.modules.tbs.service.TbsBudgetService;
+import com.qs.serve.modules.tbs.service.TbsCostApplyService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -49,6 +52,7 @@ public class BirRoiRateController {
     private TbsBudgetService tbsBudgetService;
     private BirCenterRateService birCenterRateService;
     private SysDictDataService sysDictDataService;
+    private TbsCostApplyService costApplyService;
 
 
 //    /**
@@ -197,10 +201,21 @@ public class BirRoiRateController {
      */
     @GetMapping("/rebuildBir")
     public R<?> rebuildBir(){
-        Long[] costIds = new Long[]{
+        //select count(1) from tbs_cost_apply where create_time >= '2023-03-01' and create_time < '2023-04-01'
-                267638L
+        LocalDate startTime = LocalDate.of(2023,6,1);
-        };
+        LocalDate endTime = LocalDate.of(2023,7,1);
-        birActivityCenterGoodsService.rebuildBir(Arrays.asList(costIds).stream().distinct().collect(Collectors.toList()));
+        LambdaQueryWrapper<TbsCostApply> lqw = new LambdaQueryWrapper<>();
+        lqw.select(TbsCostApply::getId);
+        lqw.ge(TbsCostApply::getCreateTime,startTime);
+        lqw.le(TbsCostApply::getCreateTime,endTime);
+        List<TbsCostApply> costApplyList = costApplyService.list(lqw);
+        List<Long> costIds = costApplyList.stream().map(a->a.getId()).distinct().collect(Collectors.toList());
+        birActivityCenterGoodsService.rebuildBir(costIds);
+
+//        Long[] costIds = new Long[]{
+//                267638L
+//        };
+//        birActivityCenterGoodsService.rebuildBir(Arrays.asList(costIds).stream().distinct().collect(Collectors.toList()));
         return R.ok();
     }
 

src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java

@@ -181,8 +181,8 @@ public class BirRoiRateServiceImpl extends ServiceImpl<BirRoiRateMapper,BirRoiRa
         for (int i = startMonthNum; i <= currMonthNum; i++) {
             int month = Integer.parseInt((""+i).substring(4));
             if(month>12){
-                i = startMonth.getYear()*100 + 100;
+                i = startMonth.getYear()*100 + 101;
-                continue;
+                month = 1;
             }
             boolean isEmpty = true;
             for (BirRoiCostItemVo itemVo : costItemVoList) {

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

@@ -353,6 +353,12 @@ public class BmsSupplier implements Serializable {
     @TableField(exist = false)
     private String otherUserIdsString;
 
+    /**
+     * 对应是supplierFlag
+     */
+    @TableField(exist = false)
+    private List<Integer> selectSupplierTypes;
+
     public List<String> listBizRegionIds(){
         List<String> list = new ArrayList<>();
         list.add(this.getRegion2First());

src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java

@@ -75,6 +75,9 @@ public class HisUserSupplierServiceImpl extends ServiceImpl<HisUserSupplierMappe
             lqw.lambda().like(HisUserSupplier::getSupplierCode,param.getKeyword());
             lqw.lambda().like(HisUserSupplier::getSupplierName,param.getKeyword());
         }
+        if(CollectionUtil.isNotEmpty(param.getSelectSupplierTypes())){
+            lqw.lambda().in(HisUserSupplier::getSupplierFlag,param.getSelectSupplierTypes());
+        }
         lqw.lambda().in(HisUserSupplier::getUserId,userIds)
                 .ne(HisUserSupplier::getSupplierId,0);
         if(usePage){

src/main/java/com/qs/serve/modules/sys/entity/dto/CostDeletion.java

@@ -0,0 +1,23 @@
+package com.qs.serve.modules.sys.entity.dto;
+
+import lombok.Data;
+
+@Data
+public class CostDeletion {
+
+    /**
+     * 员工号
+     */
+    private String empNo;
+
+    /**
+     * 操作时间
+     */
+    private String requestDeleteTime;
+
+    /**
+     * 核销案号
+     */
+    private String verificationCode;
+
+}

src/main/java/com/qs/serve/modules/sys/service/impl/SysDeleteLogServiceImpl.java

@@ -4,6 +4,7 @@ import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qs.serve.common.util.IdUtil;
+import com.qs.serve.modules.sys.entity.dto.CostDeletion;
 import com.qs.serve.modules.tbs.entity.TbsCostApply;
 import com.qs.serve.modules.tbs.entity.TbsCostTodo;
 import com.qs.serve.modules.tbs.mapper.TbsCostApplyMapper;
@@ -111,6 +112,12 @@ public class SysDeleteLogServiceImpl extends ServiceImpl<SysDeleteLogMapper,SysD
         }
         tbsCostApplyRemoveMapper.tbs_cost_todo(costApplyId);
         this.saveBatch(deleteLogList);
+
+        //TODO 远程删除ERP
+        //http://59.37.164.96:9002/action/cms/cost/deletion
+
+        CostDeletion costDeletion = new CostDeletion();
+
     }
 
 }

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

@@ -103,6 +103,11 @@ public class TbsCostApplyTestController {
         return R.ok(sysTableTempList.size());
     }
 
+    @GetMapping("/overspendRebuild")
+    public R<?> ss2(Long costId){
+        return overRebuildCost(costId);
+    }
+
     public void saveTableTmp(SysTableTemp sysTableTemp){
         sysTableTempMapper.insert(sysTableTemp);
     }

src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java

@@ -227,11 +227,44 @@ public class PortalOfCostApplication {
     }
 
 
+    /**
+     * 重新构建
+     */
+    public void rebuildCreateCostProcessByPolicy(){
+        Long[] errorCostIds = new Long[]{279525L,280099L,280383L,280384L,280385L,280386L,280387L,280390L,280393L,280395L,280396L,
+                280397L,280403L,280408L,280410L,280413L,280422L,280424L,280425L,280428L,280433L,280442L,280447L,280454L,
+                280456L,280458L,280460L,280466L,280488L,280494L,280503L,280504L,280508L,280510L,280513L,280530L,280536L,
+                280543L,280546L,280553L,280555L,280556L,280557L,280558L,280562L,280563L,280565L,280566L,280567L,280569L,
+                280570L,280573L,280579L,280583L,280587L,280600L,280610L,280623L,280624L,280626L,280650L,280652L,280653L,
+                280655L,280657L,280663L,280664L,280672L,280678L,280679L,280687L,280691L,280694L,280697L,280698L,280699L,
+                280700L,280701L,280720L,280721L,280723L,280736L,280741L,280743L,280745L,280748L,280749L,280750L,280757L,
+                280760L,280775L,280798L,280799L,280800L,280803L,280806L,280825L,280835L,280844L,280845L,280849L,280850L,
+                280851L,280852L,280856L,280859L,280869L,280871L,280872L,280873L,280874L};
+
+        // costApplyService.save(costApply);
+        // activityService.save(activity);
+        // activitySubjectService.save(activitySubject);
+        // activityCenterService.save(activityCenter);
+        // activityGoodsService.saveBatch(activityGoodsList);
+        // activityCenterGoodsService.saveBatch(activityCenterGoodsList);
+
+        // budgetLogService.save(dropPolicyBudgetLog);
+        // budgetLogService.saveBatch(budgetLogList);
+        // costItemService.saveBatch(costItemList);
+
+        // policyItemLogService.save(policyItemLog);
+        // policyItemServiceService.updateById(policyItemParam);
+
+        // verificationService.save(verification);
+        // verificationSubjectService.save(verificationSubject);
+
+
+    }
+
     /**
      * 已弃用，适用 syncXltPolicyItemPayment代替
      * @param createBo
      */
-//    @Deprecated
     @Transactional(rollbackFor = Exception.class)
     public void createCostProcessByPolicy(ProcessCreatePolicyCostBo createBo){
         SysUser user = userService.getByAccount(createBo.getUserCode());

src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyTestController.java

@@ -9,9 +9,7 @@ import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.model.enums.BizType;
 import com.qs.serve.common.model.enums.BudgetLogOptFlag;
 import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.AuthContextUtils;
+import com.qs.serve.common.util.*;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.StringUtils;
 import com.qs.serve.modules.bms.entity.BmsRegion2;
 import com.qs.serve.modules.bms.service.BmsRegion2Service;
 import com.qs.serve.modules.seeyon.entity.CtpAffairQo;
@@ -23,6 +21,7 @@ import com.qs.serve.modules.sys.service.SysPostUserService;
 import com.qs.serve.modules.sys.service.SysUserService;
 import com.qs.serve.modules.tbs.common.util.TbsBudgetLogBuildUtil;
 import com.qs.serve.modules.tbs.entity.TbsBudget;
+import com.qs.serve.modules.tbs.entity.TbsBudgetCostItem;
 import com.qs.serve.modules.tbs.entity.TbsBudgetCostItemPolicy;
 import com.qs.serve.modules.tbs.entity.TbsBudgetLog;
 import com.qs.serve.modules.tbs.entity.bo.TbsAffairCommitBo;
@@ -80,7 +79,7 @@ public class TzcPolicyTestController {
 
     @GetMapping("/testSyncPolicy")
     public R<?>  syncPolicy(Long policyId){
-        tzcPolicyApplicationService.syncPolicyItem(policyId);
+        //tzcPolicyApplicationService.syncPolicyItem(policyId);
         return R.ok();
     }
 
@@ -88,7 +87,10 @@ public class TzcPolicyTestController {
     @GetMapping("/rebulidAllPolicy")
     public R<?> rebulidAllPolicy(){
         Long[] ids = new Long[]{
-
+                //487L,
+                //555L,
+                //738L,
+                775L
         };
         for (Long id : ids) {
             rebuildPolicy(id);
@@ -98,9 +100,8 @@ public class TzcPolicyTestController {
 
     public R<?> rebuildPolicy(Long policyId){
 
-       // TzcPolicy tzcPolicy = tzcPolicyService.getById(policyId);
+        TzcPolicy tzcPolicy = tzcPolicyService.getById(policyId);
-        //Integer tzcPolicyStatus = tzcPolicy.getPolicyStatus();
+        SysUser sysUser = sysUserService.getById(tzcPolicy.getCreateBy());
-        //SysUser sysUser = sysUserService.getById(tzcPolicy.getCreateBy());
 
         SysTableTemp sysTableTemp = new SysTableTemp();
         sysTableTemp.setTableName("policyId");
@@ -109,7 +110,7 @@ public class TzcPolicyTestController {
         TbsBudgetCostResult result = policyApplicationService.buildBudgetCostResult(policyId,false,false);
         if(result.getBudgetUnMatchList()!=null&&result.getBudgetUnMatchList().size()>0){
             sysTableTemp.setResultMsg("政策匹配预算失败");
-            sysTableTempMapper.insert(sysTableTemp);
+            //sysTableTempMapper.insert(sysTableTemp);
             return R.error("政策匹配预算失败");
         }
         LambdaQueryWrapper<TbsBudgetCostItemPolicy> itemPolicyLqw = new LambdaQueryWrapper<>();
@@ -132,54 +133,49 @@ public class TzcPolicyTestController {
             }
         }
 
+        //判断是否正常数据
         if(isMatchAll){
             sysTableTemp.setResultMsg("正常");
-            sysTableTempMapper.insert(sysTableTemp);
+            //sysTableTempMapper.insert(sysTableTemp);
             return R.ok("正常");
         }else {
-            sysTableTemp.setResultMsg("预算占用错误");
+            //sysTableTemp.setResultMsg("预算占用错误");
-            sysTableTempMapper.insert(sysTableTemp);
+            //sysTableTempMapper.insert(sysTableTemp);
-            return R.ok("预算占用错误");
+            //return R.ok("预算占用错误");
-        }
+        }
-
+
-
+
-//        tbsBudgetCostItemPolicyService.saveBatch(allBudgetItem);
+        //保存预算使用日志
-//        //保存预算使用日志
+        List<TbsBudgetLog> budgetLogList = saveBudgetLog(result, sysUser, tzcPolicy, result.getPolicyBudgetMatchList(),result.getPolicyItemList());
-//        List<TbsBudgetLog> budgetLogList = saveBudgetLog(result, sysUser, tzcPolicy, result.getPolicyBudgetMatchList(),result.getPolicyItemList());
+        LambdaQueryWrapper<TbsBudgetCostItemPolicy> citemLqw = new LambdaQueryWrapper<>();
-//        if(tzcPolicyStatus.equals(TzcPolicyStatus.Status_0_UnCommit)){
+        citemLqw.eq(TbsBudgetCostItemPolicy::getPolicyId,policyId);
-//            budgetLogService.saveBatch(budgetLogList);
+        List<TbsBudgetCostItemPolicy> itemList = tbsBudgetCostItemPolicyService.list(citemLqw);
-//        }else {
+        //Assert.throwEx("dev");
-//            //排除历史记录
+        // 设置remark标记防止误删,移除旧的记录
-//            LambdaQueryWrapper<TbsBudgetLog> logLqw = new LambdaQueryWrapper<>();
+        for (TbsBudgetCostItemPolicy costItem : itemList) {
-//            logLqw.eq(TbsBudgetLog::getPolicyId,policyId);
+            costItem.setRemark("toDel");
-//            logLqw.eq(TbsBudgetLog::getRollbackFlag, BudgetLogRollbackFlag.State_1);
+        }
-//            List<TbsBudgetLog> oldLogList = budgetLogService.list(logLqw);
+        tbsBudgetCostItemPolicyService.updateBatchById(itemList);
-//            List<TbsBudgetLog> oldLogList4Upd = oldLogList.stream().map(a->{
+        List<Long> itemIds = itemList.stream().map(TbsBudgetCostItemPolicy::getId).collect(Collectors.toList());
-//                TbsBudgetLog budgetLog = new TbsBudgetLog();
+        tbsBudgetCostItemPolicyService.removeBatchByIds(itemIds);
-//                budgetLog.setId(a.getId());
+        tbsBudgetCostItemPolicyService.saveBatch(allBudgetItem);
-//                budgetLog.setRollbackFlag(BudgetLogRollbackFlag.State_2);
+
-//                return budgetLog;
+
-//            }).collect(Collectors.toList());
+        // 设置remark标记防止误删,移除旧的记录
-//            budgetLogService.updateBatchById(oldLogList4Upd);
+        LambdaQueryWrapper<TbsBudgetLog> bLqw = new LambdaQueryWrapper<>();
-//            for (TbsBudgetLog budgetLog : oldLogList) {
+        bLqw.eq(TbsBudgetLog::getPolicyId,policyId);
-//                budgetLog.setCreateBy(null);
+        List<TbsBudgetLog> dbbudgetLogs = budgetLogService.list(bLqw);
-//                budgetLog.setCreateTime(null);
+        for (TbsBudgetLog budgetLog : dbbudgetLogs) {
-//                budgetLog.setUpdateBy(null);
+            budgetLog.setRemark("toDel");
-//                budgetLog.setUpdateTime(null);
+        }
-//                budgetLog.setId(null);
+        budgetLogService.updateBatchById(dbbudgetLogs);
-//                BudgetLogOptFlag optFlag = BudgetLogOptFlag.State_12;
+        List<Long> budIds = dbbudgetLogs.stream().map(TbsBudgetLog::getId).collect(Collectors.toList());
-//                budgetLog.setAmount(TbsBudgetLogBuildUtil.buildAmount(budgetLog.getAmount(),optFlag));
+        budgetLogService.removeBatchByIds(budIds);
-//                budgetLog.setOptType(optFlag.getCode());
+        //重新保存
-//            }
+        if(CollectionUtil.isNotEmpty(budgetLogList)){
-//            budgetLogService.saveBatch(oldLogList);
+            budgetLogService.saveBatch(budgetLogList);
-//            BudgetLogOptFlag optFlag = BudgetLogOptFlag.State_13;
+        }
-//            budgetLogList.forEach(a->{
+        return R.ok();
-//                a.setOptType(optFlag.getCode());
-//                a.setAmount(TbsBudgetLogBuildUtil.buildAmount(a.getAmount(),optFlag));
-//            });
-//            budgetLogService.saveBatch(budgetLogList);
-//        }
-        //return R.ok();
     }
 
     /**
@@ -218,5 +214,6 @@ public class TzcPolicyTestController {
         }
         return budgetLogList;
     }
+
 }
 

src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java

@@ -1,6 +1,7 @@
 package com.qs.serve.modules.tzc.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.qs.serve.common.config.DevEnvironmentConfig;
 import com.qs.serve.common.config.properties.ProjectApisProperties;
 import com.qs.serve.common.config.properties.ProjectProperties;
 import com.qs.serve.common.framework.manager.AsyncFactory;
@@ -182,24 +183,24 @@ public class TzcPolicyApplicationServiceImpl implements TzcPolicyApplicationServ
 
         policyItemDto.setInvCodeList(invCodes);
         policyItemDto.setPolicyGoodsItemList(goodsItems);
-
+        //测试环境不进入生成
-//        String policySyncInvUrl = projectApisProperties.getPolicySyncInv();
+        if(!DevEnvironmentConfig.isDev()){
+            String policySyncInvUrl = projectApisProperties.getPolicySyncInv();
 //        String policySyncCateUrl = projectApisProperties.getPolicySyncCate();
-//        String dataJson = JsonUtil.objectToJson(policyItemDto);
+            String dataJson = JsonUtil.objectToJson(policyItemDto);
 //
-//        String rs = HttpUtil.doPost(policySyncInvUrl, dataJson, null);
+            String rs = HttpUtil.doPost(policySyncInvUrl, dataJson, null);
-//        log.debug("policySyncInvUrl:{}\n result:{}",policySyncInvUrl,rs);
+            log.debug("policySyncInvUrl:{}\n result:{}",policySyncInvUrl,rs);
 //        String rs2 = HttpUtil.doPost(policySyncCateUrl, dataJson, null);
 //        log.debug("policySyncCateUrl:{}\n result:{}",policySyncCateUrl,rs2);
 
-        //TODO 测试临时注释
             //保存异步处理的
-        xiaoLuTonService.savePolicyItem(policyItemDto);
+            //xiaoLuTonService.savePolicyItem(policyItemDto);
             TzcPolicyItem updParam = new TzcPolicyItem();
             updParam.setId(policyItemId);
             updParam.setPolicyItemStatus(TzPolicyItemStatus.Status_2_SyncSuccess);
             tzcPolicyItemService.updateById(updParam);
-
+        }
 
     }
 
@@ -302,32 +303,34 @@ public class TzcPolicyApplicationServiceImpl implements TzcPolicyApplicationServ
             //排除历史记录
             LambdaQueryWrapper<TbsBudgetLog> logLqw = new LambdaQueryWrapper<>();
             logLqw.eq(TbsBudgetLog::getPolicyId,policyId);
-            logLqw.eq(TbsBudgetLog::getRollbackFlag, BudgetLogRollbackFlag.State_1);
+//            logLqw.eq(TbsBudgetLog::getRollbackFlag, BudgetLogRollbackFlag.State_1);
-            List<TbsBudgetLog> oldLogList = budgetLogService.list(logLqw);
+            budgetLogService.remove(logLqw);
-            List<TbsBudgetLog> oldLogList4Upd = oldLogList.stream().map(a->{
-                TbsBudgetLog budgetLog = new TbsBudgetLog();
-                budgetLog.setId(a.getId());
-                budgetLog.setRollbackFlag(BudgetLogRollbackFlag.State_2);
-                return budgetLog;
-            }).collect(Collectors.toList());
-            budgetLogService.updateBatchById(oldLogList4Upd);
-            for (TbsBudgetLog budgetLog : oldLogList) {
-                budgetLog.setCreateBy(null);
-                budgetLog.setCreateTime(null);
-                budgetLog.setUpdateBy(null);
-                budgetLog.setUpdateTime(null);
-                budgetLog.setId(null);
-                BudgetLogOptFlag optFlag = BudgetLogOptFlag.State_12;
-                budgetLog.setAmount(TbsBudgetLogBuildUtil.buildAmount(budgetLog.getAmount(),optFlag));
-                budgetLog.setOptType(optFlag.getCode());
-            }
-            budgetLogService.saveBatch(oldLogList);
-            BudgetLogOptFlag optFlag = BudgetLogOptFlag.State_13;
-            budgetLogList.forEach(a->{
-                a.setOptType(optFlag.getCode());
-                a.setAmount(TbsBudgetLogBuildUtil.buildAmount(a.getAmount(),optFlag));
-            });
             budgetLogService.saveBatch(budgetLogList);
+//            List<TbsBudgetLog> oldLogList = budgetLogService.list(logLqw);
+//            List<TbsBudgetLog> oldLogList4Upd = oldLogList.stream().map(a->{
+//                TbsBudgetLog budgetLog = new TbsBudgetLog();
+//                budgetLog.setId(a.getId());
+//                budgetLog.setRollbackFlag(BudgetLogRollbackFlag.State_2);
+//                return budgetLog;
+//            }).collect(Collectors.toList());
+//            budgetLogService.updateBatchById(oldLogList4Upd);
+//            for (TbsBudgetLog budgetLog : oldLogList) {
+//                budgetLog.setCreateBy(null);
+//                budgetLog.setCreateTime(null);
+//                budgetLog.setUpdateBy(null);
+//                budgetLog.setUpdateTime(null);
+//                budgetLog.setId(null);
+//                BudgetLogOptFlag optFlag = BudgetLogOptFlag.State_12;
+//                budgetLog.setAmount(TbsBudgetLogBuildUtil.buildAmount(budgetLog.getAmount(),optFlag));
+//                budgetLog.setOptType(optFlag.getCode());
+//            }
+//            budgetLogService.saveBatch(oldLogList);
+//            BudgetLogOptFlag optFlag = BudgetLogOptFlag.State_13;
+//            budgetLogList.forEach(a->{
+//                a.setOptType(optFlag.getCode());
+//                a.setAmount(TbsBudgetLogBuildUtil.buildAmount(a.getAmount(),optFlag));
+//            });
+//            budgetLogService.saveBatch(budgetLogList);
         }
         //创建流程后回调
         BaseCreateCallbackBo callbackBo = new BaseCreateCallbackBo(TbsSeeYonConst.PolicyConf.Code(),tzcPolicy.getId()+"");

src/main/java/com/qs/serve/modules/wx/api/WxSvcUserApi.java

@@ -16,6 +16,7 @@ import com.qs.serve.common.util.IdUtil;
 import com.qs.serve.common.util.JwtUtils;
 import com.qs.serve.common.util.StringUtils;
 import com.qs.serve.modules.base.TencentYunSmsService;
+import com.qs.serve.modules.base.TianYiYunSmsService;
 import com.qs.serve.modules.sys.entity.SysDept;
 import com.qs.serve.modules.sys.entity.SysRole;
 import com.qs.serve.modules.sys.entity.SysUser;
@@ -54,6 +55,7 @@ public class WxSvcUserApi {
     private RedisService redisService;
     private SysUserService sysUserService;
     private TencentYunSmsService tencentYunSmsService;
+    private TianYiYunSmsService tianYiYunSmsService;
     private  SysUserDetailsServiceImpl userDetailsService;
     private SysRoleService sysRoleService;
     private SysUserSalesService sysUserSalesService;
@@ -104,7 +106,8 @@ public class WxSvcUserApi {
         if(code==null){
             code = IdUtil.genCode(6);
         }
-        tencentYunSmsService.send(phone,code);
+        tianYiYunSmsService.send(phone,code);
+        //tencentYunSmsService.send(phone,code);
         log.debug("手机'{}'验证码：{}",phone,code);
         redisService.set(key,code,10, TimeUnit.MINUTES);
         return R.ok();

src/main/resources/mapper/bms/BmsSupplierMapper.xml

@@ -116,6 +116,12 @@
             <if test="query.searchUserCode!=null and query.searchUserCode != ''">
                 and (`bms_supplier`.`user_code` LIKE CONCAT('%',#{query.searchUserCode},'%') or `bms_supplier`.`other_user_codes` LIKE CONCAT('%',#{query.searchUserCode},'%') )
             </if>
+            <if test="query.selectSupplierTypes!=null and query.selectSupplierTypes.size > 0">
+                and bms_supplier.supplier_flag in
+                <foreach collection="query.selectSupplierTypes" item ="selectId" index="i" open="(" close=")" separator=",">
+                    #{selectId}
+                </foreach>
+            </if>
             <if test="query.searchInIds!=null and query.searchInIds.size > 0">
                 and bms_supplier.id in
                 <foreach collection="query.searchInIds" item ="selectId" index="i" open="(" close=")" separator=",">