功能逻辑整理，添加交易商个性化菜单，构建更改

mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/BankAccountController.java

@@ -27,10 +27,6 @@ public class BankAccountController {
     private final Logger log = LoggerFactory.getLogger(this.getClass());
     @Resource
     private IBankAccountSignService iBankAccountSignService;
-    @Resource
-    private ICommonService iCommonService;
-    @Resource
-    private ISystemmanagerMapper iSystemmanagerMapper;
 
     @ApiOperation("资金账户管理->银行签约信息/签解约管理列表")
     @ApiResponse(code = 200, message = "成功", response = PageResult.class)

mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/InvestorController.java

@@ -260,4 +260,19 @@ public class InvestorController {
     public AjaxResult modifyAudit(InvestorModifyAuditParam param, HttpServletRequest request) {
         return iUseraccountService.modifyAudit(param, request);
     }
+
+    @ApiOperation("交易商管理-->个性化管理-->交易商分组管理-->获取列表")
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.GET, value = "/queryPersonalized")
+    public PageResult<InvestorPersonalizedResult> queryPersonalized(String groupname, Integer pageNum, Integer pageSize, HttpServletRequest request) {
+        return iUseraccountService.queryPersonalized(groupname, pageNum, pageSize, request);
+    }
+
+    @ApiOperation("交易商管理-->个性化管理-->交易商分组管理-->获取所选客户信息")
+    @ResponseBody
+    @RequestMapping(method = RequestMethod.GET, value = "/getRiskRatioTypeForMarketer")
+    public AjaxResult<Riskratiotype> getRiskRatioTypeForMarketer(Integer customertype ,HttpServletRequest request) {
+        return iUseraccountService.getRiskRatioTypeForMarketer(customertype, request);
+    }
+
 }

mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/QueryController.java

@@ -3,6 +3,7 @@ package com.muchinfo.mtp3century.controller;
 import com.muchinfo.mtp3century.service.IQueryService;
 import com.muchinfo.mtp3common.vo.AjaxResult;
 import com.muchinfo.mtp3common.vo.PageResult;
+import com.muchinfo.mtp3pojos.vo.common.OrganSelectResult;
 import com.muchinfo.mtp3pojos.vo.query.accounttransaction.AccountTransactionQueryParam;
 import com.muchinfo.mtp3pojos.vo.query.accounttransaction.AccountTransactionQueryResult;
 import com.muchinfo.mtp3pojos.vo.query.commission.CommissionSheetParam;
@@ -188,6 +189,14 @@ public class QueryController {
         return iQueryService.warehouseSum(param, request);
     }
 
+    @RequestMapping(method = RequestMethod.GET, value = "/summaryQueryInit")
+    @ResponseBody
+    @ApiOperation("仓单查询--> 仓单汇总查询查询 --> 详情 --> 初始化持有人")
+    @ApiResponse(code = 200, message = "成功", response = PageResult.class)
+    public AjaxResult<OrganSelectResult> summaryQueryInit(HttpServletRequest request) {
+        return iQueryService.summaryQueryInit(request);
+    }
+
     @RequestMapping(method = RequestMethod.GET, value = "/summaryQueryDetail")
     @ResponseBody
     @ApiOperation("仓单查询--> 仓单汇总查询查询 --> 详情")

mtp3-century/src/main/java/com/muchinfo/mtp3century/exception/GlobalExceptionHandler.java

@@ -14,7 +14,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 /**
- * 全局异常的处理器@RestControllerAdvice
+ *  全局异常的处理器@RestControllerAdvice
  *  @RestControllerAdvice 该注解是一个复合注解包括下面两个注解
  *  @ControllerAdvice  将控制所有的Controller层并拦截所有的异常
  *  @ResponseBody       将本类中所有方法的返回值转换为JSON
@@ -68,7 +68,7 @@ public class GlobalExceptionHandler {
         List<ObjectError> errors = e.getBindingResult().getAllErrors();
         // map()：对于流的一些中间业务操作就用此方法
         // ObjectError::getDefaultMessage：我只要流中对象的defaultMessage
-        //errors.stream().map(o->o.getDefaultMessage())
+        // errors.stream().map(o->o.getDefaultMessage())
         // Collectors.joining(",")：joining只对字符串生效，用其他类型会报错,把所有的得到的字符串使用逗号进行隔开并组合成一个字符串
         String messages = errors.stream().map(ObjectError::getDefaultMessage).collect(Collectors.joining(","));
 

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/IQueryService.java

@@ -2,6 +2,7 @@ package com.muchinfo.mtp3century.service;
 
 import com.muchinfo.mtp3common.vo.AjaxResult;
 import com.muchinfo.mtp3common.vo.PageResult;
+import com.muchinfo.mtp3pojos.vo.common.OrganSelectResult;
 import com.muchinfo.mtp3pojos.vo.query.accounttransaction.AccountTransactionQueryParam;
 import com.muchinfo.mtp3pojos.vo.query.accounttransaction.AccountTransactionQueryResult;
 import com.muchinfo.mtp3pojos.vo.query.commission.CommissionSheetParam;
@@ -69,4 +70,6 @@ public interface IQueryService {
     PageResult<GoodsTradeQueryResult> queryGoodsTrade(GoodsTradeQueryParam param, HttpServletRequest request);
 
     AjaxResult queryGoodsTradeExport(GoodsTradeQueryParam param, HttpServletRequest request);
+
+    AjaxResult<OrganSelectResult> summaryQueryInit(HttpServletRequest request);
 }

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/IUseraccountService.java

@@ -3,6 +3,7 @@ package com.muchinfo.mtp3century.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.muchinfo.mtp3common.vo.AjaxResult;
 import com.muchinfo.mtp3common.vo.PageResult;
+import com.muchinfo.mtp3pojos.entity.Riskratiotype;
 import com.muchinfo.mtp3pojos.entity.Useraccount;
 import com.muchinfo.mtp3pojos.vo.investor.*;
 
@@ -33,4 +34,8 @@ public interface IUseraccountService extends IService<Useraccount> {
     AjaxResult modifyAudit(InvestorModifyAuditParam param, HttpServletRequest request);
 
     AjaxResult investorEdit(DetailBeforeResult param, HttpServletRequest request) throws Exception;
+
+    PageResult<InvestorPersonalizedResult> queryPersonalized(String groupname, Integer pageNum, Integer pageSize, HttpServletRequest request);
+
+    AjaxResult<Riskratiotype> getRiskRatioTypeForMarketer(Integer customertype, HttpServletRequest request);
 }

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/QueryServiceImpl.java

@@ -21,6 +21,8 @@ import com.muchinfo.mtp3common.vo.PageResult;
 import com.muchinfo.mtp3common.vo.ExportResult;
 import com.muchinfo.mtp3interface.mapper.*;
 import com.muchinfo.mtp3pojos.entity.*;
+import com.muchinfo.mtp3pojos.vo.common.OrganSelectParam;
+import com.muchinfo.mtp3pojos.vo.common.OrganSelectResult;
 import com.muchinfo.mtp3pojos.vo.query.accounttransaction.AccountTransactionQueryParam;
 import com.muchinfo.mtp3pojos.vo.query.accounttransaction.AccountTransactionQueryResult;
 import com.muchinfo.mtp3pojos.vo.query.commission.*;
@@ -834,13 +836,25 @@ public class QueryServiceImpl implements IQueryService {
         WarehouseInitResult result = new WarehouseInitResult();
         List<Wrstandard> wrstandards = iWrstandardMapper.selectList(new QueryWrapper<Wrstandard>().eq("isvalid", 1));
         result.setWrStandardList(wrstandards);
-        List<Warehouseinfo> warehouseinfos = iWarehouseinfoMapper.selectList(new QueryWrapper<Warehouseinfo>().eq("isvalid", 1));
+        List<Warehouseinfo> warehouseinfos = iWarehouseinfoMapper.selectList(new QueryWrapper<Warehouseinfo>());
         result.setWarehouseInfoList(warehouseinfos);
         return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), result);
     }
 
     @Override
     public PageResult<WarehouseSumResult> warehouseSum(WarehouseSumParam param, HttpServletRequest request) {
+        if(StringUtils.isNotBlank(param.getWrsids())){
+            List<Long> wrstandardids = Arrays.stream(param.getWrsids().split(","))
+                    .filter(s -> !s.trim().isEmpty())
+                    .map(Long::valueOf).collect(Collectors.toList());
+            param.setWrstandardids(wrstandardids);
+        }
+        if(StringUtils.isNotBlank(param.getWareids())){
+            List<Long> warehouseids = Arrays.stream(param.getWareids().split(","))
+                    .filter(s -> !s.trim().isEmpty())
+                    .map(Long::valueOf).collect(Collectors.toList());
+            param.setWarehouseids(warehouseids);
+        }
         Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
         if (systemmanager.getReletype() != 1) {
             param.setMemberuserid(systemmanager.getAreauserid());
@@ -861,6 +875,12 @@ public class QueryServiceImpl implements IQueryService {
     @Override
     public PageResult<WarehouseSumDetailResult> summaryQueryDetail(WarehouseSumDetailParam param, HttpServletRequest request) {
         Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
+        if(StringUtils.isNotBlank(param.getIds())){
+            List<Long> longList = Arrays.stream(param.getIds().split(","))
+                    .filter(s -> !s.trim().isEmpty())
+                    .map(Long::valueOf).collect(Collectors.toList());
+            param.setUserids(longList);
+        }
         if (systemmanager.getReletype() != 1) {
             param.setMemberuserid(systemmanager.getAreauserid());
         }
@@ -1014,6 +1034,16 @@ public class QueryServiceImpl implements IQueryService {
         }
     }
 
+    @Override
+    public AjaxResult<OrganSelectResult> summaryQueryInit(HttpServletRequest request) {
+        Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
+        OrganSelectParam vo = new OrganSelectParam();
+        vo.setUsertype("2");
+        Useraccount ua = iUseraccountMapper.selectOne(new QueryWrapper<Useraccount>().eq("userid",systemmanager.getAreauserid()));
+        vo.setSubarealevelpath(ua.getSubarealevelpath());
+        return iCommonService.queryOrganSelect(vo, request);
+    }
+
     private void getPerformanceTemplateById(WarehouseCommissionResultDetail dto) {
         Performanceplantemplate plantemplate = iPerformanceplantemplateMapper.selectOne(
                 new QueryWrapper<Performanceplantemplate>().eq("autoid", dto.getWrTradeOrderDetail().getPerformancetemplateid()));

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/TaaccountServiceImpl.java

@@ -89,9 +89,17 @@ public class TaaccountServiceImpl extends ServiceImpl<ITaaccountMapper, Taaccoun
     @Override
     public PageResult<TaAccountQueryResult> queryUserMsg(HttpServletRequest request, TaAccountQueryParam taAccountQueryParam) {
         Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
+        Arearole ar = iArearoleMapper.selectOne(new QueryWrapper<Arearole>()
+                .eq("userid",systemmanager.getAreauserid())
+                .eq("roletype",6));
         taAccountQueryParam.setUserId(systemmanager.getAreauserid());
         IPage<TaAccountQueryResult> page = new Page<>(taAccountQueryParam.getPageNum(), taAccountQueryParam.getPageSize());
         IPage<TaAccountQueryResult> queryResultIPage = iTaaccountMapper.queryTaAccountPage(page, taAccountQueryParam);
+        queryResultIPage.getRecords().forEach(a->{
+            if (Objects.nonNull(ar)) {
+                a.setSelfsupport(1);
+            }
+        });
         PageResult<TaAccountQueryResult> pageResult = new PageResult<>();
         pageResult.setCode(Constants.Success_Code_Design);
         pageResult.setMessage(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language")));

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/UseraccountServiceImpl.java

@@ -32,7 +32,10 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -89,6 +92,8 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
     private SystemmanagerServiceImpl systemmanagerService;
     @Resource
     private ITaaccountMapper iTaaccountMapper;
+    @Resource
+    private IRiskratiotypeMapper iRiskratiotypeMapper;
 
 
     @Override
@@ -759,6 +764,87 @@ public class UseraccountServiceImpl extends ServiceImpl<IUseraccountMapper, User
         return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"));
     }
 
+    @Override
+    public PageResult<InvestorPersonalizedResult> queryPersonalized(String groupname, Integer pageNum, Integer pageSize, HttpServletRequest request) {
+        Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
+        Long userid = null;
+        if (systemmanager.getReletype().intValue() == SysConstants.SYS_TYPE_CLIENT) {
+            userid = systemmanager.getAreauserid();
+        }
+        IPage<InvestorPersonalizedResult> page = new Page<>(pageNum, pageSize);
+        IPage<InvestorPersonalizedResult> modifyPage = iUseraccountMapper.queryPersonalized(page, groupname, userid);
+        PageResult<InvestorPersonalizedResult> pageResult = new PageResult<>();
+        pageResult.setCode(Constants.Success_Code_Design);
+        pageResult.setMessage(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language")));
+        pageResult.setPages(modifyPage.getPages());
+        pageResult.setCurrent(modifyPage.getCurrent());
+        pageResult.setTotal(modifyPage.getTotal());
+        pageResult.setPageSize(modifyPage.getSize());
+        pageResult.setData(modifyPage.getRecords());
+        return pageResult;
+    }
+
+    @Override
+    public AjaxResult<Riskratiotype> getRiskRatioTypeForMarketer(Integer customertype, HttpServletRequest request) {
+        Riskratiotype riskRatioType = iRiskratiotypeMapper.selectOne(new QueryWrapper<Riskratiotype>()
+                .eq("customertype", customertype)
+                .eq("riskcontrolmode", 1));
+
+        BigDecimal cNum = new BigDecimal(100);
+        if (riskRatioType.getRecovertraderiskratio() != null) {
+            riskRatioType.setRecovertraderiskratio(riskRatioType.getRecovertraderiskratio()
+                    .multiply(cNum).setScale(2, RoundingMode.HALF_UP));
+        }
+        if (riskRatioType.getNotemarginriskratio() != null) {
+            riskRatioType.setNotemarginriskratio(riskRatioType.getNotemarginriskratio()
+                    .multiply(cNum).setScale(2, RoundingMode.HALF_UP));
+        }
+        if (riskRatioType.getAddmarginriskratio() != null) {
+            riskRatioType.setAddmarginriskratio(riskRatioType.getAddmarginriskratio()
+                    .multiply(cNum).setScale(2, RoundingMode.HALF_UP));
+        }
+        if (riskRatioType.getCutriskratio() != null) {
+            riskRatioType.setCutriskratio(riskRatioType.getCutriskratio().multiply(cNum)
+                    .setScale(2, RoundingMode.HALF_UP));
+        }
+        if (riskRatioType.getCutbackriskratio() != null) {
+            riskRatioType.setCutbackriskratio(riskRatioType.getCutbackriskratio()
+                    .multiply(cNum).setScale(2, RoundingMode.HALF_UP));
+        }
+
+        //安全度
+        if (riskRatioType.getNotesaferatio() != null) {
+            riskRatioType.setNotesaferatio(riskRatioType.getNotesaferatio().multiply(cNum)
+                    .setScale(2, RoundingMode.HALF_UP));
+        }
+        if (riskRatioType.getAddsaferatio() != null) {
+            riskRatioType.setAddsaferatio(riskRatioType.getAddsaferatio().multiply(cNum)
+                    .setScale(2, RoundingMode.HALF_UP));
+        }
+        if (riskRatioType.getRecoversaferatio() != null) {
+            riskRatioType.setRecoversaferatio(riskRatioType.getRecoversaferatio()
+                    .multiply(cNum).setScale(2, RoundingMode.HALF_UP));
+        }
+        if (riskRatioType.getCutsaferatio() != null) {
+            riskRatioType.setCutsaferatio(riskRatioType.getCutsaferatio()
+                    .multiply(cNum).setScale(2, RoundingMode.HALF_UP));
+        }
+
+        List<Market> marketList = iMarketMapper.selectList(new QueryWrapper<Market>().in(StringUtils.isNotBlank(riskRatioType.getCutmarginseq()), "marketid",
+                Arrays.stream(riskRatioType.getCutmarginseq().split(",")).filter(s -> !s.trim().isEmpty()).map(Long::valueOf).collect(Collectors.toList())));
+        StringBuilder stringBuilder = new StringBuilder();
+        for (int i = 0; i < marketList.size(); i++) {
+            if (i == marketList.size() - 1) {
+                stringBuilder.append(marketList.get(i).getMarketname());
+            } else {
+                stringBuilder.append(marketList.get(i).getMarketname()).append(",");
+            }
+        }
+        riskRatioType.setMarkets(stringBuilder.toString());
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"),riskRatioType);
+
+    }
+
     private Integer getUserESignRecordCount(Long userid, Long areauserid) {
         // 根据ESignTemplateConfig表生成UserESignRecord表记录
         Map<String, Object> map = new HashMap<>();

mtp3-century/src/main/resources/mapper/UseraccountMapper.xml

@@ -572,4 +572,19 @@
           and u.parentuserid = #{areauserid}
           and not exists(select 1 from subareagroupdetail m where m.userid = u.userid)
     </select>
+
+
+    <select id="queryPersonalized" resultType="com.muchinfo.mtp3pojos.vo.investor.InvestorPersonalizedResult">
+        select t.*,u.accountname as areausername from usergroup t,useraccount u
+        <where>
+            t.areauserid = u.userid
+            <if test="groupname != null and groupname !=''">
+                and t.groupname like '%'||#{groupname}||'%'
+            </if>
+            <if test="userid != null">
+                and t.areauserid = #{userid}
+            </if>
+        </where>
+        order by t.autoid
+    </select>
 </mapper>

mtp3-century/src/main/resources/mapper/WrtradeOrderdetailMapper.xml

@@ -343,13 +343,13 @@
         left join warehouseinfo wh on wf.warehouseid = wh.autoid
         <where>
             sp.totalqty > 0
-            <if test="vo.wrstandardids!=null and vo.wrstandardids.length>0">
-                <foreach collection="vo.wrstandardids" item="item" open="and wh.autoid in (" close=")" separator=",">
+            <if test="vo.wrstandardids!=null and vo.wrstandardids.size>0">
+                <foreach collection="vo.wrstandardids" item="item" open="and ws.wrstandardid in (" close=")" separator=",">
                     ${item}
                 </foreach>
             </if>
-            <if test="vo.warehouseids!=null and vo.warehouseids.length>0">
-                <foreach collection="vo.warehouseids" item="item" open="and whl.userid in (" close=")" separator=",">
+            <if test="vo.warehouseids!=null and vo.warehouseids.size>0">
+                <foreach collection="vo.warehouseids" item="item" open="and wh.autoid in (" close=")" separator=",">
                     ${item}
                 </foreach>
             </if>
@@ -397,7 +397,7 @@
             <if test="vo.memberuserid != null">
                 and whl.userid = #{vo.memberuserid}
             </if>
-            <if test="vo.userids!=null and vo.userids.length>0">
+            <if test="vo.userids!=null and vo.userids.size>0">
                 <foreach collection="vo.userids" item="item" open="and whl.userid in (" close=")" separator=",">
                     ${item}
                 </foreach>

mtp3-common/src/main/java/com/muchinfo/mtp3common/vo/AjaxResult.java

@@ -17,9 +17,6 @@ import java.util.ResourceBundle;
 @NoArgsConstructor
 public class AjaxResult<T> {
 
-    // 默认成功
-    private boolean success;
-
     // 默认成功的状态码为0
     private Integer code;
 
@@ -64,7 +61,6 @@ public class AjaxResult<T> {
 
     public static AjaxResult error(GlobalExceptionEnum globalExceptionEnum) {
         AjaxResult ajaxResult = new AjaxResult();
-        ajaxResult.setSuccess(false);
         ajaxResult.setMessage(globalExceptionEnum.getMessage());
         ajaxResult.setCode(ajaxResult.getCode());
         return ajaxResult;
@@ -75,7 +71,6 @@ public class AjaxResult<T> {
             message = dealMsg(message, languages);
         }
         AjaxResult ajaxResult = new AjaxResult();
-        ajaxResult.setSuccess(false);
         ajaxResult.setMessage(message);
         ajaxResult.setCode(code);
         return ajaxResult;
@@ -86,7 +81,6 @@ public class AjaxResult<T> {
             message = dealMsg(message, languages);
         }
         AjaxResult ajaxResult = new AjaxResult();
-        ajaxResult.setSuccess(false);
         ajaxResult.setMessage(message);
         ajaxResult.setCode(code);
         ajaxResult.setData(data);

mtp3-interface/src/main/java/com/muchinfo/mtp3interface/mapper/IRiskratiotypeMapper.java

@@ -0,0 +1,16 @@
+package com.muchinfo.mtp3interface.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.muchinfo.mtp3pojos.entity.Riskratiotype;
+
+/**
+ * <p>
+ * 风险率类型表 Mapper 接口
+ * </p>
+ *
+ * @author XKF
+ * @since 2024-09-04
+ */
+public interface IRiskratiotypeMapper extends BaseMapper<Riskratiotype> {
+
+}

mtp3-interface/src/main/java/com/muchinfo/mtp3interface/mapper/IUseraccountMapper.java

@@ -64,4 +64,6 @@ public interface IUseraccountMapper extends BaseMapper<Useraccount> {
     Integer querySonOrganLevel(@Param("userid")Long userid,@Param("memberuserid") Long memberuserid);
 
     List<ProfitSharGroupOrganResult> getNoGroupSubOrgan(@Param("areauserid") Long areauserid);
+
+    IPage<InvestorPersonalizedResult> queryPersonalized(IPage<InvestorPersonalizedResult> page,@Param("groupname") String groupname, @Param("userid")Long userid);
 }

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/entity/Riskratiotype.java

@@ -0,0 +1,134 @@
+package com.muchinfo.mtp3pojos.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 风险率类型表
+ * </p>
+ *
+ * @author XKF
+ * @since 2024-09-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("RISKRATIOTYPE")
+@ApiModel(value="Riskratiotype对象", description="风险率类型表")
+public class Riskratiotype extends Model<Riskratiotype> {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "客户类别(机构/投资者客户类别枚举项值)")
+    private Integer customertype;
+
+    @ApiModelProperty(value = "适用交易用户类型 1:投资者/机构自营 2:机构做市")
+    @TableField("RISKCONTROLMODE")
+    private Integer riskcontrolmode;
+
+    @ApiModelProperty(value = "类型名称")
+    @TableField("RISKRATIONAME")
+    private String riskrationame;
+
+    @ApiModelProperty(value = "风险率计算方法 - 1:占用/净值")
+    @TableField("RISKRATIOCALCMODE")
+    private Integer riskratiocalcmode;
+
+    @ApiModelProperty(value = "提示保证金风险率")
+    @TableField("NOTEMARGINRISKRATIO")
+    private BigDecimal notemarginriskratio;
+
+    @ApiModelProperty(value = "追加保证金风险率")
+    @TableField("ADDMARGINRISKRATIO")
+    private BigDecimal addmarginriskratio;
+
+    @ApiModelProperty(value = "恢复正常交易风险率(会员)")
+    @TableField("RECOVERTRADERISKRATIO")
+    private BigDecimal recovertraderiskratio;
+
+    @ApiModelProperty(value = "斩仓恢复风险率(投资者用，会员转全部净头寸)")
+    @TableField("CUTBACKRISKRATIO")
+    private BigDecimal cutbackriskratio;
+
+    @ApiModelProperty(value = "斩仓风险率")
+    @TableField("CUTRISKRATIO")
+    private BigDecimal cutriskratio;
+
+    @ApiModelProperty(value = "斩仓市场顺序（按市场）")
+    @TableField("CUTMARGINSEQ")
+    private String cutmarginseq;
+
+    @ApiModelProperty(value = "净值斩仓标志 - 0:不启用  1:启用(做市会员用)")
+    @TableField("CUTTHRESHOLDFLAG")
+    private Integer cutthresholdflag;
+
+    @ApiModelProperty(value = "净值斩仓阈值(做市会员用)")
+    @TableField("CUTTHRESHOLD")
+    private BigDecimal cutthreshold;
+
+    @ApiModelProperty(value = "是否默认(每个风控模式必有且只能设置一个默认) -  0:非默认  1：默认")
+    @TableField("ISDEFAULT")
+    private Integer isdefault;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("CREATETIME")
+    private Date createtime;
+
+    @ApiModelProperty(value = "创建人")
+    @TableField("CREATORID")
+    private Long creatorid;
+
+    @ApiModelProperty(value = "修改时间")
+    @TableField("MODIFYTIME")
+    private Date modifytime;
+
+    @ApiModelProperty(value = "修改人ID")
+    @TableField("MODIFIERID")
+    private Long modifierid;
+
+    @ApiModelProperty(value = "到达追加风险率是否撤单(交易) - 0:不撤 1:撤单")
+    @TableField("ISSENDCANCEL")
+    private Integer issendcancel;
+
+    @ApiModelProperty(value = "到达追加风险率是否撤单(交割) - 0:不撤 1:撤单")
+    @TableField("ISSENDDELIVERYCANCEL")
+    private Integer issenddeliverycancel;
+
+    @ApiModelProperty(value = "提示安全度")
+    @TableField("NOTESAFERATIO")
+    private BigDecimal notesaferatio;
+
+    @ApiModelProperty(value = "追加安全度")
+    @TableField("ADDSAFERATIO")
+    private BigDecimal addsaferatio;
+
+    @ApiModelProperty(value = "恢复正常安全度(会员)")
+    @TableField("RECOVERSAFERATIO")
+    private BigDecimal recoversaferatio;
+
+    @ApiModelProperty(value = "斩仓安全度")
+    @TableField("CUTSAFERATIO")
+    private BigDecimal cutsaferatio;
+
+    @TableField(select = false)
+    private String markets;
+    @Override
+    public Serializable pkVal() {
+        return this.customertype;
+    }
+
+}

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/investor/InvestorPersonalizedResult.java

@@ -0,0 +1,34 @@
+package com.muchinfo.mtp3pojos.vo.investor;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "InvestorPersonalizedResult对象", description = "交易商个性化设置")
+public class InvestorPersonalizedResult {
+
+    @ApiModelProperty(value = "id")
+    private Long autoid;
+
+    @ApiModelProperty(value = "会员名称")
+    private String areausername;
+
+    @ApiModelProperty(value = "分组名称")
+    private String groupname;
+
+    @ApiModelProperty(value = "风险客户类别")
+    private Integer customertype;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createtime;
+
+}

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/marketrun/MarketRunInvestorParam.java

@@ -30,8 +30,4 @@ public class MarketRunInvestorParam {
 
     @ApiModelProperty(value = "管理员所属机构角色类型")
     private String orgztypes;
-
-    private Integer pageNo;
-
-    private Integer pageSize;
 }

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/query/warehouse/WarehouseSumDetailParam.java

@@ -20,7 +20,7 @@ public class WarehouseSumDetailParam {
     private Integer wrstandardid;
 
     @ApiModelProperty(value = "持有人")
-    private List<Long> userids;
+    private String ids;
 
     @ApiModelProperty(value = "查询类型 0正常 1历史")
     private Integer ishis;
@@ -33,4 +33,5 @@ public class WarehouseSumDetailParam {
 
     private Long memberuserid;
 
+    private List<Long> userids;
 }

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/query/warehouse/WarehouseSumParam.java

@@ -17,10 +17,10 @@ import java.util.List;
 public class WarehouseSumParam {
 
     @ApiModelProperty(value = "仓单标准")
-    private List<Long> wrstandardids;
+    private String wrsids;
 
     @ApiModelProperty(value = "仓库")
-    private List<Long> warehouseids;
+    private String wareids;
 
     @ApiModelProperty(value = "查询类型 0正常 1历史")
     private Integer ishis;
@@ -39,4 +39,7 @@ public class WarehouseSumParam {
 
     private Long memberuserid;
 
+    private List<Long> wrstandardids;
+
+    private List<Long> warehouseids;
 }

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/taaccount/TaAccountQueryResult.java

@@ -36,4 +36,7 @@ public class TaAccountQueryResult {
 
     @ApiModelProperty(value = "所属用户")
     private String accountName;
+
+    @ApiModelProperty(value = "是否展示修改按钮")
+    private Integer selfsupport;
 }

pom.xml

@@ -25,7 +25,7 @@
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
-        <flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
+        <flatten-maven-plugin.version>1.3.0</flatten-maven-plugin.version>
         <!-- 看看咋放到 bom 里 -->
         <lombok.version>1.18.30</lombok.version>
         <mapstruct.version>1.5.5.Final</mapstruct.version>