修改日期精确到日

src/main/java/com/steerinfo/dil/controller/AmstruckPurplanController.java

@@ -6,6 +6,7 @@ import com.steerinfo.dil.service.IAmstruckPurplanMaterialService;
 import com.steerinfo.dil.service.IAmstruckPurplanService;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.util.PageListAdd;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
@@ -81,6 +82,7 @@ public class AmstruckPurplanController extends BaseRESTfulController {
         if(mapValue.size() == 1){
             //将查询结果存入索引中
             allPurPlan = amstruckPurplanService.getAllPurPlan(mapValue);
+            DataChange.changeDateToDayDate(allPurPlan, "planTruckTime", "planIncomingTime");
             Map<String, Object> map = new HashMap<>();
             //添加索引
             map.put("index","get_pur_plan_list");
@@ -92,11 +94,13 @@ public class AmstruckPurplanController extends BaseRESTfulController {
             //删除
             allPurPlan.remove(allPurPlan.size()-1);
         }
-        if(allPurPlan == null)
+        if(allPurPlan == null) {
             allPurPlan = amstruckPurplanService.getAllPurPlan(mapValue);
+        }
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> purPlan = amstruckPurplanService.getAllPurPlan(mapValue);
+        DataChange.changeDateToDayDate(purPlan, "planTruckTime", "planIncomingTime");
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allPurPlan,purPlan);
         return success(pageList);
     }
@@ -208,6 +212,7 @@ public class AmstruckPurplanController extends BaseRESTfulController {
         if(mapValue.size() == count){
             //将查询结果存入索引中
             allPlan = amstruckPurplanMaterialService.getDecomposedPlan(mapValue);
+            DataChange.changeDateToDayDate(allPlan, "planTruckTime", "planIncomingTime");
             Map<String, Object> map = new HashMap<>();
             //添加索引
             map.put("index","get_decomposed_list");
@@ -219,11 +224,13 @@ public class AmstruckPurplanController extends BaseRESTfulController {
             //删除
             allPlan.remove(allPlan.size()-1);
         }
-        if(allPlan == null)
+        if(allPlan == null) {
             allPlan = amstruckPurplanMaterialService.getDecomposedPlan(mapValue);
+        }
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> plan = amstruckPurplanMaterialService.getDecomposedPlan(mapValue);
+        DataChange.changeDateToDayDate(plan, "planTruckTime", "planIncomingTime");
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allPlan,plan);
         return success(pageList);
     }

src/main/resources/bootstrap.yml

@@ -16,7 +16,7 @@ openfeign:
   ESFeign:
     url: ${ESFEIGN_URL:localhost:8089}
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:localhost:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
 
 #eureka设置
 eureka: