xie.kaifeng 4 hónapja
szülő
commit
c5d10b96eb

+ 1 - 1
mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/PerformanceController.java

@@ -23,7 +23,7 @@ public class PerformanceController {
     private IPerformanceService iPerformanceService;
 
     @RequestMapping(method = RequestMethod.GET, value = "/query")
-    @ApiOperation("履约管理--> 我的买履约、我的卖履约 --> 获取列表")
+    @ApiOperation("履约管理--> 我的买履约、我的卖履约/履约计划管理 --> 获取列表")
     @ApiResponse(code = 200, message = "成功", response = PageResult.class)
     public PageResult<PayPerformanceResult> query(PayPerformanceParam param, HttpServletRequest request) {
         return iPerformanceService.query(param, request);

+ 1 - 1
mtp3-century/src/main/java/com/muchinfo/mtp3century/controller/PresaleController.java

@@ -24,7 +24,7 @@ import javax.servlet.http.HttpServletRequest;
 
 @RestController
 @RequestMapping("/presale")
-@Api(value = "预售管理API", description = "预售管理")
+@Api(value = "产能预售管理API", description = "产能预售管理")
 public class PresaleController {
 
     @Resource

+ 32 - 1
mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/NoticeServiceImpl.java

@@ -334,6 +334,10 @@ public class NoticeServiceImpl implements INoticeService {
         if (param.getId() != null) {
             SiteColumnconfig temp = iSiteColumnconfigMapper.selectOne(new QueryWrapper<SiteColumnconfig>().eq("id", param.getId()));
             temp.setColumnname(param.getColumnname());
+            temp.setColumnnameen(param.getColumnnameen());
+            temp.setColumnnameth(param.getColumnnameth());
+            temp.setColumnnametw(param.getColumnnametw());
+            temp.setColumnnamevi(param.getColumnnamevi());
             temp.setColumntype(param.getColumntype());
             temp.setIsshow(param.getIsshow());
             temp.setSort(param.getSort());
@@ -343,6 +347,10 @@ public class NoticeServiceImpl implements INoticeService {
         } else {
             SiteColumnconfig config = new SiteColumnconfig();
             config.setColumnname(param.getColumnname());
+            config.setColumnnameen(param.getColumnnameen());
+            config.setColumnnameth(param.getColumnnameth());
+            config.setColumnnametw(param.getColumnnametw());
+            config.setColumnnamevi(param.getColumnnamevi());
             config.setColumntype(param.getColumntype());
             config.setIsshow(param.getIsshow());
             config.setSort(param.getSort());
@@ -390,6 +398,11 @@ public class NoticeServiceImpl implements INoticeService {
             GzMemberinfo entity = new GzMemberinfo();
             entity.setMemberid(param.getMemberid());
             entity.setMembername(param.getMembername());
+            entity.setMembernameen(param.getMembernameen());
+            entity.setMembernamevi(param.getMembernamevi());
+            entity.setMembernameth(param.getMembernameth());
+            entity.setMembernametw(param.getMembernametw());
+
             String tags = param.getMembertags();
             if (tags == null) {
                 entity.setMembertags("");
@@ -404,6 +417,11 @@ public class NoticeServiceImpl implements INoticeService {
         } else {
             GzMemberinfo entity = iGzMemberinfoMapper.selectOne(new QueryWrapper<GzMemberinfo>().eq("memberid", param.getMemberid()));
             entity.setMembername(param.getMembername());
+            entity.setMembernameen(param.getMembernameen());
+            entity.setMembernamevi(param.getMembernamevi());
+            entity.setMembernameth(param.getMembernameth());
+            entity.setMembernametw(param.getMembernametw());
+
             String tags = param.getMembertags();
             if (tags == null) {
                 entity.setMembertags("");
@@ -462,7 +480,20 @@ public class NoticeServiceImpl implements INoticeService {
         SiteColumndetail siteColumndetail = iSiteColumndetailMapper.selectOne(new QueryWrapper<SiteColumndetail>().eq("id", id));
         siteColumndetail.setColumnname(iSiteColumnconfigMapper.selectOne(new QueryWrapper<SiteColumnconfig>().eq("id", siteColumndetail.getColumnid())).getColumnname());
         if (siteColumndetail.getSrcid() != null) {
-            siteColumndetail.setSrcname(iGzMemberinfoMapper.selectOne(new QueryWrapper<GzMemberinfo>().eq("memberid", siteColumndetail.getSrcid())).getMembername());
+            GzMemberinfo gzMemberinfo = iGzMemberinfoMapper.selectOne(new QueryWrapper<GzMemberinfo>().eq("memberid", siteColumndetail.getSrcid()));
+            siteColumndetail.setSrcname(gzMemberinfo.getMembername());
+            siteColumndetail.setSrcnameen(gzMemberinfo.getMembernameen());
+            siteColumndetail.setSrcnameth(gzMemberinfo.getMembernameth());
+            siteColumndetail.setSrcnametw(gzMemberinfo.getMembernametw());
+            siteColumndetail.setSrcnamevi(gzMemberinfo.getMembernamevi());
+        }
+        if (siteColumndetail.getColumnid() != null) {
+            SiteColumnconfig columnconfig = iSiteColumnconfigMapper.selectOne(new QueryWrapper<SiteColumnconfig>().eq("id", siteColumndetail.getColumnid()));
+            siteColumndetail.setColumnname(columnconfig.getColumnname());
+            siteColumndetail.setColumnnameen(columnconfig.getColumnnameen());
+            siteColumndetail.setColumnnameth(columnconfig.getColumnnameth());
+            siteColumndetail.setColumnnametw(columnconfig.getColumnnametw());
+            siteColumndetail.setColumnnamevi(columnconfig.getColumnnamevi());
         }
         return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), siteColumndetail);
     }

+ 54 - 10
mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/PerformanceServiceImpl.java

@@ -29,10 +29,12 @@ import org.slf4j.LoggerFactory;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.MessageProperties;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
+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.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -70,6 +72,18 @@ public class PerformanceServiceImpl implements IPerformanceService {
     private IPerformancebreachapplyMapper iPerformancebreachapplyMapper;
     @Resource
     private RabbitTemplate rabbitTemplate;
+    @Resource
+    private IHisWrtradeTradedetailMapper iHisWrtradeTradedetailMapper;
+    @Resource
+    private IHisWrtradeOrderdetailMapper iHisWrtradeOrderdetailMapper;
+    @Resource
+    private IWrtradeTradedetailMapper iWrtradeTradedetailMapper;
+    @Resource
+    private IWrtradeOrderdetailMapper iWrtradeOrderdetailMapper;
+    @Resource
+    private IWrfactortypeMapper iWrfactortypeMapper;
+    @Resource
+    private IWrstandardMapper iWrstandardMapper;
 
     @Override
     public PageResult<PayPerformanceResult> query(PayPerformanceParam param, HttpServletRequest request) {
@@ -88,15 +102,6 @@ public class PerformanceServiceImpl implements IPerformanceService {
         } else {
             resultIPage = iPerformanceplanMapper.queryHis(page, param);
         }
-        for (PayPerformanceResult record : resultIPage.getRecords()) {
-            String sysparm = iCommonService.getSysparmById(SysConstants.SYSPARAM_CODE_DELAY);
-            if (StringUtils.isNotBlank(sysparm)) {
-                record.setDelayapply(sysparm);
-            } else {
-                record.setDelayapply("1");
-            }
-            record.setAccountid(systemmanager.getAreauserid());
-        }
         pageResult.setCode(Constants.Success_Code_Design);
         pageResult.setMessage(AjaxResult.dealMsg(MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language")));
         pageResult.setPages(resultIPage.getPages());
@@ -221,7 +226,46 @@ public class PerformanceServiceImpl implements IPerformanceService {
             relatedInfoResult.setDeliverytotalamount(detailResult.getDeliverytotalamount());
             result.setRelatedInfoResult(relatedInfoResult);
         } else if (plan != null && (plan.getPerformancetype() == 2 || plan.getPerformancetype() == 3)) {
-
+            //仓单贸易 / 预售(63)、集采(62)
+            WrtradeTradedetail tradeDetail = new WrtradeTradedetail();
+            WrtradeOrderdetail wr = new WrtradeOrderdetail();
+            if (histradedate != null) {
+                HisWrtradeTradedetail his = iHisWrtradeTradedetailMapper.selectOne(new QueryWrapper<HisWrtradeTradedetail>()
+                        .eq("wrTradeDetailId", plan.getRelatedOrderId())
+                        .eq(sellorbuy != null, "buyOrSell", sellorbuy)
+                        .eq("histradedate", histradedate));
+                if (his != null) {
+                    HisWrtradeTradedetail hiswrOrde = iHisWrtradeTradedetailMapper.selectOne(new QueryWrapper<HisWrtradeTradedetail>()
+                            .eq("wrTradeOrderId", his.getWrtradeorderid()));
+                    BeanUtils.copyProperties(hiswrOrde, wr);
+                }
+            } else {
+                WrtradeTradedetail tradeDetailEntity = iWrtradeTradedetailMapper.selectOne(new QueryWrapper<WrtradeTradedetail>()
+                        .eq("wrTradeDetailId", plan.getRelatedOrderId())
+                        .eq(sellorbuy != null, "buyOrSell", sellorbuy));
+                if (tradeDetailEntity != null) {
+                    BeanUtils.copyProperties(tradeDetailEntity, tradeDetail);
+                    wr = iWrtradeOrderdetailMapper.selectOne(new QueryWrapper<WrtradeOrderdetail>()
+                            .eq("wrTradeOrderId", tradeDetail.getWrtradeorderid()));
+                    if (wr == null) {
+                        wr = new WrtradeOrderdetail();
+                        HisWrtradeOrderdetail hiswrOrd = iHisWrtradeOrderdetailMapper.selectOne(new QueryWrapper<HisWrtradeOrderdetail>()
+                                .eq("wrTradeOrderId", tradeDetail.getWrtradeorderid()));
+                        BeanUtils.copyProperties(hiswrOrd, wr);
+                    }
+                }
+            }
+            Wrfactortype wrs = iWrfactortypeMapper.selectOne(new QueryWrapper<Wrfactortype>().eq("wrfactortypeid",wr.getWrfactortypeid()));
+            if (wrs != null) {
+                if (wrs.getWrfactortypename() != null) {
+                    relatedInfoResult.setWrFactorTypeName(wrs.getWrfactortypename());
+                } else {
+                    relatedInfoResult.setWrFactorTypeName(wrs.getWrstandardcode());
+                }
+                Wrstandard wRStandard = iWrstandardMapper.selectOne(new QueryWrapper<Wrstandard>().eq("wrstandardid",wrs.getWrstandardid()));
+                relatedInfoResult.setWrstandardcode(wRStandard.getWrstandardcode());
+                relatedInfoResult.setWrstandardname(wRStandard.getWrstandardname());
+            }
         } else if (plan != null && plan.getPerformancetype() == 5) {
             //挂牌期权
             if (StringUtils.isEmpty(histradedate)) {

+ 15 - 10
mtp3-century/src/main/resources/mapper/NoticemsgMapper.xml

@@ -23,9 +23,9 @@
         <result column="MSGICONURL" property="msgiconurl" />
         <result column="ISFORCEDISPLAY" property="isforcedisplay" />
         <result column="TITLEEN" property="titleen" />
-        <result column="TITLETW" property="titleTW" />
-        <result column="TITLETH" property="titleTH" />
-        <result column="TITLEVI" property="titleVI" />
+        <result column="TITLETW" property="titletw" />
+        <result column="TITLETH" property="titleth" />
+        <result column="TITLEVI" property="titlevi" />
         <result column="CONTENT2" property="content2" />
         <result column="CONTENT2EN" property="content2en" />
         <result column="CONTENT2TW" property="content2tw" />
@@ -119,28 +119,33 @@
         order by id
     </select>
     <select id="columnsourcequery" resultType="com.muchinfo.mtp3pojos.vo.notice.ColumnSourceQueryResult">
-        select
-        *
-        from gz_memberinfo t
+        select * from gz_memberinfo t
         where 1=1
         <if test="smembername != null and smembername != ''">
             and t.membername like '%'||#{smembername}||'%'
         </if>
-
         order by t.orderindex, t.membername
     </select>
     <select id="informManquery" resultType="com.muchinfo.mtp3pojos.vo.notice.InforManQueryResult">
         <choose>
             <when test=" vo.columnid != null and vo.columnid == -1">
-                select d.id,d.title,d.creaedate,#{vo.userid} userid,s.username as creatoruser,
-                c.id columnid, c.columnname
+                select d.id,d.title,d.creaedate,d.userid userid,s.username as creatoruser,
+                c.id columnid, c.columnname, c.columnname,c.columnnameen,c.columnnametw,c.columnnameth ,c.columnnamevi
                 from site_columnconfig c
                 left join site_columndetail d on c.id = d.columnid and d.userid=#{vo.userid}
                 left join systemmanager s on d.creatorid = s.autoid
                 where c.columntype=100 and c.id !=3
             </when>
             <otherwise>
-                select t.*,s.columnname, gm.membername "srcname",sy.username as creatoruser
+                select t.*,s.columnname, gm.membername srcname,sy.username as creatoruser,
+                s.COLUMNNAMEEN columnnameen,
+                s.COLUMNNAMETW columnnametw,
+                s.COLUMNNAMETH columnnameth,
+                s.COLUMNNAMEVI columnnamevi,
+                gm.MEMBERNAMEEN srcnameen,
+                gm.MEMBERNAMETW srcnametw,
+                gm.MEMBERNAMETH srcnameth,
+                gm.MEMBERNAMEVI srcnamevi
                 from site_columndetail t
                 left join site_columnconfig s on t.columnid = s.id
                 left join gz_memberinfo gm on t.srcid = gm.memberid

+ 56 - 29
mtp3-century/src/main/resources/mapper/PerformanceplanMapper.xml

@@ -54,6 +54,11 @@
         with ps as(
         select p.*,st.steptypename from performancestep p
         left join performancesteptype st on p.steptypeid=st.steptypeid
+        <where>
+            <if test="vo.performancePlanId != null and vo.performancePlanId != '' ">
+                AND p.planid = #{vo.performancePlanId,jdbcType=DECIMAL}
+            </if>
+        </where>
         )
         select p.performanceplanid,
 			'- -' "histradedate",
@@ -109,6 +114,24 @@
 		left join taaccount buyta on p.buyaccountid = buyta.accountid
 		left join taaccount sellta on p.sellaccountid = sellta.accountid
         <where>
+            <if test="vo.performancePlanId != null and vo.performancePlanId != '' ">
+                AND p.performancePlanId =
+                #{vo.performancePlanId,jdbcType=DECIMAL}
+            </if>
+            <if test="vo.buyId != null and vo.buyId != '' ">
+                AND p.buyAccountId in (select accountid from taaccount
+                where userid = #{vo.buyId,jdbcType=DECIMAL})
+            </if>
+            <if test="vo.sellId != null and vo.sellId != '' ">
+                AND p.sellAccountId in (select accountid from taaccount
+                where userid = #{vo.sellId,jdbcType=DECIMAL})
+            </if>
+            <if test="vo.buyAccountId != null and vo.buyAccountId != '' ">
+                AND p.buyAccountId like '%'||#{vo.buyAccountId}||'%'
+            </if>
+            <if test="vo.sellAccountId != null and vo.sellAccountId != '' ">
+                AND p.sellAccountId like '%'||#{vo.sellAccountId}||'%'
+            </if>
             <if test="vo.relatedorderid != null and vo.relatedorderid != '' ">
                 AND p.relatedOrderId like
                 '%'||#{vo.relatedorderid}||'%'
@@ -118,22 +141,13 @@
                     <![CDATA[and ps.remaindays < 0]]>
                 </if>
             </if>
-            <choose>
-                <when test="type = 0 ">
-                    <if test="accountid != null and accountid != '' ">
-                        AND p.buyAccountId in (select accountid from taaccount
-                        where userid = #{accountid})
-                    </if>
-                </when>
-                <otherwise>
-                    <if test="accountid != null and accountid != '' ">
-                        AND p.sellAccountId in (select accountid from taaccount
-                        where userid = #{accountid})
-                    </if>
-                </otherwise>
-            </choose>
+            <if test="vo.performancetype != null and vo.performancetype != '' ">
+                AND p.performancetype = #{vo.performancetype,jdbcType=DECIMAL}
+            </if>
+            <if test="vo.performanceStatus != null and vo.performanceStatus != '' ">
+                AND p.performancestatus = #{vo.performanceStatus,jdbcType=DECIMAL}
+            </if>
             <if test="vo.parentuserid != null and vo.parentuserid!=0">
-
                 and (buyta.userid in (select userid from useraccount uo
                 start with uo.userid = #{vo.parentuserid}
                 connect by prior uo.userid =uo.parentuserid and uo.userid !=#{vo.parentuserid})
@@ -155,6 +169,9 @@
         left join performancesteptype st on p.steptypeid=st.steptypeid
         <where>
             and p.isvaliddata = 1
+            <if test="vo.performancePlanId != null and vo.performancePlanId != '' ">
+                AND p.planid = #{performancePlanId,jdbcType=DECIMAL}
+            </if>
             <if test="vo.starttime != null and vo.starttime != '' ">
                 AND p.histradedate &gt;= #{vo.starttime}
             </if>
@@ -210,6 +227,24 @@
         left join taaccount buyta on p.buyaccountid = buyta.accountid
         left join taaccount sellta on p.sellaccountid = sellta.accountid
         where p.performancestatus in(3,6,7,8) and p.isvaliddata = 1
+        <if test="vo.performancePlanId != null and vo.performancePlanId != '' ">
+            AND p.performancePlanId =
+            #{vo.performancePlanId,jdbcType=DECIMAL}
+        </if>
+        <if test="vo.buyId != null and vo.buyId != '' ">
+            AND p.buyAccountId in (select accountid from taaccount
+            where userid = #{vo.buyId,jdbcType=DECIMAL})
+        </if>
+        <if test="vo.sellId != null and vo.sellId != '' ">
+            AND p.sellAccountId in (select accountid from taaccount
+            where userid = #{vo.sellId,jdbcType=DECIMAL})
+        </if>
+        <if test="vo.buyAccountId != null and vo.buyAccountId != '' ">
+            AND p.buyAccountId like '%'||#{vo.buyAccountId}||'%'
+        </if>
+        <if test="vo.sellAccountId != null and vo.sellAccountId != '' ">
+            AND p.sellAccountId like '%'||#{vo.sellAccountId}||'%'
+        </if>
         <if test="vo.relatedorderid != null and vo.relatedorderid != '' ">
             AND p.relatedOrderId like
             '%'||#{vo.relatedorderid}||'%'
@@ -220,20 +255,12 @@
         <if test="vo.endtime != null and vo.endtime != '' ">
             AND p.histradedate &lt;= #{vo.endtime}
         </if>
-        <choose>
-            <when test="type = 0 ">
-                <if test="accountid != null and accountid != '' ">
-                    AND p.buyAccountId in (select accountid from taaccount
-                    where userid = #{accountid})
-                </if>
-            </when>
-            <otherwise>
-                <if test="accountid != null and accountid != '' ">
-                    AND p.sellAccountId in (select accountid from taaccount
-                    where userid = #{accountid})
-                </if>
-            </otherwise>
-        </choose>
+        <if test="vo.performancetype != null and vo.performancetype != '' ">
+            AND p.performancetype = #{vo.performancetype,jdbcType=DECIMAL}
+        </if>
+        <if test="vo.performanceStatus != null and vo.performanceStatus != '' ">
+            AND p.performancestatus = #{vo.performanceStatus,jdbcType=DECIMAL}
+        </if>
         <if test="vo.searchrange != null ">
             <if test="vo.searchrange == -1 ">
                 <![CDATA[and ps.remaindays < 0]]>

+ 5 - 0
mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/entity/GzMemberinfo.java

@@ -65,6 +65,11 @@ public class GzMemberinfo extends Model<GzMemberinfo> {
     @TableField("ORDERINDEX")
     private Integer orderindex;
 
+    private String membernameth;
+    private String membernametw;
+    private String membernameen;
+    private String membernamevi;
+
 
     @Override
     public Serializable pkVal() {

+ 5 - 0
mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/entity/SiteColumnconfig.java

@@ -66,6 +66,11 @@ public class SiteColumnconfig extends Model<SiteColumnconfig> {
     @TableField("MODIFIERID")
     private Long modifierid;
 
+    private String columnnameen;
+    private String columnnametw;
+    private String columnnameth;
+    private String columnnamevi;
+
     @TableField(select = false)
     private String modifieruser;
     @TableField(select = false)

+ 16 - 0
mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/entity/SiteColumndetail.java

@@ -126,8 +126,24 @@ public class SiteColumndetail extends Model<SiteColumndetail> {
     @TableField(select = false)
     private String srcname;
     @TableField(select = false)
+    private String srcnameth;
+    @TableField(select = false)
+    private String srcnametw;
+    @TableField(select = false)
+    private String srcnameen;
+    @TableField(select = false)
+    private String srcnamevi;
+    @TableField(select = false)
     private String columnname;
     @TableField(select = false)
+    private String columnnameth;
+    @TableField(select = false)
+    private String columnnametw;
+    @TableField(select = false)
+    private String columnnamevi;
+    @TableField(select = false)
+    private String columnnameen;
+    @TableField(select = false)
     private String creatoruser;
     @TableField(select = false)
     private String modifieruser;

+ 4 - 0
mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/notice/ColumnAddParam.java

@@ -16,6 +16,10 @@ public class ColumnAddParam {
 
     @ApiModelProperty(value = "栏目名称")
     private String columnname;
+    private String columnnameen;
+    private String columnnametw;
+    private String columnnameth;
+    private String columnnamevi;
 
     @ApiModelProperty(value = "是否展示")
     private Integer isshow;

+ 4 - 0
mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/notice/ColumnQueryResult.java

@@ -18,6 +18,10 @@ public class ColumnQueryResult {
 
     @ApiModelProperty(value = "栏目名称")
     private String columnname;
+    private String columnnameen;
+    private String columnnametw;
+    private String columnnameth;
+    private String columnnamevi;
 
     @ApiModelProperty(value = "排序")
     private Integer sort;

+ 4 - 0
mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/notice/ColumnSourceAddParam.java

@@ -16,6 +16,10 @@ public class ColumnSourceAddParam {
 
     @ApiModelProperty(value = "来源名称")
     private String membername;
+    private String membernametw;
+    private String membernameth;
+    private String membernameen;
+    private String membernamevi;
 
     @ApiModelProperty(value = "来源网址")
     private String membertags;

+ 4 - 0
mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/notice/ColumnSourceQueryResult.java

@@ -19,6 +19,10 @@ public class ColumnSourceQueryResult {
 
     @ApiModelProperty(value = "来源名称")
     private String membername;
+    private String membernametw;
+    private String membernameth;
+    private String membernameen;
+    private String membernamevi;
 
     @ApiModelProperty(value = "来源网址")
     private String membertags;

+ 24 - 0
mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/notice/InforManQueryResult.java

@@ -46,5 +46,29 @@ public class InforManQueryResult {
     @ApiModelProperty(value = "创建时间")
     private Date creaedate;
 
+    @ApiModelProperty(value = "标题多语言")
+    private String titleen;
+    private String titletw;
+    private String titleth;
+    private String titlevi;
+
+    @ApiModelProperty(value = "作者多语言")
+    private String authoren;
+    private String authortw;
+    private String authorth;
+    private String authorvi;
+
+    @ApiModelProperty(value = "来源多语言")
+    private String srcnameen;
+    private String srcnametw;
+    private String srcnameth;
+    private String srcnamevi;
+
+    @ApiModelProperty(value = "资讯类型多语言")
+    private String columnnameen;
+    private String columnnametw;
+    private String columnnameth;
+    private String columnnamevi;
+
     private Long id;
 }

+ 21 - 0
mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/performance/PayPerformanceParam.java

@@ -18,6 +18,27 @@ public class PayPerformanceParam {
     @ApiModelProperty(value = "关联单号")
     private String relatedorderid;
 
+    @ApiModelProperty(value = "履约计划id")
+    private String performancePlanId;
+
+    @ApiModelProperty(value = "买方")
+    private Long buyId;
+
+    @ApiModelProperty(value = "卖方")
+    private Long sellId;
+
+    @ApiModelProperty(value = "买方资金账号")
+    private Long buyAccountId;
+
+    @ApiModelProperty(value = "卖方资金账号")
+    private Long sellAccountId;
+
+    @ApiModelProperty(value = "类型")
+    private Integer performancetype;
+
+    @ApiModelProperty(value = "履约状态")
+    private Integer performanceStatus;
+
     @ApiModelProperty(value = "查询范围")
     private Integer searchrange;