|
|
@@ -40,27 +40,46 @@ public class LegalAffairsServiceImpl extends BaseMybatisDao<TOrderMidMapper> imp
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public Object orderList(InputOrderListBo in) {
|
|
|
- HashMap<String, Object> map = new HashMap<>();
|
|
|
- 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.getDepId()!=null)map.put("depId",in.getDepId());
|
|
|
- if(in.getUserName()!=null)map.put("user",in.getUserName());
|
|
|
- Pagination<OutOrderLegalAffairsListBo> p= (Pagination<OutOrderLegalAffairsListBo>) findPage("legalAffairsOrderList","legalAffairsOrderCount",map,in.getPageNo(),in.getPageSize());
|
|
|
+ public Object orderListPage(InputOrderListBo in) {
|
|
|
+ HashMap<String, Object> params = new HashMap<>();
|
|
|
+ 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);
|
|
|
+ return p;
|
|
|
+ }
|
|
|
+
|
|
|
+ private void addParams(InputOrderListBo in, HashMap<String, Object> map) {
|
|
|
+ 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.getDepId()!=null) map.put("depId", in.getDepId());
|
|
|
+ if(in.getUserName()!=null) map.put("user", in.getUserName());
|
|
|
+ if(in.getStartTime()!=null)map.put("startTime", in.getStartTime());
|
|
|
+ if(in.getEndTime()!=null)map.put("endTime", in.getEndTime()+" 23:59:59");
|
|
|
+ }
|
|
|
+
|
|
|
+ private void sumDaysRemaining(List<OutOrderLegalAffairsListBo> list) {
|
|
|
Date date = new Date();
|
|
|
for (OutOrderLegalAffairsListBo out : list) {
|
|
|
- long start=out.getDunStartTime().getTime()+AFTConstants.DUN_START_LIMIT_MS;
|
|
|
- int i= (int) ((start-date.getTime())/(3600*24*1000));
|
|
|
- out.setDaysRemaining(i);
|
|
|
+ if (out.getLegalAffairs()==0){
|
|
|
+ long start=out.getDunStartTime().getTime()+AFTConstants.DUN_START_LIMIT_MS;
|
|
|
+ int i= (int) ((start-date.getTime())/(3600*24*1000));
|
|
|
+ out.setDaysRemaining(i);
|
|
|
+ }else {
|
|
|
+ out.setDaysRemaining(0);
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
- return p;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public List<OutOrderLegalAffairsListBo> getLegalAffairsOrder() {
|
|
|
- return (List<OutOrderLegalAffairsListBo>) findList("legalAffairsOrderList",new HashMap<>(),1,999999);
|
|
|
+ public List<OutOrderLegalAffairsListBo> getLegalAffairsOrder(InputOrderListBo in) {
|
|
|
+ HashMap<String, Object> params = new HashMap<>();
|
|
|
+ addParams(in, params);
|
|
|
+ List<OutOrderLegalAffairsListBo> list =(List<OutOrderLegalAffairsListBo>) findList("legalAffairsOrderList",params,1,999999);
|
|
|
+ sumDaysRemaining(list);
|
|
|
+ return list;
|
|
|
}
|
|
|
|
|
|
@Override
|