|
|
@@ -46,7 +46,9 @@ public class LegalAffairsServiceImpl extends BaseMybatisDao<TOrderMidMapper> imp
|
|
|
addParams(in, params);
|
|
|
Pagination<OutOrderLegalAffairsListBo> p= (Pagination<OutOrderLegalAffairsListBo>) findPage("legalAffairsOrderList","legalAffairsOrderCount",params,in.getPageNo(),in.getPageSize());
|
|
|
List<OutOrderLegalAffairsListBo> list = (List<OutOrderLegalAffairsListBo>) p.getList();
|
|
|
- sumDaysRemaining(list);
|
|
|
+ if(in.getType()==0){
|
|
|
+ sumDaysRemaining(list);
|
|
|
+ }
|
|
|
return p;
|
|
|
}
|
|
|
|
|
|
@@ -54,10 +56,12 @@ public class LegalAffairsServiceImpl extends BaseMybatisDao<TOrderMidMapper> imp
|
|
|
if(in.getContractNo()!=null) map.put("contractNo", in.getContractNo());
|
|
|
if(in.getLegalAffairs()!=null) map.put("legalAffairs", in.getLegalAffairs());
|
|
|
if(in.getAid()!=null) map.put("aid", in.getAid());
|
|
|
- if(in.getType()!=null){
|
|
|
+ if(in.getType()==0){
|
|
|
+ map.put("aid", TokenManager.getAdminId());
|
|
|
+ map.put("type", in.getType());
|
|
|
+ }else{
|
|
|
+ if(in.getAid()!=null) map.put("aid", in.getAid());
|
|
|
map.put("type", in.getType());
|
|
|
- }else {
|
|
|
- map.put("type", 0);
|
|
|
}
|
|
|
if(in.getDepId()!=null) map.put("depId", in.getDepId());
|
|
|
if(in.getUserName()!=null) map.put("user", in.getUserName());
|
|
|
@@ -84,7 +88,9 @@ public class LegalAffairsServiceImpl extends BaseMybatisDao<TOrderMidMapper> imp
|
|
|
HashMap<String, Object> params = new HashMap<>();
|
|
|
addParams(in, params);
|
|
|
List<OutOrderLegalAffairsListBo> list =(List<OutOrderLegalAffairsListBo>) findList("legalAffairsOrderList",params,1,999999);
|
|
|
- sumDaysRemaining(list);
|
|
|
+ if(in.getType()==0){
|
|
|
+ sumDaysRemaining(list);
|
|
|
+ }
|
|
|
return list;
|
|
|
}
|
|
|
|