报表更改

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

@@ -3,8 +3,8 @@ 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.ReckonDayaccountpp;
-import com.muchinfo.mtp3pojos.entity.ReckonDaytaaccount;
+import com.muchinfo.mtp3pojos.entity.ReportPlateformpp;
+import com.muchinfo.mtp3pojos.entity.ReportTaaccount;
 import com.muchinfo.mtp3pojos.vo.reportform.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -77,7 +77,7 @@ public class ReportFormController {
     @RequestMapping(method = RequestMethod.GET, value = "/taaccountReportQuery")
     @ApiOperation("报表管理-->资金账户报表-->资金信息")
     @ApiResponse(code = 200, message = "成功", response = PageResult.class)
-    public PageResult<ReckonDaytaaccount> taaccountReportQuery(TaAccountReportParam param, HttpServletRequest request) {
+    public AjaxResult<ReportTaaccount> taaccountReportQuery(TaAccountReportParam param, HttpServletRequest request) {
         return iReportFormService.taaccountReportQuery(param,request);
     }
 
@@ -105,7 +105,7 @@ public class ReportFormController {
     @RequestMapping(method = RequestMethod.GET, value = "/accountppquery")
     @ApiOperation("报表管理-->资金账户报表-->履约汇总表")
     @ApiResponse(code = 200, message = "成功", response = PageResult.class)
-    public PageResult<ReckonDayaccountpp> accountppquery(TaAccountReportParam param, HttpServletRequest request) {
+    public AjaxResult<ReportPlateformpp> accountppquery(TaAccountReportParam param, HttpServletRequest request) {
         return iReportFormService.accountppquery(param,request);
     }
 }

mtp3-century/src/main/java/com/muchinfo/mtp3century/interceptor/SignAuthInterceptor.java

@@ -32,17 +32,17 @@ public class SignAuthInterceptor implements HandlerInterceptor {
             return false;
         }
         //重复请求判断
-        Object timeCache = redisUtils.getCacheObject(request.getHeader("Sign-Id")+"-timestamp");
-        if(Objects.isNull(timeCache)){
-            redisUtils.setCacheObject(request.getHeader("Sign-Id")+"-timestamp", timestampStr, RedisConstants.CACHE_NULL_TTL, TimeUnit.MINUTES);
-        }else{
-            if(timestampStr.equals(timeCache)){
-                log.debug("不可多次重复请求...........");
-                ResponseUtils.writeFiled(response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "系统异常,请联系管理员！", false);
-                return false;
-            }
-            redisUtils.setCacheObject(request.getHeader("Sign-Id")+"-timestamp", timestampStr, RedisConstants.CACHE_NULL_TTL, TimeUnit.MINUTES);
-        }
+//        Object timeCache = redisUtils.getCacheObject(request.getHeader("Sign-Id")+"-timestamp");
+//        if(Objects.isNull(timeCache)){
+//            redisUtils.setCacheObject(request.getHeader("Sign-Id")+"-timestamp", timestampStr, RedisConstants.CACHE_NULL_TTL, TimeUnit.MINUTES);
+//        }else{
+//            if(timestampStr.equals(timeCache)){
+//                log.debug("不可多次重复请求...........");
+//                ResponseUtils.writeFiled(response, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "系统异常,请联系管理员！", false);
+//                return false;
+//            }
+//            redisUtils.setCacheObject(request.getHeader("Sign-Id")+"-timestamp", timestampStr, RedisConstants.CACHE_NULL_TTL, TimeUnit.MINUTES);
+//        }
         String sign = request.getHeader("sign");
         if (StringUtils.isBlank(sign)) {
             log.debug("sign不能为空...........");

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

@@ -2,8 +2,8 @@ package com.muchinfo.mtp3century.service;
 
 import com.muchinfo.mtp3common.vo.AjaxResult;
 import com.muchinfo.mtp3common.vo.PageResult;
-import com.muchinfo.mtp3pojos.entity.ReckonDayaccountpp;
-import com.muchinfo.mtp3pojos.entity.ReckonDaytaaccount;
+import com.muchinfo.mtp3pojos.entity.ReportPlateformpp;
+import com.muchinfo.mtp3pojos.entity.ReportTaaccount;
 import com.muchinfo.mtp3pojos.vo.reportform.*;
 
 import javax.servlet.http.HttpServletRequest;
@@ -21,7 +21,7 @@ public interface IReportFormService {
 
     PageResult<InvestorReportQueryResult> investorReportQuery(InvestorReportQueryParam param, HttpServletRequest request);
 
-    PageResult<ReckonDaytaaccount> taaccountReportQuery(TaAccountReportParam param, HttpServletRequest request);
+    AjaxResult<ReportTaaccount> taaccountReportQuery(TaAccountReportParam param, HttpServletRequest request);
 
     PageResult<HolderTotalResult> holdertotalquery(TaAccountReportParam param, HttpServletRequest request);
 
@@ -29,7 +29,7 @@ public interface IReportFormService {
 
     PageResult<TradeReportQueryResult> tradequery(TaAccountReportParam param, HttpServletRequest request);
 
-    PageResult<ReckonDayaccountpp> accountppquery(TaAccountReportParam param, HttpServletRequest request);
+    AjaxResult<ReportPlateformpp> accountppquery(TaAccountReportParam param, HttpServletRequest request);
 
     AjaxResult<TAAccountChildrenSelect> queryTAAccountChildrenSelect(String searchcode , HttpServletRequest request);
 }

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

@@ -16,17 +16,17 @@ import com.muchinfo.mtp3common.vo.PageResult;
 import com.muchinfo.mtp3common.enumtype.SysConstants;
 import com.muchinfo.mtp3common.enumtype.Constants;
 import com.muchinfo.mtp3interface.mapper.*;
-import com.muchinfo.mtp3pojos.entity.ReckonDayaccountpp;
-import com.muchinfo.mtp3pojos.entity.ReckonDaytaaccount;
-import com.muchinfo.mtp3pojos.entity.Systemmanager;
-import com.muchinfo.mtp3pojos.entity.Useraccount;
+import com.muchinfo.mtp3pojos.entity.*;
 import com.muchinfo.mtp3pojos.vo.reportform.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.ParseException;
 import java.util.Date;
 import java.util.List;
@@ -51,6 +51,10 @@ public class ReportFormServiceImpl implements IReportFormService {
     private IReckonDaytaaccountMapper iReckonDaytaaccountMapper;
     @Resource
     private IReckonDayaccountppMapper iReckonDayaccountppMapper;
+    @Resource
+    private IReportTaaccountMapper iReportTaaccountMapper;
+    @Resource
+    private IReportPlateformppMapper iReportPlateformppMapper;
 
     @Override
     public PageResult<ShareAmountQueryResult> selectShareAmount(ShareAmountQueryParam param, HttpServletRequest request) {
@@ -230,7 +234,7 @@ public class ReportFormServiceImpl implements IReportFormService {
     }
 
     @Override
-    public PageResult<ReckonDaytaaccount> taaccountReportQuery(TaAccountReportParam param, HttpServletRequest request) {
+    public AjaxResult<ReportTaaccount> taaccountReportQuery(TaAccountReportParam param, HttpServletRequest request) {
         if (param.getCycletype() == 4) {
             // 周数不足两位前面补0 #5732 推荐成交报表-周报表查不到数据 -- 重构成公共函数
             String cycletime = DateTimeUtils.getYearWeekNum(param.getCycletime());
@@ -238,20 +242,37 @@ public class ReportFormServiceImpl implements IReportFormService {
         } else {
             param.setCycletime(formatDate(param.getCycletype(), param.getCycletime(), param.getQuarter()));
         }
-        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());
-        pageResult.setCurrent(resultIPage.getCurrent());
-        pageResult.setTotal(resultIPage.getTotal());
-        pageResult.setPageSize(resultIPage.getSize());
-        pageResult.setData(resultIPage.getRecords());
-        return pageResult;
+        ReportTaaccount reportTaaccount = new ReportTaaccount();
+        if (param.getCycletype() != 0) {
+            ReportTaaccount result = iReportTaaccountMapper.selectOne(new QueryWrapper<ReportTaaccount>()
+                    .eq(param.getAccountid() != null, "accountid", param.getAccountid())
+                    .eq(StringUtils.isNotBlank(param.getCycletime()), "cycletime", param.getCycletime())
+                    .eq(param.getCycletype() != null,"cycletype", param.getCycletype()));
+            BeanUtils.copyProperties(result, reportTaaccount);
+        } else {
+            ReckonDaytaaccount result = iReckonDaytaaccountMapper.selectOne(new QueryWrapper<ReckonDaytaaccount>()
+                    .eq(param.getAccountid() != null, "accountid", param.getAccountid())
+                    .eq(StringUtils.isNotBlank(param.getCycletime()), "reckondate", param.getCycletime()));
+            BeanUtils.copyProperties(result, reportTaaccount);
+            reportTaaccount.setCycletime(result.getReckondate());
+        }
+        String value = iCommonService.getSysparmById("082") == null ? "0" : iCommonService.getSysparmById("082");
+        /**  #68530
+         * 其他收入 = 原其他收入 - （收到延期交割补偿费 + 收到货款）
+         * 其他支出 = 原其他支出 - （支出延期交割补偿费 + 支出货款）
+         */
+        if ("1".equals(value)) {
+            BigDecimal income = dealNull(reportTaaccount.getDeliverycompensationfeein()).add(dealNull(reportTaaccount.getDeliveryamountin()));
+            BigDecimal otherincome = dealNull(reportTaaccount.getOtherincome()).subtract(income);
+            reportTaaccount.setOtherincome(otherincome);
+            BigDecimal pay = dealNull(reportTaaccount.getDeliverycompensationfeeout()).add(dealNull(reportTaaccount.getDeliveryamountout()));
+            BigDecimal otherpay = dealNull(reportTaaccount.getOtherpay()).subtract(pay);
+            reportTaaccount.setOtherpay(otherpay);
+        }
+        return AjaxResult.success(Constants.Success_Code_Design, Constants.Deal_Success_Message, reportTaaccount);
+    }
+    public BigDecimal dealNull(BigDecimal bigDecimal){
+        return bigDecimal == null ? BigDecimal.ZERO : bigDecimal.setScale(2, RoundingMode.HALF_UP);
     }
 
     @Override
@@ -265,7 +286,7 @@ public class ReportFormServiceImpl implements IReportFormService {
         }
         param.setExcludetrademodelarray(new String[]{"40", "41", "48", "51"});
         IPage<HolderTotalResult> page = new Page<>(param.getPageNum(), param.getPageSize());
-        IPage<HolderTotalResult>  resultIPage = detailMapper.tradeposition(page, param);
+        IPage<HolderTotalResult> resultIPage = detailMapper.tradeposition(page, param);
         PageResult<HolderTotalResult> pageResult = new PageResult<>();
         pageResult.setCode(Constants.Success_Code_Design);
         pageResult.setMessage(Constants.Deal_Success_Message);
@@ -322,7 +343,7 @@ public class ReportFormServiceImpl implements IReportFormService {
     }
 
     @Override
-    public PageResult<ReckonDayaccountpp> accountppquery(TaAccountReportParam param, HttpServletRequest request) {
+    public AjaxResult<ReportPlateformpp> accountppquery(TaAccountReportParam param, HttpServletRequest request) {
         if (param.getCycletype() == 4) {
             // 周数不足两位前面补0 #5732 推荐成交报表-周报表查不到数据 -- 重构成公共函数
             String cycletime = DateTimeUtils.getYearWeekNum(param.getCycletime());
@@ -330,26 +351,26 @@ public class ReportFormServiceImpl implements IReportFormService {
         } else {
             param.setCycletime(formatDate(param.getCycletype(), param.getCycletime(), param.getQuarter()));
         }
-        IPage<ReckonDayaccountpp> page = new Page<>(param.getPageNum(), param.getPageSize());
-        IPage<ReckonDayaccountpp> resultIPage = iReckonDayaccountppMapper.selectPage(page, new QueryWrapper<ReckonDayaccountpp>()
-                .eq(param.getAccountid() != null, "accountid", param.getAccountid())
-                .eq(StringUtils.isNotBlank(param.getCycletime()), "reckondate", param.getCycletime())
-                .eq(param.getCycletype() != null, ("cycletype"), param.getCycletype()));
-        PageResult<ReckonDayaccountpp> pageResult = new PageResult<>();
-        pageResult.setCode(Constants.Success_Code_Design);
-        pageResult.setMessage(Constants.Deal_Success_Message);
-        pageResult.setPages(resultIPage.getPages());
-        pageResult.setCurrent(resultIPage.getCurrent());
-        pageResult.setTotal(resultIPage.getTotal());
-        pageResult.setPageSize(resultIPage.getSize());
-        pageResult.setData(resultIPage.getRecords());
-        return pageResult;
+        ReportPlateformpp reportPlateformpp = new ReportPlateformpp();
+        if (param.getCycletype() != 0) {
+            ReportPlateformpp result = iReportPlateformppMapper.selectOne(new QueryWrapper<ReportPlateformpp>()
+                    .eq(StringUtils.isNotBlank(param.getCycletime()), "cycletime", param.getCycletime())
+                    .eq(param.getCycletype() != null, "cycletype", param.getCycletype()));
+            BeanUtils.copyProperties(result, reportPlateformpp);
+        } else {
+            ReckonDayaccountpp result = iReckonDayaccountppMapper.selectOne(new QueryWrapper<ReckonDayaccountpp>()
+                            .eq(param.getAccountid() != null, "accountid", param.getAccountid())
+                            .eq(StringUtils.isNotBlank(param.getCycletime()), "reckondate", param.getCycletime()));
+            BeanUtils.copyProperties(result, reportPlateformpp);
+            reportPlateformpp.setCycletime(result.getReckondate());
+        }
+        return AjaxResult.success(Constants.Success_Code_Design, Constants.Deal_Success_Message, reportPlateformpp);
     }
 
     @Override
-    public AjaxResult<TAAccountChildrenSelect> queryTAAccountChildrenSelect(String searchcode ,HttpServletRequest request) {
+    public AjaxResult<TAAccountChildrenSelect> queryTAAccountChildrenSelect(String searchcode, HttpServletRequest request) {
         Systemmanager systemmanager = iSystemmanagerMapper.selectOne(new QueryWrapper<Systemmanager>().eq("LOGINCODE", iCommonService.getUserLoginCode(request)));
-        List<TAAccountChildrenSelect> result = iTaaccountMapper.queryChildren(searchcode,systemmanager.getAreauserid());
+        List<TAAccountChildrenSelect> result = iTaaccountMapper.queryChildren(searchcode, systemmanager.getAreauserid());
         return AjaxResult.success(Constants.Success_Code_Design, Constants.Deal_Success_Message, result);
     }
 

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

@@ -1168,7 +1168,7 @@
     <select id="wrposition"  parameterType="com.muchinfo.mtp3pojos.vo.reportform.TaAccountReportParam"
             resultType="com.muchinfo.mtp3pojos.vo.reportform.WrPositionResult">
         <choose>
-            <when test="cycletype==0">
+            <when test="vo.cycletype==0">
                 select
                 dwrs.totalqty "totalqty", dwrs.increaseqty "increaseqty", dwrs.decreaseqty "decreaseqty",
                 dwrs.freezeqty "freezeqty", dwrs.deliverygoodsid "deliverygoodsid", dwrs.accountid "accountid",

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

@@ -270,7 +270,7 @@
     <select id="queryChildren" resultType="com.muchinfo.mtp3pojos.vo.reportform.TAAccountChildrenSelect">
         select ta.accountid,
         ua.userid || '/' || ua.accountname relatedname,
-        vlog.LOGINIDS as invloginids,
+        vlog.LOGINIDS as invloginids
         from TAAccount ta
         inner join useraccount ua on ta.relateduserid = ua.userid
         left join VIEW_USER_LOGINIDS vlog on vlog.USERID = ua.userid

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

@@ -0,0 +1,16 @@
+package com.muchinfo.mtp3interface.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.muchinfo.mtp3pojos.entity.ReportPlateformpp;
+
+/**
+ * <p>
+ * 平台履约计划报表表(未完成的履约计划汇总) Mapper 接口
+ * </p>
+ *
+ * @author XKF
+ * @since 2024-08-21
+ */
+public interface IReportPlateformppMapper extends BaseMapper<ReportPlateformpp> {
+
+}

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

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

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

@@ -1,6 +1,5 @@
 package com.muchinfo.mtp3pojos.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -37,7 +36,7 @@ public class ReckonDayaccountpp extends Model<ReckonDayaccountpp> {
 
     @ApiModelProperty(value = "资金账户ID")
     @TableField("ACCOUNTID")
-    private BigDecimal accountid;
+    private Long accountid;
 
     @ApiModelProperty(value = "今日履约总金额(未完成履约的总金额)")
     @TableField("AMOUNT")

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

@@ -1,8 +1,6 @@
 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;
@@ -298,7 +296,7 @@ public class ReckonDaytaaccount extends Model<ReckonDaytaaccount> {
 
     @ApiModelProperty(value = "所属上级账户")
     @TableField("FROMACCOUNTID")
-    private BigDecimal fromaccountid;
+    private Long fromaccountid;
 
     @ApiModelProperty(value = "账号层级路径(逗号分隔,首尾加逗号)")
     @TableField("SUBLEVELPATH")

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

@@ -0,0 +1,70 @@
+package com.muchinfo.mtp3pojos.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+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;
+
+/**
+ * <p>
+ * 平台履约计划报表表(未完成的履约计划汇总)
+ * </p>
+ *
+ * @author XKF
+ * @since 2024-08-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("REPORT_PLATEFORMPP")
+@ApiModel(value="ReportPlateformpp对象", description="平台履约计划报表表(未完成的履约计划汇总)")
+public class ReportPlateformpp extends Model<ReportPlateformpp> {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "周期类型 - 1:月 2:季 3:年 4:周 5:全报表")
+    private Integer cycletype;
+
+    @ApiModelProperty(value = "周期时间 月(YYYYMM)  季(YYYYQ) 年(YYYY) 周(YYYYIW) 全(0)")
+    @TableField("CYCLETIME")
+    private String cycletime;
+
+    @ApiModelProperty(value = "更新时间")
+    @TableField("UPDATETIME")
+    private Date updatetime;
+
+    @ApiModelProperty(value = "履约金额")
+    @TableField("AMOUNT")
+    private BigDecimal amount;
+
+    @ApiModelProperty(value = "买方已冻/已扣金额")
+    @TableField("BUYPAIDAMOUNT")
+    private BigDecimal buypaidamount;
+
+    @ApiModelProperty(value = "卖方已收金额")
+    @TableField("SELLRECEIVEDAMOUNT")
+    private BigDecimal sellreceivedamount;
+
+    @ApiModelProperty(value = "本周期买方扣/冻金额")
+    @TableField("BUYTODAYAMOUNT")
+    private BigDecimal buytodayamount;
+
+    @ApiModelProperty(value = "本周期卖方收取金额")
+    @TableField("SELLTODAYAMOUNT")
+    private BigDecimal selltodayamount;
+
+
+    @Override
+    public Serializable pkVal() {
+        return this.cycletype;
+    }
+
+}

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

@@ -0,0 +1,334 @@
+package com.muchinfo.mtp3pojos.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+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;
+
+/**
+ * <p>
+ * 资金账户报表表
+ * </p>
+ *
+ * @author XKF
+ * @since 2024-08-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("REPORT_TAACCOUNT")
+@ApiModel(value="ReportTaaccount对象", description="资金账户报表表")
+public class ReportTaaccount extends Model<ReportTaaccount> {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "资金账户ID")
+    private BigDecimal accountid;
+
+    @ApiModelProperty(value = "周期类型 - 1:月 2:季 3:年 4:周 5:全报表")
+    @TableField("CYCLETYPE")
+    private Integer cycletype;
+
+    @ApiModelProperty(value = "周期时间 月(YYYYMM)  季(YYYYQ) 年(YYYY) 周(YYYYIW) 全(0)")
+    @TableField("CYCLETIME")
+    private String cycletime;
+
+    @ApiModelProperty(value = "更新时间")
+    @TableField("UPDATETIME")
+    private Date updatetime;
+
+    @ApiModelProperty(value = "用户ID")
+    @TableField("USERID")
+    private BigDecimal userid;
+
+    @ApiModelProperty(value = "是否母账号 0:不是母账户 1:是母账户")
+    @TableField("ISMAIN")
+    private Integer ismain;
+
+    @ApiModelProperty(value = "所属根账户")
+    @TableField("PARENTACCOUNTID")
+    private BigDecimal parentaccountid;
+
+    @ApiModelProperty(value = "外部/内部账号 - 1:外部账号 2:内部账号")
+    @TableField("TAACCOUNTTYPE")
+    private Integer taaccounttype;
+
+    @ApiModelProperty(value = "货币ID")
+    @TableField("CURRENCYID")
+    private BigDecimal currencyid;
+
+    @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 Long fromaccountid;
+
+    @ApiModelProperty(value = "账号层级路径(逗号分隔,首尾加逗号)")
+    @TableField("SUBLEVELPATH")
+    private String sublevelpath;
+
+    @ApiModelProperty(value = "关联用户")
+    @TableField("RELATEUSERID")
+    private BigDecimal relateuserid;
+
+    @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/vo/reportform/HolderTotalResult.java

@@ -18,6 +18,8 @@ public class HolderTotalResult {
 
     private Long accountid;
 
+    private String goodscode;
+
     @ApiModelProperty(value = "商品/代码")
     private String goodsname;
 

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

@@ -16,6 +16,8 @@ import java.math.BigDecimal;
 @ApiModel(value = "TradeReportQueryResult对象", description = "成交汇总报表")
 public class TradeReportQueryResult {
 
+    private String goodscode;
+
     @ApiModelProperty(value = "商品/代码")
     private String goodsname;