diff --git a/WebContent/AppFresh/AppVersion/APPFeedbackOpinion.jsp b/WebContent/AppFresh/AppVersion/APPFeedbackOpinion.jsp
new file mode 100644
index 000000000..fb4ecb768
--- /dev/null
+++ b/WebContent/AppFresh/AppVersion/APPFeedbackOpinion.jsp
@@ -0,0 +1,37 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
+ /*
+ Author: undefined 2020-07-24
+ Content:
+ History Log:
+ */
+ ASObjectModel doTemp = new ASObjectModel("APPFeedbackOpinionList");
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+ dwTemp.Style="1"; //--设置为Grid风格--
+ dwTemp.ReadOnly = "1"; //只读模式
+ dwTemp.setPageSize(10);
+ dwTemp.genHTMLObjectWindow("");
+
+ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
+ String sButtons[][] = {
+ /* {"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
+ {"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""}, */
+ {"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'')","","","","btn_icon_delete"},
+ };
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
index bdf05ffe4..9d8313be9 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_customer.xml
@@ -3370,5 +3370,64 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/data/service/impl/BusinessDataServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/data/service/impl/BusinessDataServiceImpl.java
index bdb595376..649b9db1c 100644
--- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/data/service/impl/BusinessDataServiceImpl.java
+++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/data/service/impl/BusinessDataServiceImpl.java
@@ -116,7 +116,7 @@ public class BusinessDataServiceImpl implements BusinessDataService {
String userid = fieldMap.get("userid") == null ? "" : fieldMap.get("userid").toString();
String brandid = fieldMap.get("brandid") == null ? "" : fieldMap.get("brandid").toString();
String carseriesid = fieldMap.get("carseriesid") == null ? "" : fieldMap.get("carseriesid").toString();
-
+ String frame_number = fieldMap.get("frame_number") == null ? "" : fieldMap.get("frame_number").toString();
Map body = new HashMap();
ASUser asUser = new ASUser(userid);
BizObjectManager lbacm = JBOFactory.getBizObjectManager(LB_BEFORE_APPLICATION_CONFIG.CLASS_NAME);
@@ -201,7 +201,8 @@ public class BusinessDataServiceImpl implements BusinessDataService {
lba.setAttributeValue("modelId", modelId);
lba.setAttributeValue("carseries", carseries);
lba.setAttributeValue("mile", mile);
- lba.setAttributeValue("frame_number", age_limit);
+ lba.setAttributeValue("age_limit", age_limit);
+ lba.setAttributeValue("frame_number", frame_number);
lba.setAttributeValue("price", price);
lba.setAttributeValue("carattributes", carattributes);
lba.setAttributeValue("liter", liter);
diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/detail/service/impl/BusinessDocDetailServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/detail/service/impl/BusinessDocDetailServiceImpl.java
index 8f746f61b..539185713 100644
--- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/detail/service/impl/BusinessDocDetailServiceImpl.java
+++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/detail/service/impl/BusinessDocDetailServiceImpl.java
@@ -1,6 +1,9 @@
package apx.com.amarsoft.als.apzl.apply.business.doc.detail.service.impl;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -293,7 +296,7 @@ public class BusinessDocDetailServiceImpl implements BusinessDocDetailService {
public Map doc(String objectNo, String docName,
HttpServletRequest request, HttpServletResponse response,
JBOTransaction tx, Transaction sqlca, ReturnMapUtil ReturnMapUtil,String userId)
- throws JBOException {
+ throws Exception {
// String flowUnid = fieldMap.get("objectno") == null ? "" : fieldMap.get(
// "objectno").toString(); // 流程号
@@ -323,8 +326,8 @@ public class BusinessDocDetailServiceImpl implements BusinessDocDetailService {
return ReturnMapUtil.getReturnMap();
}
BizObjectManager ftM = JBOFactory.getBizObjectManager(FLOW_TASK.CLASS_NAME);
- List ftList = ftM.createQuery(" objectno=:flow_unid AND phaseno='0010'").setParameter("flow_unid", objectNo).getResultList(false);
-
+ BizObject ft = ftM.createQuery(" objectno=:flow_unid AND phaseno='0010' AND (endtime IS NULL OR endtime='') ").setParameter("flow_unid", objectNo).getSingleResult(false);
+ String begintime = ft == null? null :ft.getAttribute("begintime").toString();
String proj_id = fbo.getAttribute("proj_id").getString();
BizObjectManager relaManage = JBOFactory
@@ -409,17 +412,29 @@ public class BusinessDocDetailServiceImpl implements BusinessDocDetailService {
: att.getAttribute("objecttype").toString();
String inputuserid = att.getAttribute("inputuserid") == null ? ""
: att.getAttribute("inputuserid").toString();
+
+ String inputtime = att.getAttribute("inputtime") == null ? null
+ : att.getAttribute("inputtime").toString();
attMap.put("attId", attId);
attMap.put("fileName", fileName);
attMap.put("fileSize", fileSize);
attMap.put("fileType", fileType);
attMap.put("attRemark", attRemark);
- if( "0010".equals(phaseno) && applyFlow.equals(objecttype) && userId.equals(inputuserid)&& ftList.size()<=1){
- attMap.put("isDelete", "Y");
+ if(begintime != null && inputtime != null ){
+ SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+ Date date1 = format.parse(begintime);
+ Date date2 = format.parse(inputtime);
+ boolean before = date1.before(date2);
+ if( "0010".equals(phaseno) && userId.equals(inputuserid)&& before){
+ attMap.put("isDelete", "Y");
+ }else{
+ attMap.put("isDelete", "N");
+ }
}else{
attMap.put("isDelete", "N");
}
+
attList.add(attMap);
}
libraryMap.put("fileList", attList);
@@ -431,5 +446,4 @@ public class BusinessDocDetailServiceImpl implements BusinessDocDetailService {
RestfullConstant.baseProperty.get("SUCCESS").toString(), "");
return ReturnMapUtil.getReturnMap();
}
-
}
diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/contract/make/controller/ContractMakeController.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/contract/make/controller/ContractMakeController.java
index 167672da0..d0ab6b034 100644
--- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/contract/make/controller/ContractMakeController.java
+++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/contract/make/controller/ContractMakeController.java
@@ -183,4 +183,24 @@ public class ContractMakeController {
return ReturnMapUtil.rollback(e);
}
}
+
+ /**
+ * 删除合同
+ */
+ @Path("/delete/contract")
+ @POST
+ public Map deleteContract(@Context HttpServletRequest request,
+ @Context HttpServletResponse response, @Context JBOTransaction tx,
+ @Context Transaction sqlca) throws Exception {
+ ReturnMapUtil ReturnMapUtil = new ReturnMapUtil(tx, sqlca);
+ ARE.getLog()
+ .info("[CONTROLLER] BusinessDataController run .................");
+ ARE.getLog().info(
+ "[Path] /contract/make/deleteContract/contract" + " run .................");
+ try {
+ return service.deleteContract(request, response, tx, sqlca, ReturnMapUtil);
+ } catch (Exception e) {
+ return ReturnMapUtil.rollback(e);
+ }
+ }
}
diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/contract/make/service/ContractMakeService.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/contract/make/service/ContractMakeService.java
index e960bbf51..b6b6a3cf5 100644
--- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/contract/make/service/ContractMakeService.java
+++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/contract/make/service/ContractMakeService.java
@@ -46,6 +46,10 @@ public interface ContractMakeService {
@Context HttpServletResponse response, @Context JBOTransaction tx,
@Context Transaction sqlca, ReturnMapUtil ReturnMapUtil)
throws Exception;
+ Map deleteContract(@Context HttpServletRequest request,
+ @Context HttpServletResponse response, @Context JBOTransaction tx,
+ @Context Transaction sqlca, ReturnMapUtil ReturnMapUtil)
+ throws Exception;
diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/contract/make/service/impl/ContractMakeServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/contract/make/service/impl/ContractMakeServiceImpl.java
index 6ceac1afa..6f73f4d3b 100644
--- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/contract/make/service/impl/ContractMakeServiceImpl.java
+++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/contract/make/service/impl/ContractMakeServiceImpl.java
@@ -10,7 +10,9 @@ import javax.servlet.http.HttpServletResponse;
import jbo.app.tenwa.customer.CUSTOMER_ACCOUNT;
import jbo.app.tenwa.doc.LB_DOC_CONTRACT_LIST;
import jbo.com.tenwa.entity.comm.officetempalte.BF_TEMPLATE;
+import jbo.com.tenwa.lease.comm.LB_CONTRACT_TEMPLATE;
import jbo.com.tenwa.lease.comm.LB_EQUIPMENT_CAR_TEMP;
+import jbo.com.tenwa.lease.comm.LB_PROJECT_INFO;
import net.sf.json.JSONObject;
import com.amarsoft.are.jbo.BizObject;
@@ -48,17 +50,24 @@ public class ContractMakeServiceImpl implements ContractMakeService{
.readRequestParam(request, "UTF-8");
fieldMap = (Map) testMap.get("fieldMap"); // 参数
String userId = fieldMap.get("userid") == null ? "" : fieldMap.get("userid").toString();
+ String globaltext = fieldMap.get("globaltext") == null ? "" : fieldMap.get("globaltext").toString();
Map body = new HashMap();
ASUser asUser = new ASUser(userId);
String orgID = asUser.getOrgID();
String sql = "";
if("8006011".equals(orgID)){
- sql = "SELECT lpi.END_DATE AS startdate,lpi.id projectid, lpi.product_id, lpi.project_no, lpi.project_name, ci.customername, getItemName ('CertType', ci.certtype) certtype, ci.certid, getUserName (lpi.project_manage) AS project_manage, getOrgLevelName (lpi.project_dept) project_dept, ci.customertype,lpi.leas_form,lpi.CAR_TYPE,lpi.IS_NETCAR,psl.operationType,psl.signType,psl.sealType,lpi.subjectid,lpi.subjectname,lpc.CLEAN_LEASE_MONEY AS clean_lease_money,lpc.INCOME_NUMBER AS income_number,lec.MODEL AS model,lprp.RENT AS rent FROM LB_PROJECT_INFO lpi LEFT JOIN LC_PROJ_CONDITION lpc ON lpi.id=lpc.project_id LEFT JOIN LB_CONTRACT_INFO lci ON lpi.id=lci.project_id LEFT JOIN LC_CONTRACT_CONDITION lcc ON lci.id=lcc.contract_id LEFT JOIN LB_UNION_LESSEE lult ON lpi.id = lult.project_id AND (lult.contract_id = '' OR lult.contract_id IS NULL) LEFT JOIN CUSTOMER_INFO ci ON lult.customer_id = ci.customerid LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON psl.productid=lpi.product_id LEFT JOIN LB_EQUIPMENT_CAR lec ON lec.project_id=lpi.id LEFT JOIN LC_PROJ_RENT_PLAN lprp ON lprp.project_id=lpi.id AND lprp.plan_list='1' WHERE lult.is_main = 'y' AND lpi.project_status = '13' AND((lci.contract_status = '21' AND lpc.equip_amt>lcc.equip_amt) OR ((lult.CONTRACT_ID='' OR lult.CONTRACT_ID IS NULL)AND (SELECT COUNT(*) FROM lb_contract_info WHERE project_id=lpi.id)=0)) AND lpi.INPUTORGID='"+orgID+"' AND lpi.businesstype='1' ORDER BY lpi.END_DATE DESC";
+ sql = "SELECT lpi.END_DATE AS startdate,lpi.id projectid, lpi.product_id, lpi.project_no, lpi.project_name, ci.customername, getItemName ('CertType', ci.certtype) certtype, ci.certid, getUserName (lpi.project_manage) AS project_manage, getOrgLevelName (lpi.project_dept) project_dept, ci.customertype,lpi.leas_form,lpi.CAR_TYPE,lpi.IS_NETCAR,psl.operationType,psl.signType,psl.sealType,lpi.subjectid,lpi.subjectname,lpc.CLEAN_LEASE_MONEY AS clean_lease_money,lpc.INCOME_NUMBER AS income_number,lec.MODEL AS model,lprp.RENT AS rent FROM LB_PROJECT_INFO lpi LEFT JOIN LC_PROJ_CONDITION lpc ON lpi.id=lpc.project_id LEFT JOIN LB_CONTRACT_INFO lci ON lpi.id=lci.project_id LEFT JOIN LC_CONTRACT_CONDITION lcc ON lci.id=lcc.contract_id LEFT JOIN LB_UNION_LESSEE lult ON lpi.id = lult.project_id AND (lult.contract_id = '' OR lult.contract_id IS NULL) LEFT JOIN CUSTOMER_INFO ci ON lult.customer_id = ci.customerid LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON psl.productid=lpi.product_id LEFT JOIN LB_EQUIPMENT_CAR lec ON lec.project_id=lpi.id LEFT JOIN LC_PROJ_RENT_PLAN lprp ON lprp.project_id=lpi.id AND lprp.plan_list='1' WHERE lult.is_main = 'y' AND lpi.project_status = '13' AND((lci.contract_status = '21' AND lpc.equip_amt>lcc.equip_amt) OR ((lult.CONTRACT_ID='' OR lult.CONTRACT_ID IS NULL)AND (SELECT COUNT(*) FROM lb_contract_info WHERE project_id=lpi.id)=0)) AND lpi.INPUTORGID='"+orgID+"'";
}else{
- sql="SELECT lpi.END_DATE AS startdate,lpi.id projectid, lpi.product_id, lpi.project_no, lpi.project_name, ci.customername, getItemName ('CertType', ci.certtype) certtype, ci.certid, getUserName (lpi.project_manage) AS project_manage, getOrgLevelName (lpi.project_dept) project_dept, ci.customertype,lpi.leas_form,lpi.CAR_TYPE,lpi.IS_NETCAR,psl.operationType,psl.signType,psl.sealType,lpi.subjectid,lpi.subjectname,lpc.CLEAN_LEASE_MONEY AS clean_lease_money,lpc.INCOME_NUMBER AS income_number,lec.MODEL AS model,lprp.RENT AS rent FROM LB_PROJECT_INFO lpi LEFT JOIN LC_PROJ_CONDITION lpc ON lpi.id=lpc.project_id LEFT JOIN LB_CONTRACT_INFO lci ON lpi.id=lci.project_id LEFT JOIN LC_CONTRACT_CONDITION lcc ON lci.id=lcc.contract_id LEFT JOIN LB_UNION_LESSEE lult ON lpi.id = lult.project_id AND (lult.contract_id = '' OR lult.contract_id IS NULL) LEFT JOIN CUSTOMER_INFO ci ON lult.customer_id = ci.customerid LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON psl.productid=lpi.product_id LEFT JOIN LB_EQUIPMENT_CAR lec ON lec.project_id=lpi.id LEFT JOIN LC_PROJ_RENT_PLAN lprp ON lprp.project_id=lpi.id AND lprp.plan_list='1' WHERE lult.is_main = 'y' AND lpi.project_status = '13' AND((lci.contract_status = '21' AND lpc.equip_amt>lcc.equip_amt) OR ((lult.CONTRACT_ID='' OR lult.CONTRACT_ID IS NULL)AND (SELECT COUNT(*) FROM lb_contract_info WHERE project_id=lpi.id)=0)) AND lpi.PROJECT_MANAGE='"+userId+"' AND lpi.businesstype='1' ORDER BY lpi.END_DATE DESC";
+ sql="SELECT lpi.END_DATE AS startdate,lpi.id projectid, lpi.product_id, lpi.project_no, lpi.project_name, ci.customername, getItemName ('CertType', ci.certtype) certtype, ci.certid, getUserName (lpi.project_manage) AS project_manage, getOrgLevelName (lpi.project_dept) project_dept, ci.customertype,lpi.leas_form,lpi.CAR_TYPE,lpi.IS_NETCAR,psl.operationType,psl.signType,psl.sealType,lpi.subjectid,lpi.subjectname,lpc.CLEAN_LEASE_MONEY AS clean_lease_money,lpc.INCOME_NUMBER AS income_number,lec.MODEL AS model,lprp.RENT AS rent FROM LB_PROJECT_INFO lpi LEFT JOIN LC_PROJ_CONDITION lpc ON lpi.id=lpc.project_id LEFT JOIN LB_CONTRACT_INFO lci ON lpi.id=lci.project_id LEFT JOIN LC_CONTRACT_CONDITION lcc ON lci.id=lcc.contract_id LEFT JOIN LB_UNION_LESSEE lult ON lpi.id = lult.project_id AND (lult.contract_id = '' OR lult.contract_id IS NULL) LEFT JOIN CUSTOMER_INFO ci ON lult.customer_id = ci.customerid LEFT JOIN PRD_SPECIFIC_LIBRARY psl ON psl.productid=lpi.product_id LEFT JOIN LB_EQUIPMENT_CAR lec ON lec.project_id=lpi.id LEFT JOIN LC_PROJ_RENT_PLAN lprp ON lprp.project_id=lpi.id AND lprp.plan_list='1' WHERE lult.is_main = 'y' AND lpi.project_status = '13' AND((lci.contract_status = '21' AND lpc.equip_amt>lcc.equip_amt) OR ((lult.CONTRACT_ID='' OR lult.CONTRACT_ID IS NULL)AND (SELECT COUNT(*) FROM lb_contract_info WHERE project_id=lpi.id)=0)) AND lpi.PROJECT_MANAGE='"+userId+"'";
+ }
+ if(globaltext.length() ==0 ){
+ sql = sql+ " AND lpi.businesstype='1' ORDER BY lpi.END_DATE DESC ";
+ }else{
+ sql = sql+ " and (lpi.project_no like '%"+globaltext+"%' or ci.customername like '%"+globaltext+"%') AND lpi.businesstype='1' ORDER BY lpi.END_DATE DESC ";
}
List