Selaa lähdekoodia

管理中心,客户审核代码优化和修改

anderx 7 vuotta sitten
vanhempi
commit
14674d468d

+ 2 - 2
src/main/java/com/goafanti/achievement/controller/AdminAchievementApiController.java

@@ -726,7 +726,7 @@ public class AdminAchievementApiController extends CertifyApiController {
      */
     @RequestMapping(value = "/listPublish", method = RequestMethod.GET)
     private Result listPublish(String name,String publishPlatform,Integer publishClient,String publishPage,
-    		Integer ifTop, Integer pageNo, Integer pageSize) {
+    		Integer ifTop, Integer pageNo, Integer pageSize,String ownerName) {
         Result res = new Result();
         if (null==pageNo) {
 			pageNo=1;
@@ -735,7 +735,7 @@ public class AdminAchievementApiController extends CertifyApiController {
 			pageSize=10;
 		}
         res.setData(achievementPublishService.listPublish( name, publishPlatform, publishClient, publishPage,
-        		 ifTop,  pageNo,  pageSize));     
+        		 ifTop,  pageNo,  pageSize,ownerName));     
         return res;
     }
     /**

+ 1 - 1
src/main/java/com/goafanti/achievement/service/AchievementPublishService.java

@@ -16,7 +16,7 @@ public interface AchievementPublishService {
 	int updatePublish(AchievementPublish a);
 
 	Pagination<AchievementPublishBo> listPublish(String name, String publishPlatform, Integer publishClient, String publishPage, Integer ifTop,
-			Integer pageNo, Integer pageSize);
+			Integer pageNo, Integer pageSize,String ownerName);
 
 	
 

+ 4 - 1
src/main/java/com/goafanti/achievement/service/impl/AchievementPublishServiceImpl.java

@@ -70,7 +70,7 @@ public class AchievementPublishServiceImpl extends BaseMybatisDao<AchievementPub
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<AchievementPublishBo> listPublish(String name, String publishPlatform, Integer publishClient,
-			String publishPage, Integer ifTop, Integer pageNo, Integer pageSize) {
+			String publishPage, Integer ifTop, Integer pageNo, Integer pageSize,String ownerName) {
 		Map<String, Object> params=new HashMap<String, Object>();
 		if (null!=name) {
 			params.put("name", name);
@@ -87,6 +87,9 @@ public class AchievementPublishServiceImpl extends BaseMybatisDao<AchievementPub
 		if (null!=ifTop) {
 			params.put("ifTop", ifTop);
 		}
+		if (null!=ownerName) {
+			params.put("ownerName", ownerName);
+		}
 		
 		Pagination<AchievementPublishBo> p=(Pagination<AchievementPublishBo>) findPage("findAchievementPublishByPage", "findAchievementPublishCount",
 				params,pageNo, pageSize);

+ 5 - 2
src/main/java/com/goafanti/common/mapper/AchievementPublishMapper.xml

@@ -376,7 +376,7 @@ where 1=1
   	and a.name like "%"#{name,jdbcType=VARCHAR}"%"
   	</if>
   	<if test="userName != null">
-  	and a.owner_name = = #{userName,jdbcType=VARCHAR}
+  	and a.owner_name  = #{userName,jdbcType=VARCHAR}
   	</if>
   	<if test="publishPage != null">
 		and ap.publish_page = #{publishPage,jdbcType=VARCHAR}
@@ -389,8 +389,11 @@ where 1=1
 	</if>
 	<if test="ifTop != null">
 		and ap.if_top =#{ifTop,jdbcType=INTEGER}
-
 	</if>
+	<if test="ownerName != null">
+		and a.owner_name like #{ownerName,jdbcType=INTEGER}"%"
+	</if>
+	
 		order by ap.if_top, ap.top_number,ap.show_number asc
 	<if test="page_sql!=null">
 			${page_sql}

+ 3 - 0
src/main/java/com/goafanti/common/mapper/DemandPublishMapper.xml

@@ -391,6 +391,9 @@ where 1=1
 		and dp.if_top =#{ifTop,jdbcType=INTEGER}
 
 	</if>
+	<if test="employerName != null">
+		and d.employer_name like #{employerName,jdbcType=INTEGER}'%'
+	</if>
 		order by dp.if_top, dp.top_number,dp.show_number asc
 	<if test="page_sql!=null">
 			${page_sql}

+ 2 - 1
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -1271,7 +1271,8 @@
 		set
       	nickname = #{nickname,jdbcType=VARCHAR},
       	mobile = #{mobile,jdbcType=VARCHAR},
-      	societyTag = #{societyTag,jdbcType=VARCHAR}
+      	society_tag = #{societyTag,jdbcType=VARCHAR},
+      	audit_status=0
     	where id = #{id,jdbcType=VARCHAR}
     </update>
 </mapper>

+ 2 - 2
src/main/java/com/goafanti/demand/controller/AdminDemandApiController.java

@@ -748,7 +748,7 @@ public class AdminDemandApiController extends CertifyApiController {
      */
     @RequestMapping(value = "/listPublish", method = RequestMethod.GET)
     private Result listPublish(String name,String publishPlatform,Integer publishClient,String publishPage,
-    		Integer ifTop, Integer pageNo, Integer pageSize) {
+    		Integer ifTop, Integer pageNo, Integer pageSize,String employerName) {
         Result res = new Result();
         if (null==pageNo) {
 			pageNo=1;
@@ -757,7 +757,7 @@ public class AdminDemandApiController extends CertifyApiController {
 			pageSize=10;
 		}
         res.setData(demandPublishService.listPublish( name, publishPlatform, publishClient, publishPage,
-        		 ifTop,  pageNo,  pageSize));     
+        		 ifTop,  pageNo,  pageSize,employerName));     
         return res;
     }
     /**

+ 1 - 1
src/main/java/com/goafanti/demand/service/DemandPublishService.java

@@ -17,6 +17,6 @@ public interface DemandPublishService {
 	int updatePublish(DemandPublish d);
 
 	Pagination<DemandPublishBo> listPublish(String name, String publishPlatform, Integer publishClient, String publishPage, Integer ifTop,
-			Integer pageNo, Integer pageSize);
+			Integer pageNo, Integer pageSize,String employerName);
 
 }

+ 5 - 2
src/main/java/com/goafanti/demand/service/impl/DemandPublishServiceImpl.java

@@ -69,7 +69,7 @@ public class DemandPublishServiceImpl extends BaseMybatisDao<DemandPublishMapper
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<DemandPublishBo> listPublish(String name, String publishPlatform, Integer publishClient,
-			String publishPage, Integer ifTop, Integer pageNo, Integer pageSize) {
+			String publishPage, Integer ifTop, Integer pageNo, Integer pageSize,String employerName) {
 		Map<String, Object> params=new HashMap<String, Object>();
 		if (null!=name) {
 			params.put("name", name);
@@ -85,7 +85,10 @@ public class DemandPublishServiceImpl extends BaseMybatisDao<DemandPublishMapper
 		}
 		if (null!=ifTop) {
 			params.put("ifTop", ifTop);
-		}																					
+		}
+		if (null!=employerName) {
+			params.put("employerName", employerName);
+		}								
 		Pagination<DemandPublishBo> p=(Pagination<DemandPublishBo>) findPage("findDemandPublishByPage", "findDemandPublishCount",
 				params,pageNo, pageSize);
 		List<DemandPublishBo> dp=(List<DemandPublishBo>) p.getList();

+ 2 - 2
src/main/resources/log4j.properties

@@ -1,10 +1,10 @@
-log4j.rootLogger=ERROR,Console
+log4j.rootLogger=INFO,ERROR,Console
 log4j.appender.Console=org.apache.log4j.ConsoleAppender
 log4j.appender.Console.Target=System.out
 log4j.appender.Console.layout=org.apache.log4j.PatternLayout
 log4j.appender.Console.layout.ConversionPattern=[%p][%d{yyyy-MM-dd HH\:mm\:ss,SSS}][%c]%m%n
 
-log4j.logger.com.springframework=ERROR
+log4j.logger.com.springframework=INFO
 log4j.logger.com.ibatis=ERROR  
 log4j.logger.com.ibatis.common.jdbc.SimpleDataSource=ERROR  
 log4j.logger.com.ibatis.common.jdbc.ScriptRunner=ERROR