|
|
@@ -748,9 +748,10 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
public Pagination<OutPublicReleaseList> listPublicRelease(InputPublicReleaseList in) {
|
|
|
Map<String,Object> map =new HashMap<String, Object>();
|
|
|
map.put("type", in.getType()==null?0:in.getType());
|
|
|
- //先修改他人公出做测试
|
|
|
+
|
|
|
+ OutPublicConfig config=null;
|
|
|
if (in.getType()==7){
|
|
|
- PublicConfig config=publicConfigMapper.queryById(1);
|
|
|
+ config=publicConfigMapper.selectDetails();
|
|
|
String aid=TokenManager.getAdminId();
|
|
|
int configType=9;
|
|
|
if (aid.equals(config.getTechAuditor())){
|
|
|
@@ -778,11 +779,30 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
map.put("assist",in.getAssist()==null?0:in.getAssist());
|
|
|
Pagination<OutPublicReleaseList> p=(Pagination<OutPublicReleaseList>) findPage("listPublicRelease", "countPublicRelease", map, in.getPageNo(), in.getPageSize());
|
|
|
//处理审核人
|
|
|
- pushExamines(p);
|
|
|
-
|
|
|
+ if (in.getType()==7){
|
|
|
+ pushMaxExamines(p,config);
|
|
|
+ }else {
|
|
|
+ pushExamines(p);
|
|
|
+ }
|
|
|
return p;
|
|
|
}
|
|
|
|
|
|
+ private void pushMaxExamines(Pagination<OutPublicReleaseList> p,OutPublicConfig config) {
|
|
|
+ List<OutPublicReleaseList> list = (List<OutPublicReleaseList>) p.getList();
|
|
|
+ if (config==null)config=config=publicConfigMapper.selectDetails();
|
|
|
+ for (OutPublicReleaseList e : list) {
|
|
|
+ if (e.getOrderNo()!=null){
|
|
|
+ if (e.getMaxProcess()==1){
|
|
|
+ e.setAdminExamine(config.getTechAuditorName());
|
|
|
+ }else if (e.getMaxProcess()==2){
|
|
|
+ e.setAdminExamine(config.getFinanceAuditorName());
|
|
|
+ }else if (e.getMaxProcess()==3){
|
|
|
+ e.setAdminExamine(config.getOtherAuditorName());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
private void pushExamines(Pagination<OutPublicReleaseList> p) {
|
|
|
List<OutPublicReleaseList> list = (List<OutPublicReleaseList>) p.getList();
|
|
|
if (!list.isEmpty()){
|