Browse Source

客户公出情况新增审核列表

anderx 2 weeks ago
parent
commit
dd54b2f145

+ 11 - 0
src/main/java/com/goafanti/customer/bo/PublicReleaseListBo.java

@@ -3,6 +3,7 @@ package com.goafanti.customer.bo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.util.Date;
+import java.util.List;
 
 public class PublicReleaseListBo {
 
@@ -77,6 +78,16 @@ public class PublicReleaseListBo {
      */
     private Integer followCount;
 
+    private List<?> logList;
+
+    public List<?> getLogList() {
+        return logList;
+    }
+
+    public void setLogList(List<?> logList) {
+        this.logList = logList;
+    }
+
     public Integer getPrdId() {
         return prdId;
     }

+ 12 - 1
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -21,6 +21,7 @@ import com.goafanti.customer.bo.*;
 import com.goafanti.customer.service.CustomerService;
 import com.goafanti.order.bo.TOrderNewBo;
 import com.goafanti.user.bo.OutUserChannel;
+import com.goafanti.weChat.bo.outPublicReleaseLog;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.ibatis.builder.BuilderException;
@@ -3125,10 +3126,20 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		}else {
 			map.put("myUser",0);
 		}
-		map.put("list",userMapper.getPublicReleaseList(id));
+		List<PublicReleaseListBo> publicReleaseList = userMapper.getPublicReleaseList(id);
+		pushLog(publicReleaseList);
+		map.put("list",publicReleaseList);
 		return map;
     }
 
+	private void pushLog(List<PublicReleaseListBo> publicReleaseList) {
+		for (PublicReleaseListBo e : publicReleaseList) {
+			List<outPublicReleaseLog> outPublicReleaseLogs = publicReleaseLogMapper.listPublicReleaseLog(e.getPrdId(), null);
+			e.setLogList(outPublicReleaseLogs);
+		}
+
+	}
+
 	@Override
 	public void updateUserShareType(List<LockingReleaseBo> newList) {
 			userMapper.updateUserShareType(newList);