소스 검색

处理元打卡数据标记每天

anderx 1 년 전
부모
커밋
254a10de82

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

@@ -25,4 +25,6 @@ public interface PublicReleaseDateClockMapper {
     int updateByPrimaryKey(PublicReleaseDateClock record);
 
     void insertBatch(List<PublicReleaseDateClock> list);
+
+    List<PublicReleaseDateClock> selectByPrid(Integer id);
 }

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

@@ -24,6 +24,12 @@
         from public_release_date_clock
         where  id = #{id,jdbcType=INTEGER} 
     </select>
+    <select id="selectByPrid" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from public_release_date_clock
+        where  id = #{id,jdbcType=INTEGER}
+    </select>
 
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
         delete from public_release_date_clock

+ 15 - 1
src/main/java/com/goafanti/weChat/bo/OutPublicReleaseList.java

@@ -1,5 +1,7 @@
 package com.goafanti.weChat.bo;
 
+import com.goafanti.common.model.PublicReleaseDateClock;
+
 import java.math.BigDecimal;
 import java.util.List;
 
@@ -35,6 +37,18 @@ public class OutPublicReleaseList {
 	private Integer techStartProcess;
 	private BigDecimal expenseAmount;
 
+	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;
 	}
@@ -67,7 +81,7 @@ public class OutPublicReleaseList {
 		this.expenseAmount = expenseAmount;
 	}
 
-	private List<OutPublicReleaseDetails> prdList;
+
 
 	public String getAdminExamine() {
 		return adminExamine;

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

@@ -1397,7 +1397,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		}
 		if (id==null)id=myPublic.get(0).getId();
 		OutPublicReleaseList out = publicReleaseMapper.selectOutListBoById(id);
-		out.setPrdList(publicReleaseDetailsMapper.selectByPrid(out.getId()));
+		out.setPrdList(publicReleaseDetailsMapper.selectByPrid(id));
+		out.setPrdcList(publicReleaseDateClockMapper.selectByPrid(id));
 		return out;
 //		List<OutPublicReleaseList> myPublic = getMyPublic(0,1);
 //		if (myPublic.isEmpty()){