需求调整

src/main/java/com/qs/serve/modules/seeyon/entity/CtpAffairQo.java

@@ -51,4 +51,5 @@ public class CtpAffairQo {
     String dataKey;
 
     String queryBizRegion;
+    String querySaleRegion;
 }

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

@@ -14,5 +14,6 @@ public class CtpAffairPageSo {
     Integer state;
     Integer pageNum;
     Integer pageSize;
-    Integer queryBizRegion;
+    String queryBizRegion;
+    String querySaleRegion;
 }

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

@@ -166,6 +166,7 @@ public interface SeeYonOperationService extends SeeYonBaseService{
             Assert.throwEx("当前账号未绑定致远用户信息");
         }
         param.setQueryBizRegion(param.getQueryBizRegion());
+        param.setQuerySaleRegion(param.getQuerySaleRegion());
         param.setMemberId(sysUser.getSyUserId());
         param.setTemplateCode(getTemplateCode());
         R<PageVo<CtpAffair>> syResult = getRequestService().pageMemberAffair(param);

src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java

@@ -14,10 +14,12 @@ import com.qs.serve.common.model.dto.TreeNode;
 import com.qs.serve.common.model.enums.BizType;
 import com.qs.serve.common.model.enums.SystemModule;
 import com.qs.serve.common.util.*;
+import com.qs.serve.modules.seeyon.service.impl.SeeYonRequestBaseService;
 import com.qs.serve.modules.sys.entity.*;
 import com.qs.serve.modules.sys.entity.bo.*;
 import com.qs.serve.modules.sys.entity.dto.*;
 import com.qs.serve.modules.sys.service.*;
+import com.qs.serve.modules.tbs.common.TbsSeeYonConst;
 import com.qs.serve.modules.wx.entity.WxUser;
 import com.qs.serve.modules.wx.service.WxUserService;
 import lombok.AllArgsConstructor;
@@ -49,6 +51,17 @@ public class SysUserController {
     private WxUserService wxUserService;
     private SysUserSalesService sysUserSalesService;
 
+    /**
+     * 获取致远用户列表
+     * @param code
+     * @return
+     */
+    @GetMapping("/getSyUserList")
+    public R<?> getSyUserList(String code){
+        SeeYonRequestBaseService service = SpringUtils.getBean(SeeYonRequestBaseService.class);
+        R<String> rs = service.getBase(TbsSeeYonConst.OA_USER_LIST+"?code="+code,null);
+        return R.ok(rs.getData());
+    }
 
 
     @GetMapping("/getChildList")

src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java

@@ -46,6 +46,8 @@ public interface TbsSeeYonConst {
     String API_ADD_NODE = "/process/addNode";
     String API_COUNT_NOT_OK = "/process/countUnfinished";
 
+    String OA_USER_LIST = "/process/getSyUserList";
+
     String XLT_SAVE_CHECK = "/xlt/saveCheck";
     String XLT_SAVE_PAYMENT = "/xlt/savePayment";
     String XLT_SAVE_POLICY = "/xlt/savePolicyItem";

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

@@ -173,10 +173,13 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
         String bizRegionId = supplier.handleBizRegionId();
         BmsRegion saleRegion = regionMapper.selectById(saleRegionId);
         BmsRegion2 bizRegion = region2Mapper.selectById(bizRegionId);
-        String saleRegionNames = saleRegion!=null?saleRegion.getPathNames():"null";
-        String bizRegionNames = bizRegion!=null?bizRegion.getPathNames():"null";
+        String saleRegionNames = saleRegion!=null?saleRegion.getPathNames():"null_申请时未录入";
+        String bizRegionNames = bizRegion!=null?bizRegion.getPathNames():"null_申请时未录入";
+
+        //拓展添加审批关联
+        data.put("biz_region",bizRegionNames);
         data.put("exsp2",saleRegionNames);
-        data.put("exsp3",bizRegionNames);
+        data.put("data_state",TbsCostApplyState.State_1_apply);
 
         //添加跳转地址业务
         String urlKey = "exsp5"+IdUtil.simpleUUID();

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

@@ -22,6 +22,7 @@ import com.qs.serve.modules.seeyon.service.XiaoLuTonService;
 import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.sys.service.SysConfigService;
 import com.qs.serve.modules.sys.service.SysUserService;
+import com.qs.serve.modules.tbs.common.TbsCostApplyState;
 import com.qs.serve.modules.tbs.common.TbsGoodsType;
 import com.qs.serve.modules.tbs.common.TbsSeeYonConst;
 import com.qs.serve.modules.tbs.common.dto.CostSortWrapper;
@@ -178,10 +179,11 @@ public class TzcPolicyApplicationServiceImpl implements TzcPolicyApplicationServ
         String bizRegionId = supplier.handleBizRegionId();
         BmsRegion saleRegion = regionMapper.selectById(saleRegionId);
         BmsRegion2 bizRegion = region2Mapper.selectById(bizRegionId);
-        String saleRegionNames = saleRegion!=null?saleRegion.getPathNames():"null";
-        String bizRegionNames = bizRegion!=null?bizRegion.getPathNames():"null";
+        String saleRegionNames = saleRegion!=null?saleRegion.getPathNames():"null_申请时未录入";
+        String bizRegionNames = bizRegion!=null?bizRegion.getPathNames():"null_申请时未录入";
+        data.put("biz_region",bizRegionNames);
         data.put("exsp2",saleRegionNames);
-        data.put("exsp3",bizRegionNames);
+        data.put("data_state", TzcPolicyStatus.Status_1_Checking);
 
         //添加跳转地址业务
         String urlKey = "exsp5"+IdUtil.simpleUUID();

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

@@ -259,11 +259,12 @@ public class VtbVerificationController {
         param.setState(pageSo.getState());
         param.setPageNum(pageSo.getPageNum());
         param.setPageSize(pageSo.getPageSize());
+        param.setQueryBizRegion(pageSo.getQueryBizRegion());
+        param.setQuerySaleRegion(pageSo.getQuerySaleRegion());
         param.setTitle(costApply.getChargeTheme());
         param.setSupplierName(costApply.getSupplierName());
         param.setSupplierCode(costApply.getSupplierCode());
         param.setApplyUserName(costApply.getUserName());
-        param.setQueryBizRegion(param.getQueryBizRegion());
         param.setTemplateCode(TbsSeeYonConst.CostCheckConf.Code());
         R<PageVo<CtpAffair>> syResult = seeYonService.pageMemberAffair(param);
         PageVo<CtpAffair> pageVo = syResult.getData();

src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java

@@ -216,6 +216,15 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         if(!costApply.getChargeState().equals(TbsCostApplyState.State_2_actioning.getCode())){
             Assert.throwEx("当前费用状态不支持");
         }
+
+        String saleRegionId = supplier.handleSaleRegionId();
+        BmsRegion saleRegion = regionMapper.selectById(saleRegionId);
+        String saleBizNames = saleRegion!=null?saleRegion.getPathNames():"null_申请时未录入";
+
+        String bizRegionId = supplier.handleBizRegionId();
+        BmsRegion2 bizRegion = region2Mapper.selectById(bizRegionId);
+        String bizBizNames = bizRegion!=null?bizRegion.getPathNames():"null_申请时未录入";
+
         //协议类申请
         PayWay payWay = null;
         if(verificationBo.getPayWayId()!=null){
@@ -313,7 +322,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         verification.setAmountRecord(totalAmount);
         //保存
         this.saveOrUpdate(verification);
-        this.commitSy(activity.getActTitle(),sysUser,verification);
+        this.commitSy(activity.getActTitle(),sysUser,verification,saleBizNames,bizBizNames);
         this.updateById(verification);
         if(!StringUtils.hasText(verification.getSyFormId())||!StringUtils.hasText(verification.getSyFlowId())){
             Assert.throwEx("远程调用失败");
@@ -347,7 +356,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
      * @param sysUser
      * @param verification
      */
-    private void commitSy(String actTitle,SysUser sysUser,VtbVerification verification){
+    private void commitSy(String actTitle,SysUser sysUser,VtbVerification verification,String saleRegionNames,String bizRegionNames){
         Map<String, Object> data = new HashMap<>(20);
         data.put("applyUserCode",sysUser.getCode());
         data.put("applyUserName",sysUser.getName());
@@ -362,17 +371,10 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         data.put("exsp1",TbsSeeYonConst.CostCheckConf.Code());
         data.put("jinE",verification.getAmount().toString());
 
-        BmsSupplier supplier = bmsSupplierService.getById(verification.getSupplierId());
-
         //拓展添加审批关联
-        String saleRegionId = supplier.handleSaleRegionId();
-        String bizRegionId = supplier.handleBizRegionId();
-        BmsRegion saleRegion = regionMapper.selectById(saleRegionId);
-        BmsRegion2 bizRegion = region2Mapper.selectById(bizRegionId);
-        String saleRegionNames = saleRegion!=null?saleRegion.getPathNames():"null";
-        String bizRegionNames = bizRegion!=null?bizRegion.getPathNames():"null";
+        data.put("biz_region",bizRegionNames);
         data.put("exsp2",saleRegionNames);
-        data.put("exsp3",bizRegionNames);
+        data.put("data_state",TbsActivityState.STATE_1_Checking);
 
         //添加跳转地址业务
         String urlKey = "exsp5"+IdUtil.simpleUUID();