git-svn-id: https://192.168.57.71/svn/jsgkj@1462 931142cf-59ea-a443-aa0e-51397b428577

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/xmxxgl/xmxxglmain.jsp

@@ -32,12 +32,12 @@
 			initgqSelect('gqsel','${szgq }',$('.szdselectpicker').val(),$('.gkselectpicker').val(),null,'80%');
 		}
 		
-		function exportExcelAll(data1,data2,data3,data4,data5,data6,data7){
+		function exportExcelAll(data1,data2,data3,data4,data5,data6,data7,data8){
 			$.alert({
        		    title: '提示',
 			    content: '导出数据中，请耐心等待！',
 			    confirm: function(){
-			    	location.href=$.app+"/xmxxgl/exportExcelAll?xmmc="+data1+"&xmfr="+data2+"&szdid="+data3+"&szgkid="+data4+"&szgqid="+data5+"&xmhzjbid="+data6+"&sfyzjbzid="+data7;
+			    	location.href=$.app+"/xmxxgl/exportExcelAll?xmmc="+data1+"&xmfr="+data2+"&szdid="+data3+"&szgkid="+data4+"&szgqid="+data5+"&xmhzjbid="+data6+"&sfyzjbzid="+data7+"&xmbm="+data8;
 				 }
 			});
 		}
@@ -138,7 +138,7 @@
 							   <i class="glyphicon glyphicon-plus"></i> 
 							            新增</a>
 							            </authz:hasPermission>
-					            <a class="btn btn-default btn-sm" href="#"  onclick="exportExcelAll('${xmmc}','${xmfr}','${szd}','${szgk}','${szgq}','${xmhzjbid}','${sfyzjbz}')">
+					            <a class="btn btn-default btn-sm" href="#"  onclick="exportExcelAll('${xmmc}','${xmfr}','${szd}','${szgk}','${szgq}','${xmhzjbid}','${sfyzjbz}','${xmbm}')">
 							   		<i class="glyphicon glyphicon-download-alt"></i>导出
 							   	</a>
                      </td>

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/xmxxgl/ctl/XmxxglCtl.java

@@ -821,6 +821,7 @@ public class XmxxglCtl extends BaseWebCtl {
 				if (StringUtils.isNotEmpty(xmmc)) {
 					list.add(cb.like(root.get("xmmc").as(String.class), "%" + xmmc + "%"));
 				}
+				// 新增项目编码条件查询
 				if (StringUtils.isNotEmpty(xmbm)) {
 					list.add(cb.like(root.get("xmbm").as(String.class), "%" + xmbm + "%"));
 				}
@@ -863,7 +864,15 @@ public class XmxxglCtl extends BaseWebCtl {
 				if (isJyr()) {
 					list.add(cb.like(root.get("jyrid").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));
 				} else {
-					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + SecUtils.getCurrUser().getSzd().getId() + "%"));
+					In<String> in = cb.in(root.get("szgq").get("id").as(String.class));
+					@SuppressWarnings("unchecked")
+					List<String> gqlist = (List<String>) Utils.getSession().getAttribute("gqList");
+					if (gqlist != null && gqlist.size() > 0) {
+						for (int i = 0; i < gqlist.size(); i++) {
+							in.value(gqlist.get(i));
+						}
+						list.add(in);
+					}
 				}
 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/xmxxgl/service/impl/XmxxglServiceImpl.java

@@ -229,7 +229,7 @@ public class XmxxglServiceImpl extends BaseWorkFlowServiceImpl<XmxxglEntity, Str
 					}
 					if (isEmpty(ztz) || isEmpty(zftze)) {
 						cell.setCellValue("");
-						break;
+						continue;
 					}
 					if (isFDS(ztz) && isFDS(zftze)) {
 						double rate = (Double.parseDouble(zftze) / xmxxgl.getZtz()) * 100;