Parcourir la source

订单协单开发

anderx il y a 4 ans
Parent
commit
542db748e5

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

@@ -30,4 +30,6 @@ public interface PublicReleaseMapper {
     void updateSignByAidAndUid(@Param("uid") String buyerId, @Param("aid") String salesmanId);
 
     List<OutPublicReleaseCount > getTimeUserFollow(@Param("date")Date date, @Param("now")Date now);
+
+    List<OutPublicRelease> publicByOrder(String orderNo);
 }

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

@@ -602,4 +602,14 @@
      group by aid,uid,new_user)a left join admin c on a.aid=c.id
     left join department d on c.department_id =d.id left join district_glossory e on d.province =e.id
   </select>
+  <select id="publicByOrder" resultType="com.goafanti.weChat.bo.OutPublicRelease">
+    select a.id,a.uid,a.aid,b.nickname ,c.name aname,a.duration ,a.user_name userName,
+           date_format(a.release_start,'%Y-%m-%d %H:%i:%S')releaseStarts,
+           date_format(a.release_end ,'%Y-%m-%d %H:%i:%S')releaseEnds,
+           date_format(a.clock_in_time ,'%Y-%m-%d %H:%i:%S')clockInTimes,
+           a.remarks
+    from public_release a left join user b on a.uid=b.id
+                          left join admin c on a.aid =c.id
+    where a.order_no = #{orderNo}
+    </select>
 </mapper>

+ 12 - 0
src/main/java/com/goafanti/weChat/bo/OutPublicRelease.java

@@ -2,6 +2,8 @@ package com.goafanti.weChat.bo;
 
 import com.goafanti.common.model.PublicRelease;
 
+import java.util.Date;
+
 public class OutPublicRelease extends PublicRelease {
 	/**
 	 * 
@@ -20,6 +22,16 @@ public class OutPublicRelease extends PublicRelease {
 
 	private String reviewer;
 
+	private String clockInTimes;
+
+	public String getClockInTimes() {
+		return clockInTimes;
+	}
+
+	public void setClockInTimes(String clockInTimes) {
+		this.clockInTimes = clockInTimes;
+	}
+
 	public String getReviewer() {
 		return reviewer;
 	}

+ 17 - 3
src/main/java/com/goafanti/weChat/controller/AdminReleaseApiController.java

@@ -235,14 +235,28 @@ public class AdminReleaseApiController extends CertifyApiController{
 	/**
 	 * 根据客户返回订单
 	 */
-	@RequestMapping(value = "/selectOrderByuid",method =RequestMethod.GET)
-	public Result selectOrderByuid(String uid){
+	@RequestMapping(value = "/selectOrderByUid",method =RequestMethod.GET)
+	public Result selectOrderByUid(String uid){
 		Result res = new Result();
 		if (uid==null){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,ErrorConstants.PARAM_EMPTY_ERROR,"客户编号"));
 			return res;
 		}
-		res.data(publicReleaseService.selectOrderByuid(uid));
+		res.data(publicReleaseService.selectOrderByUid(uid));
+		return res;
+	}
+
+	/**
+	 * 查看上门记录
+	 */
+	@RequestMapping(value = "/publicByOrder",method =RequestMethod.GET)
+	public Result publicByOrder(String orderNo){
+		Result res = new Result();
+		if (orderNo==null){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR,ErrorConstants.PARAM_EMPTY_ERROR,"订单编号"));
+			return res;
+		}
+		res.data(publicReleaseService.publicByOrder(orderNo));
 		return res;
 	}
 	

+ 3 - 1
src/main/java/com/goafanti/weChat/service/PublicReleaseService.java

@@ -44,5 +44,7 @@ public interface PublicReleaseService {
 
     int addSupplement(Integer id, String supplement, String nextPlan);
 
-    List<Map<String,Object>> selectOrderByuid(String uid);
+    List<Map<String,Object>> selectOrderByUid(String uid);
+
+	List<OutPublicRelease> publicByOrder(String orderNo);
 }

+ 5 - 8
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -399,17 +399,14 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 
 
 	@Override
-	public List<Map<String, Object>> selectOrderByuid(String uid) {
+	public List<Map<String, Object>> selectOrderByUid(String uid) {
 		return tOrderNewMapper.selectOrderByuid(uid);
 	}
 
-
-
-
-
-	
-
-	
+	@Override
+	public List<OutPublicRelease> publicByOrder(String orderNo) {
+		return publicReleaseMapper.publicByOrder(orderNo);
+	}
 
 
 }