Explorar o código

新增公出修改

anderx %!s(int64=3) %!d(string=hai) anos
pai
achega
2806266630

+ 2 - 1
src/main/java/com/goafanti/common/dao/PublicReleaseDetailsMapper.java

@@ -1,6 +1,7 @@
 package com.goafanti.common.dao;
 
 import com.goafanti.common.model.PublicReleaseDetails;
+import com.goafanti.weChat.bo.OutPublicReleaseDetails;
 
 import java.util.List;
 
@@ -17,7 +18,7 @@ public interface PublicReleaseDetailsMapper {
 
     int updateByPrimaryKey(PublicReleaseDetails record);
 
-    List<PublicReleaseDetails> selectByPCid(Integer id);
+    List<OutPublicReleaseDetails> selectByPCid(Integer id);
 
     void insertBatch(List<PublicReleaseDetails> list);
 

+ 5 - 3
src/main/java/com/goafanti/common/mapper/PublicReleaseDetailsMapper.xml

@@ -180,10 +180,12 @@
     where id = #{id,jdbcType=INTEGER}
   </update>
 
-  <select id="selectByPCid" resultType="com.goafanti.common.model.PublicReleaseDetails">
+  <select id="selectByPCid" resultType="com.goafanti.weChat.bo.OutPublicReleaseDetails">
     select
-      id,prid, `uid`, ufid, new_user newUser, sign_sum signSum
-    from public_release_details
+      a.id,a.prid, a.`uid`, a.ufid, a.new_user newUser,a.longitude,a.latitude,
+      a.district_name districtName ,a.clock_in clockIn,date_format(a.clock_in_time, '%Y-%m-%d %H:%i:%S')  clockInTimes,a.photo_url photoUrl
+
+    from public_release_details a left join user b on a.uid=b.id
     where prid = #{id,jdbcType=INTEGER}
   </select>
 

+ 31 - 0
src/main/java/com/goafanti/weChat/bo/OutPublicReleaseDetails.java

@@ -0,0 +1,31 @@
+package com.goafanti.weChat.bo;
+
+import com.goafanti.common.model.PublicReleaseDetails;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * public_release_details
+ * @author
+ */
+public class OutPublicReleaseDetails extends PublicReleaseDetails {
+    private String userName;
+    private String clockInTimes;
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getClockInTimes() {
+        return clockInTimes;
+    }
+
+    public void setClockInTimes(String clockInTimes) {
+        this.clockInTimes = clockInTimes;
+    }
+}

+ 16 - 3
src/main/java/com/goafanti/weChat/bo/OutPublicReleaseList.java

@@ -1,8 +1,12 @@
 package com.goafanti.weChat.bo;
 
+import com.goafanti.common.model.PublicReleaseDetails;
+
+import java.util.List;
+
 public class OutPublicReleaseList {
 
-	private String id;
+	private Integer id;
 	private String nickname;
 	private String userName;
 	private String aid;
@@ -26,6 +30,15 @@ public class OutPublicReleaseList {
 	private String assistantName;
 	private String userNames;
 	private Integer publicAgain;
+	private List<OutPublicReleaseDetails> prdList;
+
+	public List<OutPublicReleaseDetails> getPrdList() {
+		return prdList;
+	}
+
+	public void setPrdList(List<OutPublicReleaseDetails> prdList) {
+		this.prdList = prdList;
+	}
 
 	public String getUserNames() {
 		return userNames;
@@ -131,10 +144,10 @@ public class OutPublicReleaseList {
 		this.updateStatus = updateStatus;
 	}
 
-	public String getId() {
+	public Integer getId() {
 		return id;
 	}
-	public void setId(String id) {
+	public void setId(Integer id) {
 		this.id = id;
 	}
 	public String getNickname() {

+ 12 - 16
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -7,6 +7,7 @@ import com.goafanti.admin.service.DepartmentService;
 import com.goafanti.common.dao.*;
 import com.goafanti.common.model.*;
 import com.goafanti.order.service.OrderService;
+import com.goafanti.weChat.bo.*;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
@@ -27,15 +28,6 @@ import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.customer.bo.FollowBusinessBo;
 import com.goafanti.customer.service.CustomerService;
-import com.goafanti.weChat.bo.InputPublicDtails;
-import com.goafanti.weChat.bo.InputPublicRelease;
-import com.goafanti.weChat.bo.InputPublicReleaseList;
-import com.goafanti.weChat.bo.InputPublicStatistics;
-import com.goafanti.weChat.bo.OutPublicDtails;
-import com.goafanti.weChat.bo.OutPublicRelease;
-import com.goafanti.weChat.bo.OutPublicReleaseList;
-import com.goafanti.weChat.bo.OutPublicStatistics;
-import com.goafanti.weChat.bo.outPublicReleaseLog;
 import com.goafanti.weChat.service.PublicReleaseService;
 import com.goafanti.core.websocket.SystemWebSocketHandler;
 
@@ -201,7 +193,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 
 		if (in.getUids()!=null){
 			List<String> split = Arrays.asList(in.getUids().split(","));
-			List<PublicReleaseDetails> prList = publicReleaseDetailsMapper.selectByPCid(in.getId());
+			List<OutPublicReleaseDetails> prList = publicReleaseDetailsMapper.selectByPCid(in.getId());
 			addPRD(split,prList);
 			deletePRD(split,prList);
 		}
@@ -237,8 +229,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		return 1;
 	}
 
-	private void deletePRD(List<String> split, List<PublicReleaseDetails> prdList) {
-		for (PublicReleaseDetails prd : prdList) {
+	private void deletePRD(List<String> split, List<OutPublicReleaseDetails> prdList) {
+		for (OutPublicReleaseDetails prd : prdList) {
 			boolean flag=true;
 			for (String s : split) {
 				if (prd.getUid().equals(s)){
@@ -251,12 +243,12 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		}
 	}
 
-	private void  addPRD(List<String> split, List<PublicReleaseDetails> prdList) {
+	private void  addPRD(List<String> split, List<OutPublicReleaseDetails> prdList) {
 		List<PublicReleaseDetails> addPrdList=new ArrayList<>();
 		for (String s : split) {
 			boolean flag=true;
 			Integer id=null;
-			for (PublicReleaseDetails prd : prdList) {
+			for (OutPublicReleaseDetails prd : prdList) {
 				if (id==null)id=prd.getPrid();
 				if (s.equals(prd.getUid())){
 					flag=false;
@@ -549,10 +541,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 	public int pushPublicReleaseClockIn(Integer id,String photoUrl,Integer clockIn ,String clockInRemarks ,String uid) {
 		if (clockIn == null) clockIn = 1;
 		PublicRelease use = publicReleaseMapper.selectByPrimaryKey(id);
-		List<PublicReleaseDetails> prdList = publicReleaseDetailsMapper.selectByPCid(id);
+		List<OutPublicReleaseDetails> prdList = publicReleaseDetailsMapper.selectByPCid(id);
 		String str = "";
 		boolean flag=false;
-		for (PublicReleaseDetails prd : prdList) {
+		for (OutPublicReleaseDetails prd : prdList) {
 			if (prd.getUid().equals(uid)){
 				String aid = TokenManager.getAdminId();
 				prd.setId(id);
@@ -813,6 +805,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		}
 		map.put("aid",TokenManager.getAdminId());
 		List<OutPublicReleaseList> list = (List<OutPublicReleaseList>) findList("listPublicRelease",map,1,1);
+		for (OutPublicReleaseList out : list) {
+			out.setPrdList(publicReleaseDetailsMapper.selectByPCid(out.getId()));
+
+		}
 		return list;
 	}