diff --git a/v5/apps-customize/pom.xml b/v5/apps-customize/pom.xml
new file mode 100644
index 0000000..fbcab92
--- /dev/null
+++ b/v5/apps-customize/pom.xml
@@ -0,0 +1,71 @@
+
+
+
+
+ com.seeyon
+ apps-root
+ 5371630367615140082-standard-V8.1SP2-release_20220812-SNAPSHOT
+
+
+ 4.0.0
+
+ apps-customize
+ ${apps.version}
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+ 8
+ 8
+
+
+
+
+
+
+
+
+
+
+
+ open.seeyon.3rd
+ hutool
+ 5.5.7
+ system
+ ${basedir}/src/main/webapp/WEB-INF/lib/hutool-all-5.5.7.jar
+
+
+ open.seeyon.3rd
+ seeyon-extend
+ 3.0
+ system
+ ${basedir}/src/main/webapp/WEB-INF/lib/seeyon-extend-v3.0.jar
+
+
+ javax.servlet
+ javax.servlet-api
+ 3.1.0
+
+
+ javax.servlet
+ javax.servlet-api
+ 3.1.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/v5/apps-customize/src/main/java/com/seeyon/apps/src_financing/controller/InterestMeasurementController.java b/v5/apps-customize/src/main/java/com/seeyon/apps/src_financing/controller/InterestMeasurementController.java
index 303db75..f4cb00a 100644
--- a/v5/apps-customize/src/main/java/com/seeyon/apps/src_financing/controller/InterestMeasurementController.java
+++ b/v5/apps-customize/src/main/java/com/seeyon/apps/src_financing/controller/InterestMeasurementController.java
@@ -4,17 +4,24 @@ import cn.hutool.log.Log;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.seeyon.apps.common.config.ICstConfigApi;
+import com.seeyon.apps.common.plugin.vo.ConfigVo;
+import com.seeyon.apps.src_financing.constants.FinancingConstants;
import com.seeyon.apps.src_financing.dao.IFinancingContractDao;
import com.seeyon.apps.src_financing.util.FormExportUtil;
import com.seeyon.apps.src_financing.util.InterestCalculationUtil;
import com.seeyon.apps.src_financing.util.NumberUtil;
+import com.seeyon.apps.src_ydctleasebill.constant.YdctLeaseBillConstant;
import com.seeyon.apps.ydctu8c.U8CCommonNode;
+import com.seeyon.cap4.form.api.FormApi4Cap4;
+import com.seeyon.cap4.form.bean.FormBean;
import com.seeyon.ctp.common.AppContext;
import com.seeyon.ctp.common.controller.BaseController;
import com.seeyon.ctp.util.UUIDLong;
import com.seeyon.ctp.util.json.JSONUtil;
import com.seeyon.v3x.services.form.FormFactory;
import com.seeyon.v3x.services.form.bean.FormExport;
+import com.seeyon.v3x.services.form.bean.RecordExport;
import com.seeyon.v3x.services.form.bean.SubordinateFormExport;
import com.seeyon.v3x.services.form.bean.ValueExport;
import nc.vo.jcom.lang.StringUtil;
@@ -33,6 +40,8 @@ public class InterestMeasurementController extends BaseController {
private static Log log = Log.get(InterestMeasurementController.class);
private FormFactory formFactory;
+ protected ICstConfigApi cstConfigApi = (ICstConfigApi) AppContext.getBean("cstConfigApi");
+
public FormFactory getFormFactory() {
if (formFactory == null) {
formFactory = (FormFactory) AppContext.getBean("formFactory");
@@ -57,13 +66,31 @@ public class InterestMeasurementController extends BaseController {
this.financingContractDao = financingContractDao;
}
+ private FormApi4Cap4 formApi4Cap4;
+
+ public FormApi4Cap4 getFormApi4Cap4() {
+ if (this.formApi4Cap4 == null) {
+ this.formApi4Cap4 = (FormApi4Cap4)AppContext.getBean("formApi4Cap4");
+ }
+
+ return this.formApi4Cap4;
+ }
+ public ConfigVo getFinancingConfig() {
+ return cstConfigApi.getConfig(getPluginId());
+ }
+
+ public String getPluginId() {
+ return FinancingConstants.getPluginId();
+ }
public ModelAndView index(HttpServletRequest request, HttpServletResponse response) throws Exception {
log.info("进入ajax方法");
+ ConfigVo configVo = getFinancingConfig();
// 设置返回值对象
Map res = new HashMap<>();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
InterestCalculationUtil rentCalculationUtil = new InterestCalculationUtil();
request.setCharacterEncoding("UTF-8");
response.setCharacterEncoding("UTF-8");
@@ -156,17 +183,17 @@ public class InterestMeasurementController extends BaseController {
// 数据生成前根据合同编号清楚所有的辅助表信息
String contractCode = jsonObject.getString("contractCode");
- if(!StringUtil.isEmpty(contractCode)){
-// 删除明细表辅助数据
- int daleteFZFinancingSubnum = getLeaseContractDao().daleteFZFinancingSub(contractCode);
-// 删除主表辅助数据
- int daleteFZFinancingnum = getLeaseContractDao().daleteFZFinancing(contractCode);
- if(daleteFZFinancingSubnum!=0 &&daleteFZFinancingnum!=0){
- System.out.println("存在辅助表数据，删除成功，主表删除"+daleteFZFinancingnum+"条数据，明细表删除"+daleteFZFinancingSubnum+"条数据");
- }else{
- System.out.println("删除失败，主表"+daleteFZFinancingSubnum+"明细表"+daleteFZFinancingnum+"合同编码"+contractCode);
- }
- }
+// if(!StringUtil.isEmpty(contractCode)){
+//// 删除明细表辅助数据
+// int daleteFZFinancingSubnum = getLeaseContractDao().daleteFZFinancingSub(contractCode);
+//// 删除主表辅助数据
+// int daleteFZFinancingnum = getLeaseContractDao().daleteFZFinancing(contractCode);
+// if(daleteFZFinancingSubnum!=0 &&daleteFZFinancingnum!=0){
+// System.out.println("存在辅助表数据，删除成功，主表删除"+daleteFZFinancingnum+"条数据，明细表删除"+daleteFZFinancingSubnum+"条数据");
+// }else{
+// System.out.println("删除失败，主表"+daleteFZFinancingSubnum+"明细表"+daleteFZFinancingnum+"合同编码"+contractCode);
+// }
+// }
log.info("删除历史生成的数据");
// 创建保存利息明细信息
List> sublist = new ArrayList>();
@@ -207,18 +234,165 @@ public class InterestMeasurementController extends BaseController {
// 计算利息信息保存利息明细对象
sublist = rentCalculationUtil.detailedHandle(jsonObject,type);
log.info("生成完成所有利息");
- Map mainmap = new HashMap();
- mainmap.put("合同编号", contractCode);
- mainmap.put("触发文本更新", contractCode+codenum);
+
+ log.info("创建档案");
+ List contractIds = getLeaseContractDao().getFZinancingid(contractCode);
+ FormExport[] formExports = getFormFactory().exportBusinessFormData("LXCSMX",
+ "2024-11-01 00:00:00",simpleDateFormat.format(new Date()),new String[]{});
FormExportUtil formExportUtil = new FormExportUtil();
FormExport formExport = new FormExport();
- List subordinateFormExports = formExportUtil.setSubordinateFormValue(sublist);
- List valueExports = formExportUtil.setFormValue(mainmap);
- formExport.setSubordinateForms(subordinateFormExports);
- formExport.setValues(valueExports);
- log.info("创建档案");
- getFormFactory().importBusinessFormData("shenxian", "LXCSMX",
+ for(FormExport formExportold :formExports){
+ for(ValueExport valueExport : formExportold.getValues()){
+ if("合同编号".equals(valueExport.getDisplayName())){
+ if(contractCode.equals(valueExport.getValue())){
+ formExport = formExportold;
+ }
+ }
+ }
+ }
+ if(contractIds.size()==0){
+ Map mainmap = new HashMap();
+ mainmap.put("合同编号", contractCode);
+ mainmap.put("触发文本更新", contractCode+codenum);
+
+ List subordinateFormExports = formExportUtil.setSubordinateFormValue(sublist);
+ List valueExports = formExportUtil.setFormValue(mainmap);
+ formExport.setSubordinateForms(subordinateFormExports);
+ formExport.setValues(valueExports);
+
+ log.info("创建档案");
+ String loginName = configVo.getParamVal(FinancingConstants.loginName.name());
+ getFormFactory().importBusinessFormData(loginName, "LXCSMX",
formExport, new String[] {});
+ }else{
+// 查询需要修改的ID
+ String contractId = contractIds.get(0);
+// 修改主表信息
+ int issuccessform = getLeaseContractDao().updateLXFinancingbyId(contractCode+codenum,contractId);
+// 修改从表信息
+ // 获取明细表对象列表
+ List subordinateFormExports = formExport.getSubordinateForms();
+// 获取第一个明细表对象
+ SubordinateFormExport subordinateFormExport =subordinateFormExports.get(0);
+// 获取明细行对象
+ List recordExports = subordinateFormExport.getValues();
+// 判断明细行与当前明细行是否匹配
+ int differ = recordExports.size()-sublist.size();
+ if(differ==0){
+ for(int i = 0 ; i < recordExports.size() ;i++){
+// 替换原本数据信息
+ Map paramMap = new HashMap<>();
+ RecordExport recordExport = recordExports.get(i);
+ Map map = sublist.get(i);
+ List valueExports = recordExport.getRecord();
+ for(int n = 0 ; n < valueExports.size();n ++){
+ ValueExport subValueExport = valueExports.get(n);
+ if("序号1".equals(subValueExport.getDisplayName())){
+ paramMap.put("field0001",subValueExport.getValue());
+ }if("计划利息还款明细编号".equals(subValueExport.getDisplayName())){
+ paramMap.put("field0004",subValueExport.getValue());
+ }
+ }
+ paramMap.put("field0005","-4351865301164799504");
+ paramMap.put("formmainId",contractId);
+ paramMap.put("field0006",map.get("计划还款日期").toString());
+ paramMap.put("field0007",map.get("计划还款金额").toString());
+ paramMap.put("field0008","");
+// 查询出来基础数据
+ int issuccessSub = getLeaseContractDao().updateLXFinancingSubbyFormId(paramMap);
+ System.out.println("替换"+issuccessform);
+ }
+ }else if (differ>0){
+ for(int i = 0 ; i < sublist.size() ;i++){
+// 替换原有数据库数据
+ Map paramMap = new HashMap<>();
+ RecordExport recordExport = recordExports.get(i);
+ Map map = sublist.get(i);
+ List valueExports = recordExport.getRecord();
+ for(int n = 0 ; n < valueExports.size();n ++){
+ ValueExport subValueExport = valueExports.get(n);
+ if("序号1".equals(subValueExport.getDisplayName())){
+ paramMap.put("field0001",subValueExport.getValue());
+ }if("计划利息还款明细编号".equals(subValueExport.getDisplayName())){
+ paramMap.put("field0004",subValueExport.getValue());
+ }
+ }
+ paramMap.put("field0005","-4351865301164799504");
+ paramMap.put("formmainId",contractId);
+ paramMap.put("field0006",map.get("计划还款日期").toString());
+ paramMap.put("field0007",map.get("计划还款金额").toString());
+ paramMap.put("field0008","");
+// 查询出来基础数据
+ int issuccessSub = getLeaseContractDao().updateLXFinancingSubbyFormId(paramMap);
+ System.out.println("替换"+issuccessSub);
+ }
+// 删除多余明细行数据
+ int isdeleteSub = getLeaseContractDao().deleteLXFinancingSubbyFormId(sublist.size()+"",contractId );
+ System.out.println("删除"+isdeleteSub);
+ }else if (differ<0){
+ for(int i = 0 ; i < recordExports.size() ;i++){
+// 替换原本数据信息
+ Map paramMap = new HashMap<>();
+ RecordExport recordExport = recordExports.get(i);
+ Map map = sublist.get(i);
+ List valueExports = recordExport.getRecord();
+ for(int n = 0 ; n < valueExports.size();n ++){
+ ValueExport subValueExport = valueExports.get(n);
+ if("序号1".equals(subValueExport.getDisplayName())){
+ paramMap.put("field0001",subValueExport.getValue());
+ }if("计划利息还款明细编号".equals(subValueExport.getDisplayName())){
+ paramMap.put("field0004",subValueExport.getValue());
+ }
+ }
+ paramMap.put("field0005","-4351865301164799504");
+ paramMap.put("formmainId",contractId);
+ paramMap.put("field0006",map.get("计划还款日期").toString());
+ paramMap.put("field0007",map.get("计划还款金额").toString());
+ paramMap.put("field0008","");
+// 查询出来基础数据
+ int issuccessSub = getLeaseContractDao().updateLXFinancingSubbyFormId(paramMap);
+ System.out.println("替换"+issuccessSub);
+ }
+ for(int i = 0 ; i<(differ*-1) ; i++){
+// 添加明细表
+ Map map = sublist.get(recordExports.size()+i);
+ Map paramMap = new HashMap<>();
+ long l = UUIDLong.longUUID();
+ paramMap.put("id",l+"");
+ paramMap.put("formmainId",contractId);
+ paramMap.put("field0001",recordExports.size()+i+1+"");
+ paramMap.put("field0004",contractCode+(recordExports.size()+i+1));
+ paramMap.put("field0005","-4351865301164799504");
+ paramMap.put("field0006",map.get("计划还款日期").toString());
+ paramMap.put("field0007",map.get("计划还款金额").toString());
+ int isAddSub = getLeaseContractDao().addLXFinancingSubbyFormId(paramMap);
+ System.out.println("新增"+isAddSub);
+ }
+ }
+
+// Map mainmap = new HashMap();
+// mainmap.put("触发文本更新", contractCode+codenum);
+// formExport = formExportUtil.updateFormValue(formExport,mainmap);
+// formExport = formExportUtil.updateSubordinateFormValue(formExport,sublist);
+// long updateId = getFormFactory().updateBusinessFormData(Long.parseLong(contractCodes.get(0)),
+// "shenxian", "LXCSMX",formExport);
+// System.out.println(updateId);
+ }
+
+// Map mainmap = new HashMap();
+// mainmap.put("合同编号", contractCode);
+// mainmap.put("触发文本更新", contractCode+codenum);
+//
+// List subordinateFormExports = formExportUtil.setSubordinateFormValue(sublist);
+// List valueExports = formExportUtil.setFormValue(mainmap);
+// formExport.setSubordinateForms(subordinateFormExports);
+// formExport.setValues(valueExports);
+// FormBean cap4FormBean = getFormApi4Cap4().getFormByFormCode("LXCSMX");
+
+
+// getFormFactory().updateBusinessFormData(1l,"shenxian", "LXCSMX",formExport);
+// getFormFactory().importBusinessFormData("admin1", "LXCSMX",
+// formExport, new String[] {});
// getFormFactory().importBusinessFormData("admin1", "LXCSMX",
// formExport, new String[] {});
// getFormFactory().importBusinessFormData("demo2", "LXCSMX",
@@ -228,51 +402,51 @@ public class InterestMeasurementController extends BaseController {
res.put("s", "");
res.put("num", contractCode+codenum);
- JSONObject patchData = new JSONObject();
- patchData.put("code",0);
- JSONObject jsonData = new JSONObject();
- jsonData.put("success",1);
- jsonData.put("code","200");
- jsonData.put("message","操作成功!");
- JSONObject formData = new JSONObject();
- JSONObject tableData = new JSONObject();
- JSONObject formmain_0087 = new JSONObject();
- JSONObject formupdate0087 = new JSONObject();
- JSONObject field0215 = new JSONObject();
- field0215.put("value","1");
- field0215.put("showValue","1");
- field0215.put("showValue2","1");
- formupdate0087.put("field0215",field0215);
- formmain_0087.put("update",formupdate0087);
- formmain_0087.put("empty",false);
- tableData.put("formmain_0087",formmain_0087);
- JSONObject formson_0091 = new JSONObject();
- JSONArray formadds0091 = new JSONArray();
- sublist.size();
- for(int i = 0 ; i < sublist.size() ; i ++){
- JSONObject recordId = new JSONObject();
- recordId.put("recordId", UUIDLong.longUUID());
- formadds0091.add(recordId);
- }
- formson_0091.put("add",formadds0091);
- List lxFinancingSubId = getLeaseContractDao().getLXFinancingSubId(contractCode);
- String[] deletes0091 =lxFinancingSubId.stream().toArray(String[]::new);
- formson_0091.put("delete",deletes0091);
- formson_0091.put("empty",false);
- tableData.put("formson_0091",formson_0091);
- formData.put("tableData",tableData);
- JSONObject extend = new JSONObject();
- formData.put("extend",extend);
- jsonData.put("data",formData);
- patchData.put("data",jsonData);
- patchData.put("message","");
+// JSONObject patchData = new JSONObject();
+// patchData.put("code",0);
+// JSONObject jsonData = new JSONObject();
+// jsonData.put("success",1);
+// jsonData.put("code","200");
+// jsonData.put("message","操作成功!");
+// JSONObject formData = new JSONObject();
+// JSONObject tableData = new JSONObject();
+// JSONObject formmain_0087 = new JSONObject();
+// JSONObject formupdate0087 = new JSONObject();
+// JSONObject field0215 = new JSONObject();
+// field0215.put("value","1");
+// field0215.put("showValue","1");
+// field0215.put("showValue2","1");
+// formupdate0087.put("field0215",field0215);
+// formmain_0087.put("update",formupdate0087);
+// formmain_0087.put("empty",false);
+// tableData.put("formmain_0087",formmain_0087);
+// JSONObject formson_0091 = new JSONObject();
+// JSONArray formadds0091 = new JSONArray();
+// sublist.size();
+// for(int i = 0 ; i < sublist.size() ; i ++){
+// JSONObject recordId = new JSONObject();
+// recordId.put("recordId", UUIDLong.longUUID());
+// formadds0091.add(recordId);
+// }
+// formson_0091.put("add",formadds0091);
+// List lxFinancingSubId = getLeaseContractDao().getLXFinancingSubId(contractCode);
+// String[] deletes0091 =lxFinancingSubId.stream().toArray(String[]::new);
+// formson_0091.put("delete",deletes0091);
+// formson_0091.put("empty",false);
+// tableData.put("formson_0091",formson_0091);
+// formData.put("tableData",tableData);
+// JSONObject extend = new JSONObject();
+// formData.put("extend",extend);
+// jsonData.put("data",formData);
+// patchData.put("data",jsonData);
+// patchData.put("message","");
// String sss = "{\"code\":0,\"data\":{\"code\":\"2000\",\"data\":{\"tableData\":{\"formson_0091\":{\"update\":{\""+lxFinancingSubId.get(0)+"\":{\"field0193\":{\"showValue\":\"11\",\"showValue2\":\"11\",\"value\":\"11\"}}}}}},\"message\":\"the operation is success!!!\"},\"message\":\"\"}";
// JSONObject jsonnnn = JSON.parseObject(sss);
- res.put("data",patchData);
- log.info(patchData.toString());
+// res.put("data",patchData);
+// log.info(patchData.toString());
render(response, JSONUtil.toJSONString(res));
return null;
}
diff --git a/v5/apps-customize/src/main/java/com/seeyon/apps/src_financing/dao/FinancingContractDaoImpl.java b/v5/apps-customize/src/main/java/com/seeyon/apps/src_financing/dao/FinancingContractDaoImpl.java
index bbbabb2..4d6e665 100644
--- a/v5/apps-customize/src/main/java/com/seeyon/apps/src_financing/dao/FinancingContractDaoImpl.java
+++ b/v5/apps-customize/src/main/java/com/seeyon/apps/src_financing/dao/FinancingContractDaoImpl.java
@@ -12,15 +12,31 @@ import java.util.Map;
public class FinancingContractDaoImpl implements IFinancingContractDao {
// 本地
- private String daleteFZFinancing = "delete from formmain_0097 WHERE field0002 = ?";
- private String daleteFZFinancingSub = "delete from formson_0098 WHERE FORMMAIN_ID in (SELECT ID FROM formmain_0097 WHERE field0002 = ? )";
- private String getLXFinancingSub = "select id from formson_0091 WHERE FORMMAIN_ID in (SELECT ID FROM formmain_0087 WHERE field0001 = ? )";
-// 测试
+// private String daleteFZFinancing = "delete from formmain_0097 WHERE field0002 = ?";
+// private String daleteFZFinancingSub = "delete from formson_0098 WHERE FORMMAIN_ID in (SELECT ID FROM formmain_0097 WHERE field0002 = ? )";
+// private String getFZinancingid = "SELECT ID FROM formmain_0097 WHERE field0002 = ?";
+// private String getLXFinancingSub = "select id from formson_0091 WHERE FORMMAIN_ID in (SELECT ID FROM formmain_0087 WHERE field0001 = ? )";
+// private String updateLXFinancingbyId = "update formmain_0097 set field0009 = ? where id = ?";
+// private String updateLXFinancingSubbyFormId =
+// "update formson_0098 set field0004 = ?,field0005= ? ,field0006= ? ,field0007= ? ,field0008= ? where formmain_id = ? and field0001 = ?";
+// private String addLXFinancingSubbyFormId =
+// "INSERT INTO formson_0098 (id, formmain_id, sort,field0001,field0004,field0005,field0006,field0007) VALUES (?,?,?,?,?,?,?,?)";
+// private String deleteLXFinancingSubbyFormId ="delete from formson_0098 where field0001>? and formmain_id = ?";
+
+ // 测试
// private String daleteFZFinancing = "delete from formmain_0019 WHERE field0002 = ?";
// private String daleteFZFinancingSub = "delete from formson_0020 WHERE FORMMAIN_ID in (SELECT ID FROM formmain_0019 WHERE field0002 = ? )";
// 正式
-// private String daleteFZFinancing = "delete from formmain_0760 WHERE field0002 = ?";
-// private String daleteFZFinancingSub = "delete from formson_0761 WHERE FORMMAIN_ID in (SELECT ID FROM formmain_0760 WHERE field0002 = ? )";
+ private String daleteFZFinancing = "delete from formmain_0760 WHERE field0002 = ?";
+ private String daleteFZFinancingSub = "delete from formson_0761 WHERE FORMMAIN_ID in (SELECT ID FROM formmain_0760 WHERE field0002 = ? )";
+ private String getFZinancingid = "SELECT ID FROM formmain_0760 WHERE field0002 = ?";
+ private String getLXFinancingSub = "select id from formson_0744 WHERE FORMMAIN_ID in (SELECT ID FROM formmain_0725 WHERE field0001 = ? )";
+ private String updateLXFinancingbyId = "update formmain_0760 set field0009 = ? where id = ?";
+ private String updateLXFinancingSubbyFormId =
+ "update formson_0761 set field0004 = ?,field0005= ? ,field0006= ? ,field0007= ? ,field0008= ? where formmain_id = ? and field0001 = ?";
+ private String addLXFinancingSubbyFormId =
+ "INSERT INTO formson_0761 (id, formmain_id, sort,field0001,field0004,field0005,field0006,field0007) VALUES (?,?,?,?,?,?,?,?)";
+ private String deleteLXFinancingSubbyFormId ="delete from formson_0761 where field0001>? and formmain_id = ?";
@@ -42,6 +58,89 @@ public class FinancingContractDaoImpl implements IFinancingContractDao {
return i;
}
+ @Override
+ public int updateLXFinancingbyId(String contractCodenum,String id) throws BusinessException, SQLException {
+ int i = 0 ;
+ JDBCAgent agent = new JDBCAgent();
+ try {
+ StringBuilder sql = new StringBuilder(updateLXFinancingbyId);
+ List