|
|
@@ -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;
|
|
|
}
|
|
|
|