|
@@ -249,11 +249,9 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
Map<String, Object>map=new HashMap<String, Object>();
|
|
Map<String, Object>map=new HashMap<String, Object>();
|
|
|
//无需订单负责人审核
|
|
//无需订单负责人审核
|
|
|
if (in.getTechStartProcess()==0){
|
|
if (in.getTechStartProcess()==0){
|
|
|
- //获取公出审核人
|
|
|
|
|
- if (my.getReviewer()==null){
|
|
|
|
|
- throw new BusinessException("请让管理员设置公出审核人。");
|
|
|
|
|
- }
|
|
|
|
|
- Admin a=adminMapper.selectByPrimaryKey(my.getReviewer());
|
|
|
|
|
|
|
+// Admin a=adminMapper.selectByPrimaryKey(my.getReviewer());
|
|
|
|
|
+ //订单审核换成多人
|
|
|
|
|
+ List<AdminPublicReviewerBo> adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(in.getAid());
|
|
|
String str="["+my.getName()+"]发起["+nickname+"]的外出申请,请及时审核。";
|
|
String str="["+my.getName()+"]发起["+nickname+"]的外出申请,请及时审核。";
|
|
|
//默认上级审核
|
|
//默认上级审核
|
|
|
AtomicReference<Integer> status= new AtomicReference<>(1);
|
|
AtomicReference<Integer> status= new AtomicReference<>(1);
|
|
@@ -301,7 +299,11 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
if (status.get()==1){
|
|
if (status.get()==1){
|
|
|
- pushNoticeAndSoucketAndEmail(my, in, date, a, str, map);
|
|
|
|
|
|
|
+ for (AdminPublicReviewerBo adminPublicReviewerBo : adminPublicReviewerBos) {
|
|
|
|
|
+ Admin admin = adminMapper.selectByPrimaryKey(adminPublicReviewerBo.getReviewerId());
|
|
|
|
|
+ pushNoticeAndSoucketAndEmail(my, in, date, admin, str, map);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
publicReleaseMapper.updateByPrimaryKeySelective(in);
|
|
publicReleaseMapper.updateByPrimaryKeySelective(in);
|
|
|
}else {
|
|
}else {
|
|
@@ -706,17 +708,22 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
List<PublicExamine> publicExamines = publicExamineMapper.selectByIds(ids);
|
|
List<PublicExamine> publicExamines = publicExamineMapper.selectByIds(ids);
|
|
|
for (OutPublicReleaseList e : list) {
|
|
for (OutPublicReleaseList e : list) {
|
|
|
if (e.getStatus()==1){
|
|
if (e.getStatus()==1){
|
|
|
|
|
+ List<AdminPublicReviewerBo> adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(e.getAid());
|
|
|
if (e.getType()==3){
|
|
if (e.getType()==3){
|
|
|
- List<AdminPublicReviewerBo> adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(e.getAid());
|
|
|
|
|
StringBuffer str =new StringBuffer();
|
|
StringBuffer str =new StringBuffer();
|
|
|
for (AdminPublicReviewerBo ap : adminPublicReviewerBos) {
|
|
for (AdminPublicReviewerBo ap : adminPublicReviewerBos) {
|
|
|
- if(ap.getType()==1)str=str.append(ap.getReviewerName()+" 未审核,");
|
|
|
|
|
|
|
+ if(ap.getType()==1)str=str.append(ap.getReviewerName()+",");
|
|
|
}
|
|
}
|
|
|
- e.setAdminExamine(str.substring(0,str.length()-1));
|
|
|
|
|
|
|
+ e.setAdminExamine(str.substring(0,str.length()-1)+" 未审核");
|
|
|
}else {
|
|
}else {
|
|
|
if (((e.getPublicType()==0||e.getPublicType()==2)
|
|
if (((e.getPublicType()==0||e.getPublicType()==2)
|
|
|
&&(e.getTechStartProcess()==0||e.getTechStartProcess()==2))){
|
|
&&(e.getTechStartProcess()==0||e.getTechStartProcess()==2))){
|
|
|
- e.setAdminExamine(e.getReviewerName()+" 未审核");
|
|
|
|
|
|
|
+ StringBuffer str =new StringBuffer();
|
|
|
|
|
+ for (AdminPublicReviewerBo ap : adminPublicReviewerBos) {
|
|
|
|
|
+ if(ap.getType()==0)str=str.append(ap.getReviewerName()+",");
|
|
|
|
|
+ }
|
|
|
|
|
+ e.setAdminExamine(str.substring(0,str.length()-1)+" 未审核");
|
|
|
|
|
+
|
|
|
}else {
|
|
}else {
|
|
|
e.setAdminExamine(e.getUserAdminName()+" 未审核");
|
|
e.setAdminExamine(e.getUserAdminName()+" 未审核");
|
|
|
}
|
|
}
|
|
@@ -958,6 +965,15 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
return i;
|
|
return i;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ @Override
|
|
|
|
|
+ public boolean checkPublicReviewer(InputPublicRelease in) {
|
|
|
|
|
+ List<AdminPublicReviewerBo> adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(TokenManager.getAdminId());
|
|
|
|
|
+ if (adminPublicReviewerBos.isEmpty()){
|
|
|
|
|
+ return true;
|
|
|
|
|
+ }
|
|
|
|
|
+ return false;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
private void updateAdminUserCountPublicRelease(String aid, Date transferTime) {
|
|
private void updateAdminUserCountPublicRelease(String aid, Date transferTime) {
|
|
|
String startTime= DateUtils.formatDate(transferTime,AFTConstants.YYYYMMDD);
|
|
String startTime= DateUtils.formatDate(transferTime,AFTConstants.YYYYMMDD);
|
|
|
String endTime=startTime+" 23:59:59";
|
|
String endTime=startTime+" 23:59:59";
|