|
@@ -1,18 +1,17 @@
|
|
|
package com.fjhx.purchase.service.impl;
|
|
|
|
|
|
+import cn.hutool.core.date.DateUtil;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.fjhx.entity.purchase.PurchaseContract;
|
|
|
import com.fjhx.purchase.mapper.PurchaseContractMapper;
|
|
|
import com.fjhx.purchase.service.PurchaseContractService;
|
|
|
-import com.fjhx.utils.DateUtil;
|
|
|
-import com.fjhx.utils.ListUtil;
|
|
|
import org.springblade.core.tool.utils.ObjectUtil;
|
|
|
+import org.springblade.core.tool.utils.StringUtil;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
-import java.text.ParseException;
|
|
|
-import java.util.Arrays;
|
|
|
+import java.util.Date;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
@@ -71,7 +70,7 @@ public class PurchaseContractServiceImpl extends ServiceImpl<PurchaseContractMap
|
|
|
* @return
|
|
|
*/
|
|
|
@Override
|
|
|
- public List<PurchaseContract> getPayList(Map<String, Object> condition) throws ParseException {
|
|
|
+ public List<PurchaseContract> getPayList(Map<String, Object> condition) {
|
|
|
List<PurchaseContract> list = baseMapper.getPayList(condition);
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
|
|
@@ -88,7 +87,7 @@ public class PurchaseContractServiceImpl extends ServiceImpl<PurchaseContractMap
|
|
|
}
|
|
|
|
|
|
if (ObjectUtil.isNotEmpty(p.getQuantityStatus())) {
|
|
|
- map.put("quantityCheck", ListUtil.checkList(Arrays.asList(p.getQuantityStatus()), "1"));
|
|
|
+ map.put("quantityCheck", StringUtil.equals(p.getQuantityStatus(), "1"));
|
|
|
}
|
|
|
|
|
|
if (ObjectUtil.isNotEmpty(p.getContractStatus()) &&
|
|
@@ -102,8 +101,8 @@ public class PurchaseContractServiceImpl extends ServiceImpl<PurchaseContractMap
|
|
|
}
|
|
|
|
|
|
if (ObjectUtil.isNotEmpty(p.getCompleteStockTime())) {
|
|
|
- String date = DateUtil.dateMinusMonth(p.getCompleteStockTime(), p.getAccountDate());
|
|
|
- map.put("payDate", DateUtil.differenceDate(date));
|
|
|
+ Date date = DateUtil.offsetDay(DateUtil.parse(p.getCompleteStockTime()), p.getAccountDate());
|
|
|
+ map.put("payDate", DateUtil.betweenDay(new Date(), date, true));
|
|
|
}
|
|
|
p.setCheck(map);
|
|
|
}
|
|
@@ -142,4 +141,5 @@ public class PurchaseContractServiceImpl extends ServiceImpl<PurchaseContractMap
|
|
|
public BigDecimal getSumMoney(String date) {
|
|
|
return baseMapper.getSumMoney(date);
|
|
|
}
|
|
|
+
|
|
|
}
|