出库时间

src/main/java/cn/fastfun/controller/api/ApiAppDeviceLogController.java

@@ -63,7 +63,7 @@ public class ApiAppDeviceLogController {
         return ApiDTO.ok();
     }
 
-    @ApiOperation(value = "出库分页搜索")
+    @ApiOperation(value = "出库详细分页搜索")
     @RequestMapping(value = "outstorage/pageQuery", method = RequestMethod.POST)
     public ApiPageDTO outPageQuery(@RequestBody OutQueryParam param) {
         param.addParam(QueryParamExp.eq("type", 3));
@@ -143,7 +143,7 @@ public class ApiAppDeviceLogController {
     @ApiOperation(value = "出库分页搜索列表")
     @RequestMapping(value = "batchNum/out/pageQuery", method = RequestMethod.POST)
     public ApiPageDTO outPageQuery(@RequestBody LogTransferQueryParam param) {
-        StringBuffer sql = new StringBuffer("select t.batch_num,t.add_time,count(0) as total,t.out_type,t.receiver_name,t.receiver_phone,t.remarks,t.out_custom_id,t.operator from app_device_log t where t.type = 3");
+        StringBuffer sql = new StringBuffer("select t.batch_num,t.add_time,count(0) as total,t.out_type,t.receiver_name,t.receiver_phone,t.remarks,t.out_custom_id,t.operator,t.update_time from app_device_log t where t.type = 3");
 
         // sn搜索
         if (!StringUtils.isEmpty(param.getSn())) {
@@ -155,7 +155,7 @@ public class ApiAppDeviceLogController {
             sql.append(StringUtils.isEmpty(param.getSn()) ? "where" : "and");
             sql.append(" t.out_type = '").append(param.getType()).append("'");
         }
-        sql.append(" group by t.batch_num,t.add_time,t.out_type,t.receiver_name,t.receiver_phone,t.remarks,t.out_custom_id,t.operator");
+        sql.append(" group by t.batch_num,t.add_time,t.out_type,t.receiver_name,t.receiver_phone,t.remarks,t.out_custom_id,t.operator,t.update_time");
         if (!StringUtils.isEmpty(param.getOrderBy())) {
             sql.append(param.getOrderBy());
         }
@@ -167,7 +167,9 @@ public class ApiAppDeviceLogController {
             List<Map<String, Object>> list = (List<Map<String, Object>>) page.getData();
             for (Map<String, Object> p : list) {
                 p.put("add_time", DateUtils.toString(ObjectUtil.obj2Date(p.get("add_time")), DateUtils.YMDHMS));
+                p.put("update_time", DateUtils.toString(ObjectUtil.obj2Date(p.get("update_time")), DateUtils.YMDHMS));
                 p.put("operator", "admin");
+                p.put("out_type",String.valueOf(p.get("out_type")));
             }
             page.setData(list);
         }