|
|
@@ -1098,6 +1098,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
e.setAdminExamine(config.getOtherAuditorName());
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -1108,6 +1109,11 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
list.forEach(e ->{ ids.add(e.getId()); });
|
|
|
List<PublicExamine> publicExamines = publicExamineMapper.selectByIds(ids);
|
|
|
for (OutPublicReleaseList e : list) {
|
|
|
+ if (e.getType()>4){
|
|
|
+ //开始时间和结束时间删除时分秒
|
|
|
+ e.setReleaseStarts(e.getReleaseStarts().substring(0,10));
|
|
|
+ e.setReleaseEnds(e.getReleaseEnds().substring(0,10));
|
|
|
+ }
|
|
|
if (e.getStatus()==1){
|
|
|
List<AdminPublicReviewerBo> adminPublicReviewerBos=null;
|
|
|
if (e.getType()==3){
|
|
|
@@ -2573,6 +2579,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}else {
|
|
|
out.setPermission(1);
|
|
|
}
|
|
|
+ if (out.getType()>4){
|
|
|
+ out.setReleaseStarts(out.getReleaseStarts().substring(0,10));
|
|
|
+ out.setReleaseEnds(out.getReleaseEnds().substring(0,10));
|
|
|
+ }
|
|
|
}else {
|
|
|
out=null;
|
|
|
return out;
|
|
|
@@ -2987,7 +2997,11 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
out.setPublicAssistAdvice(publicAssistAdvices.size());
|
|
|
|
|
|
}
|
|
|
-
|
|
|
+ if (out.getType()>4){
|
|
|
+ //开始时间与结束时间显示去掉时分秒
|
|
|
+ out.setReleaseStarts(out.getReleaseStarts().substring(0,10));
|
|
|
+ out.setReleaseEnds(out.getReleaseEnds().substring(0,10));
|
|
|
+ }
|
|
|
return out;
|
|
|
// List<OutPublicReleaseList> myPublic = getMyPublic(0,1);
|
|
|
// if (myPublic.isEmpty()){
|