|
|
@@ -125,6 +125,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
// in.setAssistAidName(getAssistAidName(in.getAssistAid()));
|
|
|
in.setMainName(my.getName());
|
|
|
in.setAssistProcess(1);
|
|
|
+
|
|
|
}
|
|
|
if (in.getType() == 1) {
|
|
|
//技术公出
|
|
|
@@ -136,6 +137,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
in.setTechStartProcess(1);
|
|
|
}
|
|
|
}
|
|
|
+ in.setProcessStatus(1);
|
|
|
publicReleaseMapper.insertSelective(in);
|
|
|
if (in.getType()==1&&in.getOrderNo()!=null){
|
|
|
TOrderNew tOrderNew = tOrderNewMapper.queryById(in.getOrderNo());
|
|
|
@@ -153,10 +155,32 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
updateName.setUserNames(userNames);
|
|
|
publicReleaseMapper.update(updateName);
|
|
|
addpublicLog(in.getId(), PublicReleaseLog.states.fq.getCode(), "发起外出申请");
|
|
|
+ //公出信息抄送
|
|
|
pushPublicCarbonCopy(in, my, userNames);
|
|
|
+ //协单抄送
|
|
|
+ if (in.getAssist()==1){
|
|
|
+ pushPublicAssistCarbonCopy(in, my, userNames);
|
|
|
+
|
|
|
+ }
|
|
|
return (Map<String, Object>) addPublicReleaseLog(my, in,userNames,date,users,checkOrderNo);
|
|
|
}
|
|
|
|
|
|
+ private void pushPublicAssistCarbonCopy(InputPublicRelease in, AdminListBo my, String userNames) {
|
|
|
+ String[] split = in.getAssistAid().split(",");
|
|
|
+ for (String aid2 : split) {
|
|
|
+ AdminListBo my2 = adminMapper.getDeptNameByAid(aid2);
|
|
|
+ PublicRelease p=new PublicRelease();
|
|
|
+ p.setId(in.getId());
|
|
|
+ p.setAid(aid2);
|
|
|
+ p.setReleaseStart(in.getReleaseStart());
|
|
|
+ p.setReleaseEnd(in.getReleaseEnd());
|
|
|
+ p.setPlan(in.getPlan());
|
|
|
+ p.setType(3);
|
|
|
+ pushPublicCarbonCopy(p, my2, userNames);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
private void pushUserArchivesInterview(InputPublicRelease in) {
|
|
|
if (in.getUids()!=null){
|
|
|
String[] split1 = in.getUais().split(",");
|
|
|
@@ -252,36 +276,52 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
publicReleaseDetailsMapper.insertBatch(prdList);
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- private void pushPublicCarbonCopy(InputPublicRelease in, AdminListBo my, String userNames) {
|
|
|
+ private void pushPublicCarbonCopy(PublicRelease p, AdminListBo my, String userNames) {
|
|
|
List<AdminPublicReviewerBo> adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(my.getId())
|
|
|
.stream().filter(e -> e.getType() == 3).collect(Collectors.toList());
|
|
|
if (adminPublicReviewerBos.size()>0){
|
|
|
for (AdminPublicReviewerBo e : adminPublicReviewerBos) {
|
|
|
+ //公出信息
|
|
|
if (StringUtils.isNotEmpty(e.getReviewerId())){
|
|
|
- String startTime = DateUtils.formatDateChineseYYYYMMddHH(in.getReleaseStart());
|
|
|
- String endTime = DateUtils.formatDateChineseYYYYMMddHH(in.getReleaseEnd());
|
|
|
+ String startTime = DateUtils.formatDateChineseYYYYMMddHH(p.getReleaseStart());
|
|
|
+ String endTime = DateUtils.formatDateChineseYYYYMMddHH(p.getReleaseEnd());
|
|
|
//分类 0业务 1技术 2行政 3 技术协单 4 技术助手
|
|
|
String typeName=null;
|
|
|
- if(in.getType()==0)typeName="业务公出";
|
|
|
- else if(in.getType()==1)typeName="技术公出";
|
|
|
- else if(in.getType()==2)typeName="行政公出";
|
|
|
- String str2=String.format("营销员%s,%s - %s,将公出%s,请知悉!", my.getName(),
|
|
|
+ if(p.getType()==0)typeName="业务公出";
|
|
|
+ else if(p.getType()==1)typeName="技术公出";
|
|
|
+ else if(p.getType()==2)typeName="行政公出";
|
|
|
+ else if(p.getType()==3)typeName="技术协单";
|
|
|
+ String str=String.format("%s,%s - %s,将公出%s,请知悉!", my.getName(),
|
|
|
startTime,
|
|
|
endTime,
|
|
|
userNames);
|
|
|
+ String str2=String.format("协单%s,请知悉!",
|
|
|
+ userNames);
|
|
|
asyncUtils.addNoticAndEmail(NoticeStatus.PUBLIC_CARBON_COPY.getCode(), e.getReviewerId()
|
|
|
- ,str2);
|
|
|
- asyncUtils.sendCarbonCopyWeChat(e.getReviewerId(), in.getId(),
|
|
|
+ ,str);
|
|
|
+ asyncUtils.sendCarbonCopyWeChat(e.getReviewerId(), p.getId(),
|
|
|
my.getName(), startTime,
|
|
|
endTime,
|
|
|
typeName,
|
|
|
- in.getPlan());
|
|
|
+ str2);
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|
|
|
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ private void pushPublicCarbonCopy(InputPublicRelease in, AdminListBo my, String userNames) {
|
|
|
+ PublicRelease p=new PublicRelease();
|
|
|
+ p.setId(in.getId());
|
|
|
+ p.setAid(in.getAid());
|
|
|
+ p.setReleaseStart(in.getReleaseStart());
|
|
|
+ p.setReleaseEnd(in.getReleaseEnd());
|
|
|
+ p.setPlan(in.getPlan());
|
|
|
+ p.setType(in.getType());
|
|
|
+ pushPublicCarbonCopy(p, my, userNames);
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -334,6 +374,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
// Admin a=adminMapper.selectById(my.getReviewer());
|
|
|
//订单审核换成多人
|
|
|
List<AdminPublicReviewerBo> adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(in.getAid());
|
|
|
+ adminPublicReviewerBos=adminPublicReviewerBos.stream().filter(e -> e.getType() == 0).collect(Collectors.toList());
|
|
|
String str="["+my.getName()+"]发起["+nickname+"]的外出申请,请及时审核。";
|
|
|
//默认上级审核
|
|
|
AtomicReference<Integer> status= new AtomicReference<>(1);
|
|
|
@@ -442,8 +483,15 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
* @param map 返回实体
|
|
|
*/
|
|
|
private void pushNoticeAndSoucketAndEmail(AdminListBo my, PublicRelease in, Date date, Admin a, String str, Map<String, Object> map) {
|
|
|
+ System.out.println("================================="+1);
|
|
|
sendNoticeAndSoucket(a.getId(),1, str);
|
|
|
if (a.getOpenId() !=null) {
|
|
|
+ //间隔一秒发送
|
|
|
+ try {
|
|
|
+ Thread.sleep(1000);
|
|
|
+ } catch (InterruptedException e) {
|
|
|
+ Thread.currentThread().interrupt();
|
|
|
+ }
|
|
|
Integer res= weChatUtils.addNotice(a.getOpenId(), in.getStatus(), in.getId(), date, my.getName(),"["+ my.getName()+"]发起外出申请");
|
|
|
if (res!=0) {
|
|
|
sendEmail(my, a,1);
|
|
|
@@ -600,6 +648,8 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
addPublicReleaseDateClock(in);
|
|
|
publicReleaseLogMapper.insertSelective(log);
|
|
|
+ //设置回不需要审核,理论上按流程变更
|
|
|
+ in.setProcessStatus(0);
|
|
|
publicReleaseMapper.update(in);
|
|
|
if (in.getOrderNo()!=null){
|
|
|
TOrderNew tOrderNew = tOrderNewMapper.queryById(in.getOrderNo());
|
|
|
@@ -685,6 +735,21 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
// }
|
|
|
AdminListBo my = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
|
|
|
pushPublicCarbonCopy( in, my, userNames);
|
|
|
+ if (in.getAssist()==1){
|
|
|
+ String[] split2 = in.getAssistAid().split(",");
|
|
|
+ for (String aid2 : split2) {
|
|
|
+ AdminListBo my2 = adminMapper.getDeptNameByAid(aid2);
|
|
|
+ PublicRelease p=new PublicRelease();
|
|
|
+ p.setId(in.getId());
|
|
|
+ p.setAid(aid2);
|
|
|
+ p.setReleaseStart(in.getReleaseStart());
|
|
|
+ p.setReleaseEnd(in.getReleaseEnd());
|
|
|
+ p.setPlan(in.getPlan());
|
|
|
+ p.setType(3);
|
|
|
+ pushPublicCarbonCopy(p, my2, userNames);
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
//重新发起
|
|
|
addPublicReleaseLog(my, in, in.getUserNames(), date, uses, checkOrderNo);
|
|
|
}
|
|
|
@@ -932,10 +997,16 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
){
|
|
|
StringBuffer str =new StringBuffer();
|
|
|
adminPublicReviewerBos= adminPublicReviewerMapper.selectByAid(e.getAid());
|
|
|
- for (AdminPublicReviewerBo ap : adminPublicReviewerBos) {
|
|
|
- if(ap.getType()==0)str=str.append(ap.getReviewerName()+",");
|
|
|
+ if (e.getProcessStatus()==0||e.getProcessStatus()==1){
|
|
|
+ for (AdminPublicReviewerBo ap : adminPublicReviewerBos) {
|
|
|
+ if(ap.getType()==0)str=str.append(ap.getReviewerName()+",");
|
|
|
+ }
|
|
|
+ }else if (e.getProcessStatus()==2){
|
|
|
+ for (AdminPublicReviewerBo ap : adminPublicReviewerBos) {
|
|
|
+ if(ap.getType()==4)str=str.append(ap.getReviewerName()+",");
|
|
|
+ }
|
|
|
}
|
|
|
- e.setAdminExamine(str.substring(0,str.length()-1)+" 未审核");
|
|
|
+ if (str.length()>1)e.setAdminExamine(str.substring(0,str.length()-1)+" 未审核");
|
|
|
}else if (e.getType()==0&&e.getAssistProcess()==2){
|
|
|
//获取技术协单
|
|
|
List<PublicRelease> publicReleases = publicReleaseMapper.selectByMainId(e.getId(), null, null);
|
|
|
@@ -959,16 +1030,19 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
e.setAdminExamine("");
|
|
|
}else {
|
|
|
if (!publicExamines.isEmpty()){
|
|
|
- StringBuffer str =new StringBuffer();
|
|
|
- for (PublicExamine pe : publicExamines) {
|
|
|
- if (e.getId().equals(pe.getPrid())){
|
|
|
- str=str.append(pe.getAname());
|
|
|
- if (pe.getStatus()==0)str=str.append(" 未审核,");
|
|
|
- if (pe.getStatus()==1)str=str.append(" 已审核,");
|
|
|
+ if (e.getStatus()==2){
|
|
|
+ e.setAdminExamine("");
|
|
|
+ }else{
|
|
|
+ StringBuffer str =new StringBuffer();
|
|
|
+ for (PublicExamine pe : publicExamines) {
|
|
|
+ if (e.getId().equals(pe.getPrid())){
|
|
|
+ str=str.append(pe.getAname());
|
|
|
+ if (pe.getStatus()==0)str=str.append(" 未审核,");
|
|
|
+ if (pe.getStatus()==1)str=str.append(" 已审核,");
|
|
|
+ }
|
|
|
+ if (str.length()>1) e.setAdminExamine(str.substring(0,str.length()-1));
|
|
|
}
|
|
|
- if (str.length()>1) e.setAdminExamine(str.substring(0,str.length()-1));
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
}
|
|
|
if(e.getType()==3){
|
|
|
@@ -1000,7 +1074,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
* @param id
|
|
|
* @param status 状态 0驳回 1发起 2同意 3 撤销 4技术驳回
|
|
|
* @param remarks
|
|
|
- * @param examineType 0上级审核 1营销员审核 2技术审核
|
|
|
+ * @param examineType 0上级审核 1营销员审核 2技术审核 3二级审核
|
|
|
* @param evaluateType 0不存指导意见 1存指导意见
|
|
|
* @return
|
|
|
*/
|
|
|
@@ -1031,44 +1105,76 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
//上级审核
|
|
|
if(examineType==0){
|
|
|
p.setStatus(status);
|
|
|
- if (status==0){
|
|
|
- addpublicLog(id, status, remarks);
|
|
|
- str=str.append("驳回,");
|
|
|
- if (use.getAssist()==2){
|
|
|
- content=content.append("技术协单被[").append(ad.getName()).append("]拒绝!");
|
|
|
- }else {
|
|
|
- content=content.append("未通过公出审核!");
|
|
|
- }
|
|
|
- if(use.getPublicType()>1){
|
|
|
- p.setPublicType(1);
|
|
|
- PublicExamine inpe=new PublicExamine();
|
|
|
- inpe.setStatus(0);
|
|
|
- inpe.setPrid(use.getId());
|
|
|
- publicExamineMapper.updateStatusByPrid(inpe);
|
|
|
- }
|
|
|
- }else if(status==2){
|
|
|
- str=str.append("同意,");
|
|
|
- addpublicLog(id, status, remarks);
|
|
|
- //如果是协单公出主公出,在审核通过
|
|
|
- if (use.getAssist()==1){
|
|
|
- pushPublicReleaseAssist(use, p, date, a);
|
|
|
-
|
|
|
- }else if (use.getAssist()==0){
|
|
|
- publicReleaseMapper.updateStatusByMainId(3,use.getId(),null,null);
|
|
|
- }
|
|
|
- content=content.append("已通过审核!");
|
|
|
- }
|
|
|
- str=str.append(remarks);
|
|
|
- p.setAuditInfo(str.toString());
|
|
|
- p.setAuditTime(date);
|
|
|
- p.setRejectName(ad.getName());
|
|
|
- sendNoticeAndSoucket(a.getId(),status,content.toString());
|
|
|
- List<OutPublicReleaseDetails> outPublicReleaseDetails = publicReleaseDetailsMapper.selectByPrid(id);
|
|
|
- //添加上级评价
|
|
|
- if (evaluateType==1){
|
|
|
- addUserSuperEvaluate(remarks, outPublicReleaseDetails, date);
|
|
|
- }
|
|
|
-
|
|
|
+ if (status==0){
|
|
|
+ addpublicLog(id, status, remarks);
|
|
|
+ str=str.append("驳回,");
|
|
|
+ if (use.getAssist()==2){
|
|
|
+ content=content.append("技术协单被[").append(ad.getName()).append("]拒绝!");
|
|
|
+ }else {
|
|
|
+ content=content.append("未通过公出审核!");
|
|
|
+ }
|
|
|
+ if(use.getPublicType()>1){
|
|
|
+ p.setPublicType(1);
|
|
|
+ PublicExamine inpe=new PublicExamine();
|
|
|
+ inpe.setStatus(0);
|
|
|
+ inpe.setPrid(use.getId());
|
|
|
+ publicExamineMapper.updateStatusByPrid(inpe);
|
|
|
+ }
|
|
|
+ }else if(status==2){//同意区分是1级审核还是二级审核
|
|
|
+ str=str.append("同意,");
|
|
|
+ addpublicLog(id, status, remarks);
|
|
|
+ content=content.append("已通过审核!");
|
|
|
+ //新增二级审核
|
|
|
+ List<AdminPublicReviewerBo> adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(use.getAid());
|
|
|
+ adminPublicReviewerBos=adminPublicReviewerBos.stream().filter(e -> e.getType() == 4).collect(Collectors.toList());
|
|
|
+ if (adminPublicReviewerBos.isEmpty()){
|
|
|
+ p.setStatus(2);
|
|
|
+ p.setProcessStatus(3);
|
|
|
+ //如果是协单公出主公出,在审核通过
|
|
|
+ if (use.getAssist()==1){
|
|
|
+ pushPublicReleaseAssist(use, p, date, a);
|
|
|
+ }else if (use.getAssist()==0){
|
|
|
+ publicReleaseMapper.updateStatusByMainId(3,use.getId(),null,null);
|
|
|
+ }
|
|
|
+ addpublicLog(id, status, "无需二级审核直接通过");
|
|
|
+ }else {
|
|
|
+ if(use.getProcessStatus()==0||use.getProcessStatus()==1){
|
|
|
+ p.setStatus(1);
|
|
|
+ p.setProcessStatus(2);
|
|
|
+ str=str.append(remarks);
|
|
|
+ p.setAuditInfo(str.toString());
|
|
|
+ p.setAuditTime(date);
|
|
|
+ p.setRejectName(ad.getName());
|
|
|
+ for (AdminPublicReviewerBo e : adminPublicReviewerBos) {
|
|
|
+ sendNoticeAndSoucket(e.getReviewerId(),status,content.toString());
|
|
|
+ }
|
|
|
+ }else if (use.getProcessStatus()==2){
|
|
|
+ p.setStatus(2);
|
|
|
+ p.setProcessStatus(3);
|
|
|
+ //如果是协单公出主公出,在审核通过
|
|
|
+ if (use.getAssist()==1){
|
|
|
+ pushPublicReleaseAssist(use, p, date, a);
|
|
|
+ }else if (use.getAssist()==0){
|
|
|
+ publicReleaseMapper.updateStatusByMainId(3,use.getId(),null,null);
|
|
|
+ }
|
|
|
+ str=str.append(remarks);
|
|
|
+ p.setAuditInfo(str.toString());
|
|
|
+ p.setAuditTime(date);
|
|
|
+ p.setRejectName(ad.getName());
|
|
|
+ sendNoticeAndSoucket(a.getId(),status,content.toString());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ str=str.append(remarks);
|
|
|
+ p.setAuditInfo(str.toString());
|
|
|
+ p.setAuditTime(date);
|
|
|
+ p.setRejectName(ad.getName());
|
|
|
+ sendNoticeAndSoucket(a.getId(),status,content.toString());
|
|
|
+ List<OutPublicReleaseDetails> outPublicReleaseDetails = publicReleaseDetailsMapper.selectByPrid(id);
|
|
|
+ //添加上级评价
|
|
|
+ if (use.getProcessStatus()==1&&evaluateType==1){
|
|
|
+ addUserSuperEvaluate(remarks, outPublicReleaseDetails, date);
|
|
|
+ }
|
|
|
//营销员审核
|
|
|
}else if (examineType==1){
|
|
|
//通知公出人切换成公出人审核人
|
|
|
@@ -1116,6 +1222,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
sendNoticeAndSoucket(a.getId(),status,content.toString());
|
|
|
}
|
|
|
}else if (examineType==2){
|
|
|
+ //技术审核
|
|
|
if (status==2){//审核通过
|
|
|
str=str.append("同意公出我的企业,").append(remarks);
|
|
|
content=content.append("已通过审核,请尽快审核。");
|
|
|
@@ -1904,8 +2011,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
){
|
|
|
StringBuffer str =new StringBuffer();
|
|
|
adminPublicReviewerBos= adminPublicReviewerMapper.selectByAid(e.getAid());
|
|
|
+
|
|
|
for (AdminPublicReviewerBo ap : adminPublicReviewerBos) {
|
|
|
- if(ap.getType()==0)str=str.append(ap.getReviewerName()+",");
|
|
|
+ if((e.getProcessStatus()==0||e.getProcessStatus()==1)&&ap.getType()==0)str=str.append(ap.getReviewerName()+",");
|
|
|
+ if((e.getProcessStatus()==2)&&ap.getType()==4)str=str.append(ap.getReviewerName()+",");
|
|
|
}
|
|
|
if(str.length()>1){
|
|
|
outPublicReleaseLog.setAname(str.substring(0,str.length()-1));
|
|
|
@@ -1971,6 +2080,9 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
if (prd.getUid().equals(uid)){
|
|
|
String aid = TokenManager.getAdminId();
|
|
|
pc.setPrdid(prd.getId());
|
|
|
+ pc.setLatitude(prd.getLatitude());
|
|
|
+ pc.setLongitude(prd.getLongitude());
|
|
|
+ pc.setDistrictName(prd.getDistrictName());
|
|
|
prd.setClockInRemarks(clockInRemarks);
|
|
|
prd.setPhotoUrl(photoUrl);
|
|
|
prd.setClockInTime(date);
|
|
|
@@ -2091,18 +2203,32 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
if (adminPublicReviewerBos==null)adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(out.getAid());
|
|
|
//判定是否是上级审核人
|
|
|
boolean myFlag = false;
|
|
|
+ List<AdminPublicReviewerBo> collect = new ArrayList<>();
|
|
|
+ if (out.getProcessStatus()==0||out.getProcessStatus()==1){
|
|
|
+ collect = adminPublicReviewerBos.stream().filter(e -> e.getType() == 0).collect(Collectors.toList());
|
|
|
+ }else if (out.getProcessStatus()==2){
|
|
|
+ collect = adminPublicReviewerBos.stream().filter(e -> e.getType() == 4).collect(Collectors.toList());
|
|
|
+ //逻辑未完成先搁置
|
|
|
+ }
|
|
|
//如果是审核人可以查看
|
|
|
- List<AdminPublicReviewerBo> collect = adminPublicReviewerBos.stream().filter(e -> e.getType() == 0).collect(Collectors.toList());
|
|
|
- for (AdminPublicReviewerBo e : collect) {
|
|
|
- if (e.getReviewerId().equals(aid)){
|
|
|
- flag=true;
|
|
|
- if (out.getType()==0){
|
|
|
- flag2=true;
|
|
|
- }
|
|
|
- myFlag=true;
|
|
|
- break;
|
|
|
+ for (AdminPublicReviewerBo e : collect) {
|
|
|
+ if (e.getReviewerId().equals(aid)){
|
|
|
+ flag=true;
|
|
|
+ if (out.getType()==0){
|
|
|
+ flag2=true;
|
|
|
}
|
|
|
+ myFlag=true;
|
|
|
+ break;
|
|
|
}
|
|
|
+ }
|
|
|
+ //新增所有审核人就是查看权限
|
|
|
+ for (AdminPublicReviewerBo e : adminPublicReviewerBos) {
|
|
|
+ if ((e.getType()==0||e.getType()==4)
|
|
|
+ &&aid.equals(e.getReviewerId())){
|
|
|
+ flag=true;
|
|
|
+ flag2=true;
|
|
|
+ }
|
|
|
+ }
|
|
|
//判定是否是上级审核状态
|
|
|
if((out.getPublicType()==0|| out.getPublicType()==2)&&
|
|
|
(out.getTechStartProcess()==0|| out.getTechStartProcess()==2)&&
|
|
|
@@ -2275,10 +2401,18 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
// }
|
|
|
} else {
|
|
|
//业务公出,且协单审核完成?
|
|
|
- List<AdminPublicReviewerBo> collect = adminPublicReviewerBos.stream().filter(e -> e.getType() == 0).collect(Collectors.toList());
|
|
|
+ List<AdminPublicReviewerBo> collect=new ArrayList<>();
|
|
|
+ if (out.getProcessStatus()==0||out.getProcessStatus()==1){
|
|
|
+ collect = adminPublicReviewerBos.stream().filter(e -> e.getType() == 0).collect(Collectors.toList());
|
|
|
+ }else {
|
|
|
+ collect = adminPublicReviewerBos.stream().filter(e -> e.getType() == 4).collect(Collectors.toList());
|
|
|
+ }
|
|
|
for (AdminPublicReviewerBo e : collect) {
|
|
|
str.append(e.getReviewerName()+",");
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
|
|
|
|