Merge branch 'dev' of trick9191/patient-co-management into dev

edu-article/JkEdu/src/com/yihu/jk/api/CategoryApi.java

@@ -78,6 +78,19 @@ public class CategoryApi {
		return dao.addCategory(vo).toString();
	}
	public String checkCategory(InterfaceMessage im)throws SQLException{
		JSONObject json = JSONObject.fromObject(im.getParam());
		String categoryName = StringUtil.isEmpty(json.get("categoryName")) ? null : json.getString("categoryName");
		Integer categoryLevel = StringUtil.isEmpty(json.get("categoryLevel")) ? null : json.getInt("categoryLevel");
		Category vo = new Category();
		vo.setCategoryName(categoryName);
		vo.setCategoryLevel(categoryLevel);
		com.common.json.JSONObject  j =dao.getCategoryList(vo);
		return j.toString();
	}
	/**
	 * 更新文章分类
	 * @param im

edu-article/JkEdu/src/com/yihu/jk/dao/CategoryDao.java

@@ -46,7 +46,20 @@ public class CategoryDao {
//		sql.addVar("@UserId", paramUserId.toString());
		sql.addVar("@Condition", param.toString());
		return DB.me().queryForJson(MyDatabaseEnum.JkEduDB, sql, start, pageSize);
	}
	public JSONObject getCategoryList(Category vo) throws SQLException {
		Sql sql = DB.me().createSql(CategorySqlNameEnum.getCategoryList);
		StringBuffer param = new StringBuffer();
		StringBuffer paramUserId = new StringBuffer();
		if (StringUtil.isNotEmpty(vo.getCategoryLevel())) {
			param.append(" and CategoryName =").append(vo.getCategoryName());
		}
		if (StringUtil.isNotEmpty(vo.getFirstlevelId())) {
			param.append(" and CategoryLevel =").append(vo.getCategoryLevel());
		}
		sql.addVar("@Condition", param.toString());
		return DB.me().queryForJson(MyDatabaseEnum.JkEduDB, sql);
	}
	// 保存分类

edu-article/JkEdu/src/com/yihu/jk/enums/CategorySqlNameEnum.java

@@ -7,5 +7,4 @@ public enum CategorySqlNameEnum implements SqlNameEnum {
	getCategoryList,
	addCategory,
	updateCategory,
}