Home Explore Help
Register Sign In
trick9191
/
wlyy2.0
forked from Amoy2/wlyy2.0
Watch 1
Star 0
Fork 0
Files
Browse Source

Merge branch 'dev_1.4.1' of http://192.168.1.220:10080/Amoy/patient-co-management into 1.4.1

Conflicts:
	patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/jimeiJkEduPC/DoctorJMJkEduArticlePCController.java
liuwenbin 7 years ago
parent
6cf84c8267
commit
d0c9d295ed
4 changed files with 46 additions and 4 deletions
Split View Show Diff Stats
  1. 15 1
      edu-article/JkEdu/WebRoot/WEB-INF/classes/Article.sql.xml
  2. 8 1
      edu-article/JkEdu/WebRoot/WEB-INF/classes/articlePc.sql.xml
  3. 15 1
      edu-article/JkEdu/src/Article.sql.xml
  4. 8 1
      edu-article/JkEdu/src/articlePc.sql.xml

+ 15 - 1
edu-article/JkEdu/WebRoot/WEB-INF/classes/Article.sql.xml
View File 

@ -8,6 +8,13 @@
 
		
			]]>
 
		</Sql>
 
		<!--<Sql name='getArticleList'>
 
			<![CDATA[
 
		select m.*,IFNULL(n.BrowseNumber,0) as BrowseNumber,IFNULL(n.PointNumber,0) as PointNumber,IFNULL(n.CollectionNumber,0) as CollectionNumber,IFNULL(n.PushNumber,0) as CommentNumber, IFNULL(n.PushNumber,0) as PushNumber
 
		from Org_Article m JOIN User_ArticleStatistics n on m.ArticleId=n.ArticleId where 1=1 @Condition
 
			]]>
 
		</Sql>-->
 
		<Sql name='getArticleListCount'>
 
			<![CDATA[
 
	select count(*) from Org_Article m 
@ -15,10 +22,17 @@ LEFT JOIN User_ArticleStatistics n on m.ArticleId=n.ArticleId where 1=1 @Conditi
 
			]]>
 
		</Sql>
 
		<Sql name='getCollectionArticleList'>
 
		<!--<Sql name='getCollectionArticleList'>
 
			<![CDATA[
 
select aa.* ,n.BrowseNumber,n.PointNumber,n.CollectionNumber,n.CommentNumber, IFNULL(n.PushNumber,0) as PushNumber from (
 
select m.* from Org_Article m  INNER JOIN User_ArticleCollection n on  m.articleid=n.ArticleId and  1=1 @UserParam) as aa LEFT JOIN 
User_ArticleStatistics n on aa.ArticleId=n.ArticleId where 1=1 @Condition
 
			]]>
 
		</Sql>-->
 
		<Sql name='getCollectionArticleList'>
 
			<![CDATA[
 
select aa.* ,n.BrowseNumber,n.PointNumber,n.CollectionNumber,IFNULL(n.PushNumber,0) as CommentNumber, IFNULL(n.PushNumber,0) as PushNumber from (
 
select m.* from Org_Article m  INNER JOIN User_ArticleCollection n on  m.articleid=n.ArticleId and  1=1 @UserParam) as aa LEFT JOIN
 
User_ArticleStatistics n on aa.ArticleId=n.ArticleId where 1=1 @Condition
 
			]]>
 
		</Sql>

+ 8 - 1
edu-article/JkEdu/WebRoot/WEB-INF/classes/articlePc.sql.xml
View File 

@ -1,12 +1,19 @@
 
<?xml version="1.0" encoding="UTF-8"?>
 
<das-client>
 
	<Sqls> 
		 <Sql name='getArticlePcList'>
 
		 <!--<Sql name='getArticlePcList'>
 
		 <![CDATA[
 
				select m.*,IFNULL(n.BrowseNumber,0) as BrowseNumber,IFNULL(n.PointNumber,0) as PointNumber,IFNULL(n.CollectionNumber,0) as CollectionNumber,IFNULL(n.CommentNumber,0) as CommentNumber ,IFNULL(n.PushNumber,0) as PushNumber ,
 
				(select count(1) from user_articlecollection a where a.ArticleId=m.ArticleId  @Condition2 )as collectionType, IFNULL(n.PushNumber,0) as PushNumber from Org_Article m
 
				LEFT JOIN User_ArticleStatistics n on m.ArticleId=n.ArticleId where 1=1   and  ArticleState =1  @Condition    order by ArticleOrder desc  ,UpdateTime desc   @PageParam
 
			]]>
 
		</Sql>-->
 
		<Sql name='getArticlePcList'>
 
			<![CDATA[
 
				select m.*,IFNULL(n.BrowseNumber,0) as BrowseNumber,IFNULL(n.PointNumber,0) as PointNumber,IFNULL(n.CollectionNumber,0) as CollectionNumber,IFNULL(n.PushNumber,0) as CommentNumber ,IFNULL(n.PushNumber,0) as PushNumber ,
 
				(select count(1) from user_articlecollection a where a.ArticleId=m.ArticleId  @Condition2 )as collectionType, IFNULL(n.PushNumber,0) as PushNumber from Org_Article m
 
				LEFT JOIN User_ArticleStatistics n on m.ArticleId=n.ArticleId where 1=1   and  ArticleState =1  @Condition    order by ArticleOrder desc  ,UpdateTime desc   @PageParam
 
			]]>
 
		</Sql>
 
		<Sql name='getArticlePcListCount'>
 
			<![CDATA[

+ 15 - 1
edu-article/JkEdu/src/Article.sql.xml
View File 

@ -8,6 +8,13 @@
 
		
			]]>
 
		</Sql>
 
		<!--<Sql name='getArticleList'>
 
			<![CDATA[
 
		select m.*,IFNULL(n.BrowseNumber,0) as BrowseNumber,IFNULL(n.PointNumber,0) as PointNumber,IFNULL(n.CollectionNumber,0) as CollectionNumber,IFNULL(n.PushNumber,0) as CommentNumber, IFNULL(n.PushNumber,0) as PushNumber
 
		from Org_Article m JOIN User_ArticleStatistics n on m.ArticleId=n.ArticleId where 1=1 @Condition
 
			]]>
 
		</Sql>-->
 
		<Sql name='getArticleListCount'>
 
			<![CDATA[
 
	select count(*) from Org_Article m 
@ -15,10 +22,17 @@ LEFT JOIN User_ArticleStatistics n on m.ArticleId=n.ArticleId where 1=1 @Conditi
 
			]]>
 
		</Sql>
 
		<Sql name='getCollectionArticleList'>
 
		<!--<Sql name='getCollectionArticleList'>
 
			<![CDATA[
 
select aa.* ,n.BrowseNumber,n.PointNumber,n.CollectionNumber,n.CommentNumber, IFNULL(n.PushNumber,0) as PushNumber from (
 
select m.* from Org_Article m  INNER JOIN User_ArticleCollection n on  m.articleid=n.ArticleId and  1=1 @UserParam) as aa LEFT JOIN 
User_ArticleStatistics n on aa.ArticleId=n.ArticleId where 1=1 @Condition
 
			]]>
 
		</Sql>-->
 
		<Sql name='getCollectionArticleList'>
 
			<![CDATA[
 
select aa.* ,n.BrowseNumber,n.PointNumber,n.CollectionNumber,IFNULL(n.PushNumber,0) as CommentNumber, IFNULL(n.PushNumber,0) as PushNumber from (
 
select m.* from Org_Article m  INNER JOIN User_ArticleCollection n on  m.articleid=n.ArticleId and  1=1 @UserParam) as aa LEFT JOIN
 
User_ArticleStatistics n on aa.ArticleId=n.ArticleId where 1=1 @Condition
 
			]]>
 
		</Sql>

+ 8 - 1
edu-article/JkEdu/src/articlePc.sql.xml
View File 

@ -1,12 +1,19 @@
 
<?xml version="1.0" encoding="UTF-8"?>
 
<das-client>
 
	<Sqls> 
		 <Sql name='getArticlePcList'>
 
		 <!--<Sql name='getArticlePcList'>
 
		 <![CDATA[
 
				select m.*,IFNULL(n.BrowseNumber,0) as BrowseNumber,IFNULL(n.PointNumber,0) as PointNumber,IFNULL(n.CollectionNumber,0) as CollectionNumber,IFNULL(n.CommentNumber,0) as CommentNumber ,IFNULL(n.PushNumber,0) as PushNumber ,
 
				(select count(1) from user_articlecollection a where a.ArticleId=m.ArticleId  @Condition2 )as collectionType, IFNULL(n.PushNumber,0) as PushNumber from Org_Article m
 
				LEFT JOIN User_ArticleStatistics n on m.ArticleId=n.ArticleId where 1=1   and  ArticleState =1  @Condition    order by ArticleOrder desc  ,UpdateTime desc   @PageParam
 
			]]>
 
		</Sql>-->
 
		<Sql name='getArticlePcList'>
 
			<![CDATA[
 
				select m.*,IFNULL(n.BrowseNumber,0) as BrowseNumber,IFNULL(n.PointNumber,0) as PointNumber,IFNULL(n.CollectionNumber,0) as CollectionNumber,IFNULL(n.CommentNumber,0) as CommentNumber ,IFNULL(n.PushNumber,0) as PushNumber ,
 
				(select count(1) from user_articlecollection a where a.ArticleId=m.ArticleId  @Condition2 )as collectionType, IFNULL(n.PushNumber,0) as PushNumber from Org_Article m
 
				LEFT JOIN User_ArticleStatistics n on m.ArticleId=n.ArticleId where 1=1   and  ArticleState =1  @Condition    order by ArticleOrder desc  ,UpdateTime desc   @PageParam
 
			]]>
 
		</Sql>
 
		<Sql name='getArticlePcListCount'>
 
			<![CDATA[