diff --git a/WebContent/Tenwa/Gps/LmGpsOrderInfo.jsp b/WebContent/Tenwa/Gps/LmGpsOrderInfo.jsp
index 8a53ed4b3..c9dc1068d 100644
--- a/WebContent/Tenwa/Gps/LmGpsOrderInfo.jsp
+++ b/WebContent/Tenwa/Gps/LmGpsOrderInfo.jsp
@@ -35,11 +35,15 @@
String period = incomNuber.divide(new BigDecimal("12"),0,BigDecimal.ROUND_UP).toString();
String sTempletNo = "LmGpsOrderInfo";//--ģ--
ASObjectModel doTemp = new ASObjectModel(sTempletNo);
- if(GpsEnum.TY.getCode().equals(source)){
- doTemp.setColumnAttribute("CARTYPE", "COLVISIBLE", "0");
- doTemp.setColumnAttribute("USERNAME", "COLVISIBLE", "0");
- doTemp.setColumnAttribute("USERPHONE", "COLVISIBLE", "0");
- doTemp.setColumnAttribute("SHOPNAME", "COLVISIBLE", "0");
+ if(GpsEnum.ZR.getCode().equals(source)){
+ doTemp.setColumnAttribute("CARTYPE", "COLVISIBLE", "1");
+ doTemp.setColumnAttribute("CARTYPE", "COLREQUIRED", "1");
+ doTemp.setColumnAttribute("USERNAME", "COLVISIBLE", "1");
+ doTemp.setColumnAttribute("USERNAME", "COLREQUIRED", "1");
+ doTemp.setColumnAttribute("USERPHONE", "COLVISIBLE", "1");
+ doTemp.setColumnAttribute("USERPHONE", "COLREQUIRED", "1");
+ doTemp.setColumnAttribute("SHOPNAME", "COLVISIBLE", "1");
+ doTemp.setColumnAttribute("SHOPNAME", "COLREQUIRED", "1");
}
ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
dwTemp.Style = "2";//freeform
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml
index 7609c8023..2881d72b6 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml
@@ -189,7 +189,7 @@
-
+
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 539185713..c2bae36c2 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
@@ -15,6 +15,7 @@ import jbo.app.tenwa.doc.LB_DOCATTRIBUTE;
import jbo.app.tenwa.doc.LB_DOCLIBRARY;
import jbo.app.tenwa.doc.LB_DOCRELATIVE;
import jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT;
+import jbo.sys.CODE_LIBRARY;
import jbo.sys.FLOW_OBJECT;
import jbo.sys.FLOW_TASK;
import net.sf.json.JSONObject;
@@ -379,7 +380,13 @@ public class BusinessDocDetailServiceImpl implements BusinessDocDetailService {
String tweClassly = library.getAttribute("TWO_CLASSIFY") == null ? ""
: library.getAttribute("TWO_CLASSIFY").toString();
//УǷ
- if(!(docNature.equals("01")||docName1.equals(""))){
+ BizObjectManager clManage= JBOFactory.getBizObjectManager(CODE_LIBRARY.CLASS_NAME);
+ BizObject cl = clManage.createQuery(" codeno='DocList' AND itemno=:itemno ").setParameter("itemno", oneClassly).getSingleResult(false);
+ String oneName = "";
+ if(cl!=null){
+ oneName = cl.getAttribute("ITEMNAME")==null?"":cl.getAttribute("ITEMNAME").getString();
+ }
+ if(!(docNature.equals("01")||("".equals(oneName) && docName1.equals("")))){
continue;
}
libraryMap.put("libraryId", libraryId);
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 4593b73da..2423633f8 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
@@ -13,6 +13,7 @@ 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 jbo.com.tenwa.lease.comm.LB_PROJECT_INFO_TEMP;
import net.sf.json.JSONObject;
import com.amarsoft.are.jbo.BizObject;
@@ -383,12 +384,12 @@ public class ContractMakeServiceImpl implements ContractMakeService{
String status = result[0];
if("true".equals(result[3])){
message = "pdfĺͬ";
- };
- if( status!=null && !status.equals("null") && status.length()>0 && new Integer(status) < 3 ){
+ }else if( status!=null && !status.equals("null") && status.length()>0 && new Integer(status) < 2 ){
message = "ɺͬ,ڵǩԼ";
- };
- if(status!=null && !status.equals("null") && status.length()>0 && new Integer(status) > 4 &&new Integer(status) < 7 ){
+ }else if(status!=null && !status.equals("null") && status.length()>0 && new Integer(status) > 4 &&new Integer(status) < 7 ){
message = "ͬ״̬Ϊ:"+result[1]+"Եǩ";
+ }else if (("sendMessageAgain".equals(signType)||"queryAgain".equals(signType)) && new Integer(status) == 2){
+ message = "ǩԼδѯط";
}
if("4".equals(status)){
message = "ǩԼ";
@@ -476,12 +477,15 @@ public class ContractMakeServiceImpl implements ContractMakeService{
return ReturnMapUtil.getReturnMap();
}
String projectId = flowParms.get("ProjectId");
+ String ContractId = flowParms.get("ContractId");
BizObjectManager lclManager=JBOFactory.getBizObjectManager(LB_DOC_CONTRACT_LIST.CLASS_NAME,tx);
BizObjectManager lpiManager=JBOFactory.getBizObjectManager(LB_PROJECT_INFO.CLASS_NAME,tx);
+ BizObjectManager lpitManager=JBOFactory.getBizObjectManager(LB_PROJECT_INFO_TEMP.CLASS_NAME,tx);
BizObjectManager lctManager=JBOFactory.getBizObjectManager(LB_CONTRACT_TEMPLATE.CLASS_NAME,tx);
- lclManager.createQuery("update O set file_flag='no',message='1' where flow_unid=:flow_unid").setParameter("flow_unid",flowunid).executeUpdate();
+ lclManager.createQuery("update O set file_flag='no',message='1' where contract_id=:contract_id").setParameter("contract_id",ContractId).executeUpdate();
lpiManager.createQuery("update O set PROJECT_STATUS=13 where id=:id").setParameter("id",projectId).executeUpdate();
- lctManager.createQuery("delete from O where flowunid=:flowunid ").setParameter("flowunid", flowunid).executeUpdate();
+ lpitManager.createQuery("update O set DATA_STATE=2 where flowunid=:flowunid").setParameter("flowunid",flowunid).executeUpdate();
+ lctManager.createQuery("delete from O where contract_id=:contract_id ").setParameter("contract_id", ContractId).executeUpdate();
ReturnMapUtil.setReturnMap(null,RestfullConstant.baseProperty.get("success").toString(), "");
return ReturnMapUtil.getReturnMap();
}
diff --git a/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyArchiveServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyArchiveServiceImpl.java
index e313da242..055026a05 100644
--- a/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyArchiveServiceImpl.java
+++ b/src_app_fresh/apx/com/amarsoft/als/user/change/center/service/impl/ApplyArchiveServiceImpl.java
@@ -243,10 +243,10 @@ public class ApplyArchiveServiceImpl implements ApplyArchiveService{
String sql = "SELECT lrp.PROJECT_PLAN_NUMBER,lul.customer_name,cp.mobile,cp.SEX,cp.WORKCORP,cp.WORKADD,ca.fulladdress,cp.EMERGENCY_CONTACT_PERSON,lrp.contract_id,cp.customerid AS customer_id FROM lc_overdue_rent_plan lrp LEFT JOIN lb_contract_info lci ON lci.id=lrp.contract_id LEFT JOIN lb_union_lessee lul ON lul.CONTRACT_ID = lrp.CONTRACT_ID LEFT JOIN CUSTOMER_PERSON cp ON cp.customerid = lul.CUSTOMER_ID LEFT JOIN CUSTOMER_ADDRESS ca ON ca.customerid = cp.customerid WHERE lrp.plan_date < NOW() AND lrp.plan_status='δ' ";
if("my".equalsIgnoreCase(sign)){
System.out.println("ȡҵ ");
- sql = sql + " AND lci.project_manage='"+userId+"' GROUP BY lrp.contract_id ";
+ sql = sql + " AND lci.project_manage='"+userId+"' GROUP BY cp.customerid ";
}else{
System.out.println("ȡ ");
- sql = sql + " AND lci.distributor_id=(SELECT distributor_no FROM distributor_info WHERE orgid='"+orgid+"') GROUP BY lrp.contract_id ";
+ sql = sql + " AND lci.distributor_id=(SELECT distributor_no FROM distributor_info WHERE orgid='"+orgid+"') GROUP BY cp.customerid ";
}
//sql = "select t.FULLNAME,t.mobile,t.SEX,t.WORKCORP,t.WORKADD,t.fulladdress,t.EMERGENCY_CONTACT_PERSON,t.plan_date,sum(t.residue_rent) as residue_rent from (select cp.FULLNAME,cp.mobile,cp.SEX,cp.WORKCORP,cp.WORKADD,ca.fulladdress,cp.EMERGENCY_CONTACT_PERSON,lrp.plan_date,ifnull(sum(lrp.rent),0) - ifnull(sum(lri.rent),0) as residue_rent from lc_rent_plan lrp left join lc_rent_income lri on lri.plan_id=lrp.id left join lb_union_lessee lul on lul.CONTRACT_ID=lrp.CONTRACT_ID left join CUSTOMER_PERSON cp on cp.customerid=lul.CUSTOMER_ID left join CUSTOMER_ADDRESS ca on ca.customerid=cp.customerid WHERE lrp.plan_date =0 group by t.plan_date";
//sql = "SELECT t.FULLNAME,t.mobile,t.SEX,t.WORKCORP,t.WORKADD,t.fulladdress,t.EMERGENCY_CONTACT_PERSON,t.plan_date,t.residue_rent AS residue_rent FROM (SELECT cp.FULLNAME,cp.mobile,cp.SEX,cp.WORKCORP,cp.WORKADD,ca.fulladdress,cp.EMERGENCY_CONTACT_PERSON,lrp.plan_date,IFNULL(lrp.rent, 0) - SUM(IFNULL(lri.rent, 0)) AS residue_rent FROM lc_rent_plan lrp LEFT JOIN lc_rent_income lri ON lri.plan_id = lrp.id LEFT JOIN lb_contract_info lci ON lrp.contract_id=lci.id LEFT JOIN lb_union_lessee lul ON lul.CONTRACT_ID = lrp.CONTRACT_ID LEFT JOIN CUSTOMER_PERSON cp ON cp.customerid = lul.CUSTOMER_ID LEFT JOIN CUSTOMER_ADDRESS ca ON ca.customerid = cp.customerid WHERE lrp.plan_date < NOW() AND lci.distributor_id='"+distributor+"' GROUP BY lrp.id) t WHERE t.residue_rent > 0 ";
diff --git a/src_app_fresh/apx/com/amarsoft/als/user/change/initiate/service/impl/ApplyChangeServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/user/change/initiate/service/impl/ApplyChangeServiceImpl.java
index d75e9c196..dfe6f83d0 100644
--- a/src_app_fresh/apx/com/amarsoft/als/user/change/initiate/service/impl/ApplyChangeServiceImpl.java
+++ b/src_app_fresh/apx/com/amarsoft/als/user/change/initiate/service/impl/ApplyChangeServiceImpl.java
@@ -59,11 +59,11 @@ public class ApplyChangeServiceImpl implements ApplyChangeService{
String disSql = "SELECT distributor_no FROM distributor_info WHERE orgid=(SELECT belongorg FROM user_info WHERE userid='"+userId+"' )";
List