|
|
@@ -1,6 +1,7 @@
|
|
|
package com.goafanti.weChat.service.impl;
|
|
|
|
|
|
import cn.jiguang.common.utils.StringUtils;
|
|
|
+import com.alibaba.fastjson.JSONArray;
|
|
|
import com.goafanti.admin.bo.AdminListBo;
|
|
|
import com.goafanti.admin.service.DepartmentService;
|
|
|
import com.goafanti.common.bo.EmailBo;
|
|
|
@@ -66,6 +67,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
private AdminUserCountMapper adminUserCountMapper;
|
|
|
@Autowired
|
|
|
private PublicReleaseClockMapper publicReleaseClockMapper;
|
|
|
+ @Autowired
|
|
|
+ private PublicReleaseDateClockMapper publicReleaseDateClockMapper;
|
|
|
|
|
|
@Override
|
|
|
@Transactional
|
|
|
@@ -92,6 +95,11 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
in.setTechStartProcess(1);
|
|
|
}
|
|
|
}
|
|
|
+ if (in.getValidDate()!=null){
|
|
|
+ String validDate = in.getValidDate();
|
|
|
+ List<Map> maps = JSONArray.parseArray(validDate, Map.class);
|
|
|
+
|
|
|
+ }
|
|
|
publicReleaseMapper.insertSelective(in);
|
|
|
List<PublicReleaseDetails> prdList=new ArrayList<>();
|
|
|
List<User> users=new ArrayList<>();
|
|
|
@@ -389,7 +397,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
if (in.getUids()!=null){
|
|
|
List<String> split = Arrays.asList(in.getUids().split(","));
|
|
|
- List<OutPublicReleaseDetails> prList = publicReleaseDetailsMapper.selectByPCid(in.getId());
|
|
|
+ List<OutPublicReleaseDetails> prList = publicReleaseDetailsMapper.selectByPrid(in.getId());
|
|
|
uses=pushPublicReleaseDetails(split,prList,use,in);
|
|
|
}
|
|
|
in.setStatus(1);
|
|
|
@@ -980,8 +988,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
|
|
|
private void updatePublicReleaseDtails(PublicRelease use, Integer id) {
|
|
|
- List<OutPublicReleaseDetails> list = publicReleaseDetailsMapper.selectByPCid(use.getId());
|
|
|
- List<OutPublicReleaseDetails> list2 = publicReleaseDetailsMapper.selectByPCid(id);
|
|
|
+ List<OutPublicReleaseDetails> list = publicReleaseDetailsMapper.selectByPrid(use.getId());
|
|
|
+ List<OutPublicReleaseDetails> list2 = publicReleaseDetailsMapper.selectByPrid(id);
|
|
|
//查找新增的
|
|
|
for (OutPublicReleaseDetails out : list) {
|
|
|
boolean flag=true;
|
|
|
@@ -1017,7 +1025,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
|
|
|
private void addpublicReleaseDtails(PublicRelease use, Integer id) {
|
|
|
- List<OutPublicReleaseDetails> list = publicReleaseDetailsMapper.selectByPCid(use.getId());
|
|
|
+ List<OutPublicReleaseDetails> list = publicReleaseDetailsMapper.selectByPrid(use.getId());
|
|
|
for (OutPublicReleaseDetails out : list) {
|
|
|
OutPublicReleaseDetails prd=new OutPublicReleaseDetails();
|
|
|
BeanUtils.copyProperties(out,prd);
|
|
|
@@ -1067,7 +1075,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
if (use.getTechStartProcess()==1||use.getTechStartProcess()==3){
|
|
|
return -2;
|
|
|
}
|
|
|
- List<OutPublicReleaseDetails> prdList = publicReleaseDetailsMapper.selectByPCid(id);
|
|
|
+ List<OutPublicReleaseDetails> prdList = publicReleaseDetailsMapper.selectByPrid(id);
|
|
|
String str = "";
|
|
|
Date date = new Date();
|
|
|
boolean flag=false;
|
|
|
@@ -1199,7 +1207,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
|
|
|
}
|
|
|
}
|
|
|
- out.setPrdList(publicReleaseDetailsMapper.selectByPCid(out.getId()));
|
|
|
+ out.setPrdList(publicReleaseDetailsMapper.selectByPrid(out.getId()));
|
|
|
return out;
|
|
|
}
|
|
|
|
|
|
@@ -1389,7 +1397,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
if (id==null)id=myPublic.get(0).getId();
|
|
|
OutPublicReleaseList out = publicReleaseMapper.selectOutListBoById(id);
|
|
|
- out.setPrdList(publicReleaseDetailsMapper.selectByPCid(out.getId()));
|
|
|
+ out.setPrdList(publicReleaseDetailsMapper.selectByPrid(out.getId()));
|
|
|
return out;
|
|
|
// List<OutPublicReleaseList> myPublic = getMyPublic(0,1);
|
|
|
// if (myPublic.isEmpty()){
|
|
|
@@ -1425,7 +1433,7 @@ 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()));
|
|
|
+ out.setPrdList(publicReleaseDetailsMapper.selectByPrid(out.getId()));
|
|
|
|
|
|
}
|
|
|
return list;
|
|
|
@@ -1796,6 +1804,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
pushiClockInTime(list, publicReleaseClocks);
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+
|
|
|
private void pushiClockInTime(List<OutPublicDtails> list, List<PublicReleaseClock> publicReleaseClocks) {
|
|
|
for (OutPublicDtails outPublicDtails : list) {
|
|
|
List<PublicReleaseClock> colokList =new ArrayList<>();
|
|
|
@@ -1812,4 +1822,35 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
outPublicDtails.setClockInTimes(sb.toString());
|
|
|
}
|
|
|
}
|
|
|
+ @Override
|
|
|
+ public Object pushDateClock() {
|
|
|
+ List<PublicRelease> publicReleases = publicReleaseMapper.selectAll();
|
|
|
+ for (PublicRelease e : publicReleases) {
|
|
|
+ List<PublicReleaseDateClock> list= new ArrayList<>();
|
|
|
+ if (e.getValidDate()!=null){
|
|
|
+ List<Map> maps = JSONArray.parseArray(e.getValidDate(), Map.class);
|
|
|
+ for (Map map : maps) {
|
|
|
+ String dates = (String) map.get("value");
|
|
|
+ if (dates!=null){
|
|
|
+ Date date = DateUtils.parseDate(dates);
|
|
|
+ List<OutPublicReleaseDetails> outPublicReleaseDetails = publicReleaseDetailsMapper.selectByPrid(e.getId());
|
|
|
+ for (OutPublicReleaseDetails det : outPublicReleaseDetails) {
|
|
|
+ PublicReleaseDateClock newPRDC = new PublicReleaseDateClock();
|
|
|
+ newPRDC.setClockInTime(date);
|
|
|
+ newPRDC.setPrid(e.getId());
|
|
|
+ newPRDC.setPrdid(det.getId());
|
|
|
+ newPRDC.setStatus(det.getClockIn());
|
|
|
+ list.add(newPRDC);
|
|
|
+ }
|
|
|
+ if(!list.isEmpty()){
|
|
|
+ publicReleaseDateClockMapper.insertBatch(list);
|
|
|
+ list.clear();
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return 1;
|
|
|
+ }
|
|
|
}
|