anpeng/apzl_leasing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.修改产品日志修改人带不出来。

Browse Source 
2.修改产品日志中执行删除操作后产品名称丢失问题。
This commit is contained in:
zhangbb 2018-08-26 16:56:50 +08:00
parent 7b734b5bfd
commit 6bd17f7921
4 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
WebContent/ProductManage/ProductConfig/CopyProductCatalogInfo.jsp
View File

@ -32,7 +32,7 @@ include file="/Frame/resources/include/ui/include_info.jspf"%>
var productName = getItemValue(0, getRow(), "ProductName");
var id = getItemValue(0, getRow(), "ID");
if(catalogName != null && catalogName != ""){
var res = RunJavaMethodTrans("com.amarsoft.app.als.prd.manager.ProductManager","copyProductCatalog","catalogName="+catalogName+",productName="+productName+",productID=<%=productId%>,id="+id + ",usesrId=<%=CurUser.getUserID()%>,orgId=<%=CurUser.getOrgID()%>");
var res = RunJavaMethodTrans("com.amarsoft.app.als.prd.manager.ProductManager","copyProductCatalog","catalogName="+catalogName+",productName="+productName+",productID=<%=productId%>,id="+id + ",userId=<%=CurUser.getUserID()%>,orgId=<%=CurUser.getOrgID()%>");
if(res == "SUCCESS"){
alert("复制成功");
AsDialog.ClosePage();

3
WebContent/ProductManage/ProductConfig/ProductCatalogList.jsp
View File

@ -113,7 +113,8 @@
return ;
}
if(confirm('确实要删除吗?')){
var result = AsControl.RunJavaMethodTrans("com.amarsoft.app.als.prd.manager.ProductManager","deleteProduct","ProductID="+typeNo + ",usesrId=<%=CurUser.getUserID()%>,orgId=<%=CurUser.getOrgID()%>");
var productName = getItemValue(0, getRow(), "TypeName");
var result = AsControl.RunJavaMethodTrans("com.amarsoft.app.als.prd.manager.ProductManager","deleteProduct","ProductID="+typeNo + ",userId=<%=CurUser.getUserID()%>,orgId=<%=CurUser.getOrgID()%>,productName="+productName);
if(result.split("@")[0] == "false"){
openDWDialog(result.split("@")[1]);
return;

3
WebContent/WEB-INF/etc/jbo/jbo_sys.xml
View File

@ -2203,7 +2203,8 @@
<attribute name="target" label="操作目标" type="STRING" length="32"/>
<attribute name="inputuserid" label="登记人" type="STRING" length="32"/>
<attribute name="inputorgid" label="登记部门" type="STRING" length="32"/>
<attribute name="inputtime" label="登记时间" type="STRING" length="32"/>
<attribute name="inputtime" label="登记时间" type="STRING" length="32"/>
<attribute name="product_name" label="产品名称" type="STRING" length="100"/>
</attributes>
<manager>
<managerProperties>

26
src_prd/com/amarsoft/app/als/prd/manager/ProductManager.java
View File

@ -143,8 +143,13 @@ public class ProductManager{
public void setSortNo(String sortNo) {
this.sortNo = sortNo;
}
public String addProductDataLog(JBOTransaction tx, String name, String operation, String opNumber, String target, String userId, String orgid) throws Exception {
public String getProductNameByProductID(String productID) throws JBOException{
BizObject bo = JBOFactory.createBizObjectQuery(BUSINESS_TYPE.CLASS_NAME,"TYPENO=:projectId")
.setParameter("projectId",productID).getSingleResult(false);
String productNameByID = (bo==null)?"":bo.getAttribute("TYPENAME").getString();
return productNameByID;
}
public String addProductDataLog(JBOTransaction tx, String name, String operation, String opNumber, String target, String userId, String orgid, String productName) throws Exception {
//增加产品编辑日志
BizObjectManager bomPL = JBOFactory.getBizObjectManager(PRODUCT_LOG.CLASS_NAME, tx);
String info = userId + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + opNumber;
@ -156,6 +161,7 @@ public class ProductManager{
boPL.setAttributeValue("inputuserid", userId);
boPL.setAttributeValue("inputorgid", orgid);
boPL.setAttributeValue("inputtime", StringFunction.getTodayNow());
boPL.setAttributeValue("product_name", productName);
bomPL.saveObject(boPL);
return "success";
}
@ -175,7 +181,8 @@ public class ProductManager{
if(tran.getString(new SqlObject("select typeno from business_type where typeno = '" + newProductID + "'"))!=null) {
oper = "U";
}
addProductDataLog(tx, newProductID, oper, oper, "data", userId, orgId);
String productNameByID = getProductNameByProductID(newProductID);
addProductDataLog(tx, newProductID, oper, oper, "data", userId, orgId ,productNameByID);
return this.checkTypeNo(tx);
}
@ -196,7 +203,8 @@ public class ProductManager{
BizObjectQuery boq = bom.createQuery("select typeno,inputuser,inputorg from O where typeno=:typeno");
boq.setParameter("typeno", productID);
BizObject bo = boq.getSingleResult();
addProductDataLog(tx, productID, oper, oper, "data", userId, orgId);
String productNameByID = getProductNameByProductID(productID);
addProductDataLog(tx, productID, oper, oper, "data", userId, orgId ,productNameByID);
return "OK";
}
@ -344,7 +352,7 @@ public class ProductManager{
bomPN.createQuery("delete from O where prdid = '" + productID + "'").executeUpdate();
//增加产品编辑日志
addProductDataLog(tx, productID, "D", "D", "data", userId, orgId);
addProductDataLog(tx, productID, "D", "D", "data", userId, orgId,productName);
for(BusinessObject ps:psl){
String configFile = ps.getString("ConfigFile");
@ -402,7 +410,7 @@ public class ProductManager{
bomanager.updateDB();
//增加产品编辑日志
addProductDataLog(tx, "Cata"+sortNo, "A", "A", "catalog", userId, orgId);
addProductDataLog(tx, "Cata"+sortNo, "A", "A", "catalog", userId, orgId,catalogName);
return "true";
}
@ -480,12 +488,12 @@ public class ProductManager{
bomanager.deleteBusinessObject(bo);
//增加产品编辑日志
addProductDataLog(tx, typeNo, "D", "D", "data", userId, orgId);
addProductDataLog(tx, typeNo, "D", "D", "data", userId, orgId,productName);
}
bomanager.updateDB();
//增加产品编辑日志
addProductDataLog(tx, catalogNo, "D", "D", "catalog", userId, orgId);
addProductDataLog(tx, catalogNo, "D", "D", "catalog", userId, orgId,productName);
return "true";
}
@ -577,7 +585,7 @@ public class ProductManager{
DataOperatorUtil.copyJBOSet(PRD_NODECONFIG.CLASS_NAME, fromCondition, PRD_NODECONFIG.CLASS_NAME, new HashMap<String,String>(), otherProperty, null, tx);
//增加产品编辑日志
addProductDataLog(tx, id, "A", "A", "data", userId, orgId);
addProductDataLog(tx, id, "A", "A", "data", userId, orgId,productName);
return "SUCCESS";
}