优化

hx-common/common-tool/src/main/java/com/fjhx/utils/DateUtil.java

@@ -1,53 +0,0 @@
-package com.fjhx.utils;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-
-/**
- * @Author:caozj
- * @DATE:2022/7/14 17:23
- */
-public class DateUtil {
-    /**
-     * 时间添加或减少
-     *
-     * @param str
-     * @param day
-     * @return
-     */
-    public static String dateMinusMonth(String str, int day) {
-        try {
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-            Date dt = null;//将字符串生成Date
-            dt = sdf.parse(str);
-            Calendar rightNow = Calendar.getInstance();
-            rightNow.setTime(dt);//使用给定的 Date 设置此 Calendar 的时间。
-            rightNow.add(Calendar.DAY_OF_MONTH, day);
-            Date dt1 = rightNow.getTime();//返回一个表示此 Calendar 时间值的 Date 对象。
-            String reStr = sdf.format(dt1);//将给定的 Date 格式化为日期/时间字符串，并将结果添加到给定的 StringBuffer。
-            return reStr;
-        } catch (ParseException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    /**
-     * 判断日期距离现在多少天
-     *
-     * @param date
-     * @return
-     * @throws ParseException
-     */
-    public static String differenceDate(String date) throws ParseException {
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");//指定格式时间转换
-        Date d = simpleDateFormat.parse(date);//转换成日期
-        long datetime = d.getTime();//时间转换成毫秒值
-        long todaytime = new Date().getTime();//获取当前日期毫秒值
-        long Difference = todaytime - datetime;//差值
-        return String.valueOf(Difference / 1000 / 60 / 60 / 24);
-    }
-
-}

hx-common/common-tool/src/main/java/com/fjhx/utils/ListUtil.java

@@ -1,36 +0,0 @@
-package com.fjhx.utils;
-
-import org.springblade.core.tool.utils.StringUtil;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Author:caozj
- * @DATE:2022/7/13 20:10
- */
-public class ListUtil {
-
-    public static Map<String, Integer> duplicateCheckingCount(List<String> list) {
-        Map<String, Integer> map = new HashMap<>();
-        for (String string : list) {
-            if (map.containsKey(string)) {
-                map.put(string, map.get(string).intValue() + 1);
-            } else {
-                map.put(string, new Integer(1));
-            }
-        }
-        return map;
-    }
-
-    public static Boolean checkList(List<String> list, String eq) {
-        for (String i : list) {
-            if (!StringUtil.equals(i, eq)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-}

hx-service/storage/src/main/java/com/fjhx/purchase/service/impl/PurchaseContractServiceImpl.java

@@ -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<>();
         //初始化map集合
@@ -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);
     }
+
 }