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

gkjsjy/trunk/WebContent/WEB-INF/pages/ggfwxxgl/jdtx/jdtxmain.jsp

@@ -50,11 +50,9 @@
 							   <i class="glyphicon glyphicon-search"></i> 
 							            查询</a>
 						</authz:hasPermission>
-						<authz:hasPermission name="${appName}:jdtx:add">
 							             <a class="btn btn-default btn-sm" href="#"  onclick="jdtx.main.add()">
 							   <i class="glyphicon glyphicon-plus"></i> 
 							            新增</a>
-						</authz:hasPermission>	             
                          </td>
                     </tr>
 				</table>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/mt/mtedit.jsp

@@ -264,9 +264,12 @@
 							             <a class="btn btn-default btn-sm" href="#"  onclick="mt.detail.back()">
 							   <i class="glyphicon glyphicon-arrow-left"></i> 
 							            返回</a>
-							              <a class="btn btn-default btn-sm" href="#"  onclick="map('mt','${record.zyid}')">
+							              <a class="btn btn-default btn-sm" href="#" onclick="map('mt','${record.zyid}')">
 							   <i class="glyphicon glyphicon-plus"></i> 
 							      地图</a>
+							             <a class="btn btn-default btn-sm" href="#"  onclick="parent.main.menuClick('bwxx','泊位信息','/bw/main?ssjyr=${record.ssjyrzw}&ssmt=${record.id}&bz=${1}')">
+							   <i class="glyphicon glyphicon-search"></i> 
+							            泊位信息</a>
           			</div>
 			</div>
 			

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjcxx/mt/mtview.jsp

@@ -169,6 +169,9 @@
 							             <a class="btn btn-default btn-sm" href="#"  onclick="mt.detail.back()">
 							   <i class="glyphicon glyphicon-arrow-left"></i> 
 							            返回</a>
+							             <a class="btn btn-default btn-sm" href="#"  onclick="parent.main.menuClick('bwxx','泊位信息','/bw/main?ssjyr=${record.ssjyrzw}&ssmt=${record.id}&bz=${1}')">
+							   <i class="glyphicon glyphicon-search"></i> 
+							            泊位信息</a>
           			</div>
 			</div>
 			

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/cghzyxxgl/dcsbybb/dcsbybbmain.jsp

@@ -113,10 +113,10 @@
 							<th width="6%">内外贸</th>
 							<th width="8%">作业数量（吨）</th>
 							<th width="8%">作业数量（TEU）</th>
-							<c:if test="${jyr==null}">
+							<%-- <c:if test="${jyr==null}">
 							<th width="8%">修正作业数量（吨）</th>
 							<th width="8%">修正作业数量（TEU）</th>
-							</c:if>
+							</c:if> --%>
 							<th width="8%">报告时间</th>
 							<th width="12%">操作</th>
 						</tr>
@@ -131,10 +131,10 @@
 								<td>${dcsbybb.nwm}</td>
 								<td>${dcsbybb.zysl}</td>
 								<td>${dcsbybb.zyslteu}</td>
-								<c:if test="${jyr==null}">
+							<%-- 	<c:if test="${jyr==null}">
 								<td>${dcsbybb.zyslxg}</td>
 								<td>${dcsbybb.zyslteuxg}</td>
-								</c:if>
+								</c:if> --%>
 								<td>${fn:substring(dcsbybb.bgsj,0,7)}</td>
 								<td>
 								<a class="btn btn-default btn-xs" href="#"

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrbw/bwmain.jsp

@@ -9,7 +9,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
     <%@ include file="../../../common.jsp"%>
-    <script type="text/javascript" src="${app }/static/biz/js/gkjygl/gkjyr/jyrbw/bwmain.js"></script>
+    <script type="text/javascript" src="${app }/static/biz/js/gkjygl/gkjyr/jyrbw/bwmain.js" ></script>
 	<script type="text/javascript">
 		$(document).ready(function () {
 			bw.main.init();
@@ -132,7 +132,7 @@
 		               <tr>
 	        			<td class="right" colspan="6">
 		               		<authz:hasPermission name="${appName}:bwxx:main">
-		       	  			<a class="btn btn-default btn-sm" href="#" onclick="bw.main.search()">
+		       	  			<a class="btn btn-default btn-sm" href="#" onclick="bw.main.search('bw')">
 						   		<i class="glyphicon glyphicon-search"></i>查询
 						   	</a>
 						   	</authz:hasPermission>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/xkzxx/xkzxxmain.jsp

@@ -220,16 +220,16 @@
 									   <i class="glyphicon glyphicon-trash"></i> 
 									         删除</a>
 								</c:if>
-								<!-- 
+								
 						        <c:if test="${xkzxx.sfyx=='1'}">
 						        <a class="btn btn-default btn-xs" href="#" onclick="xkzxx.main.preview('${xkzxx.id}')">
 						            <i class="glyphicon glyphicon-search"></i>预览
 						        </a>
-						        <a class="btn btn-default btn-xs" href="#" onclick="xkzxx.main.print('${xkzxx.id}')">
+						      <%--   <a class="btn btn-default btn-xs" href="#" onclick="xkzxx.main.print('${xkzxx.id}')">
 						            <i class="glyphicon glyphicon-print"></i>打印
-						        </a>
+						        </a> --%>
 						        </c:if>
-						         -->
+						         
 					        </td>
 					    </tr>
 				    </c:forEach>

gkjsjy/trunk/WebContent/WEB-INF/pages/sys/main.jsp

@@ -41,7 +41,20 @@
 			//让修改密码的弹出框居中
 			main.letChangePasswordDialogMid();
 		});
-			
+   		//密码是否通过复杂性验证
+		var flag = "<%=request.getServletContext().getAttribute("pwdSecurity") %>";	
+		<% request.getServletContext().removeAttribute("pwdSecurity"); %>
+		if(flag=="false"){
+			$.confirm({
+				confirmButton:'修改密码',
+			    title: '密码复杂度不满足要求的提示',
+			    content: '您当前密码不满足复杂度要求(8-16位并包括字母、数字、特殊字符)，当前密码还可以使用到2016年10月1日，建议您立即修改密码!',
+			    confirm: function(){
+			    	main.shenbao();
+			    }
+			});
+		}
+		
 	</script>
 	
 	

gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gkjyr/jyrbw/bwmain.js

@@ -16,6 +16,8 @@ bw.main.search=function(){
 	$("#bwform").submit();
 }
 
+
+
 bw.main.del=function(data){
 	$.confirm({
 	    title: '确认框',

gkjsjy/trunk/WebContent/static/sql/oracle/other/7.job.sql

@@ -4,17 +4,18 @@ begin
   
 update GK_SHARE_JSJY_JYXKZ set sfyx = 2 where to_char(yxqz,'yyyy-mm-dd') = to_char(sysdate,'yyyy-mm-dd') and record_status <> 9 and sfyx =1;
 
+update GK_SHARE_JSJY_JYXKZ set sfyx = 1 where to_char(yxqz,'yyyy-mm-dd') = to_char(sysdate+interval '3' year,'yyyy-mm-dd')  and record_status <> 9 and sfyx = 4 ;
+ 
+commit;
 
-
- update GK_SHARE_JSJY_JYXKZ set sfyx = 1 where to_char(yxqz,'yyyy-mm-dd') = to_char(sysdate+interval '3' year,'yyyy-mm-dd')  and record_status <> 9 and sfyx = 4 ;
-  
 end updateXkz;
 
 --定时任务，运行时根据时间实际时间更新to_date时间
+variable job number;
 begin
   sys.dbms_job.submit(job => :job,
                       what => 'updateXkz;',
-                      next_date => to_date('01-06-2016 23:59:59', 'dd-mm-yyyy hh24:mi:ss'),
+                      next_date => to_date('20-07-2016 23:59:59', 'dd-mm-yyyy hh24:mi:ss'),
                       interval => 'sysdate+1/24/60');
   commit;
 end;

gkjsjy/trunk/resources/spring/application.properties

@@ -1,14 +1,14 @@
 #***************************************  jdbc info  ********************************************#
 #jdbc.driver                 = oracle.jdbc.driver.OracleDriver
-#jdbc.url                      = jdbc:oracle:thin:@192.168.57.81:1521:orcl
-#jdbc.username           = gk_test
+jdbc.url                      = jdbc:oracle:thin:@192.168.57.37:1521:orcl
+jdbc.username           = gk_sz
 #jdbc.password            = gk
 #hibernate.dialect        = com.xtframe.sec.common.MyOracleDialect
 
 #***************\u7701\u7ea7***************************
 jdbc.driver                 = oracle.jdbc.driver.OracleDriver
-jdbc.url                      = jdbc:oracle:thin:@10.1.30.104:1521:jttjjc
-jdbc.username           = gk
+#jdbc.url                      = jdbc:oracle:thin:@10.1.30.104:1521:jttjjc
+#jdbc.username           = gk
 jdbc.password            = gk
 hibernate.dialect        = com.xtframe.sec.common.MyOracleDialect
 
@@ -23,7 +23,7 @@ dbcp.initialSize=5
 dbcp.minIdle=5
 
 #\u672c\u7cfb\u7edf\u5f53\u524d\u53d1\u5e03\u7684webService\u5730\u5740
-webService.url=localhost
+webService.url=127.0.0.1
 webService.port=18088
 
 #\u7701\u7ea7\u53d1\u5e03\u7684webService\u5730\u5740
@@ -31,7 +31,21 @@ main.webService.ip=10.1.30.117
 main.webService.port=18089
 
 #sso
-cas.localIp=10.1.30.117
+#cas.localIp=10.1.30.117
+#cas.localPort=8080
+#cas.serverIp=10.1.30.117
+#cas.serverPort=8081
+
+cas.localIp=127.0.0.1
 cas.localPort=8080
-cas.serverIp=10.1.30.117
+cas.serverIp=127.0.0.1
 cas.serverPort=8081
+
+90011=\u9547\u6C5F\u6E2F
+90012=\u82CF\u5DDE\u6E2F
+90014=\u5357\u4EAC\u6E2F
+900=\u7701\u5385
+90023=\u6DEE\u5B89\u6E2F
+90013=\u8FDE\u4E91\u6E2FŽ…
+90015=\u5357\u901A\u6E2F
+90020=\u5F90\u5DDE\u6E2F

gkjsjy/trunk/src/com/xt/jygl/common/Constants.java

@@ -23,7 +23,9 @@ public class Constants {
 	public final static String ROLE_Jyr = "jyr";// 经营人
 
 	public final static String ROLE_SC = "sc";// 审查
-	
+
+	public final static String ROLE_JDTX = "jdtx";
+
 	public final static String ROLE_DCSBSC = "dcsbsc";// 审查
 
 	public final static String ROLE_CLSC = "clsc";// 材料审核
@@ -33,15 +35,22 @@ public class Constants {
 	public final static String ROLE_FH = "fh";// 复核
 
 	public final static String ROLE_SP = "sp";// 审查
-	
+
 	public final static String ROLE_NDSHCL = "ndshcl";// 年度审核材料
-	
+
 	public final static String ROLE_NDSHPZ = "ndshpz";// 年度审核批准
+	
+	public final static String ROLE_LD = "ld";// 年度审核批准
+
+	// 已办结
+	public static String BLTX_STATUS_DONE = "2";
+	// 已办结
+	public static String BLTX_STATUS_NOTDONE = "1";
 
 	// 许可证生效状态
-	
+
 	public final static String XKZ_SX = "1"; // 生效
-	public final static String XKZ_WX = "2";//无效
+	public final static String XKZ_WX = "2";// 无效
 	public final static String XKZ_WSX = "4"; // 未生效
 	public final static String XKZ_ZX = "3"; // 注销
 
@@ -114,9 +123,13 @@ public class Constants {
 	 */
 	public static final String GROUP_CODE_RYLX = "RYLX";
 	/**
+	 * 泊位所在水域类型
+	 */
+	public static final String GROUP_CODE_GQSZSYLX = "BWSZSX";
+	/**
 	 * 港区所在水域类型
 	 */
-	public static final String GROUP_CODE_GQSZSYLX = "GQSZSYLX";
+	public static final String GQ_CODE_GQSZSYLX = "GQSZSYLX";
 	/**
 	 * 泊位用途
 	 */
@@ -200,7 +213,7 @@ public class Constants {
 	 * 船舶类型
 	 * */
 	public static final String GROUP_CODE_CBLX = "CBLX";
-	
+
 	/**
 	 * 泊位生产类型
 	 * **/
@@ -239,7 +252,7 @@ public class Constants {
 	 * 货物类型第一大类
 	 * **/
 	public static final String GROUP_CODE_HWLXDYDL = "HWLXDYDL";
-	
+
 	/**
 	 * WebService IP
 	 * */

gkjsjy/trunk/src/com/xt/jygl/common/GlobalData.java

@@ -25,13 +25,36 @@ public class GlobalData {
 	// 省级WebService发布地址
 	public static String WEBSERVICE_IP_MAIN = "";
 	public static String WEBSERVICE_PORT_MAIN = "";
-
+	//本地WebService发布地址
+	public static String WEBSERVICE_IP = "";
+	public static String WEBSERVICE_PORT = "";
+	
 	public static String TB_USER_CODE = "tbuser";
 	public static String CITY_NAME = "";
 	public static String DSJC = "";
 	public static String VIEW_FILE_PATH = "";
+	public static String FTP_IP = "";
+	public static String FTP_PORT = "";
+	public static String FTP_UPLOAD_PATH = "";
+	public static String FTP_VIEW_PATH = "";
+	public static String FTP_VIEW_USER ="";
 
 	public static void init(ServletContext sc) {
+		String ftp_view_user = sc.getInitParameter("ftp_view_user");
+		if (StringUtils.hasLength(ftp_view_user)) {
+			FTP_VIEW_USER = ftp_view_user;
+		}
+		
+		String ftp_view_path = sc.getInitParameter("ftp_view_path");
+		if (StringUtils.hasLength(ftp_view_path)) {
+			FTP_VIEW_PATH = ftp_view_path;
+		}
+		
+		String ftp_upload_path = sc.getInitParameter("ftp_upload_path");
+		if (StringUtils.hasLength(ftp_upload_path)) {
+			FTP_UPLOAD_PATH = ftp_upload_path;
+		}
+		
 		String view_file_path = sc.getInitParameter("view_file_path");
 		if (StringUtils.hasLength(view_file_path)) {
 			VIEW_FILE_PATH = view_file_path;
@@ -40,8 +63,8 @@ public class GlobalData {
 			if (!newfile.exists() && !newfile.isDirectory()) {
 				newfile.mkdir();
 			}
-		}		
-	
+		}
+
 		String strTimeout = sc.getInitParameter("session_timeout");
 		if (StringUtils.hasLength(strTimeout))
 			SESSION_TIMEOUT = Integer.parseInt(strTimeout);
@@ -84,7 +107,7 @@ public class GlobalData {
 
 	public static void initProperties() throws SecurityException, NoSuchFieldException, IllegalArgumentException, IllegalAccessException {
 		// 读取properties属性文件
-		InputStream in = GlobalData.class.getResourceAsStream("/locale/szd.properties");
+		InputStream in = GlobalData.class.getResourceAsStream("/spring/application.properties");
 		Properties p = new Properties();
 		try {
 			p.load(in);
@@ -105,6 +128,22 @@ public class GlobalData {
 		if (StringUtils.hasLength(prop)) {
 			WEBSERVICE_PORT_MAIN = prop;
 		}
+		prop = String.valueOf(p.get("webService.url"));
+		if (StringUtils.hasLength(prop)) {
+			WEBSERVICE_IP = prop;
+		}
+		prop = String.valueOf(p.get("webService.port"));
+		if (StringUtils.hasLength(prop)) {
+			WEBSERVICE_PORT = prop;
+		}
+		prop = String.valueOf(p.get("main.ftp.ip"));
+		if (StringUtils.hasLength(prop)) {
+			FTP_IP = prop;
+		}
+		prop = String.valueOf(p.get("main.ftp.port"));
+		if (StringUtils.hasLength(prop)) {
+			FTP_PORT = prop;
+		}
 	}
 
 }

gkjsjy/trunk/src/com/xt/jygl/gkjcxx/gk/dao/GkDao.java

@@ -20,4 +20,7 @@ public interface GkDao extends SecRepository<GkEntity, String> {
 
 	@Query("SELECT m FROM GkEntity m WHERE m.gkmc like ?1 and m.recordStatus<>9")
 	public GkEntity findOneByName(String gkName);
+	
+	@Query(value ="select szgk from GK_BASIC_JSJY_GK_GQ t where id in (?1) group by szgk", nativeQuery = true)
+	public List<String> findByGqList(List<String> gqList);
 }

gkjsjy/trunk/src/com/xt/jygl/gkjcxx/gk/service/GkService.java

@@ -38,4 +38,6 @@ public interface GkService {
 	 */
 	GkEntity findOneByName(String gkName);
 
+	List<String> findByGqList(List<String> gqList);
+
 }

gkjsjy/trunk/src/com/xt/jygl/gkjcxx/gk/service/impl/GkServiceImpl.java

@@ -17,8 +17,7 @@ import com.xtframe.core.webService.AuthHandlerResolver;
 import com.xtframe.sec.common.SecRepository;
 
 @Service
-public class GkServiceImpl extends JyglBaseService<GkEntity, String> implements
-		GkService {
+public class GkServiceImpl extends JyglBaseService<GkEntity, String> implements GkService {
 
 	@Autowired
 	private GkDao dao;
@@ -47,21 +46,14 @@ public class GkServiceImpl extends JyglBaseService<GkEntity, String> implements
 	@Override
 	public GkWebService getWebService(String szdId) {
 		URL wsdlLocation;
-		if (null == szdId
-				&& GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
+		if (null == szdId && GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
 			// 市级取省级的
-			wsdlLocation = com.xt.jygl.gkjcxx.gk.client.GkService
-					.getWsdlLocationByIp(GlobalData.WEBSERVICE_IP_MAIN,
-							GlobalData.WEBSERVICE_PORT_MAIN);
+			wsdlLocation = com.xt.jygl.gkjcxx.gk.client.GkService.getWsdlLocationByIp(GlobalData.WEBSERVICE_IP_MAIN, GlobalData.WEBSERVICE_PORT_MAIN);
 		} else {// 省级取市级的webservice 根据数据的所在地
-			wsdlLocation = com.xt.jygl.gkjcxx.gk.client.GkService
-					.getWsdlLocationByIp("192.168.57.81", "18088");
+			wsdlLocation = com.xt.jygl.gkjcxx.gk.client.GkService.getWsdlLocationByIp("192.168.57.81", "18088");
 		}
-		com.xt.jygl.gkjcxx.gk.client.GkService service = new com.xt.jygl.gkjcxx.gk.client.GkService(
-				wsdlLocation,
-				com.xt.jygl.gkjcxx.gk.client.GkService.GKSERVICE_QNAME);
-		service.setHandlerResolver(new AuthHandlerResolver(
-				com.xt.jygl.gkjcxx.gk.client.GkService.GKSERVICE_QNAME));
+		com.xt.jygl.gkjcxx.gk.client.GkService service = new com.xt.jygl.gkjcxx.gk.client.GkService(wsdlLocation, com.xt.jygl.gkjcxx.gk.client.GkService.GKSERVICE_QNAME);
+		service.setHandlerResolver(new AuthHandlerResolver(com.xt.jygl.gkjcxx.gk.client.GkService.GKSERVICE_QNAME));
 		GkWebService webService = service.getGkWebServicePort();
 		return webService;
 	}
@@ -71,4 +63,9 @@ public class GkServiceImpl extends JyglBaseService<GkEntity, String> implements
 		return dao.findOneByName(gkName);
 	}
 
+	@Override
+	public List<String> findByGqList(List<String> gqList) {
+		return dao.findByGqList(gqList);
+	}
+
 }

gkjsjy/trunk/src/com/xt/jygl/gkjcxx/gq/ctl/GqCtl.java

@@ -160,7 +160,7 @@ public class GqCtl extends BaseWebCtl {
 			cacheSCmap.put("gqpage", page.getPage());
 			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);
 		}
-		List<CodeEntity> listSylx = securityMgr.codeService().findValidCodesByGroupCode(Constants.GROUP_CODE_GQSZSYLX);
+		List<CodeEntity> listSylx = securityMgr.codeService().findValidCodesByGroupCode(Constants.GQ_CODE_GQSZSYLX);
 		model.addAttribute("listSylx", listSylx);
 		model.addAttribute("gqmc", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "gqmc"));
 		model.addAttribute("szgk", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgkid"));
@@ -290,7 +290,7 @@ public class GqCtl extends BaseWebCtl {
 	@RequiresPermissions("gqgl:edit")
 	public String edit(Model model, String id) {
 		GqEntity gq = gqService.findOne(id);
-		List<CodeEntity> listSylx = securityMgr.codeService().findValidCodesByGroupCode(Constants.GROUP_CODE_GQSZSYLX);
+		List<CodeEntity> listSylx = securityMgr.codeService().findValidCodesByGroupCode(Constants.GQ_CODE_GQSZSYLX);
 		model.addAttribute("listSylx", listSylx);
 		GqVo vo = new GqVo();
 		BeanUtils.copyProperties(gq, vo);
@@ -343,7 +343,7 @@ public class GqCtl extends BaseWebCtl {
 	@RequestMapping(value = "/add")
 	@RequiresPermissions("gqgl:add")
 	public String add(Model model) {
-		List<CodeEntity> listSylx = securityMgr.codeService().findValidCodesByGroupCode(Constants.GROUP_CODE_GQSZSYLX);
+		List<CodeEntity> listSylx = securityMgr.codeService().findValidCodesByGroupCode(Constants.GQ_CODE_GQSZSYLX);
 		model.addAttribute("listSylx", listSylx);
 
 		if (SecUtils.getCurrUser() != null) {

gkjsjy/trunk/src/com/xt/jygl/gkjcxx/xzdwxxgl/xzglbmxx/service/XzglbmxxService.java

@@ -11,6 +11,8 @@ public interface XzglbmxxService {
 	public <S extends XzglbmxxEntity> S save(S entity);
 
 	XzglbmxxEntity findOne(String id);
+	
+	XzglbmxxEntity getPglbm(String id);
 
 	/***
 	 * 逻辑删除一条数据

gkjsjy/trunk/src/com/xt/jygl/gkjcxx/xzdwxxgl/xzglbmxx/service/impl/XzglbmxxServiceImpl.java

@@ -83,4 +83,12 @@ public class XzglbmxxServiceImpl extends JyglBaseService<XzglbmxxEntity, String>
 		XzglbmxxWebService webService = service.getXzglbmxxWebServicePort();
 		return webService;
 	}
+	
+	public XzglbmxxEntity getPglbm(String id){
+		XzglbmxxEntity entity = findOne(id);
+		if(!"00".equals(entity.getPid())){
+			entity = getPglbm(entity.getPid());
+		}
+		return entity;
+	}
 }

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdgl/ctl/JsjdglCtl2.java

@@ -155,7 +155,7 @@ public class JsjdglCtl2 extends BaseWebCtl {
 				}
 				//只显示状态为8或者3的
 				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.RECORD_STATE_VALID));
+				//list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
 				return cb.and(list.toArray(new Predicate[] {}));
 			}
 		};

gkjsjy/trunk/src/com/xt/jygl/gkjygl/cghzyxxgl/dcsb/ctl/DcsbybbCtl.java

@@ -205,7 +205,7 @@ public class DcsbybbCtl extends BaseWebCtl {
 			}
 			page.setPage(Integer.valueOf(String.valueOf(ybbpagepage)));
 		}
-		page.setSort("bgsj");
+		page.setSort("updateDateTime");
 		page.setOrder("desc");
 		Page<DcsbybbEntity> list = query.findAll(spec, toPageRequest(page), DcsbybbEntity.class);
 		List<DcsbybbVo> voList = new ArrayList<DcsbybbVo>();

gkjsjy/trunk/src/com/xt/jygl/gkjygl/cghzyxxgl/dcsb/service/impl/DcsbybbServiceImpl.java

@@ -38,8 +38,8 @@ public class DcsbybbServiceImpl extends JyglBaseService<DcsbybbEntity, String> i
 		Map<String, Object> params = new HashMap<String, Object>();
 		StringBuilder sb = new StringBuilder();
 		sb.append("select A.szgk,A.s/10000,nvl(round(a.s/b.ss,2)*100,0),nvl(round(a.s/c.sss,2)*100,0)  from ");
-		sb.append(" ( select szgk,nvl(sum(zyslxg)+sum(zyslteuxg)*10,0) s  ");
-		sb.append(" from (select szgk,decode(v2,0,v1,v2) zyslxg,decode(v4,0,v3,v4) zyslteuxg from( ");
+		sb.append(" ( select szgk,nvl(sum(zysl)+sum(zyslteu)*10,0) s  ");
+		sb.append(" from (select szgk,decode(v2,0,v1,v2) zysl,decode(v4,0,v3,v4) zyslteu from( ");
 		sb.append("  select t.SZGK,nvl(t.ZYSL,0) v1,nvl(t.ZYSLXG,0) v2,nvl(t.zyslteu,0) v3,nvl(t.zyslteuxg,0) v4 ");
 		sb.append("  from GK_OPERATION_JSJY_DCSBYBB t ");
 		sb.append("where t.record_Status<>9 and  to_char(t.bgsj, 'yyyy-mm') = :bgsj  ");
@@ -67,8 +67,8 @@ public class DcsbybbServiceImpl extends JyglBaseService<DcsbybbEntity, String> i
 		}
 		sb.append(" )) group by szgk  order by szgk ) A ");
 		sb.append("left join");
-		sb.append(" ( select szgk,nvl(sum(zyslxg)+sum(zyslteuxg)*10,0) ss  ");
-		sb.append(" from (select szgk,decode(v2,0,v1,v2) zyslxg,decode(v4,0,v3,v4) zyslteuxg from( ");
+		sb.append(" ( select szgk,nvl(sum(zysl)+sum(zyslteu)*10,0) ss  ");
+		sb.append(" from (select szgk,decode(v2,0,v1,v2) zysl,decode(v4,0,v3,v4) zyslteu from( ");
 		sb.append("  select t.SZGK,nvl(t.ZYSL,0) v1,nvl(t.ZYSLXG,0) v2,nvl(t.zyslteu,0) v3,nvl(t.zyslteuxg,0) v4 ");
 		sb.append("  from GK_OPERATION_JSJY_DCSBYBB t ");
 		sb.append("where t.record_Status<>9 and  to_char(t.bgsj, 'yyyy-mm') = :mbgsj  ");
@@ -98,8 +98,8 @@ public class DcsbybbServiceImpl extends JyglBaseService<DcsbybbEntity, String> i
 		sb.append(" on A.szgk = B.szgk ");
 
 		sb.append("left join");
-		sb.append(" ( select szgk,nvl(sum(zyslxg)+sum(zyslteuxg)*10,0) sss  ");
-		sb.append(" from (select szgk,decode(v2,0,v1,v2) zyslxg,decode(v4,0,v3,v4) zyslteuxg from( ");
+		sb.append(" ( select szgk,nvl(sum(zysl)+sum(zyslteu)*10,0) sss  ");
+		sb.append(" from (select szgk,decode(v2,0,v1,v2) zysl,decode(v4,0,v3,v4) zyslteu from( ");
 		sb.append("  select t.SZGK,nvl(t.ZYSL,0) v1,nvl(t.ZYSLXG,0) v2,nvl(t.zyslteu,0) v3,nvl(t.zyslteuxg,0) v4 ");
 		sb.append("  from GK_OPERATION_JSJY_DCSBYBB t ");
 		sb.append("where t.record_Status<>9 and  to_char(t.bgsj, 'yyyy-mm') = :ybgsj  ");
@@ -138,9 +138,9 @@ public class DcsbybbServiceImpl extends JyglBaseService<DcsbybbEntity, String> i
 		Map<String, Object> params = new HashMap<String, Object>();
 		StringBuilder sb = new StringBuilder();
 		sb.append("select A.szgq,A.s/10000,nvl(round(a.s/b.ss,2)*100,0),nvl(round(a.s/c.sss,2)*100,0)  from ");
-		sb.append(" ( select szgq,nvl(sum(zyslxg)+sum(zyslteuxg)*10,0) s  ");
-		sb.append(" from (select szgq,decode(v2,0,v1,v2) zyslxg,decode(v4,0,v3,v4) zyslteuxg from( ");
-		sb.append("  select t.SZGq,nvl(t.ZYSL,0) v1,nvl(t.ZYSLXG,0) v2,nvl(t.zyslteu,0) v3,nvl(t.zyslteuxg,0) v4 ");
+		sb.append(" ( select szgq,nvl(sum(zysl)+sum(zyslteu)*10,0) s  ");
+		sb.append(" from (select szgq,decode(v2,0,v1,v2) zysl,decode(v4,0,v3,v4) zyslteu from( ");
+		sb.append("  select t.SZGq,nvl(t.ZYSL,0) v1,nvl(t.ZYSLxg,0) v2,nvl(t.zyslteu,0) v3,nvl(t.zyslteuxg,0) v4 ");
 		sb.append("  from GK_OPERATION_JSJY_DCSBYBB t ");
 		sb.append("where t.record_Status<>9 and  to_char(t.bgsj, 'yyyy-mm') = :bgsj  ");
 
@@ -167,8 +167,8 @@ public class DcsbybbServiceImpl extends JyglBaseService<DcsbybbEntity, String> i
 		}
 		sb.append("  )) group by szgq  order by szgq ) A ");
 		sb.append("left join");
-		sb.append(" ( select szgq,nvl(sum(zyslxg)+sum(zyslteuxg)*10,0) ss  ");
-		sb.append(" from (select szgq,decode(v2,0,v1,v2) zyslxg,decode(v4,0,v3,v4) zyslteuxg from( ");
+		sb.append(" ( select szgq,nvl(sum(zysl)+sum(zyslteu)*10,0) ss  ");
+		sb.append(" from (select szgq,decode(v2,0,v1,v2) zysl,decode(v4,0,v3,v4) zyslteu from( ");
 		sb.append("  select t.SZGq,nvl(t.ZYSL,0) v1,nvl(t.ZYSLXG,0) v2,nvl(t.zyslteu,0) v3,nvl(t.zyslteuxg,0) v4 ");
 		sb.append("  from GK_OPERATION_JSJY_DCSBYBB t ");
 		sb.append("where t.record_Status<>9 and  to_char(t.bgsj, 'yyyy-mm') = :mbgsj  ");
@@ -198,8 +198,8 @@ public class DcsbybbServiceImpl extends JyglBaseService<DcsbybbEntity, String> i
 		sb.append(" on A.szgq = B.szgq ");
 
 		sb.append("left join");
-		sb.append(" ( select szgq,nvl(sum(zyslxg)+sum(zyslteuxg)*10,0) sss  ");
-		sb.append(" from (select szgq,decode(v2,0,v1,v2) zyslxg,decode(v4,0,v3,v4) zyslteuxg from( ");
+		sb.append(" ( select szgq,nvl(sum(zysl)+sum(zyslteu)*10,0) sss  ");
+		sb.append(" from (select szgq,decode(v2,0,v1,v2) zysl,decode(v4,0,v3,v4) zyslteu from( ");
 		sb.append("  select t.SZGq,nvl(t.ZYSL,0) v1,nvl(t.ZYSLXG,0) v2,nvl(t.zyslteu,0) v3,nvl(t.zyslteuxg,0) v4 ");
 		sb.append("  from GK_OPERATION_JSJY_DCSBYBB t ");
 		sb.append("where t.record_Status<>9 and  to_char(t.bgsj, 'yyyy-mm') = :ybgsj  ");
@@ -236,14 +236,14 @@ public class DcsbybbServiceImpl extends JyglBaseService<DcsbybbEntity, String> i
 	public List<Object> sum(String data, String mdata, String ydata, String szdid, String szgkid, String szgqid,String dydlid) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		StringBuilder sb = new StringBuilder();
-		sb.append("select aa.s, (nvl(aa.jg,0)+nvl(bb.cg,0))/10000,nvl(round((aa.jg+aa.cg)/(bb.jg+bb.cg),2)*100,0),");
-		sb.append("nvl(round((aa.jg+aa.cg)/(cc.jg+cc.cg),2)*100,0),");
-		sb.append("nvl(aa.jg,0)/10000,nvl(round(aa.jg/bb.jg,2)*100,0),nvl(round(aa.cg/bb.cg,2)*100,0),");
-		sb.append("nvl(aa.cg,0)/10000,nvl(round(aa.jg/cc.jg,2)*100,0),  nvl(round(aa.cg/cc.cg,2)*100,0)");
+		sb.append("select aa.s, (nvl(aa.jg,0)+nvl(bb.cg,0))/10000,nvl(round((aa.jg+aa.cg)/decode((bb.jg + bb.cg),0,1), 2)*100,0),");
+		sb.append("nvl(round((aa.jg+aa.cg)/decode((cc.jg + cc.cg),0,1), 2)*100,0),");
+		sb.append("nvl(aa.jg,0)/10000,nvl(round(aa.jg/decode(bb.jg,0,1),2)*100,0),nvl(round(aa.cg/decode(bb.cg,0,1),2)*100,0),");
+		sb.append("nvl(aa.cg,0)/10000,nvl(round(aa.jg/decode(cc.jg,0,1),2)*100,0),nvl(round(aa.cg/decode(cc.cg,0,1),2)*100,0)");
 		sb.append(" from ");
 		sb.append(" (select max(c.text) s,sum(a.jg) jg,sum(a.cg) cg,max(a.hwzl) hwzl ");
-		sb.append(" from (select hwzl,sum(case when (d.jcg = '5701') then d.zyslxg+d.zyslteuxg*10 end) as jg, ");
-		sb.append(" sum(case when (d.jcg = '5702') then  d.zyslxg+d.zyslteuxg*10 end) as cg ");
+		sb.append(" from (select hwzl,sum(case when (d.jcg = '5701') then  nvl(d.zysl,0) + nvl(d.zyslteu,0) * 10 end) as jg, ");
+		sb.append(" sum(case when (d.jcg = '5702') then   nvl(d.zysl,0) + nvl(d.zyslteu,0) * 10 end) as cg ");
 		sb.append(" from Gk_Operation_Jsjy_Dcsbybb d where d.record_Status<>9 and to_char(d.bgsj, 'yyyy-mm') =:bgsj");
 		params.put("bgsj", data);
 
@@ -270,8 +270,8 @@ public class DcsbybbServiceImpl extends JyglBaseService<DcsbybbEntity, String> i
 		sb.append(" left join ");
 
 		sb.append(" (select max(c.text) s,sum(a.jg) jg,sum(a.cg) cg,max(a.hwzl) hwzl ");
-		sb.append(" from (select hwzl,sum(case when (d.jcg = '5701') then  d.zyslxg+d.zyslteuxg*10 end) as jg, ");
-		sb.append(" sum(case when (d.jcg = '5702') then  d.zyslxg+d.zyslteuxg*10 end) as cg ");
+		sb.append(" from (select hwzl,sum(case when (d.jcg = '5701') then   nvl(d.zysl,0) + nvl(d.zyslteu,0) * 10 end) as jg, ");
+		sb.append(" sum(case when (d.jcg = '5702') then   nvl(d.zysl,0) + nvl(d.zyslteu,0) * 10 end) as cg ");
 		sb.append(" from Gk_Operation_Jsjy_Dcsbybb d where d.record_Status<>9 and to_char(d.bgsj, 'yyyy-mm') =:mbgsj");
 		params.put("mbgsj", mdata);
 		if (!StringUtils.isEmpty(szdid)) {
@@ -298,8 +298,8 @@ public class DcsbybbServiceImpl extends JyglBaseService<DcsbybbEntity, String> i
 		sb.append(" left join ");
 
 		sb.append(" (select max(c.text) s,sum(a.jg) jg,sum(a.cg) cg,max(a.hwzl) hwzl ");
-		sb.append(" from (select hwzl,sum(case when (d.jcg = '5701') then  d.zyslxg+d.zyslteuxg*10 end) as jg, ");
-		sb.append(" sum(case when (d.jcg = '5702') then  d.zyslxg+d.zyslteuxg*10 end) as cg ");
+		sb.append(" from (select hwzl,sum(case when (d.jcg = '5701') then   nvl(d.zysl,0) + nvl(d.zyslteu,0) * 10 end) as jg, ");
+		sb.append(" sum(case when (d.jcg = '5702') then   nvl(d.zysl,0) + nvl(d.zyslteu,0) * 10 end) as cg ");
 		sb.append(" from Gk_Operation_Jsjy_Dcsbybb d where d.record_Status<>9 and to_char(d.bgsj, 'yyyy-mm') =:ybgsj");
 		params.put("ybgsj", ydata);
 
@@ -333,14 +333,14 @@ public class DcsbybbServiceImpl extends JyglBaseService<DcsbybbEntity, String> i
 	public List<Object> sum2(String data, String mdata, String ydata, String szdid, String szgkid, String szgqid,String dedlid) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		StringBuilder sb = new StringBuilder();
-		sb.append("select aa.s, (nvl(aa.jg,0)+nvl(bb.cg,0))/10000,nvl(round((aa.jg+aa.cg)/(bb.jg+bb.cg),2)*100,0),");
-		sb.append("nvl(round((aa.jg+aa.cg)/(cc.jg+cc.cg),2)*100,0),");
-		sb.append("nvl(aa.jg,0)/10000,nvl(round(aa.jg/bb.jg,2)*100,0),nvl(round(aa.cg/bb.cg,2)*100,0),");
-		sb.append("nvl(aa.cg,0)/10000,nvl(round(aa.jg/cc.jg,2)*100,0),  nvl(round(aa.cg/cc.cg,2)*100,0)");
+		sb.append("select aa.s, (nvl(aa.jg,0)+nvl(bb.cg,0))/10000,nvl(round((aa.jg+aa.cg)/ decode((bb.jg + bb.cg),0,1), 2)*100,0),");
+		sb.append("nvl(round((aa.jg+aa.cg)/decode((cc.jg + cc.cg),0,1), 2)*100,0),");
+		sb.append("nvl(aa.jg,0)/10000,nvl(round(aa.jg/decode(bb.jg,0,1),2)*100,0),nvl(round(aa.cg/decode(bb.cg,0,1),2)*100,0),");
+		sb.append("nvl(aa.cg,0)/10000,nvl(round(aa.jg/decode(cc.jg,0,1),2)*100,0),nvl(round(aa.cg/decode(cc.cg,0,1),2)*100,0)");
 		sb.append(" from ");
 		sb.append(" (select max(c.text) s,sum(a.jg) jg,sum(a.cg) cg,max(a.hwzldedl) hwzldedl ");
-		sb.append(" from (select hwzldedl,sum(case when (d.jcg = '5701') then d.zyslxg+d.zyslteuxg*10 end) as jg, ");
-		sb.append(" sum(case when (d.jcg = '5702') then  d.zyslxg+d.zyslteuxg*10 end) as cg ");
+		sb.append(" from (select hwzldedl,sum(case when (d.jcg = '5701') then  nvl(d.zysl,0) + nvl(d.zyslteu,0) * 10 end) as jg, ");
+		sb.append(" sum(case when (d.jcg = '5702') then   nvl(d.zysl,0) + nvl(d.zyslteu,0) * 10 end) as cg ");
 		sb.append(" from Gk_Operation_Jsjy_Dcsbybb d where d.record_Status<>9 and to_char(d.bgsj, 'yyyy-mm') =:bgsj");
 		params.put("bgsj", data);
 
@@ -367,8 +367,8 @@ public class DcsbybbServiceImpl extends JyglBaseService<DcsbybbEntity, String> i
 		sb.append(" left join ");
 
 		sb.append(" (select max(c.text) s,sum(a.jg) jg,sum(a.cg) cg,max(a.hwzldedl) hwzldedl ");
-		sb.append(" from (select hwzldedl,sum(case when (d.jcg = '5701') then  d.zyslxg+d.zyslteuxg*10 end) as jg, ");
-		sb.append(" sum(case when (d.jcg = '5702') then  d.zyslxg+d.zyslteuxg*10 end) as cg ");
+		sb.append(" from (select hwzldedl,sum(case when (d.jcg = '5701') then   nvl(d.zysl,0) + nvl(d.zyslteu,0) * 10 end) as jg, ");
+		sb.append(" sum(case when (d.jcg = '5702') then   nvl(d.zysl,0) + nvl(d.zyslteu,0) * 10 end) as cg ");
 		sb.append(" from Gk_Operation_Jsjy_Dcsbybb d where d.record_Status<>9 and to_char(d.bgsj, 'yyyy-mm') =:mbgsj");
 		params.put("mbgsj", mdata);
 		if (!StringUtils.isEmpty(szdid)) {
@@ -395,8 +395,8 @@ public class DcsbybbServiceImpl extends JyglBaseService<DcsbybbEntity, String> i
 		sb.append(" left join ");
 
 		sb.append(" (select max(c.text) s,sum(a.jg) jg,sum(a.cg) cg,max(a.hwzldedl) hwzldedl ");
-		sb.append(" from (select hwzldedl,sum(case when (d.jcg = '5701') then  d.zyslxg+d.zyslteuxg*10 end) as jg, ");
-		sb.append(" sum(case when (d.jcg = '5702') then  d.zyslxg+d.zyslteuxg*10 end) as cg ");
+		sb.append(" from (select hwzldedl,sum(case when (d.jcg = '5701') then   nvl(d.zysl,0) + nvl(d.zyslteu,0) * 10 end) as jg, ");
+		sb.append(" sum(case when (d.jcg = '5702') then   nvl(d.zysl,0) + nvl(d.zyslteu,0) * 10 end) as cg ");
 		sb.append(" from Gk_Operation_Jsjy_Dcsbybb d where d.record_Status<>9 and to_char(d.bgsj, 'yyyy-mm') =:ybgsj");
 		params.put("ybgsj", ydata);
 

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrbw/ctl/BwCtl.java

@@ -88,135 +88,186 @@ public class BwCtl extends BaseWebCtl {
 	 */
 	@RequestMapping(value = "/main")
 	@RequiresPermissions("bwxx:main")
-	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String ssjyr, final String szdid, final String szgkid, final String szgqid, final String bwmc, final String menuid, final String wxpbwid, final String bwsxid, final String fwlxid,final String sfdwkfid,final String bwbwyt) throws JsonProcessingException {
-		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request,"bwxx");
+	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String ssjyr, final String ssmt, final String szdid, final String szgkid, final String szgqid, final String bwmc, final String menuid, final String wxpbwid, final String bwsxid, final String fwlxid, final String sfdwkfid, final String bwbwyt, final String bz) throws JsonProcessingException {
+		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "bwxx");
 		final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-		
+
 		// 查詢條件
 		Specification<BwEntity> spec = new Specification<BwEntity>() {
 
 			@Override
 			public Predicate toPredicate(Root<BwEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
 				List<Predicate> list = new ArrayList<Predicate>();
+				//标志位，判断查询条件
+				String flag = bz;
+				if (flag != null) {
 
-				if (StringUtils.isNotEmpty(szdid)) {
-					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
-				} else if(isGET(request)){
-					String v=(String)CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szdid");
-					if(StringUtils.isNotEmpty(v)){
-						list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + v + "%"));
+//					if (StringUtils.isNotEmpty(ssjyr)) {
+//						list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + ssjyr + "%"));
+//					} else if (isGET(request)) {
+//						String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "ssjyr");
+//						if (StringUtils.isNotEmpty(v)) {
+//							list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + v + "%"));
+//						}
+//					}
+					if (cacheSCmap != null) {
+					    cacheSCmap.remove("ssjyr");
 					}
-				}
-//				else if (StringUtils.isNotEmpty(SearchCondition.bwszd) && isGET(request)) {
-//					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + SearchCondition.bwszd + "%"));
-//				}
-				if (StringUtils.isNotEmpty(szgkid)) {
-					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));
-				} else if(isGET(request)){
-					String v=(String)CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgkid");
-					if(StringUtils.isNotEmpty(v)){
-						list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + v + "%"));
+					if (StringUtils.isNotEmpty(ssmt)) {
+						list.add(cb.like(root.get("ssmt").get("id").as(String.class), "%" + ssmt + "%"));
+					} else if (isGET(request)) {
+						String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "ssmt");
+						if (StringUtils.isNotEmpty(v)) {
+							list.add(cb.like(root.get("ssmt").get("id").as(String.class), "%" + v + "%"));
+						}
 					}
-				}
-//				else if (StringUtils.isNotEmpty(SearchCondition.bwszgk) && isGET(request)) {
-//					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + SearchCondition.bwszgk + "%"));
-//				}
-				if (StringUtils.isNotEmpty(szgqid)) {
-					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));
-				}else if(isGET(request)){
-					String v=(String)CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgqid");
-					if(StringUtils.isNotEmpty(v)){
-						list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + v + "%"));
+				
+
+				} else {
+					//清除ssmt的缓存数据
+					if (cacheSCmap != null) {
+						cacheSCmap.remove("ssmt");
+						
 					}
-				}
-//				else if (StringUtils.isNotEmpty(SearchCondition.bwszgq) && isGET(request)) {
-//					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + SearchCondition.bwszgq + "%"));
-//				}
-				if (StringUtils.isNotEmpty(ssjyr)) {
-					list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + ssjyr + "%"));
-				}else if(isGET(request)){
-					String v=(String)CacheSearchCondition.cacheSCmapVal(cacheSCmap, "ssjyr");
-					if(StringUtils.isNotEmpty(v)){
-						list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + v + "%"));
+					if (StringUtils.isNotEmpty(szdid)) {
+						list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
+					} else if (isGET(request)) {
+						String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szdid");
+						if (StringUtils.isNotEmpty(v)) {
+							list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + v + "%"));
+						}
 					}
-				}
-//				else if (StringUtils.isNotEmpty(SearchCondition.bwssjyr) && isGET(request)) {
-//					list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + SearchCondition.bwssjyr + "%"));
-//				}
-				if (StringUtils.isNotEmpty(bwmc)) {
-					list.add(cb.like(root.get("bwmc").as(String.class), "%" + bwmc + "%"));
-				}else if(isGET(request)){
-					String v=(String)CacheSearchCondition.cacheSCmapVal(cacheSCmap, "bwmc");
-					if(StringUtils.isNotEmpty(v)){
-						list.add(cb.like(root.get("bwmc").as(String.class), "%" +v + "%"));
+					// else if (StringUtils.isNotEmpty(SearchCondition.bwszd) &&
+					// isGET(request)) {
+					// list.add(cb.like(root.get("szd").get("id").as(String.class),
+					// "%" + SearchCondition.bwszd + "%"));
+					// }
+					if (StringUtils.isNotEmpty(szgkid)) {
+						list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));
+					} else if (isGET(request)) {
+						String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgkid");
+						if (StringUtils.isNotEmpty(v)) {
+							list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + v + "%"));
+						}
 					}
-				}
-//				else if (StringUtils.isNotEmpty(SearchCondition.bwmc) && isGET(request)) {
-//					list.add(cb.like(root.get("bwmc").as(String.class), "%" + SearchCondition.bwmc + "%"));
-//				}
-				if (StringUtils.isNotEmpty(wxpbwid)) {
-					list.add(cb.like(root.get("wxpbw").get("id").as(String.class), "%" + wxpbwid + "%"));
-				}else if(isGET(request)){
-					String v=(String)CacheSearchCondition.cacheSCmapVal(cacheSCmap, "wxpbwid");
-					if(StringUtils.isNotEmpty(v)){
-						list.add(cb.like(root.get("wxpbw").get("id").as(String.class), "%" + v + "%"));
+
+					// else if (StringUtils.isNotEmpty(SearchCondition.bwszgk)
+					// && isGET(request)) {
+					// list.add(cb.like(root.get("szgk").get("id").as(String.class),
+					// "%" + SearchCondition.bwszgk + "%"));
+					// }
+					if (StringUtils.isNotEmpty(szgqid)) {
+						list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));
+					} else if (isGET(request)) {
+						String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgqid");
+						if (StringUtils.isNotEmpty(v)) {
+							list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + v + "%"));
+						}
 					}
-				}
-//				else if (StringUtils.isNotEmpty(SearchCondition.wxpbw) && isGET(request)) {
-//					list.add(cb.like(root.get("wxpbw").get("id").as(String.class), "%" + SearchCondition.wxpbw + "%"));
-//				}
-				if (StringUtils.isNotEmpty(bwsxid)) {
-					list.add(cb.like(root.get("bwsx").get("id").as(String.class), "%" + bwsxid + "%"));
-				} else if(isGET(request)){
-					String v=(String)CacheSearchCondition.cacheSCmapVal(cacheSCmap, "bwsxid");
-					if(StringUtils.isNotEmpty(v)){
-						list.add(cb.like(root.get("bwsx").get("id").as(String.class), "%" + v + "%"));
+					// else if (StringUtils.isNotEmpty(SearchCondition.bwszgq)
+					// && isGET(request)) {
+					// list.add(cb.like(root.get("szgq").get("id").as(String.class),
+					// "%" + SearchCondition.bwszgq + "%"));
+					// }
+					if (StringUtils.isNotEmpty(ssjyr)) {
+						list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + ssjyr + "%"));
+					} else if (isGET(request)) {
+						String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "ssjyr");
+						if (StringUtils.isNotEmpty(v)) {
+							list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + v + "%"));
+						}
 					}
-				}
-//				else if (StringUtils.isNotEmpty(SearchCondition.bwsx) && isGET(request)) {
-//					list.add(cb.like(root.get("bwsx").get("id").as(String.class), "%" + SearchCondition.bwsx + "%"));
-//				}
-				if (StringUtils.isNotEmpty(fwlxid)) {
-					list.add(cb.like(root.get("fwlx").get("id").as(String.class), "%" + fwlxid + "%"));
-				}else if(isGET(request)){
-					String v=(String)CacheSearchCondition.cacheSCmapVal(cacheSCmap, "fwlxid");
-					if(StringUtils.isNotEmpty(v)){
-						list.add(cb.like(root.get("fwlx").get("id").as(String.class), "%" + v + "%"));
+					// else if (StringUtils.isNotEmpty(SearchCondition.bwssjyr)
+					// && isGET(request)) {
+					// list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class),
+					// "%" + SearchCondition.bwssjyr + "%"));
+					// }
+					if (StringUtils.isNotEmpty(bwmc)) {
+						list.add(cb.like(root.get("bwmc").as(String.class), "%" + bwmc + "%"));
+					} else if (isGET(request)) {
+						String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "bwmc");
+						if (StringUtils.isNotEmpty(v)) {
+							list.add(cb.like(root.get("bwmc").as(String.class), "%" + v + "%"));
+						}
 					}
-				}
-//				else if (StringUtils.isNotEmpty(SearchCondition.fwlx) && isGET(request)) {
-//					list.add(cb.like(root.get("fwlx").get("id").as(String.class), "%" + SearchCondition.fwlx + "%"));
-//				}
-				if (StringUtils.isNotEmpty(sfdwkfid)) {
-					list.add(cb.like(root.get("sfdwkf").get("id").as(String.class), "%" + sfdwkfid + "%"));
-				}else if(isGET(request)){
-					String v=(String)CacheSearchCondition.cacheSCmapVal(cacheSCmap, "sfdwkfid");
-					if(StringUtils.isNotEmpty(v)){
-						list.add(cb.like(root.get("sfdwkf").get("id").as(String.class), "%" + v + "%"));
+					// else if (StringUtils.isNotEmpty(SearchCondition.bwmc) &&
+					// isGET(request)) {
+					// list.add(cb.like(root.get("bwmc").as(String.class), "%" +
+					// SearchCondition.bwmc + "%"));
+					// }
+					if (StringUtils.isNotEmpty(wxpbwid)) {
+						list.add(cb.like(root.get("wxpbw").get("id").as(String.class), "%" + wxpbwid + "%"));
+					} else if (isGET(request)) {
+						String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "wxpbwid");
+						if (StringUtils.isNotEmpty(v)) {
+							list.add(cb.like(root.get("wxpbw").get("id").as(String.class), "%" + v + "%"));
+						}
 					}
-				}
-//				else if (StringUtils.isNotEmpty(SearchCondition.sfdwkfbw) && isGET(request)) {
-//					list.add(cb.like(root.get("sfdwkf").get("id").as(String.class), "%" + SearchCondition.sfdwkfbw + "%"));
-//				}
-				if (StringUtils.isNotEmpty(bwbwyt)) {
-					list.add(cb.like(root.get("bwyt").as(String.class), "%" + bwbwyt + "%"));
-				} else if(isGET(request)){
-					String v=(String)CacheSearchCondition.cacheSCmapVal(cacheSCmap, "bwbwyt");
-					if(StringUtils.isNotEmpty(v)){
-						list.add(cb.like(root.get("bwyt").as(String.class), "%" + v + "%"));
+					// else if (StringUtils.isNotEmpty(SearchCondition.wxpbw) &&
+					// isGET(request)) {
+					// list.add(cb.like(root.get("wxpbw").get("id").as(String.class),
+					// "%" + SearchCondition.wxpbw + "%"));
+					// }
+					if (StringUtils.isNotEmpty(bwsxid)) {
+						list.add(cb.like(root.get("bwsx").get("id").as(String.class), "%" + bwsxid + "%"));
+					} else if (isGET(request)) {
+						String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "bwsxid");
+						if (StringUtils.isNotEmpty(v)) {
+							list.add(cb.like(root.get("bwsx").get("id").as(String.class), "%" + v + "%"));
+						}
+					}
+					// else if (StringUtils.isNotEmpty(SearchCondition.bwsx) &&
+					// isGET(request)) {
+					// list.add(cb.like(root.get("bwsx").get("id").as(String.class),
+					// "%" + SearchCondition.bwsx + "%"));
+					// }
+					if (StringUtils.isNotEmpty(fwlxid)) {
+						list.add(cb.like(root.get("fwlx").get("id").as(String.class), "%" + fwlxid + "%"));
+					} else if (isGET(request)) {
+						String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "fwlxid");
+						if (StringUtils.isNotEmpty(v)) {
+							list.add(cb.like(root.get("fwlx").get("id").as(String.class), "%" + v + "%"));
+						}
+					}
+					// else if (StringUtils.isNotEmpty(SearchCondition.fwlx) &&
+					// isGET(request)) {
+					// list.add(cb.like(root.get("fwlx").get("id").as(String.class),
+					// "%" + SearchCondition.fwlx + "%"));
+					// }
+					if (StringUtils.isNotEmpty(sfdwkfid)) {
+						list.add(cb.like(root.get("sfdwkf").get("id").as(String.class), "%" + sfdwkfid + "%"));
+					} else if (isGET(request)) {
+						String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "sfdwkfid");
+						if (StringUtils.isNotEmpty(v)) {
+							list.add(cb.like(root.get("sfdwkf").get("id").as(String.class), "%" + v + "%"));
+						}
+					}
+					// else if (StringUtils.isNotEmpty(SearchCondition.sfdwkfbw)
+					// && isGET(request)) {
+					// list.add(cb.like(root.get("sfdwkf").get("id").as(String.class),
+					// "%" + SearchCondition.sfdwkfbw + "%"));
+					// }
+					if (StringUtils.isNotEmpty(bwbwyt)) {
+						list.add(cb.like(root.get("bwyt").as(String.class), "%" + bwbwyt + "%"));
+					} else if (isGET(request)) {
+						String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "bwbwyt");
+						if (StringUtils.isNotEmpty(v)) {
+							list.add(cb.like(root.get("bwyt").as(String.class), "%" + v + "%"));
+						}
 					}
+					// else if (StringUtils.isNotEmpty(SearchCondition.bwbwyt)
+					// && isGET(request)) {
+					// list.add(cb.like(root.get("bwyt").as(String.class), "%" +
+					// SearchCondition.bwbwyt + "%"));
+					// }
+					// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
 				}
-//				else if (StringUtils.isNotEmpty(SearchCondition.bwbwyt) && isGET(request)) {
-//					list.add(cb.like(root.get("bwyt").as(String.class), "%" + SearchCondition.bwbwyt + "%"));
-//				}
-				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
 				if (isJyr()) {
 					list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));
 				} else {
 					In<String> in = cb.in(root.get("szgq").get("id").as(String.class));
 					@SuppressWarnings("unchecked")
-					List<String> gqlist = (List<String>) Utils.getSession()
-							.getAttribute("gqList");
+					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));
@@ -224,7 +275,8 @@ public class BwCtl extends BaseWebCtl {
 						list.add(in);
 					}
 				}
-				//状态为0,9,10,11不显示
+
+				// 状态为0,9,10,11不显示
 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
 				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_BGFLAG));
@@ -233,12 +285,11 @@ public class BwCtl extends BaseWebCtl {
 			}
 		};
 
-		
-		//判断登录用户是否和上次登录用户相同，若不同则清空查询条件
+		// 判断登录用户是否和上次登录用户相同，若不同则清空查询条件
 		String user1 = (String) Utils.getSession().getAttribute("user");
 		String user2 = SecUtils.getCurrUser().getId();
-		if(user2!=null){
-			if(!user2.equals(user1)){
+		if (user2 != null) {
+			if (!user2.equals(user1)) {
 				SearchCondition.bwpage = 1;
 				SearchCondition.bwmc = "";
 				SearchCondition.bwssjyr = "";
@@ -248,17 +299,17 @@ public class BwCtl extends BaseWebCtl {
 				SearchCondition.wxpbw = "";
 				SearchCondition.bwsx = "";
 				SearchCondition.fwlx = "";
-				SearchCondition.sfdwkfbw="";
+				SearchCondition.sfdwkfbw = "";
 				SearchCondition.bwbwyt = "";
 
 			}
-			
+
 		}
 		Utils.getSession().setAttribute("user", user2);
-		
-//		if (page.getPage() < 1) {
-//			page.setPage(SearchCondition.bwpage);
-//		}
+
+		// if (page.getPage() < 1) {
+		// page.setPage(SearchCondition.bwpage);
+		// }
 		if (page.getPage() < 1) {
 			Object bwpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "bwpage");
 			if (StringUtils.isEmpty(bwpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(bwpage))) {
@@ -322,57 +373,58 @@ public class BwCtl extends BaseWebCtl {
 				vo.setSclx(entity.getSclx() != null ? entity.getSclx().getId() : "");
 				vo.setJgxs(entity.getJgxs() != null ? entity.getJgxs().getId() : "");
 				vo.setXkzid(entity.getXkzid() != null ? entity.getXkzid() : "");
-				
-				vo.setSszyq(entity.getSszyq() != null ? entity.getSszyq().getId():"");
-				vo.setSszyqzw(entity.getSszyq() != null ? entity.getSszyq().getZyqmc():"");
-				vo.setZls(entity.getZls() != null ? entity.getZls().getId():"");
-				vo.setZlszw(entity.getZls() != null ? entity.getZls().getText():"");
-				vo.setXp(entity.getXp() != null ? entity.getXp().getId():"");
-				vo.setXpzw(entity.getXp() != null ? entity.getXp().getText():"");
-				
+
+				vo.setSszyq(entity.getSszyq() != null ? entity.getSszyq().getId() : "");
+				vo.setSszyqzw(entity.getSszyq() != null ? entity.getSszyq().getZyqmc() : "");
+				vo.setZls(entity.getZls() != null ? entity.getZls().getId() : "");
+				vo.setZlszw(entity.getZls() != null ? entity.getZls().getText() : "");
+				vo.setXp(entity.getXp() != null ? entity.getXp().getId() : "");
+				vo.setXpzw(entity.getXp() != null ? entity.getXp().getText() : "");
+
 				voList.add(vo);
+
 			}
+
 		}
 
-		
-//		if (isPOST(request)) {
-//			model.addAttribute("bwmc", bwmc);
-//			model.addAttribute("ssjyr", ssjyr);
-//			model.addAttribute("szd", szdid);
-//			model.addAttribute("szgk", szgkid);
-//			model.addAttribute("szgq", szgqid);
-//			model.addAttribute("sfwxpbw", wxpbwid);
-//			model.addAttribute("bwsx", bwsxid);
-//			model.addAttribute("fwlx", fwlxid);
-//			model.addAttribute("sfdwkfbw",sfdwkfid);
-//			model.addAttribute("bwyt",bwbwyt);
-//
-//			SearchCondition.bwpage = page.getPage();
-//			SearchCondition.bwmc = bwmc;
-//			SearchCondition.bwssjyr = ssjyr;
-//			SearchCondition.bwszd = szdid;
-//			SearchCondition.bwszgk = szgkid;
-//			SearchCondition.bwszgq = szgqid;
-//			SearchCondition.wxpbw = wxpbwid;
-//			SearchCondition.bwsx = bwsxid;
-//			SearchCondition.fwlx = fwlxid;
-//			SearchCondition.sfdwkfbw=sfdwkfid;
-//			SearchCondition.bwbwyt = bwbwyt;
-//
-//		} else {
-//			model.addAttribute("bwmc", SearchCondition.bwmc);
-//			model.addAttribute("ssjyr", SearchCondition.bwssjyr);
-//			model.addAttribute("szd", SearchCondition.bwszd);
-//			model.addAttribute("szgk", SearchCondition.bwszgk);
-//			model.addAttribute("szgq", SearchCondition.bwszgq);
-//			model.addAttribute("sfwxpbw", SearchCondition.wxpbw);
-//			model.addAttribute("bwsx", SearchCondition.bwsx);
-//			model.addAttribute("fwlx", SearchCondition.fwlx);
-//			model.addAttribute("sfdwkfbw",SearchCondition.sfdwkfbw);
-//			model.addAttribute("bwyt",SearchCondition.bwbwyt);
-//		}
-//		model.addAttribute("list", voList);
-//		model.addAttribute("menuid", menuid);
+		// if (isPOST(request)) {
+		// model.addAttribute("bwmc", bwmc);
+		// model.addAttribute("ssjyr", ssjyr);
+		// model.addAttribute("szd", szdid);
+		// model.addAttribute("szgk", szgkid);
+		// model.addAttribute("szgq", szgqid);
+		// model.addAttribute("sfwxpbw", wxpbwid);
+		// model.addAttribute("bwsx", bwsxid);
+		// model.addAttribute("fwlx", fwlxid);
+		// model.addAttribute("sfdwkfbw",sfdwkfid);
+		// model.addAttribute("bwyt",bwbwyt);
+		//
+		// SearchCondition.bwpage = page.getPage();
+		// SearchCondition.bwmc = bwmc;
+		// SearchCondition.bwssjyr = ssjyr;
+		// SearchCondition.bwszd = szdid;
+		// SearchCondition.bwszgk = szgkid;
+		// SearchCondition.bwszgq = szgqid;
+		// SearchCondition.wxpbw = wxpbwid;
+		// SearchCondition.bwsx = bwsxid;
+		// SearchCondition.fwlx = fwlxid;
+		// SearchCondition.sfdwkfbw=sfdwkfid;
+		// SearchCondition.bwbwyt = bwbwyt;
+		//
+		// } else {
+		// model.addAttribute("bwmc", SearchCondition.bwmc);
+		// model.addAttribute("ssjyr", SearchCondition.bwssjyr);
+		// model.addAttribute("szd", SearchCondition.bwszd);
+		// model.addAttribute("szgk", SearchCondition.bwszgk);
+		// model.addAttribute("szgq", SearchCondition.bwszgq);
+		// model.addAttribute("sfwxpbw", SearchCondition.wxpbw);
+		// model.addAttribute("bwsx", SearchCondition.bwsx);
+		// model.addAttribute("fwlx", SearchCondition.fwlx);
+		// model.addAttribute("sfdwkfbw",SearchCondition.sfdwkfbw);
+		// model.addAttribute("bwyt",SearchCondition.bwbwyt);
+		// }
+		// model.addAttribute("list", voList);
+		// model.addAttribute("menuid", menuid);
 		if (isPOST(request)) {
 			cacheSCmap.put("bwpage", page.getPage());
 			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);
@@ -383,6 +435,7 @@ public class BwCtl extends BaseWebCtl {
 		model.addAttribute("list", voList);
 		model.addAttribute("bwmc", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "bwmc"));
 		model.addAttribute("ssjyr", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "ssjyr"));
+		model.addAttribute("ssmt", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "ssmt"));
 		model.addAttribute("szd", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szdid"));
 		model.addAttribute("szgk", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgkid"));
 		model.addAttribute("szgq", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgqid"));
@@ -435,7 +488,7 @@ public class BwCtl extends BaseWebCtl {
 	@RequestMapping(value = "/save")
 	@ResponseBody
 	@RequiresPermissions("bwxx:add")
-	public WebJsonResult save(Model model, String path, BwEntity code,String bwszhdid, String szdid, String szgkid, String szgqid, String ssjyrid, String ssmtid, String bwsxid, String fwlxid, String wxpbwid, String zyhbwflid, String sffzid, String sfdwkfid, String bwszsxid, String sclxid, String jgxsid,String sszyqid,String zlsid,String xpid,String kbcblxid) {
+	public WebJsonResult save(Model model, String path, BwEntity code, String bwszhdid, String szdid, String szgkid, String szgqid, String ssjyrid, String ssmtid, String bwsxid, String fwlxid, String wxpbwid, String zyhbwflid, String sffzid, String sfdwkfid, String bwszsxid, String sclxid, String jgxsid, String sszyqid, String zlsid, String xpid, String kbcblxid) {
 		WebJsonResult wr = success();
 		if (StringUtils.isEmpty(szdid)) {
 			wr.setSuccess(false);
@@ -471,16 +524,16 @@ public class BwCtl extends BaseWebCtl {
 				entity.setBwcd(code.getBwcd());
 				entity.setBwmc(code.getBwmc());
 				/* entity.setBwszsx(code.getBwszsx()); */
-				if(code.getBwyt()!=null&&code.getBwyt().startsWith(",")){
+				if (code.getBwyt() != null && code.getBwyt().startsWith(",")) {
 					entity.setBwyt(code.getBwyt().substring(1));
-				}else{
+				} else {
 					entity.setBwyt(code.getBwyt());
 				}
 				entity.setHckpnl(code.getHckpnl());
 				entity.setJd(code.getJd());
 				entity.setJgysnf(code.getJgysnf());
 				entity.setJtjgisdyidh(code.getJtjgisdyidh());
-				/*entity.setNhwtgnl(code.getNhwtgnl());*/
+				/* entity.setNhwtgnl(code.getNhwtgnl()); */
 				entity.setNwxhwttl(code.getNwxhwttl());
 				entity.setQysjsh(code.getQysjsh());
 				entity.setQysjss(code.getQysjss());
@@ -494,7 +547,7 @@ public class BwCtl extends BaseWebCtl {
 				entity.setDtsj(code.getDtsj());
 				entity.setBwdm(code.getBwdm());
 				/* entity.setSfdwkf(code.getSfdwkf()); */
-				/*entity.setNjzxtgnl(code.getNjzxtgnl());*/
+				/* entity.setNjzxtgnl(code.getNjzxtgnl()); */
 				/* entity.setSclx(code.getSclx()); */
 				entity.setJgxs(code.getJgxs());
 				entity.setHcnlxztj(code.getHcnlxztj());
@@ -534,7 +587,6 @@ public class BwCtl extends BaseWebCtl {
 				MtEntity ssmt = new MtEntity();
 				ssmt.setId(ssmtid);
 				entity.setSsmt(ssmt);
-				
 
 				if (!StringUtils.isEmpty(sffzid)) {
 					CodeEntity sffz = new CodeEntity(sffzid);
@@ -573,29 +625,30 @@ public class BwCtl extends BaseWebCtl {
 					CodeEntity jgxs = new CodeEntity(jgxsid);
 					entity.setJgxs(jgxs);
 				}
-				
+
 				if (!StringUtils.isEmpty(sszyqid)) {
 					ZyqEntity zyq = new ZyqEntity();
 					zyq.setId(sszyqid);
 					entity.setSszyq(zyq);
 				}
-				if(!StringUtils.isEmpty(zlsid)){
+				if (!StringUtils.isEmpty(zlsid)) {
 					CodeEntity zls = new CodeEntity(zlsid);
 					entity.setZls(zls);
 				}
-				if(!StringUtils.isEmpty(xpid)){
+				if (!StringUtils.isEmpty(xpid)) {
 					CodeEntity xp = new CodeEntity(xpid);
-					entity.setXp(xp);;
+					entity.setXp(xp);
+					;
 				}
-				if(!StringUtils.isEmpty(bwszhdid)){
-					CodeEntity bwszhd= new CodeEntity(bwszhdid);
+				if (!StringUtils.isEmpty(bwszhdid)) {
+					CodeEntity bwszhd = new CodeEntity(bwszhdid);
 					entity.setBwszhd(bwszhd);
 				}
 				if (!StringUtils.isEmpty(kbcblxid)) {
 					CodeEntity kbcblx = new CodeEntity(kbcblxid);
 					entity.setKbcblx(kbcblx);
 				}
-				
+
 				if (!StringUtils.isEmpty(path) && path.indexOf("bg") > 0) {
 					if (path.indexOf("add") > 0) {
 						entity.setRecordStatus(BaseEntity.RECORE_STATE_COPY);
@@ -664,22 +717,23 @@ public class BwCtl extends BaseWebCtl {
 					CodeEntity jgxs = new CodeEntity(jgxsid);
 					code.setJgxs(jgxs);
 				}
-				
+
 				if (!StringUtils.isEmpty(sszyqid)) {
 					ZyqEntity zyq = new ZyqEntity();
 					zyq.setId(sszyqid);
 					code.setSszyq(zyq);
 				}
-				if(!StringUtils.isEmpty(zlsid)){
+				if (!StringUtils.isEmpty(zlsid)) {
 					CodeEntity zls = new CodeEntity(zlsid);
 					code.setZls(zls);
 				}
-				if(!StringUtils.isEmpty(xpid)){
+				if (!StringUtils.isEmpty(xpid)) {
 					CodeEntity xp = new CodeEntity(xpid);
-					code.setXp(xp);;
+					code.setXp(xp);
+					;
 				}
-				if(!StringUtils.isEmpty(bwszhdid)){
-					CodeEntity bwszhd= new CodeEntity(bwszhdid);
+				if (!StringUtils.isEmpty(bwszhdid)) {
+					CodeEntity bwszhd = new CodeEntity(bwszhdid);
 					code.setBwszhd(bwszhd);
 				}
 				if (!StringUtils.isEmpty(kbcblxid)) {
@@ -755,28 +809,28 @@ public class BwCtl extends BaseWebCtl {
 		vo.setBwszsxzw(entity.getBwszsx() != null ? entity.getBwszsx().getText() : "");
 		vo.setSclxzw(entity.getSclx() != null ? entity.getSclx().getText() : "");
 		vo.setJgxszw(entity.getJgxs() != null ? entity.getJgxs().getText() : "");
-		
-		vo.setSszyq(entity.getSszyq() != null ? entity.getSszyq().getId():"");
-		vo.setSszyqzw(entity.getSszyq() != null ? entity.getSszyq().getZyqmc():"");
-		vo.setZls(entity.getZls() != null ? entity.getZls().getId():"");
-		vo.setZlszw(entity.getZls() != null ? entity.getZls().getText():"");
-		vo.setXp(entity.getXp() != null ? entity.getXp().getId():"");
-		vo.setXpzw(entity.getXp() != null ? entity.getXp().getText():"");
-		vo.setBwszhd(entity.getBwszhd() != null ? entity.getBwszhd().getId():"");
-		vo.setKbcblx(entity.getKbcblx()!=null?entity.getKbcblx().getId():"");
+
+		vo.setSszyq(entity.getSszyq() != null ? entity.getSszyq().getId() : "");
+		vo.setSszyqzw(entity.getSszyq() != null ? entity.getSszyq().getZyqmc() : "");
+		vo.setZls(entity.getZls() != null ? entity.getZls().getId() : "");
+		vo.setZlszw(entity.getZls() != null ? entity.getZls().getText() : "");
+		vo.setXp(entity.getXp() != null ? entity.getXp().getId() : "");
+		vo.setXpzw(entity.getXp() != null ? entity.getXp().getText() : "");
+		vo.setBwszhd(entity.getBwszhd() != null ? entity.getBwszhd().getId() : "");
+		vo.setKbcblx(entity.getKbcblx() != null ? entity.getKbcblx().getId() : "");
 		if (entity.getBwyt() != null) {
 			String bwytzw = "";
 			String[] s = entity.getBwyt().split(",");
 			for (String string : s) {
-				bwytzw += securityMgr.codeService().findOne(string)!=null?securityMgr.codeService().findOne(string).getText():"";
+				bwytzw += securityMgr.codeService().findOne(string) != null ? securityMgr.codeService().findOne(string).getText() : "";
 			}
 			vo.setBwytzw(bwytzw);
 		}
 
-		if(!StringUtils.isEmpty(entity.getSsjyr())){
-			model.addAttribute("jyrzyid", entity.getSsjyr().getZyid()!=null? entity.getSsjyr().getZyid():"");
+		if (!StringUtils.isEmpty(entity.getSsjyr())) {
+			model.addAttribute("jyrzyid", entity.getSsjyr().getZyid() != null ? entity.getSsjyr().getZyid() : "");
 		}
-		
+
 		vo.setSzd(entity.getSzd() != null ? entity.getSzd().getId() : "");
 		vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");
 		vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
@@ -791,12 +845,12 @@ public class BwCtl extends BaseWebCtl {
 		vo.setBwszsx(entity.getBwszsx() != null ? entity.getBwszsx().getId() : "");
 		vo.setSclx(entity.getSclx() != null ? entity.getSclx().getId() : "");
 		vo.setJgxs(entity.getJgxs() != null ? entity.getJgxs().getId() : "");
-		
-		if(!StringUtils.isEmpty(entity.getSsjyr())){
-			model.addAttribute("jyrzyid", entity.getSsjyr().getZyid()!=null? entity.getSsjyr().getZyid():"");
+
+		if (!StringUtils.isEmpty(entity.getSsjyr())) {
+			model.addAttribute("jyrzyid", entity.getSsjyr().getZyid() != null ? entity.getSsjyr().getZyid() : "");
 		}
-		
-		if(StringUtils.isEmpty(vo.getZyid())){
+
+		if (StringUtils.isEmpty(vo.getZyid())) {
 			SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyyMMddHHmmss");
 			String zyid = dateTimeFormat.format(new Date());
 			vo.setZyid(zyid);
@@ -834,15 +888,15 @@ public class BwCtl extends BaseWebCtl {
 			vo.setSclxzw(entity.getSclx() != null ? entity.getSclx().getText() : "");
 			vo.setJgxszw(entity.getJgxs() != null ? entity.getJgxs().getText() : "");
 			vo.setKbcblxzw(entity.getKbcblx() != null ? entity.getKbcblx().getText() : "");
-			
-			vo.setSszyq(entity.getSszyq() != null ? entity.getSszyq().getId():"");
-			vo.setSszyqzw(entity.getSszyq() != null ? entity.getSszyq().getZyqmc():"");
-			vo.setZls(entity.getZls() != null ? entity.getZls().getId():"");
-			vo.setZlszw(entity.getZls() != null ? entity.getZls().getText():"");
-			vo.setXp(entity.getXp() != null ? entity.getXp().getId():"");
-			vo.setXpzw(entity.getXp() != null ? entity.getXp().getText():"");
-			vo.setBwszhd(entity.getBwszhd() != null ? entity.getBwszhd().getText():"");
-			
+
+			vo.setSszyq(entity.getSszyq() != null ? entity.getSszyq().getId() : "");
+			vo.setSszyqzw(entity.getSszyq() != null ? entity.getSszyq().getZyqmc() : "");
+			vo.setZls(entity.getZls() != null ? entity.getZls().getId() : "");
+			vo.setZlszw(entity.getZls() != null ? entity.getZls().getText() : "");
+			vo.setXp(entity.getXp() != null ? entity.getXp().getId() : "");
+			vo.setXpzw(entity.getXp() != null ? entity.getXp().getText() : "");
+			vo.setBwszhd(entity.getBwszhd() != null ? entity.getBwszhd().getText() : "");
+
 			if (entity.getBwyt() != null) {
 				String bwytzw = "";
 				String[] s = entity.getBwyt().split(",");
@@ -905,12 +959,12 @@ public class BwCtl extends BaseWebCtl {
 			model.addAttribute("jyr", getSsjyr() != null ? JSONObject.fromObject(getSsjyr()).toString() : null);
 		}
 		model.addAttribute("path", path);
-		if(SecUtils.getCurrUser() != null){
+		if (SecUtils.getCurrUser() != null) {
 			List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCodeAndCity(Constants.GROUP_CODE_SZD, GlobalData.CITY_CODE);
-			model.addAttribute("sz",list.size()==1?list.get(0).getId():"");
-			if(list.size()==1){
+			model.addAttribute("sz", list.size() == 1 ? list.get(0).getId() : "");
+			if (list.size() == 1) {
 				List<GkEntity> gklist = gkService.findBySzd(list.get(0).getId());
-				model.addAttribute("gk",gklist.size()==1?gklist.get(0).getId():"");
+				model.addAttribute("gk", gklist.size() == 1 ? gklist.get(0).getId() : "");
 			}
 		}
 		SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyyMMddHHmmss");
@@ -925,14 +979,14 @@ public class BwCtl extends BaseWebCtl {
 		List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCode(Constants.GROUP_CODE_BWSZHD);
 		return list;
 	}
-	
+
 	@RequestMapping(value = "/selectBwxs")
 	@ResponseBody
 	public List<CodeEntity> selectBwxs() {
 		List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCode(Constants.GROUP_CODE_BWXS);
 		return list;
 	}
-	
+
 	@RequestMapping(value = "/selectSffz")
 	@ResponseBody
 	public List<CodeEntity> selectSffz() {
@@ -992,10 +1046,11 @@ public class BwCtl extends BaseWebCtl {
 	@RequestMapping(value = "/selectZyhbwfl")
 	@ResponseBody
 	public List<CodeEntity> selectZyhbwfl(String flag) {
-		List<CodeEntity> list =new ArrayList<CodeEntity>();;
-		if(!StringUtils.isEmpty(flag)){
-			if("1".equals(flag)){
-				 list= securityMgr.codeService().findValidCodesByGroupCode(Constants.GROUP_CODE_ZYHBWFL);
+		List<CodeEntity> list = new ArrayList<CodeEntity>();
+		;
+		if (!StringUtils.isEmpty(flag)) {
+			if ("1".equals(flag)) {
+				list = securityMgr.codeService().findValidCodesByGroupCode(Constants.GROUP_CODE_ZYHBWFL);
 				return list;
 			}
 		}
@@ -1039,21 +1094,21 @@ public class BwCtl extends BaseWebCtl {
 		List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCode(Constants.GROUP_CODE_MTJGXS);
 		return list;
 	}
-	
+
 	@RequestMapping(value = "/selectZls")
 	@ResponseBody
 	public List<CodeEntity> selectZls() {
 		List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCode("BWXSZLS");
 		return list;
 	}
-	
+
 	@RequestMapping(value = "/selectCblx")
 	@ResponseBody
 	public List<CodeEntity> selectCblx() {
 		List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCode(Constants.GROUP_CODE_CBLX);
 		return list;
 	}
-	
+
 	@RequestMapping(value = "/selectXp")
 	@ResponseBody
 	public List<CodeEntity> selectXp() {

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkbg/ctl/XkzbgCtl.java

@@ -42,6 +42,8 @@ import com.xt.jygl.gkjcxx.gq.entity.GqEntity;
 import com.xt.jygl.gkjcxx.gq.service.GqService;
 import com.xt.jygl.gkjcxx.mt.entity.MtEntity;
 import com.xt.jygl.gkjcxx.mt.service.MtService;
+import com.xt.jygl.gkjcxx.xzdwxxgl.xzglbmxx.entity.XzglbmxxEntity;
+import com.xt.jygl.gkjcxx.xzdwxxgl.xzglbmxx.service.XzglbmxxService;
 import com.xt.jygl.gkjcxx.zyq.entity.ZyqEntity;
 import com.xt.jygl.gkjcxx.zyq.service.ZyqService;
 import com.xt.jygl.gkjygl.gkjyr.jyrbw.service.BwService;
@@ -180,7 +182,8 @@ public class XkzbgCtl extends BaseWebCtl {
 	private XkzyxfjService xkzyxfjService;
 	@Autowired
 	private XkzsqfjService xkzsqfjService;
-
+	@Autowired
+	private XzglbmxxService xzglbmxxService;
 	@RequestMapping(value = "/main")
 	@RequiresPermissions("gkjyxkbg:main")
 	public String main(SimplePageRequest page, Model model, final String lczt, final String szdid, final String szgkid, final String szgqid, final String gkjyr, final String fddbr, final String bgdd, String menuid) throws JsonProcessingException {
@@ -2958,7 +2961,13 @@ public class XkzbgCtl extends BaseWebCtl {
 			xkz.setZyqyfw(jyfwstr2);
 			xkz.setCq(jylzstr);
 			if (!StringUtils.isEmpty(user.getSsglbm())) {
-				xkz.setFzjg(user.getSsglbm().getGkglbmqc());
+				XzglbmxxEntity glbm= user.getSsglbm();
+				if("00".equals(glbm.getPid())){
+					xkz.setFzjg(glbm.getGkglbmqc());
+				}else{
+					XzglbmxxEntity pglbm = xzglbmxxService.getPglbm(glbm.getPid());
+					xkz.setFzjg(pglbm.getGkglbmqc());
+				}
 			}
 			xkz.setGkjyxkzh(xkzbg.getXkzbh());
 			xkz.setFzrq(new Date());

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxksq/ctl/XkzsqCtl.java

@@ -47,6 +47,8 @@ import com.xt.jygl.gkjcxx.gq.entity.GqEntity;
 import com.xt.jygl.gkjcxx.gq.service.GqService;
 import com.xt.jygl.gkjcxx.mt.entity.MtEntity;
 import com.xt.jygl.gkjcxx.mt.service.MtService;
+import com.xt.jygl.gkjcxx.xzdwxxgl.xzglbmxx.entity.XzglbmxxEntity;
+import com.xt.jygl.gkjcxx.xzdwxxgl.xzglbmxx.service.XzglbmxxService;
 import com.xt.jygl.gkjcxx.zyq.entity.ZyqEntity;
 import com.xt.jygl.gkjcxx.zyq.service.ZyqService;
 import com.xt.jygl.gkjygl.gkjyr.jyrbw.service.BwService;
@@ -163,7 +165,8 @@ public class XkzsqCtl extends BaseWebCtl {
 	private QytzService qytzService;
 	@Autowired
 	private ZxjxService zxjxService;
-
+	@Autowired
+	private XzglbmxxService xzglbmxxService;
 	@RequestMapping(value = "/main")
 	@RequiresPermissions("gkjyxksq:main")
 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String lczt, final String szdid, final String szgkid, final String szgqid, final String gkjyr, final String fddbr, final String bgdd, String menuid) throws JsonProcessingException {
@@ -174,7 +177,7 @@ public class XkzsqCtl extends BaseWebCtl {
 			model.addAttribute("jyr", jyr);
 		}
 		model.addAttribute("user", user);
-		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request,"gkjyxksq");
+		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "gkjyxksq");
 		final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		// 查询条件
 		Specification<XkzsqEntity> spec = new Specification<XkzsqEntity>() {
@@ -183,70 +186,82 @@ public class XkzsqCtl extends BaseWebCtl {
 				List<Predicate> list = new ArrayList<Predicate>();
 				if (StringUtils.isNotEmpty(szdid)) {
 					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
-				}else if (isGET(request)) {
-					String v=(String)CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szdid");
-					if(StringUtils.isNotEmpty(v) ){
+				} else if (isGET(request)) {
+					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szdid");
+					if (StringUtils.isNotEmpty(v)) {
 						list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + v + "%"));
 					}
-				} 
-//				else if (StringUtils.isNotEmpty(SearchCondition.xkzsqszdid) && isGET(request)) {
-//					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + SearchCondition.xkzsqszdid + "%"));
-//				}
+				}
+				// else if (StringUtils.isNotEmpty(SearchCondition.xkzsqszdid)
+				// && isGET(request)) {
+				// list.add(cb.like(root.get("szd").get("id").as(String.class),
+				// "%" + SearchCondition.xkzsqszdid + "%"));
+				// }
 				if (StringUtils.isNotEmpty(szgkid)) {
 					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));
-				}else if (isGET(request)) {
-					String v=(String)CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgkid");
-					if(StringUtils.isNotEmpty(v) ){
+				} else if (isGET(request)) {
+					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgkid");
+					if (StringUtils.isNotEmpty(v)) {
 						list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + v + "%"));
 					}
-				} 
-//				else if (StringUtils.isNotEmpty(SearchCondition.xkzsqszgkid) && isGET(request)) {
-//					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + SearchCondition.xkzsqszgkid + "%"));
-//				}
+				}
+				// else if (StringUtils.isNotEmpty(SearchCondition.xkzsqszgkid)
+				// && isGET(request)) {
+				// list.add(cb.like(root.get("szgk").get("id").as(String.class),
+				// "%" + SearchCondition.xkzsqszgkid + "%"));
+				// }
 				if (StringUtils.isNotEmpty(szgqid)) {
 					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));
-				}else if (isGET(request)) {
-					String v=(String)CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgqid");
-					if(StringUtils.isNotEmpty(v) ){
+				} else if (isGET(request)) {
+					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgqid");
+					if (StringUtils.isNotEmpty(v)) {
 						list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + v + "%"));
 					}
-				} 
-//				else if (StringUtils.isNotEmpty(SearchCondition.xkzsqszgqid) && isGET(request)) {
-//					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + SearchCondition.xkzsqszgqid + "%"));
-//				}
+				}
+				// else if (StringUtils.isNotEmpty(SearchCondition.xkzsqszgqid)
+				// && isGET(request)) {
+				// list.add(cb.like(root.get("szgq").get("id").as(String.class),
+				// "%" + SearchCondition.xkzsqszgqid + "%"));
+				// }
 				if (StringUtils.isNotEmpty(gkjyr)) {
 					list.add(cb.like(root.get("jyrmc").as(String.class), "%" + gkjyr + "%"));
-				}else if (isGET(request)) {
-					String v=(String)CacheSearchCondition.cacheSCmapVal(cacheSCmap, "gkjyr");
-					if(StringUtils.isNotEmpty(v) ){
+				} else if (isGET(request)) {
+					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "gkjyr");
+					if (StringUtils.isNotEmpty(v)) {
 						list.add(cb.like(root.get("jyrmc").as(String.class), "%" + v + "%"));
 					}
-				} 
-//				else if (StringUtils.isNotEmpty(SearchCondition.xkzsqgkjyr) && isGET(request)) {
-//					list.add(cb.like(root.get("jyrmc").as(String.class), "%" + SearchCondition.xkzsqgkjyr + "%"));
-//				}
+				}
+				// else if (StringUtils.isNotEmpty(SearchCondition.xkzsqgkjyr)
+				// && isGET(request)) {
+				// list.add(cb.like(root.get("jyrmc").as(String.class), "%" +
+				// SearchCondition.xkzsqgkjyr + "%"));
+				// }
 				if (StringUtils.isNotEmpty(fddbr)) {
 					list.add(cb.like(root.get("fddbr").as(String.class), "%" + fddbr + "%"));
-				}else if (isGET(request)) {
-					String v=(String)CacheSearchCondition.cacheSCmapVal(cacheSCmap, "fddbr");
-					if(StringUtils.isNotEmpty(v) ){
+				} else if (isGET(request)) {
+					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "fddbr");
+					if (StringUtils.isNotEmpty(v)) {
 						list.add(cb.like(root.get("fddbr").as(String.class), "%" + v + "%"));
 					}
-				}  
-//				else if (StringUtils.isNotEmpty(SearchCondition.xkzsqfddbr) && isGET(request)) {
-//					list.add(cb.like(root.get("fddbr").as(String.class), "%" + SearchCondition.xkzsqfddbr + "%"));
-//				}
+				}
+				// else if (StringUtils.isNotEmpty(SearchCondition.xkzsqfddbr)
+				// && isGET(request)) {
+				// list.add(cb.like(root.get("fddbr").as(String.class), "%" +
+				// SearchCondition.xkzsqfddbr + "%"));
+				// }
 				if (StringUtils.isNotEmpty(bgdd)) {
 					list.add(cb.like(root.get("bgdd").as(String.class), "%" + bgdd + "%"));
-				}else if (isGET(request)) {
-					String v=(String)CacheSearchCondition.cacheSCmapVal(cacheSCmap, "bgdd");
-					if(StringUtils.isNotEmpty(v) ){
+				} else if (isGET(request)) {
+					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "bgdd");
+					if (StringUtils.isNotEmpty(v)) {
 						list.add(cb.like(root.get("bgdd").as(String.class), "%" + v + "%"));
 					}
-				}  
-//				else if (StringUtils.isNotEmpty(SearchCondition.xkzsqbgdd) && isGET(request)) {
-//					list.add(cb.like(root.get("bgdd").as(String.class), "%" + SearchCondition.xkzsqbgdd + "%"));
-//				}
+				}
+				// else if (StringUtils.isNotEmpty(SearchCondition.xkzsqbgdd) &&
+				// isGET(request)) {
+				// list.add(cb.like(root.get("bgdd").as(String.class), "%" +
+				// SearchCondition.xkzsqbgdd + "%"));
+				// }
 				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
 				if (isJyr()) {
 					list.add(cb.like(root.get("jyrid").as(String.class), "%" + getSsjyr().getId() + "%"));
@@ -259,7 +274,8 @@ public class XkzsqCtl extends BaseWebCtl {
 						}
 						list.add(in);
 					}
-					//list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + SecUtils.getCurrUser().getSzd().getId() + "%"));
+					// list.add(cb.like(root.get("szd").get("id").as(String.class),
+					// "%" + SecUtils.getCurrUser().getSzd().getId() + "%"));
 				}
 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
 
@@ -268,8 +284,8 @@ public class XkzsqCtl extends BaseWebCtl {
 		};
 		String user1 = (String) Utils.getSession().getAttribute("userpre");
 		String user2 = SecUtils.getCurrUser().getId();
-		if(user2!=null){
-			if(!user2.equals(user1)){
+		if (user2 != null) {
+			if (!user2.equals(user1)) {
 				SearchCondition.xkzsqpage = 1;
 				SearchCondition.xkzsqbgdd = "";
 				SearchCondition.xkzsqfddbr = "";
@@ -278,13 +294,13 @@ public class XkzsqCtl extends BaseWebCtl {
 				SearchCondition.xkzsqszgkid = "";
 				SearchCondition.xkzsqszgqid = "";
 			}
-			
+
 		}
 		Utils.getSession().setAttribute("userpre", user2);
-		
-//		if (page.getPage() < 1) {
-//			page.setPage(SearchCondition.xkzsqpage);
-//		}
+
+		// if (page.getPage() < 1) {
+		// page.setPage(SearchCondition.xkzsqpage);
+		// }
 		if (page.getPage() < 1) {
 			Object xkzsqpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xkzsqpage");
 			if (StringUtils.isEmpty(xkzsqpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(xkzsqpage))) {
@@ -318,31 +334,31 @@ public class XkzsqCtl extends BaseWebCtl {
 				}
 			}
 		}
-//		if (isPOST(request)) {
-//			model.addAttribute("szdid", szdid);
-//			model.addAttribute("szgkid", szgkid);
-//			model.addAttribute("szgqid", szgqid);
-//			model.addAttribute("lczt", lczt);
-//			model.addAttribute("gkjyr", gkjyr);
-//			model.addAttribute("fddbr", fddbr);
-//			model.addAttribute("bgdd", bgdd);
-//
-//			SearchCondition.xkzsqpage = page.getPage();
-//			SearchCondition.xkzsqbgdd = bgdd;
-//			SearchCondition.xkzsqfddbr = fddbr;
-//			SearchCondition.xkzsqgkjyr = gkjyr;
-//			SearchCondition.xkzsqszdid = szdid;
-//			SearchCondition.xkzsqszgkid = szgkid;
-//			SearchCondition.xkzsqszgqid = szgqid;
-//		} else {
-//			model.addAttribute("szdid", SearchCondition.xkzsqszdid);
-//			model.addAttribute("szgkid", SearchCondition.xkzsqszgkid);
-//			model.addAttribute("szgqid", SearchCondition.xkzsqszgqid);
-//			model.addAttribute("gkjyr", SearchCondition.xkzsqgkjyr);
-//			model.addAttribute("fddbr", SearchCondition.xkzsqfddbr);
-//			model.addAttribute("bgdd", SearchCondition.xkzsqbgdd);
-//
-//		}
+		// if (isPOST(request)) {
+		// model.addAttribute("szdid", szdid);
+		// model.addAttribute("szgkid", szgkid);
+		// model.addAttribute("szgqid", szgqid);
+		// model.addAttribute("lczt", lczt);
+		// model.addAttribute("gkjyr", gkjyr);
+		// model.addAttribute("fddbr", fddbr);
+		// model.addAttribute("bgdd", bgdd);
+		//
+		// SearchCondition.xkzsqpage = page.getPage();
+		// SearchCondition.xkzsqbgdd = bgdd;
+		// SearchCondition.xkzsqfddbr = fddbr;
+		// SearchCondition.xkzsqgkjyr = gkjyr;
+		// SearchCondition.xkzsqszdid = szdid;
+		// SearchCondition.xkzsqszgkid = szgkid;
+		// SearchCondition.xkzsqszgqid = szgqid;
+		// } else {
+		// model.addAttribute("szdid", SearchCondition.xkzsqszdid);
+		// model.addAttribute("szgkid", SearchCondition.xkzsqszgkid);
+		// model.addAttribute("szgqid", SearchCondition.xkzsqszgqid);
+		// model.addAttribute("gkjyr", SearchCondition.xkzsqgkjyr);
+		// model.addAttribute("fddbr", SearchCondition.xkzsqfddbr);
+		// model.addAttribute("bgdd", SearchCondition.xkzsqbgdd);
+		//
+		// }
 		if (isPOST(request)) {
 			cacheSCmap.put("xkzsqpage", page.getPage());
 			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);
@@ -358,7 +374,6 @@ public class XkzsqCtl extends BaseWebCtl {
 		model.addAttribute("szgk", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgkid"));
 		model.addAttribute("fddbr", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "fddbr"));
 		model.addAttribute("bgdd", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "bgdd"));
-	
 
 		// 翻页共通
 		putPageInfo(model, page, list);
@@ -535,7 +550,7 @@ public class XkzsqCtl extends BaseWebCtl {
 
 	// 查看
 	@RequestMapping(value = "/viewmain")
-	public String viewmain(Model model, String id, String flag, String opflag, String path, String path2,String type) {
+	public String viewmain(Model model, String id, String flag, String opflag, String path, String path2, String type) {
 		model.addAttribute("path", path);
 		model.addAttribute("flag", flag);
 		model.addAttribute("path2", path2);
@@ -756,7 +771,7 @@ public class XkzsqCtl extends BaseWebCtl {
 	// 编辑
 	@RequestMapping(value = "/editmain")
 	@RequiresPermissions("gkjyxksq:edit")
-	public String editmain(Model model, String id, String flag, String path,String type) {
+	public String editmain(Model model, String id, String flag, String path, String type) {
 		model.addAttribute("flag", flag);
 		model.addAttribute("path", path);
 		model.addAttribute("type", type);
@@ -1730,6 +1745,8 @@ public class XkzsqCtl extends BaseWebCtl {
 			GkjyrEntity jyr = gkjyrService.findOne(code.getJyrid());
 			jyr.setRecordStatus(BaseEntity.RECORD_STATE_SQ);
 			gkjyrService.save(jyr);
+			// rtx提醒
+			//rtxSend(xkzsqEntity.getSzgq().getId(), Constants.ROLE_CLSC,"你有一条许可证申请待办事务，请及时处理！");
 		} catch (Exception e) {
 			wr.setSuccess(false);
 			wr.setMessage("操作失败！");
@@ -1991,6 +2008,8 @@ public class XkzsqCtl extends BaseWebCtl {
 				xkzsqService.claim(code.getId(), SecUtils.getCurrUser().getId().toString());
 			}
 			xkzsqService.changeAudit(null, xkzsqEntity, true);
+			// rtx提醒
+			//rtxSend(xkzsqEntity.getSzgq().getId(), Constants.ROLE_CLSC,"你有一条许可证申请待办事务，请及时处理！");
 		} catch (Exception e) {
 			wr.setSuccess(false);
 			wr.setMessage("操作失败！");
@@ -2349,6 +2368,7 @@ public class XkzsqCtl extends BaseWebCtl {
 	@ResponseBody
 	public WebJsonResult audit(String shyj, String id, boolean flag) {
 		WebJsonResult wr = success();
+		String role = "";
 		UserEntity user = securityMgr.getCurrUser();
 		XkzsqEntity entity = new XkzsqEntity();
 		try {
@@ -2361,14 +2381,17 @@ public class XkzsqCtl extends BaseWebCtl {
 					entity.setClscyj(StringUtils.isEmpty(shyj) ? "" : shyj);
 					entity.setClscjbr(user.getName());
 					entity.setClscrq(today);
+					role = Constants.ROLE_HC;
 				} else if ("核查".equals(taskinfo.getCurrName())) {
 					entity.setXchcyj(StringUtils.isEmpty(shyj) ? "" : shyj);
 					entity.setXchcry(user.getName());
 					entity.setXchcrq(today);
+					role = Constants.ROLE_FH;
 				} else if ("复核".equals(taskinfo.getCurrName())) {
 					entity.setFhyj(StringUtils.isEmpty(shyj) ? "" : shyj);
 					entity.setFhjbr(user.getName());
 					entity.setFhrq(today);
+					role = Constants.ROLE_SP;
 				} else if ("审批".equals(taskinfo.getCurrName())) {
 					entity.setSpyj(StringUtils.isEmpty(shyj) ? "" : shyj);
 					entity.setSpry(user.getName());
@@ -2390,12 +2413,12 @@ public class XkzsqCtl extends BaseWebCtl {
 				List<XzjydyEntity> xzjydylist = xzjydyService.findJydy(id);
 				if (xzjydylist.size() > 0 && xzjydylist != null) {
 					xkzjyfwService.deleteByJyrid(entity.getJyrid());
-					//删除后同步修改更新时间
+					// 删除后同步修改更新时间
 					List<XkzjyfwEntity> xkzjys = xkzjyfwService.findByJyrid(entity.getJyrid());
-					for(XkzjyfwEntity xkzjy:xkzjys){
+					for (XkzjyfwEntity xkzjy : xkzjys) {
 						xkzjy.setUpdateDateTime(new Timestamp(new Date().getTime()));
 						xkzjyfwService.save(xkzjy);
-					}					
+					}
 					for (XzjydyEntity xzjydyEntity : xzjydylist) {
 						if (xzjydyEntity != null) {
 							// 保存成功后
@@ -2414,6 +2437,9 @@ public class XkzsqCtl extends BaseWebCtl {
 						}
 					}
 				}
+			} else {
+				// rtx提醒
+				//rtxSend(entity.getSzgq().getId(), role,"你有一条许可证申请待办事务，请及时处理！");
 			}
 			wr.setAttr("jflag", jflag);
 		} catch (Exception e) {
@@ -2424,6 +2450,8 @@ public class XkzsqCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	
+
 	/**
 	 * 签收
 	 * 
@@ -2550,7 +2578,13 @@ public class XkzsqCtl extends BaseWebCtl {
 			xkz.setZyqyfw(jyfwstr2);
 			xkz.setCq(jylzstr);
 			if (!StringUtils.isEmpty(user.getSsglbm())) {
-				xkz.setFzjg(user.getSsglbm().getGkglbmqc());
+				XzglbmxxEntity glbm= user.getSsglbm();
+				if("00".equals(glbm.getPid())){
+					xkz.setFzjg(glbm.getGkglbmqc());
+				}else{
+					XzglbmxxEntity pglbm = xzglbmxxService.getPglbm(glbm.getPid());
+					xkz.setFzjg(pglbm.getGkglbmqc());
+				}
 			}
 			String szd = jyr.getSzd().getBz();
 			CodeEntity code = securityMgr.codeService().findOne(jyr.getSzd().getPid());
@@ -2767,7 +2801,7 @@ public class XkzsqCtl extends BaseWebCtl {
 		}
 		return wr;
 	}
-	
+
 	@RequestMapping(value = "/saveQtFile")
 	@ResponseBody
 	public WebJsonResult saveQtFile(MultipartFile filename, Model model) {

gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/gkttlfx/ctl/HwttlfzCtl.java

@@ -137,31 +137,81 @@ public class HwttlfzCtl extends BaseWebCtl {
 		SttlVo sum = new SttlVo();
 		List<Object> ttllist = dcsbybbService.sum(sdf.format(beginTime), sdf.format(monthTime), sdf.format(yearTime), null, szgkid, szgqid,dydlid);
 		List<Object> ttllist2 = dcsbybbService.sum2(sdf.format(beginTime), sdf.format(monthTime), sdf.format(yearTime), null, szgkid, szgqid,dedlid);
+		List<Object> allList = new ArrayList<Object>();
 		//合并两个list，把所有第二大类放到相应的第一大类下
-				ttllist.add(17, ttllist2.get(22));
-				ttllist.add(17, ttllist2.get(21));
-				ttllist.add(17, ttllist2.get(20));
-				ttllist.add(16, ttllist2.get(19));
-				ttllist.add(15, ttllist2.get(18));
-				ttllist.add(15, ttllist2.get(17));
-				ttllist.add(15, ttllist2.get(16));
-				ttllist.add(13, ttllist2.get(15));
-				ttllist.add(13, ttllist2.get(14));
-				ttllist.add(11, ttllist2.get(13));
-				ttllist.add(11, ttllist2.get(12));
-				ttllist.add(11, ttllist2.get(11));
-				ttllist.add(11, ttllist2.get(10));
-				ttllist.add(8, ttllist2.get(9));
-				ttllist.add(7, ttllist2.get(8));
-				ttllist.add(5, ttllist2.get(7));
-				ttllist.add(4, ttllist2.get(6));
-				ttllist.add(4, ttllist2.get(5));
-				ttllist.add(3, ttllist2.get(4));
-				ttllist.add(2, ttllist2.get(3));
-				ttllist.add(2, ttllist2.get(2));
-				ttllist.add(2, ttllist2.get(1));
-				ttllist.add(1, ttllist2.get(0));
+		allList.add(ttllist.get(0));
+		allList.add(ttllist2.get(0));
+		
+		allList.add(ttllist.get(1));
+		allList.add(ttllist2.get(1));
+		allList.add(ttllist2.get(2));
+		allList.add(ttllist2.get(3));
+		
+		allList.add(ttllist.get(2));
+		allList.add(ttllist2.get(4));
+		
+		allList.add(ttllist.get(3));
+		allList.add(ttllist2.get(5));
+		allList.add(ttllist2.get(6));
+		
+		allList.add(ttllist.get(4));
+		allList.add(ttllist2.get(7));
+		
+		allList.add(ttllist.get(5));
+		
+		allList.add(ttllist.get(6));
+		allList.add(ttllist2.get(8));
+		
+		allList.add(ttllist.get(7));
+		allList.add(ttllist2.get(9));
+		
+		allList.add(ttllist.get(8));
+		
+		allList.add(ttllist.get(9));
+		
+		allList.add(ttllist.get(10));
+		allList.add(ttllist2.get(10));
+		allList.add(ttllist2.get(11));
+		allList.add(ttllist2.get(12));
+		allList.add(ttllist2.get(13));
+		
+		allList.add(ttllist.get(11));
+		
+		allList.add(ttllist.get(12));
+		allList.add(ttllist2.get(14));
+		allList.add(ttllist2.get(15));
+		
+		allList.add(ttllist.get(13));
+		
+		allList.add(ttllist.get(14));
+		allList.add(ttllist2.get(16));
+		allList.add(ttllist2.get(17));
+		allList.add(ttllist2.get(18));
+		
+		allList.add(ttllist.get(15));
+		allList.add(ttllist2.get(19));
+		
+		allList.add(ttllist.get(16));
+		allList.add(ttllist2.get(20));
+		allList.add(ttllist2.get(21));
+		allList.add(ttllist2.get(22));
+		
 		if (ttllist != null && ttllist.size() > 0) {
+			for (int i = 0; i < allList.size(); i++) {
+				Object[] e = (Object[]) allList.get(i);
+				SttlVo vo = new SttlVo();
+				vo.setHwzlname(e[0].toString());
+				vo.setZttl(e[1].toString());
+				vo.setZtb(e[2].toString());
+				vo.setZhb(e[3].toString());
+				vo.setJgttl(e[4].toString());
+				vo.setJgtb(e[5].toString());
+				vo.setJghb(e[6].toString());
+				vo.setCgttl(e[7].toString());
+				vo.setCgtb(e[8].toString());
+				vo.setCghb(e[9].toString());
+				slist.add(vo);
+			}
 			BigDecimal zttl = new BigDecimal("0.0000");
 			BigDecimal ztb = new BigDecimal("0.0000");
 			BigDecimal zhb = new BigDecimal("0.0000");

gkjsjy/trunk/src/com/xt/jygl/set/user/ctl/UserCtl.java

@@ -556,15 +556,17 @@ public class UserCtl extends BaseWebCtl {
 	
 	@RequestMapping(value = "/reset")
 	@ResponseBody
-	public WebJsonResult reset(String id){
+	public WebJsonResult reset(String id) {
 		WebJsonResult wr = success();
-		try{
-		UserEntity user=securityMgr.userService().findById(id);
-		if(user!=null){
-		user.setPassword("8d969eef6ecad3c29a3a629280e686cf0c3f5d5a86aff3ca12020c923adc6c92");
-		securityMgr.userService().save(user);
-		}
-		}catch(Exception e){
+		try {
+			UserEntity user = securityMgr.userService().findById(id);
+			if (user != null) {
+				SimpleHash hash = new SimpleHash(credentialsMatcher.getHashAlgorithmName(), SystemParam.getDefaultPwd(), null, credentialsMatcher.getHashIterations());
+				user.setPassword(hash.toHex());
+				// user.setPassword("8d969eef6ecad3c29a3a629280e686cf0c3f5d5a86aff3ca12020c923adc6c92");
+				securityMgr.userService().save(user);
+			}
+		} catch (Exception e) {
 			wr.setMessage("操作失败");
 		}
 		return wr;

gkjsjy/trunk/src/com/xt/jygl/sys/ctl/CommonCtl.java

@@ -9,6 +9,8 @@ import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 
+import net.sf.json.JSONObject;
+
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -24,21 +26,28 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import com.xt.jygl.common.BaseWebCtl;
 import com.xt.jygl.common.Constants;
 import com.xt.jygl.common.GlobalData;
+import com.xt.jygl.common.Utils;
 import com.xt.jygl.gkjcxx.cb.entity.CbEntity;
 import com.xt.jygl.gkjcxx.gk.entity.GkEntity;
 import com.xt.jygl.gkjcxx.gk.service.GkService;
 import com.xt.jygl.gkjcxx.gq.entity.GqEntity;
 import com.xt.jygl.gkjcxx.gq.service.GqService;
 import com.xt.jygl.gkjcxx.mt.entity.MtEntity;
+import com.xt.jygl.gkjcxx.xzdwxxgl.xzglbmxx.entity.XzglbmxxEntity;
+import com.xt.jygl.gkjcxx.xzdwxxgl.xzglbmxx.service.XzglbmxxService;
+import com.xt.jygl.gkjcxx.xzdwxxgl.xzglryxx.entity.XzglryEntity;
+import com.xt.jygl.gkjcxx.xzdwxxgl.xzglryxx.service.XzglryService;
 import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.GkjyrEntity;
 import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.service.GkjyrService;
 import com.xt.jygl.workflow.entity.TaskInfoEntity;
 import com.xt.jygl.workflow.service.TaskInfoService;
 import com.xt.jygl.workflow.vo.TaskInfoVo;
 import com.xtframe.core.base.ctl.WebJsonResult;
+import com.xtframe.core.base.vo.TreeNode;
 import com.xtframe.sec.code.entity.CodeEntity;
 import com.xtframe.sec.common.BaseEntity;
 import com.xtframe.sec.common.SimplePageRequest;
+import com.xtframe.sec.user.entity.UserEntity;
 import com.xtframe.util.StringUtils;
 
 /**
@@ -57,7 +66,11 @@ public class CommonCtl extends BaseWebCtl {
 	private GqService gqService;
 	@Autowired
 	private TaskInfoService taskInfoService;
-
+	@Autowired
+	private XzglbmxxService xzglbmService;
+	@Autowired
+	private XzglryService xzglryService;
+	
 	/**
 	 * 根据当前系统部署的citycode进行过滤
 	 * 
@@ -70,8 +83,7 @@ public class CommonCtl extends BaseWebCtl {
 		List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCodeAndCity(Constants.GROUP_CODE_SZD, GlobalData.CITY_CODE);
 		return list;
 	}
-	
-	
+
 	@RequestMapping(value = "/selectSf")
 	@ResponseBody
 	public List<CodeEntity> selectSf(Model model) {
@@ -86,10 +98,22 @@ public class CommonCtl extends BaseWebCtl {
 	 * @param szd
 	 * @return
 	 */
+	@SuppressWarnings("unchecked")
 	@RequestMapping(value = "/selectGk")
 	@ResponseBody
 	public List<GkEntity> selectGk(Model model, String szd) {
-		List<GkEntity> list = gkService.findBySzd(szd);
+		List<GkEntity> list = new ArrayList<GkEntity>();
+		if (GlobalData.CITY_CODE.length() > 3 && !isJyr()) {
+			List<String> gklist = (List<String>) Utils.getSession().getAttribute("gkList");
+			if (gklist != null && gklist.size() > 0) {
+				for (String gk : gklist) {
+					GkEntity entity = gkService.findOne(gk);
+					list.add(entity);
+				}
+			}
+		} else {
+			list = gkService.findBySzd(szd);
+		}
 		return list;
 	}
 
@@ -101,10 +125,22 @@ public class CommonCtl extends BaseWebCtl {
 	 * @param szgk
 	 * @return
 	 */
+	@SuppressWarnings("unchecked")
 	@RequestMapping(value = "/selectGq")
 	@ResponseBody
 	public List<GqEntity> selectGq(Model model, String szd, String szgk) {
-		List<GqEntity> list = gqService.findAllBySzdAndGk(szd, szgk);
+		List<GqEntity> list = new ArrayList<GqEntity>();
+		if (GlobalData.CITY_CODE.length() > 3 && !isJyr()) {
+			List<String> gqlist = (List<String>) Utils.getSession().getAttribute("gqList");
+			if (gqlist != null && gqlist.size() > 0) {
+				for (String gq : gqlist) {
+					GqEntity entity = gqService.findOne(gq);
+					list.add(entity);
+				}
+			}
+		} else {
+			list = gqService.findAllBySzdAndGk(szd, szgk);
+		}
 		return list;
 	}
 
@@ -197,13 +233,13 @@ public class CommonCtl extends BaseWebCtl {
 				list.add(cb.equal(root.get("szgk").get("id").as(String.class), szgk));
 				list.add(cb.equal(root.get("szd").get("id").as(String.class), szd));
 				list.add(cb.equal(root.get("szgq").get("id").as(String.class), szgq));
-				
-				if(StringUtils.isEmpty(recordStatus)){
+
+				if (StringUtils.isEmpty(recordStatus)) {
 					list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
 					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_BGFLAG));
 					list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_ZXFLAG));
-				}else{
+				} else {
 					list.add(cb.equal(root.get("recordStatus").as(Integer.class), recordStatus));
 				}
 				return cb.and(list.toArray(new Predicate[] {}));
@@ -211,9 +247,9 @@ public class CommonCtl extends BaseWebCtl {
 		};
 		List<MtEntity> list = query.findAll(spec, MtEntity.class);
 		List<MtEntity> list2 = new ArrayList<MtEntity>();
-		if(null!=list&&!list.isEmpty()){
-			for(MtEntity e:list){
-				MtEntity e2=new MtEntity();
+		if (null != list && !list.isEmpty()) {
+			for (MtEntity e : list) {
+				MtEntity e2 = new MtEntity();
 				e2.setId(e.getId());
 				e2.setMtmc(e.getMtmc());
 				list2.add(e2);
@@ -243,7 +279,7 @@ public class CommonCtl extends BaseWebCtl {
 		}
 		return volist;
 	}
-	
+
 	@RequestMapping(value = "/selectCb")
 	@ResponseBody
 	public WebJsonResult selectJyr(final Integer page, Model model, final String zwcm) {
@@ -291,4 +327,99 @@ public class CommonCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	
+	
+	/**
+	 * 初始化公告人员树
+	 */
+	@RequestMapping(value = "/getUserTreeData", produces = { "text/json;charset=utf-8" })
+	@ResponseBody
+	public String getUserTreeData(Model model) {
+		TreeNode root = new TreeNode();
+		root.setId(Constants.BLANK_UUID);
+		root.setName("省港口局");
+		root.setOpen(true);
+		root.setChildren(getByPid("402881a45155eda5015156512d080000"));
+		return JSONObject.fromObject(root).toString();
+	}
+
+	/***
+	 * 通过部门ID所在部门人员并绑定children节点
+	 * 
+	 * @param xzglbmxx
+	 * @return
+	 */
+	private TreeNode xzglbmToTreeNode(XzglbmxxEntity xzglbmxx) {
+		if (xzglbmxx != null) {
+			TreeNode node = new TreeNode();
+			node.setId(xzglbmxx.getId());
+			node.setName(xzglbmxx.getGkglbmqc());
+			if (StringUtils.isEmpty(getByPid(xzglbmxx.getId()))) {
+				node.setChildren(getUsers(xzglbmxx.getId()));
+			} else {
+				node.setChildren(getByPid(xzglbmxx.getId()));
+			}
+			return node;
+		}
+		return null;
+	}
+
+	private List<TreeNode> getUsers(String bmid) {
+		List<TreeNode> nodeList = null;
+		List<XzglryEntity> rylist = xzglryService.queryXzglryByBmid(bmid);
+		if (rylist != null && rylist.size() > 0) {
+			nodeList = new ArrayList<TreeNode>();
+			for (XzglryEntity ry : rylist) {
+				TreeNode node = new TreeNode();
+				if (!StringUtils.isEmpty(ry)) {
+					UserEntity user = securityMgr.userService().findByssry(ry.getId());
+					if(user!=null){
+						node.setId(user.getId());
+						node.setType("user");
+						node.setName(ry.getXm());
+						node.setChecked(false);
+						nodeList.add(node);
+					}
+				}
+				
+			}
+		}
+		return nodeList;
+	}
+
+	/**
+	 * 得到树的根节点查询二级菜单
+	 * 
+	 * @param pid
+	 * @return
+	 */
+	public List<TreeNode> getByPid(String pid) {
+		List<TreeNode> nodeList = new ArrayList<TreeNode>();
+		List<XzglryEntity> rylist = xzglryService.queryXzglryByBmid(pid);
+		if (rylist != null && rylist.size() > 0) {
+			for (XzglryEntity ry : rylist) {
+				TreeNode node = new TreeNode();
+				if (!StringUtils.isEmpty(ry)) {
+					UserEntity user = securityMgr.userService().findByssry(ry.getId());
+					if(user!=null){
+						node.setId(user.getId());
+						node.setType("user");
+						node.setName(ry.getXm());
+						node.setChecked(false);
+						nodeList.add(node);
+					}
+				}
+				
+			}
+		}
+		List<XzglbmxxEntity> xzglbmxxlist = xzglbmService.queryXzglbm(pid, GlobalData.CITY_CODE);
+		if (xzglbmxxlist != null && xzglbmxxlist.size() > 0) {
+			for (XzglbmxxEntity xzglbmxxEntity : xzglbmxxlist) {
+				if ("省港口局".equals(xzglbmxxEntity.getGkglbmqc()) || !"00".equals(pid) ) {
+					nodeList.add(xzglbmToTreeNode(xzglbmxxEntity));
+				}
+			}
+		}
+		return nodeList;
+	}
 }

gkjsjy/trunk/src/com/xt/jygl/sys/ctl/IndexCtl.java

@@ -101,7 +101,11 @@ public class IndexCtl extends BaseWebCtl {
 				if (StringUtils.isNotEmpty(gqid)) {
 					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + gqid + "%"));
 				}
-				list.add(cb.equal(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
+				//list.add(cb.equal(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
+				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_BGFLAG));
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_ZXFLAG));
 				return cb.and(list.toArray(new Predicate[] {}));
 			}
 		};

gkjsjy/trunk/src/com/xt/jygl/sys/ctl/MainCtl.java

@@ -32,6 +32,8 @@ import com.xt.jygl.common.Utils;
 import com.xt.jygl.ggfwxxgl.jdtx.service.TxService;
 import com.xt.jygl.ggfwxxgl.tzgg.ggxx.entity.GgxxtxEntity;
 import com.xt.jygl.ggfwxxgl.tzgg.ggxx.service.GgxxtxService;
+import com.xt.jygl.gkjcxx.gk.entity.GkEntity;
+import com.xt.jygl.gkjcxx.gk.service.GkService;
 import com.xt.jygl.gkjcxx.gq.service.GqService;
 import com.xt.jygl.gkjsgl.xmxxgl.entity.XmxxglEntity;
 import com.xt.jygl.gkjsgl.xmxxgl.service.XmxxglService;
@@ -75,6 +77,8 @@ public class MainCtl extends BaseWebCtl {
 	@Autowired
 	private WorkflowMangerService workflowMangerService;
 	@Autowired
+	private GkService gkService;
+	@Autowired
 	private GqService gqService;
 	@Autowired
 	private XkzxxService xkzxxService;
@@ -121,6 +125,9 @@ public class MainCtl extends BaseWebCtl {
 		if (Constants.NO_ID.equals(securityMgr.getCurrUser().getSfjyr().getId()) && securityMgr.getCurrUser().getSsglbm() != null) {
 			List<String> gqList = gqService.findGqListByUserId(securityMgr.getCurrUser().getId());
 			Utils.getSession().setAttribute("gqList", gqList);
+			if(gqList!=null && gqList.size()>0){
+				Utils.getSession().setAttribute("gkList", gkService.findByGqList(gqList));
+			}
 		}
 		model.addAttribute("map", JSONArray.fromObject(map));
 		model.addAttribute("cityname", GlobalData.CITY_NAME);

gkjsjy/trunk/src/com/xt/jygl/workflow/vo/TaskInfoVo.java

@@ -8,6 +8,8 @@ public class TaskInfoVo extends BaseVo {
 	/** 任务步骤编码 */
 	private String taskKey;
 
+	/** 任务记录状态 */
+	private String state;
 	private String currName;
 
 	/** 审核时间 */
@@ -20,6 +22,8 @@ public class TaskInfoVo extends BaseVo {
 	private String auditUser;
 	/** 审核人姓名 */
 	private String auditUsername;
+	
+	private String yj ;
 
 	public String getBusId() {
 		return busId;
@@ -37,6 +41,14 @@ public class TaskInfoVo extends BaseVo {
 		this.taskKey = taskKey;
 	}
 
+	public String getState() {
+		return state;
+	}
+
+	public void setState(String state) {
+		this.state = state;
+	}
+
 	public String getCurrName() {
 		return currName;
 	}
@@ -85,4 +97,12 @@ public class TaskInfoVo extends BaseVo {
 		this.auditUsername = auditUsername;
 	}
 
+	public String getYj() {
+		return yj;
+	}
+
+	public void setYj(String yj) {
+		this.yj = yj;
+	}
+
 }

gkjsjy/trunk/src/com/xtframe/core/user/service/UserService.java

@@ -87,4 +87,6 @@ public interface UserService {
 	public void saveUserRoles(String uid, String[] rids);
 
 	public void logicDelete(String id);
+	
+	public UserEntity findByssry(String ssryid);
 }

gkjsjy/trunk/src/com/xtframe/sec/code/dao/CodeDao.java

@@ -42,8 +42,7 @@ public interface CodeDao extends SecRepository<CodeEntity, String> {
 	public List<CodeEntity> findValidCodesByGroupCode(String groupCode);
 
 	@Query("SELECT m FROM CodeEntity m  WHERE m.groupCode =?1 and m.val like ?2% and  m.recordStatus<>9 order by m.sortno asc")
-	public List<CodeEntity> findValidCodesByGroupCodeAndCity(String groupCode,
-			String cityCode);
+	public List<CodeEntity> findValidCodesByGroupCodeAndCity(String groupCode, String cityCode);
 
 	@Query("SELECT m FROM CodeEntity m  WHERE m.val=?1 and m.groupCode=?2 and m.recordStatus<>9 order by m.sortno asc")
 	public CodeEntity findOneVal(String val, final String GROUP_CODE_SF);

gkjsjy/trunk/src/com/xtframe/sec/common/CaptchaFormAuthenticationFilter.java

@@ -1,5 +1,8 @@
 package com.xtframe.sec.common;
 
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
@@ -172,6 +175,14 @@ public class CaptchaFormAuthenticationFilter extends AuthenticatingFilter implem
 	@Override
 	protected boolean onLoginSuccess(AuthenticationToken token, Subject subject, ServletRequest request, ServletResponse response) throws Exception {
 		issueSuccessRedirect(request, response);
+		String password = getPassword(request);
+		//判断密码复杂性是否满足要求
+		Pattern p = Pattern.compile("^(?=.*?[a-zA-Z])(?=.*?\\d)(?=.*?[-`=\\\\\\[\\];',.\\/~!@#$%^&*()_+|{}:<>\"]).{8,}$");  	  
+		Matcher m = p.matcher(password);  
+		if(!m.find()) {
+			//不符合要求
+			request.getServletContext().setAttribute("pwdSecurity", "false");
+		}
 		return false;
 	}
 

gkjsjy/trunk/src/com/xtframe/sec/realm/CustomRealm.java

@@ -69,6 +69,9 @@ public class CustomRealm extends AuthorizingRealm implements SecurityMgrAware {
 	 */
 	@Override
 	protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) {
+		if (principals.fromRealm(getName()).isEmpty()) {
+			return null;
+		}
 		UserEntity loginUser = (UserEntity) principals.fromRealm(getName()).iterator().next();
 		// 首先从session中获取权限
 		Session s = SecurityUtils.getSubject().getSession();

gkjsjy/trunk/src/com/xtframe/sec/user/service/impl/UserServiceImpl.java

@@ -114,4 +114,18 @@ public class UserServiceImpl extends BaseSecurityService implements UserService
 			dao.save(user);
 		}
 	}
+
+	@Override
+	public UserEntity findByssry(String ssryid) {
+		Map<String, Object> params = new HashMap<String, Object>();
+		params.put("ssglry", ssryid);
+		StringBuilder sqlBuilder = new StringBuilder();
+		sqlBuilder.append("select u.* from GK_BASIC_JSJY_USER u where u.ssglry=:ssglry and u.record_status<>9");
+		List<UserEntity> mes = dao.nativeQuery(sqlBuilder.toString(), UserEntity.class, params);
+		UserEntity ms = null;
+		if(mes.size()>0){
+			ms = mes.get(0);
+		}
+		return ms;
+	}
 }