|
|
@@ -8,7 +8,6 @@ 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;
|
|
|
@@ -20,21 +19,17 @@ import org.springframework.ui.Model;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.ResponseBody;
|
|
|
|
|
|
-import cache.CacheSearchCondition;
|
|
|
-
|
|
|
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.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;
|
|
|
import com.xt.jygl.gkjcxx.jghd.entity.JghdEntity;
|
|
|
import com.xt.jygl.gkjcxx.jghd.service.JghdService;
|
|
|
import com.xt.jygl.gkjcxx.jghd.vo.JghdVo;
|
|
|
-import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.service.GkjyrService;
|
|
|
import com.xtframe.core.anon.auth.RequiresPermissions;
|
|
|
import com.xtframe.core.base.ctl.WebJsonResult;
|
|
|
import com.xtframe.core.support.SecurityMgr;
|
|
|
@@ -45,6 +40,8 @@ import com.xtframe.sec.common.SimplePageRequest;
|
|
|
import com.xtframe.sec.utils.SecUtils;
|
|
|
import com.xtframe.util.StringUtils;
|
|
|
|
|
|
+import cache.CacheSearchCondition;
|
|
|
+
|
|
|
@Controller
|
|
|
@RequestMapping("/jghd")
|
|
|
public class JghdCtl extends BaseWebCtl {
|
|
|
@@ -58,8 +55,6 @@ public class JghdCtl extends BaseWebCtl {
|
|
|
private GkService gkService;
|
|
|
@Autowired
|
|
|
private GqService gqService;
|
|
|
- @Autowired
|
|
|
- private GkjyrService gkjyrService;
|
|
|
|
|
|
/**
|
|
|
* 一览页面
|
ld_zhangdong