zhangyuewww 11 місяців тому
батько
коміт
767585ac42

+ 14 - 7
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/IdentityAuthenticationInfoServiceImpl.java

@@ -730,17 +730,24 @@ public class IdentityAuthenticationInfoServiceImpl extends ServiceImpl<IdentityA
         if (identityAuthenticationInfo.getGoodsName().contains("玉米")) {
             identityAuthenticationInfo.setGoodsName("玉米");
         }
-        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);
         //公司id
         pageView.put("compId", identityAuthenticationInfo.getCompId());
         pageView.put("authenticationStatusKey", "7");
         pageView.put("year", year);
-        pageView.put("buyer", identityAuthenticationInfo.getBuyer());
+//        pageView.put("buyer", identityAuthenticationInfo.getBuyer());
         pageView.put("goodsName",identityAuthenticationInfo.getGoodsName());
         pageView.put("saleLimit", purchasePrice.getSaleLimit()*1000);
         pageView.put("searchKeyWord", identityAuthenticationInfo.getSearchKeyWord());