代码整合

zjcmp_cd/.classpath

@@ -21,6 +21,5 @@
 	<classpathentry kind="con" path="com.yonyou.studio.udt.core.container/Module_Lang_Library"/>
 	<classpathentry kind="con" path="com.yonyou.studio.udt.core.container/Generated_EJB"/>
 	<classpathentry kind="con" path="com.yonyou.studio.udt.core.container/NCCloud_Library"/>
-	<classpathentry kind="lib" path="D:/YY/zhenong/hdgit/icdmc_icdmc.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

zjcmp_cd/.idea/workspace.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="d4b583bb-75e1-48fb-b0e0-64af9d216c2a" name="变更" comment="" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
+  </component>
+  <component name="ProjectId" id="272iVynbKiT61ZWVNVt5Vuk59BR" />
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">
+    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/.." />
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="默认任务">
+      <changelist id="d4b583bb-75e1-48fb-b0e0-64af9d216c2a" name="变更" comment="" />
+      <created>1648524609044</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1648524609044</updated>
+      <workItem from="1648524610821" duration="224000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
+</project>

zjcmp_cd/zjcmp_cd/classes/.gitignore

@@ -1,2 +0,0 @@
-/nccloud/
-/RepayPrcplQueryCardAction.class

zjcmp_cd/zjcmp_cd/src/client/nccloud/web/cdmc/cdm/repayinterest/action/InformerToRepayintstAction.java

@@ -4,6 +4,7 @@ import nc.bs.framework.common.NCLocator;
 import nc.itf.uap.IUAPQueryBS;
 import nc.itf.uap.pf.IPfExchangeService;
 import nc.jdbc.framework.processor.BeanProcessor;
+import nc.vo.bd.bankaccount.BankAccSubVO;
 import nc.vo.cdmc.cdm.repayintst.AggRepayIntstVO;
 import nc.vo.cdmc.cdm.repayintst.RepayIntstVO;
 import nc.vo.cmp.informer.InformerVO;
@@ -14,6 +15,8 @@ import nccloud.framework.web.action.itf.ICommonAction;
 import nccloud.framework.web.container.IRequest;
 import nccloud.framework.web.convert.translate.Translator;
 import nccloud.framework.web.processor.template.BillCardConvertProcessor;
+import nccloud.framework.web.ui.model.row.Cell;
+import nccloud.framework.web.ui.model.row.Row;
 import nccloud.framework.web.ui.pattern.billcard.BillCard;
 import nccloud.framework.web.ui.pattern.billcard.BillCardFormulaHandler;
 import nccloud.web.ifac.pub.util.NCCPageInfoUtil;
@@ -58,9 +61,12 @@ public class InformerToRepayintstAction implements ICommonAction{
 		repayintstvo.setSrcbillno(informervo.getVbillno());
 		repayintstvo.setVdef7(informervo.getMoneyy().toString());//上游金额
 		repayintstvo.setVdef4(informervo.getBankrelated_code());//对账标识码
+		repayintstvo.setLoandate(informervo.getInfodate());//付息日期
+		repayintstvo.setLoanunitid(informervo.getBankaccount());//本方账户
 		aggrepayintstvo.setParent(repayintstvo);
 		BillCardConvertProcessor processor = new BillCardConvertProcessor();
 		billCard = processor.convert("36630BLPI_CARD", aggrepayintstvo);
+		
 		Translator translator = new Translator();
 		translator.translate(billCard);
 		BillCardFormulaHandler handler = new BillCardFormulaHandler(billCard);
@@ -71,6 +77,10 @@ public class InformerToRepayintstAction implements ICommonAction{
 		} catch (BusinessException var15) {
 			ExceptionUtils.wrapException(var15);
 		}
+		
+		Row[] rows=billCard.getHead().getModel().getRows();
+		Cell cell=rows[0].getValues().get("loanunitid");
+		cell.setDisplay(informervo.getBankaccount());
 		return billCard;
 	}
 

zjcmp_cd/zjcmp_cd/src/client/nccloud/web/cdmc/repayinterest/action/LinkBillToRepayintstAction.java

@@ -1,53 +0,0 @@
-//package nccloud.web.cdmc.repayinterest.action;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//
-//import nc.impl.pubapp.pattern.data.vo.VOQuery;
-//import nc.vo.cdmc.cdm.repayintst.AggRepayIntstVO;
-//import nc.vo.cdmc.cdm.repayintst.RepayIntstVO;
-//import nc.vo.cmp.informer.InformerVO;
-//import nccloud.dto.ifac.common.bean.IfacOperatorParam;
-//import nccloud.framework.web.action.itf.ICommonAction;
-//import nccloud.framework.web.container.IRequest;
-//import nccloud.framework.web.ui.pattern.billcard.BillCard;
-//import nccloud.web.ifac.pub.util.NCCPageInfoUtil;
-//import nccloud.web.sf.common.NCCUIDataModuleUtil;
-///**
-// * 到账通知发布生成贷款付息
-// * @author YY
-// *
-// */
-//public class LinkBillToRepayintstAction implements ICommonAction{
-//
-//	@Override
-//	public Object doAction(IRequest request) {
-//	try {
-//		IfacOperatorParam parm = (IfacOperatorParam) NCCPageInfoUtil.getParam(request, IfacOperatorParam.class);
-//		List<String> pksaleorder = new ArrayList<String>();//到账通知发布主键集合
-//		String[] pks= parm.getPks();
-//		pksaleorder.add(pks[0]);
-//		
-//		//获取单据VO
-//		VOQuery<InformerVO> querysordr = new VOQuery<InformerVO>(InformerVO.class);
-//		InformerVO[] informerVO = null; //到账通知发布主表
-//		informerVO = querysordr.query(pksaleorder.toArray(new String[0]));
-//		AggRepayIntstVO aggRepayIntstVO = new AggRepayIntstVO();
-//		RepayIntstVO repayIntstVO = new RepayIntstVO();
-//		//来源单据主键
-//		repayIntstVO.setPk_srcbill(pks[0]);
-//		//财务组织
-//		repayIntstVO.setPk_org(informerVO[0].getPk_org());
-//		//财务组织版本
-//		repayIntstVO.setPk_org_v(informerVO[0].getPk_org_v());
-//		aggRepayIntstVO.setParent(repayIntstVO);
-//		BillCard billCard = null;
-//		billCard = NCCUIDataModuleUtil.buildCardDataFormula(aggRepayIntstVO, "36630BLPI_CARD", "add");
-//		return billCard;
-//	} catch (Exception e) {
-//		e.printStackTrace();
-//	}
-//		return null;
-//	}
-//
-//}

zjcmp_cd/zjcmp_cd/src/client/nccloud/web/ifm/redeem/action/InformerToRedeemAction.java

@@ -58,7 +58,7 @@ public class InformerToRedeemAction implements ICommonAction {
 			headvo.setPk_org_v(informervVO[0].getPk_org_v());
 			headvo.setSrcbilltypecode(informervVO[0].getPk_billtypecode());//来源单据类型编码
 			headvo.setPk_srcbilltype(informervVO[0].getPk_billtypeid());//来源单据类型 到账通知 36S3
-			headvo.setRedeemdate(informervVO[0].getInfodate());//理财赎回：赎回日期=到账通知日期；
+			headvo.setIncomedate(informervVO[0].getInfodate());//理财赎回：赎回日期=到账通知日期；
 			
 			
 			//headvo.setPk_currtype(informervVO[0].getPk_currtype());//币种

zjcmp_cd/zjcmp_cd/src/client/nccloud/web/ifm/redeem/action/RedeemSaveAction.java

@@ -90,15 +90,20 @@ public class RedeemSaveAction extends CommonSaveAction<AggInvestRedeemVO>
          //到账通知发布主表
     	 String [] pks=new String[] {headvo.getVdef8()};
    	    InformerVO[] informerVO = querysordr.query(pks);
-   	    UFDouble realreaning=headvo.getRealreaning();//realreaning 实际收益
-   	    UFDouble redeemmoney=headvo.getRedeemmoney();//赎回金额
+   	    UFDouble realreaning=new UFDouble(0.00);
+   	  
+   	    if(headvo.getRealreaning() != null) {
+   	     realreaning=headvo.getRealreaning();//realreaning 实际收益
+   	    }
+   	    UFDouble redeemmoney=new UFDouble(0.00);
+   	    redeemmoney=headvo.getRedeemmoney();//赎回金额
     	if((realreaning.add(redeemmoney)).compareTo(informerVO[0].getMoneyy())!=0) {
     		ExceptionUtils.wrapBusinessException("理财赎回表头【赎回金额+实际收益】要等于 到账通知的【金额】! ");
     	}
     	
     	 
     	 informerVO[0].setGenerateflag("hasgenerate");//已生成
-    	 informerVO[0].setUsemoney(headvo.getRedeemmoney());//赎回金额
+    	 informerVO[0].setUsemoney(realreaning.add(redeemmoney));//赎回金额
     	 informerVO[0].setPk_claimer(headvo.getBillmaker());//认证人
     	 informerVO[0].setClaimdate(headvo.getBillmakedate());//认证日期
     	 informerVO[0].setPk_lower(headvo.getPk_redeem());//主键