소스 검색

非公出协单开发

anderx 1 일 전
부모
커밋
c4b03abf06

+ 1 - 0
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

@@ -1338,6 +1338,7 @@
             <foreach item="item" collection="assistType" separator="," open="(" close=")">
                 #{item}
             </foreach>
+            )
         </if>
         <if test="startTime !=null and endTime !=null">
             and a.release_start  between #{startTime} and #{endTime}

+ 15 - 1
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -1736,7 +1736,21 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 
 	@Override
 	public Object listAssist(InputListAssist in) {
-		Pagination<OutListAssist> page = (Pagination<OutListAssist>) findPage("findAssistList", "findAssistCount", in);
+		Map<String, Object> params = new HashMap<>();
+		//把参数放入map中
+		 params.put("startTime", in.getStartTime());
+		 params.put("endTime", in.getEndTime());
+		 params.put("contentType", in.getContentType());
+		 params.put("aid", in.getAid());
+		 params.put("assistAid", in.getAssistAid());
+		 params.put("uid", in.getUid());
+		 params.put("type", in.getType());
+		 if (in.getAssistType()!=null){
+			 params.put("assistType", in.getAssistType().split(","));
+		 }
+		 params.put("depId", in.getDepId());
+		 params.put("assistCount", in.getAssistCount());
+		Pagination<OutListAssist> page = (Pagination<OutListAssist>) findPage("findAssistList", "findAssistCount", params, in.getPageNo(), in.getPageSize());
 		for (OutListAssist e : (List<OutListAssist>)page.getList()) {
 			pushTypeName(e);
 		}