anderx пре 1 година
родитељ
комит
7d97dcefc0

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

@@ -28,7 +28,7 @@
         select
         <include refid="Base_Column_List" />
         from public_release_date_clock
-        where  id = #{id,jdbcType=INTEGER}
+        where  prid = #{id,jdbcType=INTEGER}
     </select>
 
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">

+ 12 - 2
src/main/java/com/goafanti/weChat/bo/OutPublicReleaseDetails.java

@@ -1,9 +1,9 @@
 package com.goafanti.weChat.bo;
 
+import com.goafanti.common.model.PublicReleaseDateClock;
 import com.goafanti.common.model.PublicReleaseDetails;
 
-import java.io.Serializable;
-import java.util.Date;
+import java.util.List;
 
 /**
  * public_release_details
@@ -13,6 +13,16 @@ public class OutPublicReleaseDetails extends PublicReleaseDetails {
     private String userName;
     private String clockInTimes;
 
+    private List<PublicReleaseDateClock> prdcList;
+
+    public List<PublicReleaseDateClock> getPrdcList() {
+        return prdcList;
+    }
+
+    public void setPrdcList(List<PublicReleaseDateClock> prdcList) {
+        this.prdcList = prdcList;
+    }
+
     public String getUserName() {
         return userName;
     }

+ 0 - 10
src/main/java/com/goafanti/weChat/bo/OutPublicReleaseList.java

@@ -1,7 +1,5 @@
 package com.goafanti.weChat.bo;
 
-import com.goafanti.common.model.PublicReleaseDateClock;
-
 import java.math.BigDecimal;
 import java.util.List;
 
@@ -39,15 +37,7 @@ public class OutPublicReleaseList {
 
 	private List<OutPublicReleaseDetails> prdList;
 
-	private List<PublicReleaseDateClock> prdcList;
-
-	public List<PublicReleaseDateClock> getPrdcList() {
-		return prdcList;
-	}
 
-	public void setPrdcList(List<PublicReleaseDateClock> prdcList) {
-		this.prdcList = prdcList;
-	}
 
 	public Integer getTechStartProcess() {
 		return techStartProcess;

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

@@ -1401,8 +1401,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		}
 		if (id==null)id=myPublic.get(0).getId();
 		OutPublicReleaseList out = publicReleaseMapper.selectOutListBoById(id);
-		out.setPrdList(publicReleaseDetailsMapper.selectByPrid(id));
-		out.setPrdcList(publicReleaseDateClockMapper.selectByPrid(id));
+		List<OutPublicReleaseDetails> prdList = publicReleaseDetailsMapper.selectByPrid(id);
+		List<PublicReleaseDateClock> prdcList = publicReleaseDateClockMapper.selectByPrid(id);
+		pushDateClockDetails(prdList,prdcList);
+		out.setPrdList(prdList);
 		return out;
 //		List<OutPublicReleaseList> myPublic = getMyPublic(0,1);
 //		if (myPublic.isEmpty()){
@@ -1415,7 +1417,17 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 //		}
 	}
 
-
+	private void pushDateClockDetails(List<OutPublicReleaseDetails> prdList, List<PublicReleaseDateClock> prdcList) {
+		for (OutPublicReleaseDetails out : prdList) {
+			List<PublicReleaseDateClock> elist=new ArrayList<>();;
+			for (PublicReleaseDateClock prdc : prdcList) {
+				if (prdc.getPrdid().equals(out.getId())){
+					elist.add(prdc);
+				}
+			}
+			out.setPrdcList(elist);
+		}
+	}
 
 
 	/**