From a2018673934c57e3dc45f1e5db0f1794439ff2fb Mon Sep 17 00:00:00 2001
From: liuzhao <liuzhao@DESKTOP-NULDTFM>
Date: Wed, 6 Jun 2018 18:29:36 +0800
Subject: [PATCH] =?UTF-8?q?GPS,=E7=89=8C=E7=85=A7=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/Tenwa/CarPhoto/CarPhotoList.jsp    |  44 ++++++++++++++----
 .../CarPhoto/LBCarPhotoDocumentInfo.jsp       |  23 ++++++---
 .../Tenwa/Gps/GpsRegister/GpsRegisterList.jsp |  23 ++++++++-
 WebContent/fileTemplate/GPS管理导入.xls       | Bin 19456 -> 19456 bytes
 WebContent/fileTemplate/牌照管理导入.xls      | Bin 18944 -> 18944 bytes
 .../impl/LBCarLicenseCallback.java            |  26 +++++++++--
 6 files changed, 95 insertions(+), 21 deletions(-)

diff --git a/WebContent/Tenwa/CarPhoto/CarPhotoList.jsp b/WebContent/Tenwa/CarPhoto/CarPhotoList.jsp
index f4bcedc14..a37eb212b 100644
--- a/WebContent/Tenwa/CarPhoto/CarPhotoList.jsp
+++ b/WebContent/Tenwa/CarPhoto/CarPhotoList.jsp
@@ -1,7 +1,8 @@
 <%@ page contentType="text/html; charset=GBK"%>
-<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
-String orgid=CurUser.getOrgID();
-String userid=CurUser.getUserID();
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%>
+<%
+	String orgid=CurUser.getOrgID();
+	String userid=CurUser.getUserID();
 	ASObjectModel doTemp = new ASObjectModel("LB_CAR_LICENSE_PLATE_LIST");
 	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
 	dwTemp.Style="1"; 
@@ -10,14 +11,35 @@ String userid=CurUser.getUserID();
 	
 	dwTemp.genHTMLObjectWindow("");
 	String sButtons[][] = {
-		{"true","All","Button","����","����","newRecord()","","","",""},
+		/* {"true","All","Button","����","����","newRecord()","","","",""}, */
 		{"true","All","Button","�޸�","�޸�","edit()","","","",""},
 		{"true","All","Button","ɾ��","ɾ��","do_delete()","","","","btn_icon_delete"},
-		{"true","All","Button","���չ�������","���չ�������","importExcel()","","","","btn_icon_import"}
+		{"true","All","Button","����Excel","����Excel","importExcel()","","","","btn_icon_import"},
+		{"true","","Button","����ģ������","����ģ������","LicensePlateDownload()","","","","btn_icon_down",""},
 	};
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+<iframe name="MyAtt" src="<%=com.amarsoft.awe.util.Escape.getBlankJsp(sWebRootPath,"�������ظ��������Ժ�...")%>" style="background-color: blue" width=100% height=100% frameborder=0 hspace=0 vspace=0 marginwidth=0 marginheight=0 scrolling="no"> 
+</iframe>
+<form name=form1 method=post action="<%=sWebRootPath%>/servlet/view/fileTemplateView?CompClientID=<%=sCompClientID%>" target=MyAtt>
+	<div style="display:none">
+		<input id="sqlString" name=sqlString value="">
+	</div>
+</form>
+
 <script type="text/javascript">
 	/*~[Describe=������¼;InputParam=��;OutPutParam=��;]~*/
+	
+	function LicensePlateDownload(){
+		var sId="4c559680c16242c497816604aedce292";
+		if (typeof(sId)=="undefined" || sId.length==0){
+			return;
+    	}else{
+    		$("#sqlString").val("save@"+sId);
+    		form1.submit();
+        }		
+
+	}
+	
 	function newRecord(){
 			AsDialog.OpenSelector("SelectContractCarPhoto","","dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){
 		    	
@@ -76,9 +98,11 @@ String userid=CurUser.getUserID();
 	function  edit(){
 		var sUrl = "/Tenwa/ChannelPortal/BusinessHanding/CarPhoto/LBCarPhotoDocumentInfo.jsp";
 		// AsControl.OpenView(sUrl,'','_self','');
+		
 		var id=getItemValue(0, getRow(0), "contract_id");
-		var car_id=getItemValue(0, getRow(0), "car_id");
-		var cparam="contract_id="+id+"&car_id="+car_id;
+		//var car_id=getItemValue(0, getRow(0), "car_id");
+		//var cparam="contract_id="+id+"&car_id="+car_id;
+		var cparam="contract_id="+id;
 		AsDialog.PopView(sUrl,cparam,"dialogWidth=800px;dialogHeight=480px;resizable=no;scrollbars=no;status:yes;maximize:no;help:no;",function(){
 			 reloadSelf(); 
 		},"�޸ij��ƺ�");
@@ -95,7 +119,7 @@ String userid=CurUser.getUserID();
 	    	    			{width:"350px",height:"40px",title:"�ϴ����չ�������"},function(){reloadSelf();});
 	}
 	
-	function exportExcel(){
+	<%-- function exportExcel(){
 		var param={};
 		var tempParam={};
 		var sparam="";
@@ -123,7 +147,7 @@ String userid=CurUser.getUserID();
 					"FLOW_UNID="+tempParam["FLOW_UNID"]+"&OBJECTTYPE="+tempParam["OBJECTTYPE"]);
 			downloadFile(attributeID);
 		}else{
-			alert("����ʧ�ܣ�");
+			alert("����ʧ�ܣ�");sr
 		}
 	}
 	
@@ -131,6 +155,6 @@ String userid=CurUser.getUserID();
 		if(!frames["downloadTemplate"]) $("<iframe name='downloadTemplate' style='display:none;'></iframe>").appendTo("body");
 		window.open(sWebRootPath+"/servlet/view/docDownloadServlet?CompClientID=<%=sCompClientID%>&sqlString=save@"+id, "downloadTemplate");
 	}
-	
+ --%>	
 </script>
 <%@	include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/ChannelPortal/BusinessHanding/CarPhoto/LBCarPhotoDocumentInfo.jsp b/WebContent/Tenwa/ChannelPortal/BusinessHanding/CarPhoto/LBCarPhotoDocumentInfo.jsp
index 0a644f994..f65013e51 100644
--- a/WebContent/Tenwa/ChannelPortal/BusinessHanding/CarPhoto/LBCarPhotoDocumentInfo.jsp
+++ b/WebContent/Tenwa/ChannelPortal/BusinessHanding/CarPhoto/LBCarPhotoDocumentInfo.jsp
@@ -5,12 +5,15 @@
 	//����������
 	String sObjectType=CurPage.getParameter("ObjectType");//
 	String contract_id=CurPage.getParameter("contract_id");
-	String car_id=CurPage.getParameter("car_id");
+	
+	//String contract_id=CurPage.getParameter("contract_id");
+	//String car_id=CurPage.getParameter("car_id");
 	ASObjectModel doTemp = new ASObjectModel("LB_CAR_LICENSE_PLATE_INFO");
 	ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
 	dwTemp.Style="2";      // ����DW��� 1:Grid 2:Freeform
 	dwTemp.ReadOnly = "0"; // �����Ƿ�ֻ�� 1:ֻ�� 0:��д
-	dwTemp.genHTMLObjectWindow(car_id);
+	//dwTemp.genHTMLObjectWindow(car_id);
+	dwTemp.genHTMLObjectWindow(contract_id);
 	String[][] sButtons=null;
 	sButtons=new String[][]{
 			{"true","","Button","����","���������޸�","importRecord()","","","",""},
@@ -18,7 +21,7 @@
 %><%@include file="/Frame/resources/include/ui/include_info.jspf"%>
 <script type="text/javascript">
 	$(function() {
-		$("#FILE2").attr("type","file");debugger;
+		$("#FILE2").attr("type","file");
 		$("#FILE3").attr("type","file");
 		$("#myiframe0").attr("enctype","multipart/form-data");
 		var params={};
@@ -47,12 +50,18 @@
 		}
 	}
 	function saveRecord(){
-		var car_id="<%=car_id%>";
+		<%-- var car_id="<%=car_id%>"; --%>
+		var contract_id="<%=contract_id%>";
 		var plate_number=getItemValue(0,getRow(0),"plate_number");
 		var platetime=getItemValue(0,getRow(0),"platetime");
-		var car_unit=getItemValue(0,getRow(0),"car_unit");
-		var car_location=getItemValue(0,getRow(0),"car_location");
-		var param="id="+car_id+",plate_number="+plate_number+",platetime="+platetime+",car_unit="+car_unit+",car_location="+car_location;
+		var frame_number=getItemValue(0,getRow(0),"frame_number");
+		var plate_status=getItemValue(0,getRow(0),"plate_status");
+
+		/* var car_unit=getItemValue(0,getRow(0),"car_unit"); */
+		/* var car_location=getItemValue(0,getRow(0),"car_location"); */
+		var param="id="+contract_id+",plate_number="+plate_number+",platetime="+platetime+",frame_number="+frame_number+",plate_status="+plate_status;
+		//var param="id="+contract_id+",plate_number="+plate_number+",platetime="+platetime+",car_unit="+car_unit+",car_location="+car_location;
+
 		RunJavaMethodTrans("com.tenwa.channelmanage.SaveCarPhoto", "SaveCarPhoto", param);
 	}
 	//�ύ
diff --git a/WebContent/Tenwa/Gps/GpsRegister/GpsRegisterList.jsp b/WebContent/Tenwa/Gps/GpsRegister/GpsRegisterList.jsp
index 5ef1a81ec..222183e77 100644
--- a/WebContent/Tenwa/Gps/GpsRegister/GpsRegisterList.jsp
+++ b/WebContent/Tenwa/Gps/GpsRegister/GpsRegisterList.jsp
@@ -11,12 +11,33 @@
 		{"true","All","Button","����","����","newRecord()","","","",""},
 		{"true","All","Button","�޸�","�޸�","viewAndEdit()","","","","btn_icon_edit"},
 		{"true","","Button","ɾ��","ɾ��","do_delete()","","","","btn_icon_delete"},
-		{"true","","Button","GPS����","GPS����","importExcel()","","","","btn_icon_import"}
+		{"true","","Button","����Excel","����Excel","importExcel()","","","","btn_icon_import"},
+		{"true","","Button","GPSģ������","GPSģ������","GPSDownload()","","","","btn_icon_down",""},
 	};
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+
+<iframe name="MyAtt" src="<%=com.amarsoft.awe.util.Escape.getBlankJsp(sWebRootPath,"�������ظ��������Ժ�...")%>" style="background-color: blue" width=100% height=100% frameborder=0 hspace=0 vspace=0 marginwidth=0 marginheight=0 scrolling="no"> 
+</iframe>
+<form name=form1 method=post action="<%=sWebRootPath%>/servlet/view/fileTemplateView?CompClientID=<%=sCompClientID%>" target=MyAtt>
+	<div style="display:none">
+		<input id="sqlString" name=sqlString value="">
+	</div>
+</form>
+
 <script type="text/javascript">
 	/*~[Describe=������¼;InputParam=��;OutPutParam=��;]~*/
 	
+	function GPSDownload(){
+		var sId="52b5c3fc03ec47709f6a972b9d5d5d7a";
+		if (typeof(sId)=="undefined" || sId.length==0){
+			return;
+    	}else{
+    		$("#sqlString").val("save@"+sId);
+    		form1.submit();
+        }		
+
+	}
+	
 	function newRecord(){
 		 var sUrl = "/Tenwa/Gps/GpsRegister/GpsRegister.jsp";
 		 AsDialog.PopView(sUrl,"","resizable=yes;dialogWidth=700px;dialogHeight=330px;center:yes;status:no;statusbar:no",function(){
diff --git a/WebContent/fileTemplate/GPS管理导入.xls b/WebContent/fileTemplate/GPS管理导入.xls
index b1778d7e9cc5670a0eb7b8f8c7a2d92862ade620..be00f1eca5f97771b974660a2fbc7422dbe74ea6 100644
GIT binary patch
delta 910
zcmZpe!Pqc^aYGIZo4_s|yTreni&(ZXF&a!3WEV#wg(v5*cTMKwkeJ-ZDKU8-kX8fY
zFd()A;%7jd2gJ)b1tz~^SD4%eWN+ipnJmO<Fgc3TWb!`_k;zV+BAd5y>aa@kFfcHD
z{V%}4um#8f0TwBR2Mi(%0+WC9xij)icIJ1N<OB+%su2UL5t_W1U!PHU@@0N~ENW!I
zYD6X*3%E0iPfiwaug7JM2+aH|3<^LdHv_`~uwGp1rD5u)2nz0(-!IR=!U<L{h$KFp
zdpb8vTnZvy&%iJxEe)c<9IOGC=P@mo1gqzVS#X6R0muZJ3vnpW#gG8H!jQ<oU<Py_
zM4S&M4h~#aAdf|B@?U=OdTkumOM}HRtvAD~9@880IMhSpmL~zlT_9)a<FHs9hd3?=
zK`ox#&96`oPf><ATmw;z>02EfmO@e#rf;!3ezKEr1xpzlo7Cog!ophIj6iQPFffAP
t<~z1FY%E2=#=ADlxacsmF<5071GAc+yALy~34;NH!RCct@r+Ci3;-9XxPSlv

delta 738
zcmZpe!Pqc^aYGIZ+kqopK3~3XE@IinG+BUM0*XZ@=dgE8KF1+3`5REo4oK$#aTpNK
z1L9{utOmsYICLgAamY;W;}n^!#c42k5s(h!w3y5Xl-tH3uz4G&4yz<L0|Ud?{{jpQ
zTYwA@V3AUIz#ziFH~BZ8J0tgGXMXp|n*@c}#lWJRlNa;rGxATq%&!j;m6rvJ3Ier(
z&G-T~0Z1GGiwjMb7I2?jC13zjD+w_HuJ#Ip0#G5)`U8{K3W_H}WW|9(V3Vc@3htNR
zFVDcj2{uU@Nqjo@bZ(fq2wXfZ4Wiy0tR9Q6K(^>ff@Otax~?!J0GU!S_X0x!V*3?_
zL<R;k>B(073fe$fv;fk^VTCl<BWAc{afr*~5QjtqrbqNawlIo=NJCt9;WASUq)XBe
zhmG=JlXbvqAQ6kh_Q@{7Wh}ujB#v+1CoHVR%>)b~1_nk3CI+U>cWiCgSe74s5V%>!
fMTeQKAv+6{eEr;gm|2Y(Oc=~IFZ7CM1Zn^PBD|@+

diff --git a/WebContent/fileTemplate/牌照管理导入.xls b/WebContent/fileTemplate/牌照管理导入.xls
index ca1e76aec620500fd33aaf4a08881b397dd5d606..8fd968e3f3bb0e46d23deca70f1e165c411919a7 100644
GIT binary patch
delta 816
zcmaJ<O-NKx6h8OOee>>{(f8-e`{qXwDj_iR^&_SdW&b2JqL36s0}})VQM4RrTx1J3
z${BFgAFbL|uT=yYVXGEK13|d3or@L;3bhbB?~XHVrtagN`*F^9zVpMaR9U6UUfkr#
zpI06nytIXP_zYW)e)AzM+^4bG%M%wu@F70i_vTo9&-~MmC1XTiA<9wg5`Fl?2rw@?
z@r{wi4H4j^>EI_r;EM2Z(99zzUz-_ViS9A_YsC8~JbXfVb0Uv>OdppGj%DFQC9_v&
z0_QEslK9*@LwKFAiKgAh3>^0)OXE0U2d9<ir7f9_Zo6b1%I;D&72AwOEpBc*05vEO
z%mFNRuhNvAc-)aYYBt_(;&y!M$c)>_s=Dq%dLa$mR9S8KnV9w73}mj%cnxL^t`f{P
z^nDCn$pY26#3C_8gZY|3e0WZ28aV%-sKEE6Q?E#SAf`d7YNDo&{HsIEI-j=Gf*C5N
z;<SkN?&!q(RJCY7-@U?auG%HD*j*Mrl;cU7=LF1tSbG#rc3kYqt`5ZRB%6TiaE-pZ
zZ~*SpvZn@d=}2Vi6x>VgSEA{m9Ai2@91iyj%>j)9I&`Tg2h4`pmuTVR_-?p(*oINy
zz_cXgal$c5G!a+mD_HQ26bf(}JV-$*3P)}wUL6ZG{_EVv+bBO8XjBykPJYpsZah1`
U6<Mdo68a(NhyJK|_A#U2A3Ry80ssI2

delta 740
zcmaJ<J!lj`6n?YWyPdh)-0ohM%-&CNpr(q1)o{UhpotnS0w!J{h0PtDkU~&H$^*~B
z6l&q|4pIdXEEFuFV`X)M_KHCpi$pAK6ouG$zMZ>`O>~xd@7wpj_r00Nv^uQSVOv+t
z<ksq)YU4Yun(OSk`ejZV;ikdvUanpY!G~z|Zr*2+U;k$u8&-v_V4dgC;CcK+`-3%#
zO&;J^@-MACz9#&X_L6Y1C`$Oq3h)Q_@vUXz{J<9}-=SR*KGt{<C%LN{Vm!eFwlk7>
z_#|_l@HfI~6wU;*aWN~IkBiO(?m0Hza}HDNnIl;Wy<y3?wn=TR$mS&7<7dwW*oFmy
z1%Pg8hwka(j4KCvDZH_dNARI5bD6lR<9QqDjWn1-R|WWvnElh)$UK=Fj+xs~Bbbl%
zvlx1kIr{9QSSO~4nJ)-L%PeS38{7ZM3VcO6{f;yVV%k)yZ?vx?|LPF4&!;&Zzzj80
za}LOk4|Jk=>RvRT-R#1lsH0xpQj`18<ne#x&%l@Z?^9}NWO*##Do2qdtHKIgp>GY2
z!EGA$-W0w$p@c!nBNo7zx;0&3%)rf)A*L#qycw7U6Fvfm7EyedQ|-#NA>5g(JwF{7
o=I7nD$Er9R7)G~;<+JY-Q%C6mtIWCip~P{RgtDq%c)&>g59(^GA^-pY

diff --git a/src_core/com/tenwa/officetempalte/importcallback/impl/LBCarLicenseCallback.java b/src_core/com/tenwa/officetempalte/importcallback/impl/LBCarLicenseCallback.java
index 75780b856..50a968dc3 100644
--- a/src_core/com/tenwa/officetempalte/importcallback/impl/LBCarLicenseCallback.java
+++ b/src_core/com/tenwa/officetempalte/importcallback/impl/LBCarLicenseCallback.java
@@ -4,9 +4,11 @@ import java.util.List;
 import java.util.Map;
 
 import jbo.app.tenwa.calc.VI_LC_RENT_PLAN;
+import jbo.com.tenwa.lease.comm.LB_CAR_LICENSE_PLATE_INFO;
 import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO;
 
 import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.BizObjectManager;
 import com.amarsoft.are.jbo.JBOFactory;
 import com.amarsoft.are.jbo.JBOTransaction;
 import com.amarsoft.awe.util.Transaction;
@@ -14,17 +16,35 @@ import com.amarsoft.context.ASUser;
 import com.tenwa.comm.exception.BusinessException;
 
 public class LBCarLicenseCallback extends BaseImportExcelCallBack{
-
+	
 	@Override
 	public void run(ASUser CurUser, BizObject importObject,
 			Map<String, String> model, Integer rowIndex, JBOTransaction tx,
 			Transaction Sqlca) throws Exception {
+		//��ȡExcel���еĺ�ͬ���(excel���е��ֶ�Ϊcontract_id,ʵ�����������Ϊ��ͬ���)
 		String contractNumber = importObject.getAttribute("contract_id").getString();
+		
 		//jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO
-		BizObject contractInfo=JBOFactory.createBizObjectQuery(jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO.CLASS_NAME,"contract_number=:contractNumber").setParameter("contractNumber", contractNumber).getSingleResult(false);
+		//���ݺ�ͬ��Ż�ȡ�ú�ͬ��Ϣ
+		BizObject contractInfo=JBOFactory.createBizObjectQuery(LB_CONTRACT_INFO.CLASS_NAME,"contract_number=:contractNumber").setParameter("contractNumber", contractNumber).getSingleResult(false);
 		if(contractInfo != null){
+			//��ȡ�ú�ͬ��Ϣ�ĺ�ͬid
 			String contractId = contractInfo.getAttribute("ID").toString();
-			importObject.setAttributeValue("contract_id", contractId);
+			//�жϸó�����Ϣ�����Ƿ��Ѿ����ڸú�ͬ��������������������
+			BizObject carLicenseInfo=JBOFactory.createBizObjectQuery(LB_CAR_LICENSE_PLATE_INFO.CLASS_NAME,"CONTRACT_ID=:contractId").setParameter("contractId", contractId).getSingleResult(false);
+			if(carLicenseInfo==null){
+				BizObjectManager carLicenseManager =JBOFactory.getBizObjectManager(LB_CAR_LICENSE_PLATE_INFO.CLASS_NAME);
+				BizObject carLicensePlate=carLicenseManager.newObject();
+				carLicensePlate.setAttributeValue("CONTRACT_ID", contractId);
+				carLicensePlate.setAttributeValue("PLATE_STATUS", importObject.getAttribute("plate_status").getString());
+				carLicensePlate.setAttributeValue("FRAME_NUMBER", importObject.getAttribute("frame_number").getString());
+				carLicensePlate.setAttributeValue("PLATE_NUMBER", importObject.getAttribute("plate_number").getString());
+				carLicensePlate.setAttributeValue("PLATETIME", importObject.getAttribute("platetime").getString());
+				carLicenseManager.saveObject(carLicensePlate);
+			}else{
+		    	throw new BusinessException("�ú�ͬ�����ӵ�г���");
+		    }
+			
 	    }else{
 	    	throw new BusinessException("�����ڸú�ͬ���");
 	    }