|
|
@@ -41,12 +41,17 @@ public class LegalAffairsServiceImpl extends BaseMybatisDao<TOrderMidMapper> imp
|
|
|
|
|
|
|
|
|
@Override
|
|
|
- public int pushTransferLagalAffairs(String orderNo){
|
|
|
+ public int pushTransferLagalAffairs(String orderNo,String remarks){
|
|
|
TOrderMid tm = new TOrderMid();
|
|
|
tm.setOrderNo(orderNo);
|
|
|
tm.setLegalAffairs(1);
|
|
|
tm.setLegalAffairsType(0);
|
|
|
tm.setLegalAffairsStatus(0);
|
|
|
+ InputOrderLegalAffairs in=new InputOrderLegalAffairs();
|
|
|
+ in.setOrderNo(orderNo);
|
|
|
+ in.setRemarks(remarks);
|
|
|
+ in.setType(4);
|
|
|
+ addLagalAffairsLog(in);
|
|
|
return tOrderMidMapper.updateByOrderNo(tm);
|
|
|
}
|
|
|
|
|
|
@@ -111,11 +116,9 @@ public class LegalAffairsServiceImpl extends BaseMybatisDao<TOrderMidMapper> imp
|
|
|
@Override
|
|
|
public List<OutOrderLegalAffairsListBo> getLegalAffairsOrder(InputOrderListBo in) {
|
|
|
HashMap<String, Object> params = new HashMap<>();
|
|
|
- addParams(in, params);
|
|
|
+ params.put("type",0);
|
|
|
+ params.put("legalAffairs",0);
|
|
|
List<OutOrderLegalAffairsListBo> list =(List<OutOrderLegalAffairsListBo>) findList("legalAffairsOrderList",params,1,999999);
|
|
|
- if(in.getType()==0){
|
|
|
- sumDaysRemaining(list);
|
|
|
- }
|
|
|
return list;
|
|
|
}
|
|
|
|
|
|
@@ -157,7 +160,7 @@ public class LegalAffairsServiceImpl extends BaseMybatisDao<TOrderMidMapper> imp
|
|
|
la.setStatus(in.getStatus());
|
|
|
la.setAttachmentUrl(in.getAttachmentUrl());
|
|
|
la.setAid(TokenManager.getAdminId());
|
|
|
- la.setOperationTime(DateUtils.StringToDate(in.getDate(),AFTConstants.YYYYMMDD));
|
|
|
+ if(in.getDate()!=null)la.setOperationTime(DateUtils.StringToDate(in.getDate(),AFTConstants.YYYYMMDD));
|
|
|
TOrderMid tm = new TOrderMid();
|
|
|
tm.setOrderNo(in.getOrderNo());
|
|
|
tm.setLegalAffairsType(in.getType());
|
|
|
@@ -215,4 +218,9 @@ public class LegalAffairsServiceImpl extends BaseMybatisDao<TOrderMidMapper> imp
|
|
|
}
|
|
|
return newExcelUtil.exportExcel(list,tile,uploadPath,sb.substring(0,sb.length()-1));
|
|
|
}
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public void addLagalAffairsLogList(List<String> addList2) {
|
|
|
+ tOrderLegalAffairsMapper.insertBatch(addList2);
|
|
|
+ }
|
|
|
}
|