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

gkjsjy/trunk/WebContent/WEB-INF/pages/set/user/useradd.jsp

@@ -37,7 +37,7 @@
 		}
 
 		$(document).ready(function () {
-			
+			user.detail.szdData = '${szd}';
 			user.detail.roleDate='${rolelist}';
 			user.detail.init();
 			$('.selectpicker').selectpicker({
@@ -46,6 +46,12 @@
 	    	$('#xzjyr').click(function(){
 	    		jyrselpop('jyrSel');
 	    	});
+	    	var gkjyr = '${gkjyr}';
+	    	if (isEmpty(gkjyr)){
+	    		
+	    	}else{
+	    		$("#sfjyrid option[value='201']").attr("selected", "selected");  
+	    	}
 	    	sfjyr();
 	    	user.detail.initSsglbm('ssglbmsel', 'showssglry', '');
 	    	user.detail.initSsglry('ssglrysel', $('.ssglbmselectpicker').val(), ''); 
@@ -93,11 +99,18 @@
 							</td>
 							<th><span class="needwrite">*</span>是否经营人: &nbsp;</th>
 							<td >
+								<c:if test="${gkjyr != null}">
+								<select class="selectpicker" id='sfjyrid' name='sfjyrid'>
+							      	<option selected="selected" value="201">是</option>
+							    </select>
+							    </c:if>
+							    <c:if test="${gkjyr == null}">
 								<select class="selectpicker" id='sfjyrid' name='sfjyrid' onchange='sfjyr()'>
 									<option value=""></option>
 							      	<option value="201">是</option>
 							      	<option value="202">否</option>
 							    </select>
+							    </c:if>
 							</td>
 						</tr>
 						<tr>
@@ -113,14 +126,16 @@
 						
 						<tr id="ssjyr">
 							<th><span class="needwrite">*</span>所属经营人: &nbsp;</th>
-							<td id="d1" style="position:relative;">
-								<input type="text"   class="form-control" id="xzjyr" readOnly="true">
-	                        	<input type="hidden"   class="form-control" id="xzjyrid" name="ssjyrid" >
+							<td id="d1" colspan="3" style="position:relative;">
+								<input type="text"   class="form-control" id="xzjyr" readOnly="true" value="${gkjyr.gkjyr }">
+	                        	<input type="hidden"   class="form-control" id="xzjyrid" name="ssjyrid" value="${gkjyr.id }">
+	                        	<c:if test="${gkjyr == null}">
 	                        	<a class="btn btn-primary btn-sm" href="#"
 									onclick="jyrselpop('jyrSel')" style="position:absolute;right:4px;top:4px;"> <i class="glyphicon"></i>选择
 								</a>
+								</c:if>
 							</td>
-							
+						
 						</tr>
 						<tr id="ssgl">
 							<th><span class="needwrite">*</span>所属管理部门: &nbsp;</th>

gkjsjy/trunk/WebContent/WEB-INF/pages/set/user/useredit.jsp

@@ -95,11 +95,19 @@
 							</td>
 							<th><span class="needwrite">*</span>是否经营人: &nbsp;</th>
 							<td >
+							<c:if test="${gkjyr != null}">
+								<select class="selectpicker" id='sfjyrid' name='sfjyrid'>
+							      	<option selected="selected" value="201">是</option>
+							    </select>
+							    </c:if>
+							    <c:if test="${gkjyr == null}">
 								<select class="selectpicker" id='sfjyrid' name='sfjyrid' onchange='sfjyr()'>
 									<option value=""></option>
 							      	<option value="201" <c:if test="${record.sfjyr.id=='201' }">selected='selected'</c:if>>是</option>
 							      	<option value="202" <c:if test="${record.sfjyr.id=='202' }">selected='selected'</c:if>>否</option>
 							    </select>
+							    </c:if>
+								
 							</td>
 						</tr>
 						<tr>
@@ -115,12 +123,14 @@
 						
 						<tr id="ssjyr">
 							<th><span class="needwrite">*</span>所属经营人: &nbsp;</th>
-							<td id="d1" style="position:relative;">
+							<td id="d1" colspan="3" style="position:relative;">
 								<input type="text"   class="form-control" id="xzjyr" readOnly="true" value="${record.ssjyrzw }">
 	                        	<input type="hidden"   class="form-control" id="xzjyrid" name="ssjyrid" value="${record.ssjyr.id }">
+	                        	<c:if test="${gkjyr == null }">
 	                        	<a class="btn btn-primary btn-sm" href="#"
 									onclick="jyrselpop('jyrSel')" style="position:absolute;right:4px;top:4px;"> <i class="glyphicon"></i>选择
 								</a>
+								</c:if>
 							</td>
 							
 						</tr>

gkjsjy/trunk/src/com/xt/jygl/gkjcxx/gk/ctl/GkCtl.java

@@ -8,6 +8,7 @@ import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
+import javax.persistence.criteria.CriteriaBuilder.In;
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.beans.BeanUtils;
@@ -25,6 +26,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 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.gk.client.GkWebService;
 import com.xt.jygl.gkjcxx.gk.entity.GkEntity;
 import com.xt.jygl.gkjcxx.gk.service.GkService;
@@ -90,6 +92,19 @@ public class GkCtl extends BaseWebCtl {
 					//list.add(cb.like(root.get("ssgkglbm").get("id").as(String.class), "%" + SearchCondition.gkssgkglbm + "%"));
 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "ssgkglbm");
 				}
+				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");
+					if (gqlist != null && gqlist.size() > 0) {
+						for (int i = 0; i < gqlist.size(); i++) {
+							in.value(gqlist.get(i));
+						}
+						list.add(in);
+					}
+				}
 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
 				return cb.and(list.toArray(new Predicate[] {}));
 			}

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

@@ -10,6 +10,7 @@ import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
+import javax.persistence.criteria.CriteriaBuilder.In;
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.beans.BeanUtils;
@@ -27,6 +28,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 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.gk.entity.GkEntity;
 import com.xt.jygl.gkjcxx.gk.service.GkService;
 import com.xt.jygl.gkjcxx.gq.client.GqWebService;
@@ -114,6 +116,19 @@ public class GqCtl extends BaseWebCtl {
 					// "%" + SearchCondition.gqssgkglbm + "%"));
 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "ssgkglbm");
 				}
+				if (isJyr()) {
+					//list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));
+				} else {
+					In<String> in = cb.in(root.get("id").as(String.class));
+					@SuppressWarnings("unchecked")
+					List<String> gqlist = (List<String>) Utils.getSession().getAttribute("gqList");
+					if (gqlist != null && gqlist.size() > 0) {
+						for (int i = 0; i < gqlist.size(); i++) {
+							in.value(gqlist.get(i));
+						}
+						list.add(in);
+					}
+				}
 				list.add(cb.notEqual(root.get("recordStatus").as(String.class), BaseEntity.RECORD_STATE_DELETE));
 				return cb.and(list.toArray(new Predicate[] {}));
 			}

gkjsjy/trunk/src/com/xt/jygl/gkjcxx/jghd/ctl/JghdCtl.java

@@ -8,6 +8,7 @@ import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
+import javax.persistence.criteria.CriteriaBuilder.In;
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.beans.BeanUtils;
@@ -25,6 +26,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 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.gk.entity.GkEntity;
 import com.xt.jygl.gkjcxx.gk.service.GkService;
 import com.xt.jygl.gkjcxx.gq.service.GqService;
@@ -88,6 +90,19 @@ public class JghdCtl extends BaseWebCtl {
 				if (StringUtils.isNotEmpty(hdlx)) {
 					list.add(cb.like(root.get("hdlx").as(String.class), "%" + hdlx + "%"));
 				}
+				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");
+					if (gqlist != null && gqlist.size() > 0) {
+						for (int i = 0; i < gqlist.size(); i++) {
+							in.value(gqlist.get(i));
+						}
+						list.add(in);
+					}
+				}
 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
 				return cb.and(list.toArray(new Predicate[] {}));
 			}

gkjsjy/trunk/src/com/xt/jygl/gkjcxx/md/ctl/MdCtl.java

@@ -10,6 +10,7 @@ import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
+import javax.persistence.criteria.CriteriaBuilder.In;
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.beans.BeanUtils;
@@ -28,6 +29,7 @@ import com.xt.jygl.common.BaseWebCtl;
 import com.xt.jygl.common.Constants;
 import com.xt.jygl.common.GlobalData;
 import com.xt.jygl.common.SearchCondition;
+import com.xt.jygl.common.Utils;
 import com.xt.jygl.gkjcxx.gk.entity.GkEntity;
 import com.xt.jygl.gkjcxx.gk.service.GkService;
 import com.xt.jygl.gkjcxx.gq.service.GqService;
@@ -106,6 +108,19 @@ public class MdCtl extends BaseWebCtl {
 				} else if (isGET(request)) {
 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id","xzhgh","xzhghid");
 				}
+				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");
+					if (gqlist != null && gqlist.size() > 0) {
+						for (int i = 0; i < gqlist.size(); i++) {
+							in.value(gqlist.get(i));
+						}
+						list.add(in);
+					}
+				}
 				list.add(cb.notEqual(root.get("recordStatus").as(String.class), BaseEntity.RECORD_STATE_DELETE));
 				return cb.and(list.toArray(new Predicate[] {}));
 			}

gkjsjy/trunk/src/com/xt/jygl/gkjcxx/zyq/ctl/ZyqCtl.java

@@ -10,6 +10,7 @@ import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
+import javax.persistence.criteria.CriteriaBuilder.In;
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.beans.BeanUtils;
@@ -27,6 +28,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 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.gk.entity.GkEntity;
 import com.xt.jygl.gkjcxx.gk.service.GkService;
 import com.xt.jygl.gkjcxx.gq.entity.GqEntity;
@@ -101,6 +103,19 @@ public class ZyqCtl extends BaseWebCtl {
 					//list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + SearchCondition.zyqszd + "%"));
 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id","szd","szdid");
 				}
+				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");
+					if (gqlist != null && gqlist.size() > 0) {
+						for (int i = 0; i < gqlist.size(); i++) {
+							in.value(gqlist.get(i));
+						}
+						list.add(in);
+					}
+				}
 				list.add(cb.notEqual(root.get("recordStatus").as(String.class), BaseEntity.RECORD_STATE_DELETE));
 				return cb.and(list.toArray(new Predicate[] {}));
 			}

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

@@ -10,6 +10,7 @@ import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
+import javax.persistence.criteria.CriteriaBuilder.In;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -33,6 +34,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 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.ggfwxxgl.jdtx.entity.TxEntity;
 import com.xt.jygl.ggfwxxgl.jdtx.service.TxService;
 import com.xt.jygl.ggfwxxgl.tzgg.ggxx.entity.GgxxtxEntity;
@@ -43,6 +45,7 @@ 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.gkjygl.gkjyr.jyrjbxx.vo.GkjyrVo;
 import com.xt.jygl.set.user.client.UserService;
 import com.xt.jygl.set.user.client.UserWebService;
 import com.xtframe.core.anon.auth.RequiresPermissions;
@@ -85,7 +88,7 @@ public class UserCtl extends BaseWebCtl {
 	@RequiresPermissions("user:main")
 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String menuid, final String username, final String uname, final String sfjyr) throws JsonProcessingException {
 		// 查詢條件
-		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request,"user");
+		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "user");
 		Specification<UserEntity> spec = new Specification<UserEntity>() {
 
 			@Override
@@ -93,24 +96,28 @@ public class UserCtl extends BaseWebCtl {
 				List<Predicate> list = new ArrayList<Predicate>();
 				if (StringUtils.isNotEmpty(username)) {
 					list.add(cb.like(root.get("name").as(String.class), "%" + username + "%"));
-				}else if (isGET(request)) {
-					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, null,"name");
+				} else if (isGET(request)) {
+					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, null, "name");
 				}
 				if (StringUtils.isNotEmpty(uname)) {
 					list.add(cb.like(root.get("uname").as(String.class), "%" + uname + "%"));
-				}else if (isGET(request)) {
-					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, null,"uname");
+				} else if (isGET(request)) {
+					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, null, "uname");
 				}
 				if (StringUtils.isNotEmpty(sfjyr)) {
 					list.add(cb.equal(root.get("sfjyr").get("id").as(String.class), sfjyr));
-				}else if (isGET(request)) {
-					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id","sfjyr");
+				} else if (isGET(request)) {
+					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "sfjyr");
 				}
+				if (isJyr()) {
+					list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));
+				}
+
 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
 				return cb.and(list.toArray(new Predicate[] {}));
 			}
 		};
-		
+
 		if (page.getPage() < 1) {
 			Object userpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "userpage");
 			if (StringUtils.isEmpty(userpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(userpage))) {
@@ -128,13 +135,13 @@ public class UserCtl extends BaseWebCtl {
 			userEntity.setSsglbmzw(userEntity.getSsglbm() != null ? userEntity.getSsglbm().getGkglbmqc() : "");
 			userList.add(userEntity);
 		}
-		
+
 		if (isPOST(request)) {
 			cacheSCmap.put("userpage", page.getPage());
 			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);
 		}
 		model.addAttribute("list", userList);
-		model.addAttribute("username",  CacheSearchCondition.cacheSCmapVal(cacheSCmap, "username"));
+		model.addAttribute("username", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "username"));
 		model.addAttribute("uname", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "uname"));
 		model.addAttribute("sfjyr", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "sfjyr"));
 		model.addAttribute("menuid", menuid);
@@ -295,6 +302,12 @@ public class UserCtl extends BaseWebCtl {
 		model.addAttribute("rolelist", JSONArray.fromObject(rolelist, config).toString());
 		model.addAttribute("roles", JSONArray.fromObject(roles, config).toString());
 		model.addAttribute("record", userEntity);
+		GkjyrVo gkjyr = null;
+		if (isJyr()) {
+			gkjyr = new GkjyrVo();
+			gkjyr = getSsjyr();
+		}
+		model.addAttribute("gkjyr", gkjyr);
 		return "set/user/useredit";
 	}
 
@@ -311,10 +324,10 @@ public class UserCtl extends BaseWebCtl {
 		List<RoleEntity> roles = this.securityMgr.roleService().findByUserId(userEntity.getId());
 		String rolezw = "";
 		for (RoleEntity r : roles) {
-			rolezw += r.getName()+",";
+			rolezw += r.getName() + ",";
 		}
-		if(!StringUtils.isEmpty(rolezw)){
-			rolezw = rolezw.substring(0,rolezw.length()-1);
+		if (!StringUtils.isEmpty(rolezw)) {
+			rolezw = rolezw.substring(0, rolezw.length() - 1);
 		}
 		userEntity.setRolezw(rolezw);
 		userEntity.setSfjyrzw(userEntity.getSfjyr() != null ? userEntity.getSfjyr().getText() : "");
@@ -336,6 +349,14 @@ public class UserCtl extends BaseWebCtl {
 	public String add(Model model) {
 		List<RoleEntity> rolelist = securityMgr.roleService().findAll();
 		model.addAttribute("rolelist", JSONArray.fromObject(rolelist, config).toString());
+		GkjyrVo gkjyr = null;
+		if (isJyr()) {
+			gkjyr = new GkjyrVo();
+			gkjyr = getSsjyr();
+			model.addAttribute("szd", gkjyr.getSzd());
+		}
+		
+		model.addAttribute("gkjyr", gkjyr);
 		return "set/user/useradd";
 	}
 
@@ -553,7 +574,7 @@ public class UserCtl extends BaseWebCtl {
 		}
 		return null;
 	}
-	
+
 	@RequestMapping(value = "/reset")
 	@ResponseBody
 	public WebJsonResult reset(String id) {