zhangyuewww пре 1 година
родитељ
комит
8b29c8bbdd

+ 13 - 6
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/QualityInspectionManagementServiceImpl.java

@@ -226,12 +226,19 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
         if (purchasePrice!=null){
             D=purchasePrice.getSaleLimit();
         }
-        Calendar cal = Calendar.getInstance();
-        int yearNum = cal.get(Calendar.YEAR);
-        int monthNum = cal.get(Calendar.MONTH) + 1;
-        int dayNum = cal.get(Calendar.DAY_OF_MONTH);
-        yearNum --;
-        String year = yearNum +"-"+monthNum+"-"+dayNum+" 00:00:00";
+//        Calendar cal = Calendar.getInstance();
+//        int yearNum = cal.get(Calendar.YEAR);
+//        int monthNum = cal.get(Calendar.MONTH) + 1;
+//        int dayNum = cal.get(Calendar.DAY_OF_MONTH);
+//        yearNum --;
+//        String year = yearNum +"-"+monthNum+"-"+dayNum+" 00:00:00";
+        //本年3.1号
+        SimpleDateFormat now = new SimpleDateFormat("yyyy-03-01 00:00:00");
+        Calendar c = Calendar.getInstance();
+        c.setTime(new java.util.Date());
+        c.add(Calendar.YEAR, 0);
+        Date y = c.getTime();
+        String year = now.format(y);
         if (qualityInspectionManagement.getGoodsName().contains("玉米")) {
             qualityInspectionManagement.setGoodsName("玉米");
         }