|
@@ -429,3 +429,103 @@ public class YtiotTCompanyServicesImpl implements YtiotTCompanyService {
|
|
E_STATUS = q_json.has("E_STATUS")?q_json.getString("E_STATUS"):null;
|
|
E_STATUS = q_json.has("E_STATUS")?q_json.getString("E_STATUS"):null;
|
|
// System.out.println("测试"+E_STATUS);
|
|
// System.out.println("测试"+E_STATUS);
|
|
// int a=Integer.parseInt("E_STATUS");
|
|
// int a=Integer.parseInt("E_STATUS");
|
|
|
|
+// if(a ==10) {
|
|
|
|
+// E_STATUS=null;
|
|
|
|
+// }
|
|
|
|
+// System.out.println("测试1"+E_STATUS);
|
|
|
|
+
|
|
|
|
+ order = q_json.has("order")?q_json.getString("order"):null;
|
|
|
|
+ dir = q_json.has("dir")?q_json.getString("dir"):null;
|
|
|
|
+ Start = q_json.has("start")?q_json.getString("start"):(start!=null)?start:"0";
|
|
|
|
+ Limit = q_json.has("limit")?q_json.getString("limit"):(limit!=null)?limit:null;
|
|
|
|
+ Page = q_json.has("page")?q_json.getString("page"):(page!=null)?page:"0";
|
|
|
|
+ json.put("query", queryJson);
|
|
|
|
+ }
|
|
|
|
+// System.out.println();
|
|
|
|
+ if(sort!=null) {
|
|
|
|
+ Sort = JSONArray.fromObject(sort);
|
|
|
|
+ if((Sort.isArray())&&(Sort.size()>0)) {
|
|
|
|
+ JSONObject s_json = Sort.getJSONObject(0);
|
|
|
|
+ order = s_json.has("property")?s_json.getString("property"):order;
|
|
|
|
+ dir = s_json.has("direction")?s_json.getString("direction"):dir;
|
|
|
|
+ }
|
|
|
|
+ json.put("sort", sort);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ Start = start;
|
|
|
|
+ Limit = limit;
|
|
|
|
+ Page = page;
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ if(UQ_COMPANY_ID!=null)
|
|
|
|
+ hqlwhere = chkhw(hqlwhere) + "u."+fieldname("UQ_COMPANY_ID")+"='"+UQ_COMPANY_ID+"'";
|
|
|
|
+ if(V_COMPANY_NAME!=null)
|
|
|
|
+ hqlwhere = chkhw(hqlwhere) + "u."+fieldname("V_COMPANY_NAME")+" like '%"+V_COMPANY_NAME+"%'";
|
|
|
|
+// if(UQ_ADMIN_ID!=null)
|
|
|
|
+// hqlwhere = chkhw(hqlwhere) + "u."+fieldname("UQ_ADMIN_ID")+"='"+UQ_ADMIN_ID+"'";
|
|
|
|
+ if(V_COMPANY_ADDRESS_0!=null)
|
|
|
|
+ hqlwhere = chkhw(hqlwhere) + "u."+fieldname("V_COMPANY_ADDRESS_0")+" like '%"+V_COMPANY_ADDRESS_0+"%'";
|
|
|
|
+// if(E_STATUS!=null)
|
|
|
|
+// hqlwhere = chkhw(hqlwhere) + "u."+fieldname("E_STATUS")+"='"+E_STATUS+"'";
|
|
|
|
+ if(order!=null)
|
|
|
|
+ order_str = " order by u."+fieldname(order);
|
|
|
|
+ else
|
|
|
|
+ order_str = " order by u."+fieldname("I_COMPANYVER_ID");
|
|
|
|
+
|
|
|
|
+ //System.out.println(hqlwhere);
|
|
|
|
+// System.out.println(order_str);
|
|
|
|
+ int totalCount = ytiotTCompanyVerDao.getCount(hqlwhere);
|
|
|
|
+ json.put("totalCount", totalCount);
|
|
|
|
+ if(Start!=null){
|
|
|
|
+ if(Integer.parseInt(Start)>totalCount){
|
|
|
|
+ Start = "0";
|
|
|
|
+ Page = "0";
|
|
|
|
+ }else if(page==null)
|
|
|
|
+ Page="0";
|
|
|
|
+ }else{
|
|
|
|
+ Start = "0";
|
|
|
|
+ Page = "0";
|
|
|
|
+ }
|
|
|
|
+ json.put("page", Page);
|
|
|
|
+ json.put("start", Start);
|
|
|
|
+ json.put("limit", Limit);
|
|
|
|
+ if(totalCount>0) {
|
|
|
|
+ List list = ytiotTCompanyVerDao.query(hqlwhere, order_str, dir, Start, Limit);
|
|
|
|
+// System.out.println(list);
|
|
|
|
+ if(list.size()>0) {
|
|
|
|
+ for(int i=0;i<list.size();i++) {
|
|
|
|
+ YtiotTCompanyVer o = (YtiotTCompanyVer)list.get(i);
|
|
|
|
+ Map map = new HashMap();
|
|
|
|
+ int a=Integer.parseInt(o.getEStatus());
|
|
|
|
+ if(a==0) {
|
|
|
|
+ map.put("E_STATUS", "待开通");
|
|
|
|
+ }
|
|
|
|
+ if(a==1) {
|
|
|
|
+ map.put("E_STATUS", "已开通");
|
|
|
|
+ }
|
|
|
|
+ if(a==2) {
|
|
|
|
+ map.put("E_STATUS", "已锁定");
|
|
|
|
+ }
|
|
|
|
+ if(a==3) {
|
|
|
|
+ map.put("E_STATUS", "注销");
|
|
|
|
+ }
|
|
|
|
+ map.put("I_VERSION", o.getIVersion());
|
|
|
|
+ map.put("V_COMPANY_NAME", o.getVCompanyName());
|
|
|
|
+// map.put("E_STATUS", o.getEStatus());
|
|
|
|
+ map.put("V_COMMENT", o.getVComment());
|
|
|
|
+ map.put("D_STORETIME", formatter.format(o.getDStoretime()));
|
|
|
|
+ map.put("UQ_COMPANY_ID", o.getUqCompanyId());
|
|
|
|
+// map.put("UQ_ADMIN_ID", o.getUqAdminId());
|
|
|
|
+ map.put("V_COMPANY_ADDRESS_0", o.getVCompanyAddress0());
|
|
|
|
+ JSONObject jSONObject = JSONObject.fromObject(map);
|
|
|
|
+ jSONArray.add(jSONObject);
|
|
|
|
+ }
|
|
|
|
+ json.put("RESULT", jSONArray);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ return json.toString();
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+}
|