From 6ac62e81bf1a9fcafe27c29e80066a64f1e42b37 Mon Sep 17 00:00:00 2001
From: liuzhao <liuzhao@DESKTOP-NULDTFM>
Date: Tue, 21 Aug 2018 20:21:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E7=BB=93=E6=B8=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/WEB-INF/etc/jbo/jbo_calc.xml       | 13 ++++
 .../quartz/ContractInfoForNomalSettle.java    | 69 +++----------------
 2 files changed, 21 insertions(+), 61 deletions(-)

diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
index 740337796..43291cbf1 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
@@ -3600,5 +3600,18 @@
 				</managerProperties>
 			</manager>
 		</class>
+		<class name="VI_NORMALSETTLE_CONTRACT" label="" keyAttributes="contract_id">
+			<attributes>
+				<attribute name="contract_id" label="合同id" type="STRING"/>
+				<attribute name="contract_status" label="合同状态" type="STRING"/>
+				<attribute name="income_number" label="还租次数" type="STRING"/>
+			</attributes>
+			<manager>
+				<managerProperties>
+					<property name="table" value="vi_normalsettle_contract" />
+					<property name="createKey" value="true" />
+				</managerProperties>
+			</manager>
+		</class>
 	</package>
 </jbo>
diff --git a/src_tenwa/quartz/ContractInfoForNomalSettle.java b/src_tenwa/quartz/ContractInfoForNomalSettle.java
index 2ef06de6a..56a5d8301 100644
--- a/src_tenwa/quartz/ContractInfoForNomalSettle.java
+++ b/src_tenwa/quartz/ContractInfoForNomalSettle.java
@@ -4,6 +4,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import jbo.app.tenwa.calc.VI_NORMALSETTLE_CONTRACT;
 import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO;
 import jbo.com.tenwa.lease.comm.VI_NORMALEND_CONTRACT;
 
@@ -55,78 +56,24 @@ public class ContractInfoForNomalSettle implements Job{
 			for(String conInfo:conInfos){
 //				String customerName = conInfo.split("@")[1];
 				String contractId = conInfo.split("@")[0];						
-				BizObjectManager bm =  JBOFactory.getBizObjectManager(LB_CONTRACT_INFO.CLASS_NAME, tx);
-				bm.createQuery("update O set contract_status = '105' where id = '"+contractId+"'").executeUpdate();
-				SaveBusinessStatus.saveByContractId(contractId, tx, "61", jboName.getUserId(arg0, tx));
+				//BizObjectManager bm =  JBOFactory.getBizObjectManager(LB_CONTRACT_INFO.CLASS_NAME, tx);
+				//bm.createQuery("update O set contract_status = '105' where id = '"+contractId+"'").executeUpdate();
+				SaveBusinessStatus.saveByContractId(contractId, tx, "51", jboName.getUserId(arg0, tx));
 			}
 		}
 	}
-	public String initClaimsParams(Map<String,String> param,JBOTransaction sqlca,String contractId) throws Exception {
-		//��ʼ��һ�»�������
-		String fileSavePath = "d:/tmp/als/Upload";
-		StringBuffer templateParam = new StringBuffer();
-		templateParam.append("{");
-		for(String p:param.keySet()){
-			if("Flag".equals(p)||"Display".equals(p)){
-				templateParam.append("\""+p+"\"" + ":\"" + param.get(p) + "\"@");
-			}else{
-			    templateParam.append("\""+p.toUpperCase()+"\"" + ":\"" + param.get(p) + "\"@");
-			}
-		}
-		templateParam.append("\"CurUserId\":\"");
-		templateParam.append("admin");
-		templateParam.append("\"@\"CurOrgId\":\"");
-		templateParam.append("8001007");
-		templateParam.append("\"@\"fileSavePath\":\"");
-		templateParam.append(fileSavePath+"\"");
-		return templateParam.toString();
-	}
 	
-	//��ȡ���������ĺ�ͬû�е���ǩԼ�ĺ�ͬ��
+	//��ȡ��������ĺ�ͬ
 	public String getContractId(JBOTransaction tx ) throws Exception{
-		BizObjectManager bom=JBOFactory.getBizObjectManager(VI_NORMALEND_CONTRACT.CLASS_NAME,tx);
+		BizObjectManager bom=JBOFactory.getBizObjectManager(VI_NORMALSETTLE_CONTRACT.CLASS_NAME,tx);
 		List<BizObject> boList = bom.createQuery("contract_status <> '105'").getResultList(true);
 		String conInfos = new String();
 		for(BizObject bo : boList){
-			conInfos += bo.getAttribute("id")+"@";
-			conInfos += bo.getAttribute("customername")+",";
+			conInfos += bo.getAttribute("contract_id")+"@";
+			conInfos += bo.getAttribute("income_number")+",";
 //			conInfos += bo.getAttribute("BUSINESS_STATUS")+",";
 		}
 		return conInfos;
 	}
 	
-	public void createOfficeByTemplate(CreateOfficeAction coa,String templateParam,String docName,String templetNo,String otherName,String otherParam,JBOTransaction sqlca) throws Exception{
-		StringBuffer sql = new StringBuffer();
-		sql.append(templateParam.toString());
-		sql.append("@");
-		sql.append("\"DOCNAME\":\"");
-		sql.append(docName);
-		sql.append("\"");
-		sql.append("@");
-		sql.append("\"OTHERNAME\":\"");
-		sql.append(otherName);
-		sql.append("\"");
-		if(otherParam != null){
-			sql.append(otherParam);
-		}
-		sql.append("}");
-		coa.setTemplateParam(sql.toString());
-		coa.setTemplateNo(templetNo);
-		coa.createOfficeByTemplate(sqlca);
-	}
-	
-	public void deleteAttrAndContractInfo(JBOTransaction tx,String contract_id) throws Exception{
-	    BizObjectManager LdrBom=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCRELATIVE.CLASS_NAME);
-	    BizObjectManager LdclBom=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOC_CONTRACT_LIST.CLASS_NAME);
-	    BizObjectManager LdlBom=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCLIBRARY.CLASS_NAME);
-		BizObjectManager LdaBom=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCATTRIBUTE.CLASS_NAME);
-		BizObject LdrBo = LdrBom.createQuery("contract_id = :contract_id and objecttype = '��Ȩת�Ƶ�'").setParameter("contract_id",contract_id).getSingleResult(true);
-		if(LdrBo!=null){
-			BizObject LdlBo = LdlBom.createQuery("relative_id=:id and doc_class_itemno = '010003'").setParameter("id",LdrBo.getAttribute("id").toString()).getSingleResult(true);
-			if(LdlBo!=null){
-				LdaBom.createQuery("delete from O where library_id = :id").setParameter("id",LdlBo.getAttribute("id").toString()).executeUpdate();
-			}
-		}
-		int LdclBo = LdclBom.createQuery("delete from O where flow_unid = :contract_id and doc_name like '����Ȩ%'").setParameter("contract_id",contract_id).executeUpdate();
-	}
 }