Administrator 4 years ago
parent
commit
d1ad02daaa

+ 4 - 4
src/main/java/com/goafanti/admin/service/impl/PublicReleaseServiceImpl.java

@@ -122,8 +122,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	@Override
 	public int updatePublicRelease(InputPublicRelease in) {
 		try {
-			in.setReleaseStart(DateUtils.parseDate(in.getReleaseStarts(), AFTConstants.YYYYMMDDHHMMSS));
-			in.setReleaseEnd(DateUtils.parseDate(in.getReleaseEnds(), AFTConstants.YYYYMMDDHHMMSS));
+			if(in.getReleaseStarts()!=null)in.setReleaseStart(DateUtils.parseDate(in.getReleaseStarts(), AFTConstants.YYYYMMDDHHMMSS));
+			if(in.getReleaseEnds()!=null)in.setReleaseEnd(DateUtils.parseDate(in.getReleaseEnds(), AFTConstants.YYYYMMDDHHMMSS));
 		} catch (ParseException e) {
 			e.printStackTrace();
 			throw new BusinessException("转换异常");
@@ -199,12 +199,12 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 
 	@Override
 	public OutPublicRelease dtails(Integer id) {
-		return	publicReleaseMapper.selectByid(id); 
+		return	publicReleaseMapper.selectDtails(id,null); 
 	}
 	
 	@Override
 	public OutPublicRelease followDtails(String id) {
-		return	publicReleaseMapper.selectByUfid(id); 
+		return	publicReleaseMapper.selectDtails(null,id); 
 	}
 
 	@SuppressWarnings("unchecked")

+ 3 - 2
src/main/java/com/goafanti/common/dao/PublicReleaseMapper.java

@@ -1,5 +1,7 @@
 package com.goafanti.common.dao;
 
+import org.apache.ibatis.annotations.Param;
+
 import com.goafanti.admin.bo.OutPublicRelease;
 import com.goafanti.common.model.PublicRelease;
 
@@ -48,7 +50,6 @@ public interface PublicReleaseMapper {
 
 	void insertSelectiveGetId(PublicRelease in);
 
-	OutPublicRelease selectByUfid(String ufid);
+	OutPublicRelease selectDtails(@Param("id") Integer id,@Param("ufid")String ufid);
 
-	OutPublicRelease selectByid(Integer id);
 }

+ 11 - 12
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

@@ -516,20 +516,19 @@ from public_release a left join `user` b on a.uid =b.id left join admin c on a.a
 	</if>
   </select>
   
-  <select id="selectByUfid" resultType="com.goafanti.admin.bo.OutPublicRelease">
-  	select  a.id,b.nickname ,c.name  aname,date_format(a.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,a.user_name userName,
+  <select id="selectDtails" resultType="com.goafanti.admin.bo.OutPublicRelease">
+  		select  a.id,b.nickname ,c.name  aname,date_format(a.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,a.user_name userName,
 date_format(a.release_end ,'%Y-%m-%d %H:%i:%S') releaseEnds,date_format(a.create_time ,'%Y-%m-%d %H:%i:%S') createTimes,a.status,
-a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate 
+a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate ,a.latitude ,a.longitude 
 	from public_release a left join `user` b on a.uid =b.id left join admin c on a.aid =c.id
-	where a.ufid= #{id}
-  </select>
-  
-  <select id="selectByid" resultType="com.goafanti.admin.bo.OutPublicRelease">
-  	select  a.id,b.nickname ,c.name  aname,date_format(a.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,a.user_name userName,
-date_format(a.release_end ,'%Y-%m-%d %H:%i:%S') releaseEnds,date_format(a.create_time ,'%Y-%m-%d %H:%i:%S') createTimes,a.status,
-a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate 
-	from public_release a left join `user` b on a.uid =b.id left join admin c on a.aid =c.id
-	where a.id= #{id}
+	where 1=1
+	<if test="id !=null">
+	and a.id= #{id}
+	</if>
+	<if test="ufid !=null">
+	and a.ufid= #{ufid}
+	</if>
+	
   </select>
   
   <select id="listPublicStatistics" resultType="com.goafanti.admin.bo.OutPublicStatistics">