diff --git a/src/main/java/com/qs/serve/modules/seeyon/entity/CtpAffairQo.java b/src/main/java/com/qs/serve/modules/seeyon/entity/CtpAffairQo.java index bf9f487b..5050e52c 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/entity/CtpAffairQo.java +++ b/src/main/java/com/qs/serve/modules/seeyon/entity/CtpAffairQo.java @@ -51,4 +51,5 @@ public class CtpAffairQo { String dataKey; String queryBizRegion; + String querySaleRegion; } diff --git a/src/main/java/com/qs/serve/modules/seeyon/entity/dto/CtpAffairPageSo.java b/src/main/java/com/qs/serve/modules/seeyon/entity/dto/CtpAffairPageSo.java index 6b0d65ae..b0a408e4 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/entity/dto/CtpAffairPageSo.java +++ b/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; } diff --git a/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java b/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java index 9fc908ef..52345260 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java +++ b/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> syResult = getRequestService().pageMemberAffair(param); diff --git a/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java b/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java index ec53b60d..f7eefdd1 100644 --- a/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java +++ b/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 rs = service.getBase(TbsSeeYonConst.OA_USER_LIST+"?code="+code,null); + return R.ok(rs.getData()); + } @GetMapping("/getChildList") diff --git a/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java b/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java index 22211ecd..cbb2c493 100644 --- a/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java +++ b/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"; diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java index 7b1f7c35..475bc344 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java @@ -173,10 +173,13 @@ public class TbsCostApplyServiceImpl extends ServiceImpl> syResult = seeYonService.pageMemberAffair(param); PageVo pageVo = syResult.getData(); diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java index a92ab0f8..51a609fd 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java @@ -216,6 +216,15 @@ public class VtbVerificationServiceImpl extends ServiceImpl data = new HashMap<>(20); data.put("applyUserCode",sysUser.getCode()); data.put("applyUserName",sysUser.getName()); @@ -362,17 +371,10 @@ public class VtbVerificationServiceImpl extends ServiceImpl