|
@@ -217,7 +217,6 @@ public class ApiAssetProfitController {
|
|
|
responseDTO.getAllInfoList().add(allInfo);
|
|
|
});
|
|
|
}
|
|
|
-
|
|
|
if (baseInfo != null) {
|
|
|
if (baseInfo.getStatus().equals(0) || baseInfo.getStatus().equals(14))
|
|
|
responseDTO.setOpStorageState("未出库");
|
|
@@ -524,10 +523,45 @@ public class ApiAssetProfitController {
|
|
|
// 收益预估信息
|
|
|
else if (param.getTableOrder() != null && param.getTableOrder().equals(10)) {
|
|
|
ResponseDTO responseDTO = new ResponseDTO();
|
|
|
+ SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM");
|
|
|
+ SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-00 00:00:00");
|
|
|
+ Calendar cal = Calendar.getInstance();
|
|
|
BaseInfoDTO baseInfo = (BaseInfoDTO) getBaseInfo(param).getData();
|
|
|
+
|
|
|
+ ResponseDTO assetTotalInOutInfo;
|
|
|
+ String oPTime = null;
|
|
|
+ Date now = new Date();
|
|
|
if (baseInfo != null){
|
|
|
+ oPTime = baseInfo.getOperationTime();
|
|
|
+ Date startTime = sdf1.parse(baseInfo.getOperationTime());
|
|
|
+ Date endTime ;
|
|
|
+ Date lastTime = sdf1.parse(sdf1.format(now));
|
|
|
|
|
|
+ if (param.getTimeStart() != null && !param.getTimeStart().equals("")){
|
|
|
+ startTime = sdf1.parse(sdf1.format(param.getTimeStart()));
|
|
|
+ }
|
|
|
+ if (param.getTimeEnd() != null && !param.getTimeEnd().equals("")){
|
|
|
+ lastTime = sdf1.parse(sdf1.format(param.getTimeEnd()));
|
|
|
+ }
|
|
|
+ if (StringUtils.hasLength(oPTime)){
|
|
|
+ while (startTime.getTime() <= lastTime.getTime()) {
|
|
|
+ param.setTableOrder(9);
|
|
|
+ // 日期+1月
|
|
|
+ cal.setTime(startTime);
|
|
|
+ cal.add(Calendar.MONTH, 1);
|
|
|
+ endTime = cal.getTime();
|
|
|
+ param.setTimeStart(sdf2.parse(sdf2.format(startTime)));
|
|
|
+ param.setTimeEnd(sdf2.parse(sdf2.format(endTime)));
|
|
|
+ assetTotalInOutInfo = (ResponseDTO) getAssetProfitInfo(param).getData();
|
|
|
+ ResponseDTO.ProfitPredict profitPredict = new ResponseDTO.ProfitPredict();
|
|
|
+ profitPredict.setTime(sdf1.format(startTime));
|
|
|
+ profitPredict.setNetIncome(assetTotalInOutInfo.getNetIncome());
|
|
|
+ responseDTO.getProfitPredictInfoList().add(profitPredict);
|
|
|
+ startTime = cal.getTime();
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
+ response = (ResponseDTO) responseDTO;
|
|
|
|
|
|
}
|
|
|
return ApiDTO.ok("成功", response);
|