From 3ecc92bdc345da5c18879119c51b37a0e899b081 Mon Sep 17 00:00:00 2001 From: zhangjun Date: Mon, 29 Jun 2020 14:02:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=8F=98=E6=9B=B4=E3=80=81?= =?UTF-8?q?=E6=92=A4=E9=94=80=E3=80=81=E4=BB=98=E6=AC=BE=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../start/initiate/PaymentRequestBO.java | 45 ++----------------- .../impl/AppUndoServiceServiceImpl.java | 4 +- .../impl/ApplyChangesServiceServiceImpl.java | 10 +++-- 3 files changed, 10 insertions(+), 49 deletions(-) diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/initiate/PaymentRequestBO.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/initiate/PaymentRequestBO.java index f2c366242..4b556833e 100644 --- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/initiate/PaymentRequestBO.java +++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/start/initiate/PaymentRequestBO.java @@ -38,16 +38,7 @@ public class PaymentRequestBO implements Serializable{ private String CurUserID; private String customertype; private String CustomerName;// 客户名称 - - /*private String total; - private String usedlines; - private String relines; - private String plan_money; - private String afact_money; - private String allfact_money; - private String fee_adjust; - private String overmoney; - private String username;*/ + private String msg; private String operationType; @@ -113,25 +104,7 @@ public class PaymentRequestBO implements Serializable{ this.ContractId = fieldMap.get("contract_id".toLowerCase()) == null ? "" : fieldMap.get("contract_id".toLowerCase()).toString(); // 合同ID - /*this.total = fieldMap.get("total".toLowerCase()) == null ? "" - : fieldMap.get("total".toLowerCase()).toString(); - this.usedlines = fieldMap.get("usedlines".toLowerCase()) == null ? "" - : fieldMap.get("usedlines".toLowerCase()).toString(); - this.relines = fieldMap.get("relines".toLowerCase()) == null ? "" - : fieldMap.get("relines".toLowerCase()).toString(); - this.plan_money = fieldMap.get("plan_money".toLowerCase()) == null ? "" - : fieldMap.get("plan_money".toLowerCase()).toString(); - this.afact_money = fieldMap.get("afact_money".toLowerCase()) == null ? "" - : fieldMap.get("afact_money".toLowerCase()).toString(); - this.allfact_money = fieldMap.get("allfact_money".toLowerCase()) == null ? "" - : fieldMap.get("allfact_money".toLowerCase()).toString(); - this.fee_adjust = fieldMap.get("fee_adjust".toLowerCase()) == null ? "" - : fieldMap.get("fee_adjust".toLowerCase()).toString(); - this.overmoney = fieldMap.get("overmoney".toLowerCase()) == null ? "" - : fieldMap.get("overmoney".toLowerCase()).toString(); - this.username = fieldMap.get("username".toLowerCase()) == null ? "" - : fieldMap.get("username".toLowerCase()).toString(); -*/ + this.ProjectName = FlowKey+"-"+CustomerName; } @@ -159,19 +132,7 @@ public class PaymentRequestBO implements Serializable{ map.put("ContractId", ContractId); action.setContractId(ContractId); - /*map.put("total", total); - map.put("usedlines", usedlines); - map.put("relines", relines); - map.put("plan_money", plan_money); - map.put("afact_money", afact_money); - map.put("allfact_money", allfact_money); - map.put("fee_adjust", fee_adjust); - map.put("overmoney", overmoney); - map.put("username", username); - */ - - - + JSONObject jsonObject = JSONObject.fromObject(map); this.fixedFlowParam = jsonObject.toString(); diff --git a/src_app_fresh/apx/com/amarsoft/als/user/change/initiate/service/impl/AppUndoServiceServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/user/change/initiate/service/impl/AppUndoServiceServiceImpl.java index 0004702fe..113165980 100644 --- a/src_app_fresh/apx/com/amarsoft/als/user/change/initiate/service/impl/AppUndoServiceServiceImpl.java +++ b/src_app_fresh/apx/com/amarsoft/als/user/change/initiate/service/impl/AppUndoServiceServiceImpl.java @@ -63,7 +63,7 @@ public class AppUndoServiceServiceImpl implements AppUndoService { fieldMap = (Map) testMap.get("fieldMap"); // 参数 String flowUnid = fieldMap.get("flowunid") == null ? "" : fieldMap.get( "flowunid").toString(); - String userid = fieldMap.get("PROJECT_ID") == null ? "" : fieldMap.get("PROJECT_ID").toString(); + String userid = fieldMap.get("userid") == null ? "" : fieldMap.get("userid").toString(); ASUser CurUser = new ASUser(userid, sqlca); BizObject cat = catManage.createQuery(" flowunid =:flowunid").setParameter("flowunid", flowUnid).getSingleResult(true); if(null == cat){ @@ -71,8 +71,6 @@ public class AppUndoServiceServiceImpl implements AppUndoService { cat.setAttributeValue("updateuserid", userid); cat.setAttributeValue("updateorgid", CurUser.getOrgID()); cat.setAttributeValue("updatetime", DateUtil.getSystemTimeByFormat("yyyy/MM/dd HH:mm:ss")); - }else{ - System.out.println("没有此信息！！！"); } cat.setAttributeValue("CANCLE_DATE", fieldMap.get("CANCLE_DATE") == null ? "" : fieldMap.get("CANCLE_DATE").toString()); cat.setAttributeValue("CANCLE_RESON", fieldMap.get("CANCLE_RESON") == null ? "" : fieldMap.get("CANCLE_RESON").toString()); diff --git a/src_app_fresh/apx/com/amarsoft/als/user/change/initiate/service/impl/ApplyChangesServiceServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/user/change/initiate/service/impl/ApplyChangesServiceServiceImpl.java index 3166d10f4..5742ce722 100644 --- a/src_app_fresh/apx/com/amarsoft/als/user/change/initiate/service/impl/ApplyChangesServiceServiceImpl.java +++ b/src_app_fresh/apx/com/amarsoft/als/user/change/initiate/service/impl/ApplyChangesServiceServiceImpl.java @@ -36,7 +36,7 @@ public class ApplyChangesServiceServiceImpl implements ApplyChangesService { String flowUnid = fieldMap.get("flowunid") == null ? "" : fieldMap.get( "flowunid").toString(); - String sql = "select PROJECT_ID,CHANGE_DATE,CHANGE_MEMO,FLOWUNID from LB_CHANGE_INFO_TEMP where FLOWUNID='"+flowUnid+"' "; + String sql = "select PROJECT_ID,CHANGE_DATE,FLOWUNID,CHANGE_MEMO from LB_CHANGE_INFO_TEMP where flowunid='"+flowUnid+"' "; List> lgutList = DataOperatorUtil.getDataBySql(sql); if(lgutList.size()>0){ for (Map map : lgutList) { @@ -59,23 +59,25 @@ public class ApplyChangesServiceServiceImpl implements ApplyChangesService { fieldMap = (Map) testMap.get("fieldMap"); // 参数 String flowUnid = fieldMap.get("flowunid") == null ? "" : fieldMap.get( "flowunid").toString(); - String userid = fieldMap.get("PROJECT_ID") == null ? "" : fieldMap.get("PROJECT_ID").toString(); + String userid = fieldMap.get("userid") == null ? "" : fieldMap.get("userid").toString(); ASUser CurUser = new ASUser(userid, sqlca); BizObject cat = catManage.createQuery(" flowunid =:flowunid").setParameter("flowunid", flowUnid).getSingleResult(true); if(null == cat){ cat = catManage.newObject(); cat.setAttributeValue("updateuserid", userid); + cat.setAttributeValue("PROJECT_ID", ""); + cat.setAttributeValue("CONTRACT_ID", ""); cat.setAttributeValue("updateorgid", CurUser.getOrgID()); cat.setAttributeValue("updatetime", DateUtil.getSystemTimeByFormat("yyyy/MM/dd HH:mm:ss")); - }else{ - System.out.println("没有此信息！！！"); } cat.setAttributeValue("CHANGE_DATE", fieldMap.get("CHANGE_DATE") == null ? "" : fieldMap.get("CHANGE_DATE").toString()); cat.setAttributeValue("CHANGE_MEMO", fieldMap.get("CHANGE_MEMO") == null ? "" : fieldMap.get("CHANGE_MEMO").toString()); cat.setAttributeValue("FLOWUNID", fieldMap.get("FLOWUNID") == null ? "" : fieldMap.get("FLOWUNID").toString()); + catManage.saveObject(cat); ReturnMapUtil.setReturnMap(null, RestfullConstant.baseProperty.get("success").toString(), ""); return ReturnMapUtil.getReturnMap(); + } }