资金账户报表-->资金信息获取修改

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

@@ -3,6 +3,7 @@ package com.muchinfo.mtp3century.controller;
 import com.muchinfo.mtp3century.service.IReportFormService;
 import com.muchinfo.mtp3common.vo.AjaxResult;
 import com.muchinfo.mtp3common.vo.PageResult;
+import com.muchinfo.mtp3pojos.entity.ReckonDaytaaccount;
 import com.muchinfo.mtp3pojos.vo.reportform.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -67,7 +68,7 @@ public class ReportFormController {
     @RequestMapping(method = RequestMethod.GET, value = "/taaccountReportQuery")
     @ApiOperation("报表管理-->资金账户报表-->资金信息")
     @ApiResponse(code = 200, message = "成功", response = PageResult.class)
-    public PageResult<TaAccountMsgResult> taaccountReportQuery(TaAccountReportParam param, HttpServletRequest request) {
+    public PageResult<ReckonDaytaaccount> taaccountReportQuery(TaAccountReportParam param, HttpServletRequest request) {
         return iReportFormService.taaccountReportQuery(param,request);
     }
 

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/IReportFormService.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.entity.ReckonDaytaaccount;
 import com.muchinfo.mtp3pojos.vo.reportform.*;
 
 import javax.servlet.http.HttpServletRequest;
@@ -19,7 +20,7 @@ public interface IReportFormService {
 
     PageResult<InvestorReportQueryResult> investorReportQuery(InvestorReportQueryParam param, HttpServletRequest request);
 
-    PageResult<TaAccountMsgResult> taaccountReportQuery(TaAccountReportParam param, HttpServletRequest request);
+    PageResult<ReckonDaytaaccount> taaccountReportQuery(TaAccountReportParam param, HttpServletRequest request);
 
     PageResult<HolderTotalResult> holdertotalquery(TaAccountReportParam param, HttpServletRequest request);
 

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

@@ -15,10 +15,8 @@ import com.muchinfo.mtp3common.vo.ExportResult;
 import com.muchinfo.mtp3common.vo.PageResult;
 import com.muchinfo.mtp3common.enumtype.SysConstants;
 import com.muchinfo.mtp3common.enumtype.Constants;
-import com.muchinfo.mtp3interface.mapper.IReckonDaydividecountdetailMapper;
-import com.muchinfo.mtp3interface.mapper.ISystemmanagerMapper;
-import com.muchinfo.mtp3interface.mapper.ITaaccountMapper;
-import com.muchinfo.mtp3interface.mapper.IUseraccountMapper;
+import com.muchinfo.mtp3interface.mapper.*;
+import com.muchinfo.mtp3pojos.entity.ReckonDaytaaccount;
 import com.muchinfo.mtp3pojos.entity.Systemmanager;
 import com.muchinfo.mtp3pojos.entity.Useraccount;
 import com.muchinfo.mtp3pojos.vo.query.position.PositionSumSheetResult;
@@ -51,13 +49,15 @@ public class ReportFormServiceImpl implements IReportFormService {
     private IReckonDaydividecountdetailMapper detailMapper;
     @Resource
     private ITaaccountMapper iTaaccountMapper;
+    @Resource
+    private IReckonDaytaaccountMapper iReckonDaytaaccountMapper;
 
     @Override
     public PageResult<ShareAmountQueryResult> selectShareAmount(ShareAmountQueryParam param, HttpServletRequest request) {
         Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
-        if(systemmanager.getReletype()!= 1){
+        if (systemmanager.getReletype() != 1) {
             param.setAreaid(systemmanager.getAreauserid());
-            param.setAreaname(iUseraccountMapper.selectOne(new QueryWrapper<Useraccount>().eq("userid",systemmanager.getAreauserid())).getAccountname());
+            param.setAreaname(iUseraccountMapper.selectOne(new QueryWrapper<Useraccount>().eq("userid", systemmanager.getAreauserid())).getAccountname());
         }
         Object devidetype = redisServiceUtil.getCacheMapValue(Constants.REDIS_HEADER_SYSPARAM, SysConstants.SYSPARAM_CODE_DIVIDE);
         if (devidetype == null || "1".equals(devidetype.toString())) {
@@ -78,15 +78,15 @@ public class ReportFormServiceImpl implements IReportFormService {
         IPage<ShareAmountQueryResult> resultIPage;
 
         if (param.getCycletype() == null || param.getCycletype() == 0) {
-            resultIPage = detailMapper.queryDayDivide(page,param);
-        }else{
+            resultIPage = detailMapper.queryDayDivide(page, param);
+        } else {
             if (param.getCycletype() == 2 && param.getQuarter() != null) {
-                param.setTradedate(param.getTradedate()+param.getQuarter());
+                param.setTradedate(param.getTradedate() + param.getQuarter());
             }
-            if (param.getCycletype() == 4 && param.getTradedate().length() == 8){
+            if (param.getCycletype() == 4 && param.getTradedate().length() == 8) {
                 param.setCycletime(param.getTradedate());
             }
-            resultIPage = detailMapper.queryReportDivide(page,param);
+            resultIPage = detailMapper.queryReportDivide(page, param);
         }
         PageResult<ShareAmountQueryResult> pageResult = new PageResult<>();
         pageResult.setCode(Constants.Success_Code_Design);
@@ -104,7 +104,7 @@ public class ReportFormServiceImpl implements IReportFormService {
     public AjaxResult<RefUserResult> queryRefUserSelect(String searchcode, HttpServletRequest request) {
         Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
         Long refereeuserid = systemmanager.getAreauserid();
-        List<RefUserResult> results = iTaaccountMapper.queryRefUserSelect(searchcode,refereeuserid);
+        List<RefUserResult> results = iTaaccountMapper.queryRefUserSelect(searchcode, refereeuserid);
         return AjaxResult.success(Constants.Success_Code_Design, Constants.Deal_Success_Message, results);
     }
 
@@ -114,10 +114,10 @@ public class ReportFormServiceImpl implements IReportFormService {
             // 周数不足两位前面补0 #5732 推荐成交报表-周报表查不到数据 -- 重构成公共函数
             param.setCycletime(DateTimeUtils.getYearWeekNum(param.getCycletime()));
         } else {
-            param.setCycletime(formatDate(param.getCycletype(),param.getCycletime(),param.getQuarter()));
+            param.setCycletime(formatDate(param.getCycletype(), param.getCycletime(), param.getQuarter()));
         }
         IPage<TradeQueryResult> page = new Page<>(param.getPageNum(), param.getPageSize());
-        IPage<TradeQueryResult> resultIPage = detailMapper.queryTrade(page,param);
+        IPage<TradeQueryResult> resultIPage = detailMapper.queryTrade(page, param);
         PageResult<TradeQueryResult> pageResult = new PageResult<>();
         pageResult.setCode(Constants.Success_Code_Design);
         pageResult.setMessage(Constants.Deal_Success_Message);
@@ -147,9 +147,9 @@ public class ReportFormServiceImpl implements IReportFormService {
         IPage<OrgReportQueryResult> resultIPage;
         if (param.getCycletype() == 0) {
             //日报表
-            resultIPage = detailMapper.queryOrgReckonSum(page,param);
+            resultIPage = detailMapper.queryOrgReckonSum(page, param);
         } else {
-            resultIPage = detailMapper.queryOrgReportSum(page,param);
+            resultIPage = detailMapper.queryOrgReportSum(page, param);
         }
         PageResult<OrgReportQueryResult> pageResult = new PageResult<>();
         pageResult.setCode(Constants.Success_Code_Design);
@@ -214,9 +214,9 @@ public class ReportFormServiceImpl implements IReportFormService {
         IPage<InvestorReportQueryResult> page = new Page<>(param.getPageNum(), param.getPageSize());
         IPage<InvestorReportQueryResult> resultIPage;
         if (param.getCycletype() == 0) {
-            resultIPage = detailMapper.queryReckonDayTa(page,param);
+            resultIPage = detailMapper.queryReckonDayTa(page, param);
         } else {
-            resultIPage = detailMapper.queryReportTa(page,param);
+            resultIPage = detailMapper.queryReportTa(page, param);
         }
         PageResult<InvestorReportQueryResult> pageResult = new PageResult<>();
         pageResult.setCode(Constants.Success_Code_Design);
@@ -230,22 +230,20 @@ public class ReportFormServiceImpl implements IReportFormService {
     }
 
     @Override
-    public PageResult<TaAccountMsgResult> taaccountReportQuery(TaAccountReportParam param, HttpServletRequest request) {
-        if(param.getCycletype() == 4){
+    public PageResult<ReckonDaytaaccount> taaccountReportQuery(TaAccountReportParam param, HttpServletRequest request) {
+        if (param.getCycletype() == 4) {
             // 周数不足两位前面补0 #5732 推荐成交报表-周报表查不到数据 -- 重构成公共函数
             String cycletime = DateTimeUtils.getYearWeekNum(param.getCycletime());
             param.setCycletime(cycletime);
-        }else{
-            param.setCycletime(formatDate(param.getCycletype(),param.getCycletime(),param.getQuarter()));
-        }
-        IPage<TaAccountMsgResult> page = new Page<>(param.getPageNum(), param.getPageSize());
-        IPage<TaAccountMsgResult> resultIPage;
-        if (param.getCycletype() == 0) {
-            resultIPage = detailMapper.daytaaccountreport(page,param);
         } else {
-            resultIPage = detailMapper.taaccountreport(page,param);
+            param.setCycletime(formatDate(param.getCycletype(), param.getCycletime(), param.getQuarter()));
         }
-        PageResult<TaAccountMsgResult> pageResult = new PageResult<>();
+        IPage<ReckonDaytaaccount> page = new Page<>(param.getPageNum(), param.getPageSize());
+        IPage<ReckonDaytaaccount> resultIPage = iReckonDaytaaccountMapper.selectPage(page, new QueryWrapper<ReckonDaytaaccount>()
+                .eq(param.getAccountid() != null, "accountid", param.getAccountid())
+                .eq(StringUtils.isNotBlank(param.getCycletime()), "reckondate", param.getCycletime())
+                .eq(param.getCycletype() != null, ("cycletype"), param.getCycletype()));
+        PageResult<ReckonDaytaaccount> pageResult = new PageResult<>();
         pageResult.setCode(Constants.Success_Code_Design);
         pageResult.setMessage(Constants.Deal_Success_Message);
         pageResult.setPages(resultIPage.getPages());
@@ -258,19 +256,19 @@ public class ReportFormServiceImpl implements IReportFormService {
 
     @Override
     public PageResult<HolderTotalResult> holdertotalquery(TaAccountReportParam param, HttpServletRequest request) {
-        if(param.getCycletype() == 4){
+        if (param.getCycletype() == 4) {
             // 周数不足两位前面补0 #5732 推荐成交报表-周报表查不到数据 -- 重构成公共函数
             String cycletime = DateTimeUtils.getYearWeekNum(param.getCycletime());
             param.setCycletime(cycletime);
-        }else{
-            param.setCycletime(formatDate(param.getCycletype(),param.getCycletime(),param.getQuarter()));
+        } else {
+            param.setCycletime(formatDate(param.getCycletype(), param.getCycletime(), param.getQuarter()));
         }
         IPage<HolderTotalResult> page = new Page<>(param.getPageNum(), param.getPageSize());
         IPage<HolderTotalResult> resultIPage;
         if (param.getCycletype() == 0) {
-            resultIPage = detailMapper.daytradeposition(page,param);
+            resultIPage = detailMapper.daytradeposition(page, param);
         } else {
-            resultIPage = detailMapper.tradeposition(page,param);
+            resultIPage = detailMapper.tradeposition(page, param);
         }
         PageResult<HolderTotalResult> pageResult = new PageResult<>();
         pageResult.setCode(Constants.Success_Code_Design);
@@ -285,19 +283,19 @@ public class ReportFormServiceImpl implements IReportFormService {
 
     @Override
     public PageResult<WrPositionResult> wrpositionquery(TaAccountReportParam param, HttpServletRequest request) {
-        if(param.getCycletype() == 4){
+        if (param.getCycletype() == 4) {
             // 周数不足两位前面补0 #5732 推荐成交报表-周报表查不到数据 -- 重构成公共函数
             String cycletime = DateTimeUtils.getYearWeekNum(param.getCycletime());
             param.setCycletime(cycletime);
-        }else{
-            param.setCycletime(formatDate(param.getCycletype(),param.getCycletime(),param.getQuarter()));
+        } else {
+            param.setCycletime(formatDate(param.getCycletype(), param.getCycletime(), param.getQuarter()));
         }
         IPage<WrPositionResult> page = new Page<>(param.getPageNum(), param.getPageSize());
         IPage<WrPositionResult> resultIPage;
         if (param.getCycletype() == 0) {
-            resultIPage = detailMapper.daywrposition(page,param);
+            resultIPage = detailMapper.daywrposition(page, param);
         } else {
-            resultIPage = detailMapper.wrposition(page,param);
+            resultIPage = detailMapper.wrposition(page, param);
         }
         PageResult<WrPositionResult> pageResult = new PageResult<>();
         pageResult.setCode(Constants.Success_Code_Design);
@@ -310,7 +308,7 @@ public class ReportFormServiceImpl implements IReportFormService {
         return pageResult;
     }
 
-    private String formatDate(Integer cycletype ,String cycletime,Integer quarter) {
+    private String formatDate(Integer cycletype, String cycletime, Integer quarter) {
         String rdate = null;
         if (cycletype == 0) {
             //日报表

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

@@ -100,6 +100,8 @@ public class WskhUserinfoServiceImpl extends ServiceImpl<IWskhUserinfoMapper, Ws
     private IUseraccountService iUseraccountService;
     @Resource
     private SequenceIDGeneratorUtils idGeneratorUtils;
+    @Resource
+    private IDivisionMapper iDivisionMapper;
 
     @Override
     public PageResult<WskhUserinfo> queryByPage(String username, Integer pageNum, Integer pageSize) {
@@ -142,6 +144,14 @@ public class WskhUserinfoServiceImpl extends ServiceImpl<IWskhUserinfoMapper, Ws
                 wskhUserinfo.setReferralname(referral.getAccountname());
             }
         }
+        if(wskhUserinfo.getBrokerid() != null)
+            wskhUserinfo.setBrokername(iUseraccountMapper.selectOrganName(Long.valueOf(wskhUserinfo.getBrokerid())));
+        if(wskhUserinfo.getAreaid() != null)
+            wskhUserinfo.setAreaname(iUseraccountMapper.selectOrganName(wskhUserinfo.getAreaid()));
+        if(wskhUserinfo.getMemberareaid() != null)
+            wskhUserinfo.setMemberusername(iUseraccountMapper.selectOrganName(wskhUserinfo.getMemberareaid()));
+        if (wskhUserinfo.getDistrictid() != null)
+            wskhUserinfo.setPathname(iDivisionMapper.selectAreaPathName(wskhUserinfo.getDistrictid()) + wskhUserinfo.getCardaddress());
         return AjaxResult.success(Constants.Success_Code_Design, Constants.Deal_Success_Message, wskhUserinfo);
     }
 

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

@@ -1183,93 +1183,6 @@
         </choose>
     </select>
 
-    <!-- 资金信息日报表 -->
-    <select id="daytaaccountreport"  parameterType="com.muchinfo.mtp3pojos.vo.reportform.TaAccountReportParam"
-            resultType="com.muchinfo.mtp3pojos.vo.reportform.TaAccountMsgResult">
-        select t.accountid "accountid", t.taaccounttype "taaccounttype", t.currencyid "currencyid", ce.enumdicname
-        "currencytext",
-        (t.balance + t.inamount + t.outamount + t.paycharge + t.otherpay + t.otherincome + t.transferamount + t.reckonpl
-        + t.closepl) "netvalue",
-        t.usedmargin "usedmargin",
-        (t.freezemargin + t.outamountfreeze + t.freezecharge) "freeze",
-        (t.currentbalance - t.usedmargin - t.freezemargin - t.outamountfreeze - t.freezecharge - t.otherfreezemargin)
-        "keyongamount",
-        t.otherfreezemargin "otherfreezemargin",
-        (case when (select sp.paramvalue from systemparam sp where sp.paramcode = 946) = 1 then
-        (select (t1.currentbalance - t.usedmargin - t.freezemargin - t.freezecharge - t.outamountfreeze -
-        t.otherfreezemargin - t.mortgagecredit - t.othercredit) from reckon_daytaaccount t1 where t1.accountid =
-        t.accountid and t1.reckondate = t.reckondate and t1.userid = t.userid
-        and t1.currencyid = t.currencyid)
-        else
-        (select (t1.currentbalance - t.usedmargin - t.freezemargin - t.freezecharge - t.outamountfreeze -
-        t.otherfreezemargin - t.othercredit) from reckon_daytaaccount t1 where t1.accountid = t.accountid and
-        t1.reckondate = t.reckondate and t1.userid = t.userid
-        and t1.currencyid = t.currencyid)
-        end) "kechuamount",
-        t.balance "balance", (t.inamount + t.outamount + t.transferamount) "outinamount", t.paycharge "paycharge",
-        (t.reckonpl + t.closepl) "pl", t.clearpl "clearpl",
-        (t.otherpay + t.otherincome) "moneyinout",
-        t.reckonpl "reckonpl", t.mortgagecredit "mortgagecredit",
-        u.accountname "currname", u2.accountname "parentname", u3.accountname "membername" from reckon_daytaaccount t
-        left join useraccount u on u.userid=t.userid
-        left join useraccount u2 on u2.userid =u.parentuserid
-        left join useraccount u3 on u3.userid =u.memberuserid
-        left join enumdicitem ce on t.currencyid = ce.enumitemname and ce.enumdiccode = 'currency'
-        <where>
-            <if test="vo.cycletime != null and vo.cycletime !=''">
-                and t.reckondate=#{cycletime}
-            </if>
-            <if test="vo.accountid != null">
-                and t.accountid=#{vo.accountid}
-            </if>
-        </where>
-    </select>
-
-    <!-- 资金信息报表 -->
-    <select id="taaccountreport" parameterType="com.muchinfo.mtp3pojos.vo.reportform.TaAccountReportParam"
-            resultType="com.muchinfo.mtp3pojos.vo.reportform.TaAccountMsgResult">
-        select t.accountid "accountid", t.taaccounttype "taaccounttype", t.currencyid "currencyid", ce.enumdicname
-        "currencytext",
-        (t.balance + t.inamount + t.outamount + t.paycharge + t.otherpay + t.otherincome + t.transferamount + t.reckonpl
-        + t.closepl) "netvalue",
-        t.usedmargin "usedmargin",
-        (t.freezemargin + t.outamountfreeze + t.freezecharge) "freeze",
-        (t.currentbalance - t.usedmargin - t.freezemargin - t.outamountfreeze - t.freezecharge - t.otherfreezemargin)
-        "keyongamount",
-        t.otherfreezemargin "otherfreezemargin",
-        (case when (select sp.paramvalue from systemparam sp where sp.paramcode = 946) = 1 then
-        (select (t1.currentbalance - t.usedmargin - t.freezemargin - t.freezecharge - t.outamountfreeze -
-        t.otherfreezemargin - t.mortgagecredit - t.othercredit) from report_taaccount t1 where t1.accountid =
-        t.accountid and t1.cycletype = t.cycletype
-        and t1.cycletime = t.cycletime)
-        else
-        (select (t1.currentbalance - t.usedmargin - t.freezemargin - t.freezecharge - t.outamountfreeze -
-        t.otherfreezemargin - t.othercredit) from report_taaccount t1 where t1.accountid = t.accountid and t1.cycletype
-        = t.cycletype
-        and t1.cycletime = t.cycletime)
-        end) "kechuamount",
-        t.balance "balance", (t.inamount + t.outamount + t.transferamount) "outinamount", t.paycharge "paycharge",
-        (t.reckonpl + t.closepl) "pl", t.clearpl "clearpl",
-        (t.otherpay + t.otherincome) "moneyinout",
-        t.reckonpl "reckonpl", t.mortgagecredit "mortgagecredit",
-        u.accountname "currname", u2.accountname "parentname", u3.accountname "membername" from report_taaccount t
-        left join useraccount u on u.userid=t.userid
-        left join useraccount u2 on u2.userid =u.parentuserid
-        left join useraccount u3 on u3.userid =u.memberuserid
-        left join enumdicitem ce on t.currencyid = ce.enumitemname and ce.enumdiccode = 'currency'
-        <where>
-            <if test="vo.cycletype !=null and vo.cycletype != ''">
-                and t.cycletype=#{vo.cycletype}
-            </if>
-            <if test="vo.cycletime !=null and vo.cycletime != ''">
-                and t.cycletime=#{vo.cycletime}
-            </if>
-            <if test="vo.accountid != null">
-                and t.accountid=#{vo.accountid}
-            </if>
-        </where>
-    </select>
-
     <!-- 持仓汇总日报表 -->
     <select id="daytradeposition" parameterType="com.muchinfo.mtp3pojos.vo.reportform.TaAccountReportParam"
             resultType="com.muchinfo.mtp3pojos.vo.reportform.HolderTotalResult">

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

@@ -40,10 +40,6 @@ public interface IReckonDaydividecountdetailMapper extends BaseMapper<ReckonDayd
 
     IPage<InvestorReportQueryResult> queryReportTa(IPage<InvestorReportQueryResult> page, @Param("vo")InvestorReportQueryParam param);
 
-    IPage<TaAccountMsgResult> daytaaccountreport(IPage<TaAccountMsgResult> page,@Param("vo") TaAccountReportParam param);
-
-    IPage<TaAccountMsgResult> taaccountreport(IPage<TaAccountMsgResult> page,@Param("vo") TaAccountReportParam param);
-
     IPage<HolderTotalResult> daytradeposition(IPage<HolderTotalResult> page,@Param("vo")  TaAccountReportParam param);
 
     IPage<HolderTotalResult> tradeposition(IPage<HolderTotalResult> page,@Param("vo")   TaAccountReportParam param);

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

@@ -0,0 +1,16 @@
+package com.muchinfo.mtp3interface.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.muchinfo.mtp3pojos.entity.ReckonDaytaaccount;
+
+/**
+ * <p>
+ * 资金账户日照表 Mapper 接口
+ * </p>
+ *
+ * @author XKF
+ * @since 2024-08-16
+ */
+public interface IReckonDaytaaccountMapper extends BaseMapper<ReckonDaytaaccount> {
+
+}

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

@@ -0,0 +1,357 @@
+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.*;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 资金账户日照表
+ * </p>
+ *
+ * @author XKF
+ * @since 2024-08-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("RECKON_DAYTAACCOUNT")
+@ApiModel(value="ReckonDaytaaccount对象", description="资金账户日照表")
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class ReckonDaytaaccount extends Model<ReckonDaytaaccount> {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "资金账户ID")
+    private Long accountid;
+
+    @ApiModelProperty(value = "日照日期(yyyyMMdd)")
+    @TableField("RECKONDATE")
+    private String reckondate;
+
+    @ApiModelProperty(value = "用户ID")
+    @TableField("USERID")
+    private Long userid;
+
+    @ApiModelProperty(value = "货币ID")
+    @TableField("CURRENCYID")
+    private Long currencyid;
+
+    @ApiModelProperty(value = "变动标志(当前账户资金有任何变动更新为1系统结算时更新0;供清算时使用) 0：无变动 1：有变动 ")
+    @TableField("CHANGEFLAG")
+    private Integer changeflag;
+
+    @ApiModelProperty(value = "资金密码")
+    @TableField("PASSWORD")
+    private String password;
+
+    @ApiModelProperty(value = "交易状态 - 1:正常 2:受限 3:冻结 4:禁止建仓(人工受限) 5:禁止交易(人工冻结) ")
+    @TableField("TRADESTATUS")
+    private Integer tradestatus;
+
+    @ApiModelProperty(value = "签约状态 - 1:未签约  2:已签约  3:已解约")
+    @TableField("SIGNSTATUS")
+    private Integer signstatus;
+
+    @ApiModelProperty(value = "是否账号 0:不是母账户 1:是母账户")
+    @TableField("ISMAIN")
+    private Integer ismain;
+
+    @ApiModelProperty(value = "所属根账户")
+    @TableField("PARENTACCOUNTID")
+    private Long parentaccountid;
+
+    @ApiModelProperty(value = "关联用户")
+    @TableField("RELATEUSERID")
+    private Long relateuserid;
+
+    @ApiModelProperty(value = "关联用户交易状态 - 1:正常(可交易) 2:受限(可平仓，不可建仓) 3:冻结(不可交易)")
+    @TableField("RELATEDACCOUNTSTATUS")
+    private Integer relatedaccountstatus;
+
+    @ApiModelProperty(value = "外部/内部账号 - 1:外部账号 2:内部账号")
+    @TableField("TAACCOUNTTYPE")
+    private Integer taaccounttype;
+
+    @ApiModelProperty(value = "是否机构分润账号 0:不是 1:是")
+    @TableField("ISRECKONACCOUNT")
+    private Integer isreckonaccount;
+
+    @ApiModelProperty(value = "是否机构接单账号 0:不是 1:是")
+    @TableField("ISMARKETACCOUNT")
+    private Integer ismarketaccount;
+
+    @ApiModelProperty(value = "期初余额")
+    @TableField("BALANCE")
+    private BigDecimal balance;
+
+    @ApiModelProperty(value = "期初冻结保证金")
+    @TableField("ORIFREEZEMARGIN")
+    private BigDecimal orifreezemargin;
+
+    @ApiModelProperty(value = "期初占用保证金")
+    @TableField("ORIUSEDMARGIN")
+    private BigDecimal oriusedmargin;
+
+    @ApiModelProperty(value = "期初其他冻结保证金(出金冻结资金 交割买方冻结 申购冻结 全款买入 商城买入)")
+    @TableField("ORIOTHERFREEZEMARGIN")
+    private BigDecimal oriotherfreezemargin;
+
+    @ApiModelProperty(value = "期初手续费冻结")
+    @TableField("ORIFREEZECHARGE")
+    private BigDecimal orifreezecharge;
+
+    @ApiModelProperty(value = "期初授信金额")
+    @TableField("ORIMORTGAGECREDIT")
+    private BigDecimal orimortgagecredit;
+
+    @ApiModelProperty(value = "期初其它授信金额")
+    @TableField("ORIOTHERCREDIT")
+    private BigDecimal oriothercredit;
+
+    @ApiModelProperty(value = "期初出金冻结")
+    @TableField("ORIOUTAMOUNTFREEZE")
+    private BigDecimal orioutamountfreeze;
+
+    @ApiModelProperty(value = "期末余额")
+    @TableField("CURRENTBALANCE")
+    private BigDecimal currentbalance;
+
+    @ApiModelProperty(value = "冻结保证金")
+    @TableField("FREEZEMARGIN")
+    private BigDecimal freezemargin;
+
+    @ApiModelProperty(value = "占用保证金")
+    @TableField("USEDMARGIN")
+    private BigDecimal usedmargin;
+
+    @ApiModelProperty(value = "其他冻结保证金(出金冻结资金 交割买方冻结 申购冻结 全款买入 商城买入)")
+    @TableField("OTHERFREEZEMARGIN")
+    private BigDecimal otherfreezemargin;
+
+    @ApiModelProperty(value = "手续费冻结")
+    @TableField("FREEZECHARGE")
+    private BigDecimal freezecharge;
+
+    @ApiModelProperty(value = "授信金额")
+    @TableField("MORTGAGECREDIT")
+    private BigDecimal mortgagecredit;
+
+    @ApiModelProperty(value = "其它授信金额")
+    @TableField("OTHERCREDIT")
+    private BigDecimal othercredit;
+
+    @ApiModelProperty(value = "出金冻结")
+    @TableField("OUTAMOUNTFREEZE")
+    private BigDecimal outamountfreeze;
+
+    @ApiModelProperty(value = "今日入金金额")
+    @TableField("INAMOUNT")
+    private BigDecimal inamount;
+
+    @ApiModelProperty(value = "今日出金金额")
+    @TableField("OUTAMOUNT")
+    private BigDecimal outamount;
+
+    @ApiModelProperty(value = "今日手续费支出")
+    @TableField("PAYCHARGE")
+    private BigDecimal paycharge;
+
+    @ApiModelProperty(value = "今日平仓盈亏")
+    @TableField("CLOSEPL")
+    private BigDecimal closepl;
+
+    @ApiModelProperty(value = "今日结算盈亏")
+    @TableField("RECKONPL")
+    private BigDecimal reckonpl;
+
+    @ApiModelProperty(value = "今日授信增加")
+    @TableField("CREDITINCREASE")
+    private BigDecimal creditincrease;
+
+    @ApiModelProperty(value = "今日授信减少")
+    @TableField("CREDITDECREASE")
+    private BigDecimal creditdecrease;
+
+    @ApiModelProperty(value = "今日其它授信增加")
+    @TableField("OTHERCREDITINCREASE")
+    private BigDecimal othercreditincrease;
+
+    @ApiModelProperty(value = "今日其它授信减少")
+    @TableField("OTHERCREDITDECREASE")
+    private BigDecimal othercreditdecrease;
+
+    @ApiModelProperty(value = "其他支出(交割付款 申购付款 全款买入 商城买入 卖家退货)")
+    @TableField("OTHERPAY")
+    private BigDecimal otherpay;
+
+    @ApiModelProperty(value = "其他收入(交割收款 申购收款 全款卖出 商城卖出 买家退货 会员手续费收入)")
+    @TableField("OTHERINCOME")
+    private BigDecimal otherincome;
+
+    @ApiModelProperty(value = "今日划转金额(母子账号资金划转，从账号划入为正，从账号划出为负)")
+    @TableField("TRANSFERAMOUNT")
+    private BigDecimal transferamount;
+
+    @ApiModelProperty(value = "出金阈值")
+    @TableField("OUTTHRESHOLD")
+    private BigDecimal outthreshold;
+
+    @ApiModelProperty(value = "清算余额 = 期末余额 - 授信金额 - 其它授信金额")
+    @TableField("CLEARBALANCE")
+    private BigDecimal clearbalance;
+
+    @ApiModelProperty(value = "今日已收手续费分成")
+    @TableField("DIVIDEDCHARGE")
+    private BigDecimal dividedcharge;
+
+    @ApiModelProperty(value = "今日应付交易所手续费")
+    @TableField("PAYEXCHCHARGE")
+    private BigDecimal payexchcharge;
+
+    @ApiModelProperty(value = "真实资金变动值(除出入金、应付交易所手续费) 清算盈亏 = 期末余额 - 期初余额 - (今日入金 + 今日出金) - 今日应付交易所手续费 - 【(今日授信增加 + 今日授信减少) - (今日其它授信增加 + 今日其它授信减少) ----母账户】= 今日手续费支出 + 今日平仓盈亏 + 今日结算盈亏 + 其他支出 + 其他收入 + 今日划转金额 + 今日已收手续费分成 - 今日应付交易所手续费")
+    @TableField("CLEARPL")
+    private BigDecimal clearpl;
+
+    @ApiModelProperty(value = "今日三方入金")
+    @TableField("THIRDINAMOUNT")
+    private BigDecimal thirdinamount;
+
+    @ApiModelProperty(value = "今日交易手续费支出 [101,102]")
+    @TableField("TRADECHARGE")
+    private BigDecimal tradecharge;
+
+    @ApiModelProperty(value = "今日递延费支出[103, 104]")
+    @TableField("INTERESTCHARGE")
+    private BigDecimal interestcharge;
+
+    @ApiModelProperty(value = "今日交收手续费支出 [105,106]")
+    @TableField("DELIVERYCHARGE")
+    private BigDecimal deliverycharge;
+
+    @ApiModelProperty(value = "今日持仓过夜费支出[108,109,110]")
+    @TableField("HOLDCHARGE")
+    private BigDecimal holdcharge;
+
+    @ApiModelProperty(value = "今日三方出金")
+    @TableField("THIRDOUTAMOUNT")
+    private BigDecimal thirdoutamount;
+
+    @ApiModelProperty(value = "今日成交量 - 作废:数据量大汇总有性能问题")
+    @TableField("TRADEQTY")
+    private Long tradeqty;
+
+    @ApiModelProperty(value = "今日成交金额 - 作废:数据量大汇总有性能问题")
+    @TableField("TRADEAMOUNT")
+    private BigDecimal tradeamount;
+
+    @ApiModelProperty(value = "今日交收货款支出 - 作废:数据量大汇总有性能问题")
+    @TableField("DELIVERYAMOUNTOUT")
+    private BigDecimal deliveryamountout;
+
+    @ApiModelProperty(value = "今日交收货款收入 - 作废:数据量大汇总有性能问题")
+    @TableField("DELIVERYAMOUNTIN")
+    private BigDecimal deliveryamountin;
+
+    @ApiModelProperty(value = "今日交收补偿费支出 - 作废:数据量大汇总有性能问题")
+    @TableField("DELIVERYCOMPENSATIONFEEOUT")
+    private BigDecimal deliverycompensationfeeout;
+
+    @ApiModelProperty(value = "今日交收补偿费收入 - 作废:数据量大汇总有性能问题")
+    @TableField("DELIVERYCOMPENSATIONFEEIN")
+    private BigDecimal deliverycompensationfeein;
+
+    @ApiModelProperty(value = "本金余额[外部子账户实际出入金余额]")
+    @TableField("CAPITALBALANCE")
+    private BigDecimal capitalbalance;
+
+    @ApiModelProperty(value = "平仓盈亏(逐笔)")
+    @TableField("CLOSEPL2")
+    private BigDecimal closepl2;
+
+    @ApiModelProperty(value = "结算盈亏(逐笔)  - 汇总取期末")
+    @TableField("RECKONPL2")
+    private BigDecimal reckonpl2;
+
+    @ApiModelProperty(value = "净值  = 期末余额 + 所有权市值 + 仓单市值 仓单市值由统计服务更新")
+    @TableField("NETVALUE")
+    private BigDecimal netvalue;
+
+    @ApiModelProperty(value = "今日手续费支出(外部配置)")
+    @TableField("PAYCHARGE2")
+    private BigDecimal paycharge2;
+
+    @ApiModelProperty(value = "今日递延费2支出[111, 112]")
+    @TableField("DEFERCHARGE")
+    private BigDecimal defercharge;
+
+    @ApiModelProperty(value = "所属上级账户")
+    @TableField("FROMACCOUNTID")
+    private BigDecimal fromaccountid;
+
+    @ApiModelProperty(value = "账号层级路径(逗号分隔,首尾加逗号)")
+    @TableField("SUBLEVELPATH")
+    private String sublevelpath;
+
+    @ApiModelProperty(value = "所有权市值")
+    @TableField("OWNERSHIPVALUE")
+    private BigDecimal ownershipvalue;
+
+    @ApiModelProperty(value = "现货市值-统计服务更新")
+    @TableField("SPOTVALUE")
+    private BigDecimal spotvalue;
+
+    @ApiModelProperty(value = "今日账户盈亏 = 今日净值-昨日净值+今日出金-今日入金-今日划转+今日授信减少-今日授信增加+今日其它授信减少-今日其它授信增加+今日三方出金-今日三方入金; 由统计服务更新")
+    @TableField("ACCOUNTPL")
+    private BigDecimal accountpl;
+
+    @ApiModelProperty(value = "账户名称")
+    @TableField("ACCOUNTNAME")
+    private String accountname;
+
+    @ApiModelProperty(value = "期初欠款")
+    @TableField("ORIDEBT")
+    private BigDecimal oridebt;
+
+    @ApiModelProperty(value = "期末欠款")
+    @TableField("CURDEBT")
+    private BigDecimal curdebt;
+
+    @ApiModelProperty(value = "可用资金")
+    @TableField("AVAIABLEMONEY")
+    private BigDecimal avaiablemoney;
+
+    @ApiModelProperty(value = "可出资金")
+    @TableField("AVAIABLEOUTMONEY")
+    private BigDecimal avaiableoutmoney;
+
+    @ApiModelProperty(value = "浮动盈亏 - 每日有负债类商品")
+    @TableField("FLOATPL")
+    private BigDecimal floatpl;
+
+    @ApiModelProperty(value = "浮动净值 = 净值 + 浮动盈亏")
+    @TableField("FLOATNETVALUE")
+    private BigDecimal floatnetvalue;
+
+    @ApiModelProperty(value = "风险率 = 占用/ 浮动净值 或  浮动净值/占用")
+    @TableField("RISKRATE")
+    private BigDecimal riskrate;
+
+
+    @Override
+    public Serializable pkVal() {
+        return this.accountid;
+    }
+
+}

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

@@ -376,6 +376,18 @@ public class WskhUserinfo extends Model<WskhUserinfo> {
     @ApiModelProperty(value = "管理员密码")
     @TableField(exist=false)
     private String smpassword;
+    @ApiModelProperty(value = "所属会员")
+    @TableField(exist=false)
+    private String memberusername;
+    @ApiModelProperty(value = "经纪人")
+    @TableField(exist=false)
+    private String brokername;
+    @ApiModelProperty(value = "所属机构")
+    @TableField(exist=false)
+    private String areaname;
+    @ApiModelProperty(value = "地址")
+    @TableField(exist=false)
+    private String pathname;
 
     @Override
     public Serializable pkVal() {

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/reportform/TaAccountMsgResult.java

@@ -1,60 +0,0 @@
-package com.muchinfo.mtp3pojos.vo.reportform;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.math.BigDecimal;
-
-@Builder
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@ApiModel(value = "TaAccountMsgResult对象", description = "资金账户报表查询响应")
-public class TaAccountMsgResult {
-
-    @ApiModelProperty(value = "期初余额")
-    private BigDecimal balance;
-
-    @ApiModelProperty(value = "期末余额")
-    private BigDecimal currentbalance;
-
-    @ApiModelProperty(value = "期间入金")
-    private BigDecimal inamount;
-
-    @ApiModelProperty(value = "期间出金")
-    private BigDecimal outamount;
-
-    @ApiModelProperty(value = "其他收入")
-    private BigDecimal otherincome;
-
-    @ApiModelProperty(value = "其它支出")
-    private BigDecimal otherpay;
-
-    @ApiModelProperty(value = "平仓盈亏")
-    private BigDecimal closepl;
-
-    @ApiModelProperty(value = "结算盈亏")
-    private BigDecimal reckonpl;
-
-    @ApiModelProperty(value = "占用保证金")
-    private BigDecimal usedmargin;
-
-    @ApiModelProperty(value = "冻结保证金")
-    private BigDecimal freezemargin;
-
-    @ApiModelProperty(value = "其它冻结")
-    private BigDecimal otherfreezemargin;
-
-    @ApiModelProperty(value = "总服务费支出")
-    private BigDecimal paycharge;
-
-    @ApiModelProperty(value = "交易手续费")
-    private BigDecimal tradeCharge;
-
-    @ApiModelProperty(value = "交收手续费")
-    private BigDecimal deliveryCharge;
-}

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/reportform/WrPositionResult.java

@@ -19,4 +19,19 @@ public class WrPositionResult {
 
     @ApiModelProperty(value = "现货商品")
     private String wrstandardname;
+
+    @ApiModelProperty(value = "期末数量")
+    private Integer totalqty;
+
+    @ApiModelProperty(value = "可用数量")
+    private Integer usedqty;
+
+    @ApiModelProperty(value = "冻结数量")
+    private Integer freezeqty;
+
+    @ApiModelProperty(value = "采购数量")
+    private Integer increaseqty;
+
+    @ApiModelProperty(value = "销售数量")
+    private Integer decreaseqty;
 }