|
@@ -181,6 +181,11 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
updateName.setUserNames(userNames);
|
|
updateName.setUserNames(userNames);
|
|
|
publicReleaseMapper.update(updateName);
|
|
publicReleaseMapper.update(updateName);
|
|
|
addpublicLog(in.getId(), PublicReleaseLog.states.fq.getCode(), "发起外出申请");
|
|
addpublicLog(in.getId(), PublicReleaseLog.states.fq.getCode(), "发起外出申请");
|
|
|
|
|
+ pushPublicCarbonCopy(in, my, userNames);
|
|
|
|
|
+ return (Map<String, Object>) addPublicReleaseLog(my, in,userNames,date,users,checkOrderNo);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ private void pushPublicCarbonCopy(InputPublicRelease in, AdminListBo my, String userNames) {
|
|
|
if (StringUtils.isNotEmpty(my.getPublicCarbonCopy())){
|
|
if (StringUtils.isNotEmpty(my.getPublicCarbonCopy())){
|
|
|
String startTime = DateUtils.formatDateChineseYYYYMMddHH(in.getReleaseStart());
|
|
String startTime = DateUtils.formatDateChineseYYYYMMddHH(in.getReleaseStart());
|
|
|
String endTime = DateUtils.formatDateChineseYYYYMMddHH(in.getReleaseEnd());
|
|
String endTime = DateUtils.formatDateChineseYYYYMMddHH(in.getReleaseEnd());
|
|
@@ -189,24 +194,21 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
if(in.getType()==0)typeName="业务公出";
|
|
if(in.getType()==0)typeName="业务公出";
|
|
|
else if(in.getType()==1)typeName="技术公出";
|
|
else if(in.getType()==1)typeName="技术公出";
|
|
|
else if(in.getType()==2)typeName="行政公出";
|
|
else if(in.getType()==2)typeName="行政公出";
|
|
|
- String str2=String.format("营销员%s,%s - %s,将公出%s,请知悉!",my.getName(),
|
|
|
|
|
|
|
+ String str2=String.format("营销员%s,%s - %s,将公出%s,请知悉!", my.getName(),
|
|
|
startTime,
|
|
startTime,
|
|
|
endTime,
|
|
endTime,
|
|
|
userNames);
|
|
userNames);
|
|
|
- asyncUtils.addNoticAndEmail(NoticeStatus.PUBLIC_CARBON_COPY.getCode(),my.getPublicCarbonCopy()
|
|
|
|
|
|
|
+ asyncUtils.addNoticAndEmail(NoticeStatus.PUBLIC_CARBON_COPY.getCode(), my.getPublicCarbonCopy()
|
|
|
,str2);
|
|
,str2);
|
|
|
- asyncUtils.sendWeChat(my.getPublicCarbonCopy(),in.getId(),
|
|
|
|
|
|
|
+ asyncUtils.sendWeChat(my.getPublicCarbonCopy(), in.getId(),
|
|
|
my.getName(), startTime,
|
|
my.getName(), startTime,
|
|
|
endTime,
|
|
endTime,
|
|
|
typeName,
|
|
typeName,
|
|
|
in.getPlan());
|
|
in.getPlan());
|
|
|
}
|
|
}
|
|
|
- return (Map<String, Object>) addPublicReleaseLog(my, in,userNames,date,users,checkOrderNo);
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
private void addPublicExamine(Integer id, String aid) {
|
|
private void addPublicExamine(Integer id, String aid) {
|
|
|
Admin admin = adminMapper.selectByPrimaryKey(aid);
|
|
Admin admin = adminMapper.selectByPrimaryKey(aid);
|
|
|
addPublicExamine(id,admin);
|
|
addPublicExamine(id,admin);
|
|
@@ -838,8 +840,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
addpublicLog(id, status, remarks);
|
|
addpublicLog(id, status, remarks);
|
|
|
//如果是协单公出主公出,在审核通过
|
|
//如果是协单公出主公出,在审核通过
|
|
|
if (use.getAssist()==1){
|
|
if (use.getAssist()==1){
|
|
|
- int newStatus = pushPublicReleaseAssist(use, status, date, a);
|
|
|
|
|
- p.setStatus(newStatus);
|
|
|
|
|
|
|
+ pushPublicReleaseAssist(use, p, date, a);
|
|
|
|
|
+
|
|
|
}else if (use.getAssist()==0){
|
|
}else if (use.getAssist()==0){
|
|
|
publicReleaseMapper.updateStatusByMainId(3,use.getId(),null,null);
|
|
publicReleaseMapper.updateStatusByMainId(3,use.getId(),null,null);
|
|
|
}
|
|
}
|
|
@@ -996,6 +998,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
newPublic2.setId(mianUse.getId());
|
|
newPublic2.setId(mianUse.getId());
|
|
|
newPublic2.setStatus(2);
|
|
newPublic2.setStatus(2);
|
|
|
publicReleaseMapper.update(newPublic2);
|
|
publicReleaseMapper.update(newPublic2);
|
|
|
|
|
+ addpublicLog(mianUse.getId(), status, remarks);
|
|
|
}
|
|
}
|
|
|
sendNoticeAndSoucket(mianUse.getAid(),status,content.toString());
|
|
sendNoticeAndSoucket(mianUse.getAid(),status,content.toString());
|
|
|
return 1;
|
|
return 1;
|
|
@@ -1158,16 +1161,14 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
* @param date 时间
|
|
* @param date 时间
|
|
|
* @param a
|
|
* @param a
|
|
|
*/
|
|
*/
|
|
|
- private int pushPublicReleaseAssist(PublicRelease use,Integer status,Date date,Admin a) {
|
|
|
|
|
- int newStatus=0;
|
|
|
|
|
|
|
+ private void pushPublicReleaseAssist(PublicRelease use,PublicRelease update,Date date,Admin a) {
|
|
|
if (use.getAssistAid()!=null){
|
|
if (use.getAssistAid()!=null){
|
|
|
- newStatus=updatePushassist(use, status, date,a);
|
|
|
|
|
|
|
+ updatePushassist(use, update, date,a);
|
|
|
if(use.getAssistantAid()!=null){
|
|
if(use.getAssistantAid()!=null){
|
|
|
updatepushAssistant(use,a);
|
|
updatepushAssistant(use,a);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
- return newStatus;
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -1176,9 +1177,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
* @param status
|
|
* @param status
|
|
|
* @param date
|
|
* @param date
|
|
|
*/
|
|
*/
|
|
|
- private Integer updatePushassist(PublicRelease use, Integer status, Date date, Admin a) {
|
|
|
|
|
- //营销协单公出需要协单审核完成才能公出所以需返回最新状态
|
|
|
|
|
- int newStatus = status;
|
|
|
|
|
|
|
+ private void updatePushassist(PublicRelease use, PublicRelease updatePR, Date date, Admin a) {
|
|
|
|
|
+
|
|
|
//协单
|
|
//协单
|
|
|
List<PublicRelease> list = publicReleaseMapper.selectByMainId(use.getId(),3,null);
|
|
List<PublicRelease> list = publicReleaseMapper.selectByMainId(use.getId(),3,null);
|
|
|
String []ss= use.getAssistAid().split(",");
|
|
String []ss= use.getAssistAid().split(",");
|
|
@@ -1268,11 +1268,12 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
if(count==newList.size()){
|
|
if(count==newList.size()){
|
|
|
- newStatus = 2;
|
|
|
|
|
|
|
+ updatePR.setStatus(2);
|
|
|
|
|
+ updatePR.setAssistProcess(4);
|
|
|
}else {
|
|
}else {
|
|
|
- newStatus = 1;
|
|
|
|
|
|
|
+ updatePR.setStatus(1);
|
|
|
|
|
+ updatePR.setAssistProcess(2);
|
|
|
}
|
|
}
|
|
|
- return newStatus;
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -1514,7 +1515,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
OutPublicRelease out=publicReleaseMapper.selectDtails(id);
|
|
OutPublicRelease out=publicReleaseMapper.selectDtails(id);
|
|
|
List<PublicExamine> ps = publicExamineMapper.selectByPrid(out.getId());
|
|
List<PublicExamine> ps = publicExamineMapper.selectByPrid(out.getId());
|
|
|
out.setPeList(ps);
|
|
out.setPeList(ps);
|
|
|
-
|
|
|
|
|
List<AdminPublicReviewerBo> adminPublicReviewerBos=null;
|
|
List<AdminPublicReviewerBo> adminPublicReviewerBos=null;
|
|
|
if(out!=null){
|
|
if(out!=null){
|
|
|
//默认可以看
|
|
//默认可以看
|