各种修改

src/main/java/com/chinaitop/depot/business/controller/BusinessDeliveryStorageNoticeController.java

@@ -40,14 +40,13 @@ import java.util.Map;
 @RestController
 @RequestMapping(value="/depot/business/deliveryStorageNotice")
 @Api(value= "BusinessDeliveryStorageNoticeController", description = "出入库通知单管理")
-
 public class BusinessDeliveryStorageNoticeController {
-    
+
     @Resource
     private BusinessDeliveryStorageNoticeService deliveryStorageNoticeService;
     @Resource
     private BusinessStoreWareDetailService businessStoreWareDetailService;
-    
+
     /**
      * 申请列表.
      * @param pageNum 页码

src/main/java/com/chinaitop/depot/business/model/BusinessNoticeReceive.java

@@ -2,6 +2,8 @@ package com.chinaitop.depot.business.model;
 
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 public class BusinessNoticeReceive {
 	
 	    //业务字段
@@ -68,6 +70,7 @@ public class BusinessNoticeReceive {
 		private Integer grainAnnual;//收获年度
 		private Integer productiveYear;//生产年份
 		private Integer grainProducingArea;//粮油产地
+		@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 		private Date inputTime;//入库时间
 		
 		

src/main/java/com/chinaitop/depot/business/model/BusinessStoreWareDetail.java

@@ -2,6 +2,8 @@ package com.chinaitop.depot.business.model;
 
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 public class BusinessStoreWareDetail {
     private Integer id;
 
@@ -39,6 +41,7 @@ public class BusinessStoreWareDetail {
 
     private String inDetailTotalPrice;
 
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date inputTime;
 
     private Integer state;

src/main/java/com/chinaitop/depot/business/service/impl/ReceiveNoticeServiceImpl.java

@@ -1,6 +1,5 @@
 package com.chinaitop.depot.business.service.impl;
 
-import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -21,6 +20,7 @@ import com.chinaitop.depot.business.model.BusinessNoticeReceiveExample.Criteria;
 import com.chinaitop.depot.business.service.FeignAgileService;
 import com.chinaitop.depot.business.service.FeignBasicService;
 import com.chinaitop.depot.business.service.ReceiveNoticeService;
+import com.chinaitop.depot.utils.ParameterUtil;
 import com.github.pagehelper.PageHelper;
 
 @Service
@@ -194,19 +194,7 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
                             Integer scnf = Integer.parseInt(map.get("scnf")+"");
                             Date date = null;
                             if(inputTime!=null){
-                                //String year=String.format("%tY", inputTime);
-
-                                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-                                date = sdf.parse(inputTime);
-                                // 获取String字符串中的年
-                                //SimpleDateFormat y = new SimpleDateFormat("yyyy");
-                                //System.out.println(y.format(date));
-                                //String enumName = y.format(date);
-
-                                //Integer parentId = 1004;
-                                //Map<String, Object> basicMap = feignBasicService.getIdByNameAndParentId(parentId, enumName, null);//1004是生产年份的父ID
-                                //Integer productiveYear = (Integer) basicMap.get("enumId");
-
+                                date = ParameterUtil.string2datetime(inputTime);
                                 businessNoticeReceive.setInputTime(date);//入库时间
                             }
                             businessNoticeReceive.setProductiveYear(scnf);//生产年份