头寸调拨交易入口修改

isc-funds-business/src/main/java/com/brilliance/isc/funds/basesel/ftdsel/resource/FtdselController.java

 package com.brilliance.isc.funds.basesel.ftdsel.resource;
 
-import com.brilliance.isc.bo.FtdVo;
+
 import com.brilliance.isc.funds.basesel.ftdsel.service.FtdselService;
 import com.brilliance.isc.funds.basesel.trncod.service.TrncodService;
 import com.brilliance.isc.vo.ResponseSet;
 import com.brilliance.isc.vo.TrnCodeQueryVo;
-import com.brilliance.isc.vo.funds.FttselQueryVo;import org.springframework.web.bind.annotation.RequestBody;
+import com.brilliance.isc.vo.funds.FttselQueryVo;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
@@ -24,9 +25,21 @@ public class FtdselController {
     @RequestMapping("/query")
     public ResponseSet list(@RequestBody FttselQueryVo vo) {
         return ResponseSet.simpleSuccess(
-                ftdselService.query(vo)
+        ftdselService.query(vo)
+        );
+    }
+    @RequestMapping("/querytcdb")
+    public ResponseSet querytcdb(@RequestBody FttselQueryVo vo) {
+        return ResponseSet.simpleSuccess(
+        ftdselService.querytcdb(vo)
         );
     }
+    @RequestMapping("/queryzjcj")
+    public ResponseSet queryzjcj(@RequestBody FttselQueryVo vo) {
+        return ResponseSet.simpleSuccess(
+        ftdselService.queryzjcj(vo)
+            );
+    }
     /**
      * 处理按钮查看能够进行的交易
      *
@@ -41,7 +54,7 @@ public class FtdselController {
      */
     @RequestMapping("/selectXxdByPrimaryKey")
     public ResponseSet selectXxdByPrimaryKey(@RequestBody Map<String,String> map) {
-        return ResponseSet.simpleSuccess(trncodService.selectXxdByPrimaryKey(map));
+        return ResponseSet.simpleSuccess(ftdselService.selectXxdByPrimaryKey(map));
     }
 
 

isc-funds-business/src/main/java/com/brilliance/isc/funds/basesel/ftdsel/service/FtdselService.java

 package com.brilliance.isc.funds.basesel.ftdsel.service;
-import com.brilliance.isc.bo.FtdVo;
 
-import com.brilliance.isc.vo.funds.FtdWithPtsCbbResponseVo;import com.brilliance.isc.vo.funds.FttselQueryVo;import com.github.pagehelper.PageInfo;
+import com.brilliance.isc.vo.funds.FtdWithPtsCbbResponseVo;
+import com.brilliance.isc.vo.funds.FttselQueryVo;
+import com.github.pagehelper.PageInfo;import java.util.Map;
 
 public interface FtdselService {
     PageInfo<FtdWithPtsCbbResponseVo> query(FttselQueryVo ftdVo);
 
-}
\ No newline at end of file
+    PageInfo<FtdWithPtsCbbResponseVo> querytcdb(FttselQueryVo vo);
+    PageInfo<FtdWithPtsCbbResponseVo> queryzjcj(FttselQueryVo vo);
+    Object selectXxdByPrimaryKey(Map<String, String> map);}
\ No newline at end of file

isc-funds-business/src/main/java/com/brilliance/isc/funds/basesel/ftdsel/service/impl/FtdselServiceImpl.java

 package com.brilliance.isc.funds.basesel.ftdsel.service.impl;
 
 import com.brilliance.isc.bo.FtdVo;
-import com.brilliance.isc.funds.basesel.ftdsel.service.FtdselService;
-import com.brilliance.isc.mda.dao.FtdMapper;
-import com.brilliance.isc.vo.funds.FtdWithPtsCbbResponseVo;import com.brilliance.isc.vo.funds.FttselQueryVo;import com.github.pagehelper.PageHelper;
+import com.brilliance.isc.bo.Trn;import com.brilliance.isc.common.sysmod.SysmodService;import com.brilliance.isc.funds.basesel.ftdsel.service.FtdselService;
+import com.brilliance.isc.funds.bo.funds.FttfcmStoreBo;import com.brilliance.isc.funds.bo.funds.FxtfopStoreBo;import com.brilliance.isc.funds.common.component.FtToolComponent;import com.brilliance.isc.mda.dao.FtdMapper;
+import com.brilliance.isc.mda.dao.TrnMapper;import com.brilliance.isc.vo.funds.FtdWithPtsCbbResponseVo;import com.brilliance.isc.vo.funds.FttselQueryVo;import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.List;
+import java.util.ArrayList;import java.util.List;import java.util.Map;import java.util.Objects;
 
 @Service
 public class FtdselServiceImpl implements FtdselService {
     @Resource
     private FtdMapper ftdMapper;
-
+    @Resource
+    private TrnMapper trnMapper;
+    @Resource
+    private FtToolComponent ftToolComponent;
+    @Resource
+    private SysmodService sysmodService;
     @Override
     public PageInfo<FtdWithPtsCbbResponseVo> query(FttselQueryVo  vo) {
         //搜索
-        PageHelper.startPage(1, vo.getPageSize(), null).setReasonable(true);
+        PageHelper.startPage(1, vo.getPageSize()).setReasonable(true);
         List<FtdWithPtsCbbResponseVo> list = ftdMapper.queryFtd(vo);
         return new PageInfo<>(list);
+        }
+    @Override
+    public PageInfo<FtdWithPtsCbbResponseVo> querytcdb(FttselQueryVo vo) {
+        List<String> fttypList=new ArrayList<>();
+        fttypList.add("PT");
+        vo.setFttypList(fttypList);
+        PageHelper.startPage(1, vo.getPageSize()).setReasonable(true);
+        List<FtdWithPtsCbbResponseVo> list = ftdMapper.queryFtd(vo);
+        return new PageInfo<>(list);
+    }
+    @Override
+    public PageInfo<FtdWithPtsCbbResponseVo> queryzjcj(FttselQueryVo vo) {
+         List<String> fttypList=new ArrayList<>();
+         fttypList.add("LI");
+         fttypList.add("LO");
+         fttypList.add("DI");
+         fttypList.add("DO");
+         vo.setFttypList(fttypList);
+         PageHelper.startPage(1, vo.getPageSize()).setReasonable(true);
+         List<FtdWithPtsCbbResponseVo> list = ftdMapper.queryFtd(vo);
+         return new PageInfo<>(list);
+    }
+
+    @Override
+    public Object selectXxdByPrimaryKey(Map<String, String> map) {
+        String objinr = map.get("objinr");
+        String objtyp = map.get("objtyp");
+        String pntinr = map.get("pntinr");
+        FttfcmStoreBo fttfcmStoreBo = new FttfcmStoreBo();
+        fttfcmStoreBo.reset();
+        if(objinr.length() == 16) {
+            Trn trnLid = trnMapper.selectByObjinrTrn(objtyp, objinr, "FTTFCM");
+            if (!Objects.isNull(trnLid)) {
+               fttfcmStoreBo = sysmodService.streamGetNameInSubDir(FttfcmStoreBo.class, trnLid.getInr());
+            }
+        }
+        fttfcmStoreBo.setFtdgrp(ftToolComponent.getFtdgrpByInr(objinr));
+        return fttfcmStoreBo;
+    }
 
 //        String branch = fxtselQueryVo.getBranch();
 //        if (Strings.isEmpty(branch)) {
@@ -50,7 +94,7 @@ public class FtdselServiceImpl implements FtdselService {
 //        }
 //        return new PageInfo(cpdList);
 
-    }
+
 
 
 

isc-funds-business/src/main/java/com/brilliance/isc/funds/fttfmt/service/FttfmtTransactionServiceImpl.java

@@ -153,7 +153,8 @@ public class FttfmtTransactionServiceImpl extends AbstractTransactionService<Ftt
 
         Ftdgrp ftdgrpVo = ftToolComponent.getFtdgrpByInr(ftdinr);
         fttfmtStoreBo.setFtdgrp(ftdgrpVo);
-
+        fttfmtStoreBo.getFtdgrp().getRec().setRat(ftdgrpVo.getRec().getRat());
+        fttfmtStoreBo.getFtdgrp().getRec().setMatdat(ftdgrpVo.getRec().getMatdat());
         init950(fttfmtStoreBo);
         init1000(fttfmtStoreBo);
         return fttfmtStoreBo;
@@ -162,6 +163,7 @@ public class FttfmtTransactionServiceImpl extends AbstractTransactionService<Ftt
     private void init950(FttfmtStoreBo fttfmtStoreBo) {
 
 
+
     }
 
     private void init1000(FttfmtStoreBo fttfmtStoreBo) {

isc-funds-business/src/main/java/com/brilliance/isc/funds/fttpcn/check/FttpcnValidator.java

@@ -3,7 +3,7 @@ package com.brilliance.isc.funds.fttpcn.check;
 
 
 import com.brilliance.isc.common.transaction.newcheck.AbstractModuleValidator;
-import com.brilliance.isc.funds.bo.funds.FttpcnStoreBo;
+import com.brilliance.isc.common.transaction.newcheck.ValidResult;import com.brilliance.isc.common.transaction.newcheck.Validate;import com.brilliance.isc.funds.bo.funds.FttfcnStoreBo;import com.brilliance.isc.funds.bo.funds.FttpcnStoreBo;
 import org.springframework.stereotype.Component;
 import javax.annotation.PostConstruct;
 import java.util.HashMap;
@@ -26,4 +26,11 @@ public class FttpcnValidator extends  AbstractModuleValidator<FttpcnStoreBo>{
             maps.putAll(super.validate(bo));
             return maps;
         }
+        @Validate(path="canamt")
+        public ValidResult checkCanamtN1000(FttpcnStoreBo bo){
+            if (bo.getCanamt().compareTo(bo.getFtdgrp().getCbs().getOpn2().getAmt())>0 ) {
+                    return ValidResult.build(false, "实际销账金额不能大于待销账金额！");
+                }
+                return null;
+            }
 }