feat:查询修改记录，修改人和修改时间位置变更

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java

@@ -4,8 +4,10 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeModifyLog;
 import com.dxhy.order.baseservice.module.commodity.model.dto.QueryModifyLogDTO;
+import com.dxhy.order.baseservice.module.commodity.model.dto.QueryModifyLogResultDTO;
 import com.dxhy.order.baseservice.module.commodity.service.CommodityCodeModifyLogService;
 import com.dxhy.order.constant.*;
 import com.dxhy.order.model.CommodityCodeCheckQuery;
@@ -672,8 +674,12 @@ public class CommodityController {
     @PostMapping("/modifyLog")
     public R modifyLog(@RequestBody QueryModifyLogDTO dto) {
         try {
-            PageUtils pageUtil = commodityCodeModifyLogService.queryPage(dto);
-            return R.ok().put("page", pageUtil);
+            QueryModifyLogResultDTO resp = commodityCodeModifyLogService.queryPage(dto);
+            PageUtils pageUtil = resp.getPageUtils();
+            JSONObject respJson = JSONObject.parseObject(JSONObject.toJSONString(pageUtil));
+            respJson.put("modifyUserName",resp.getModifyUserName());
+            respJson.put("modifyTime",resp.getModifyDate());
+            return R.ok().put("page", respJson);
         } catch (NumberFormatException e) {
             log.error("{},分页参数类型转换异常：{}", LOGGER_MSG, e.getMessage());
             return R.error("商品信息列表查询异常");

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/model/dto/QueryModifyLogResultDTO.java

@@ -0,0 +1,18 @@
+package com.dxhy.order.baseservice.module.commodity.model.dto;
+
+import com.dxhy.order.model.PageUtils;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Description
+ * @Author 巩权林
+ * @Date 2023/3/27 09:05
+ **/
+@Data
+public class QueryModifyLogResultDTO {
+    private PageUtils pageUtils;
+    private String modifyUserName;
+    private Date modifyDate;
+}

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/CommodityCodeModifyLogService.java

@@ -4,6 +4,7 @@ import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity;
 import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeModifyLog;
 import com.dxhy.order.baseservice.module.commodity.model.GroupCommodity;
 import com.dxhy.order.baseservice.module.commodity.model.dto.QueryModifyLogDTO;
+import com.dxhy.order.baseservice.module.commodity.model.dto.QueryModifyLogResultDTO;
 import com.dxhy.order.model.PageUtils;
 
 import java.util.List;
@@ -18,7 +19,7 @@ public interface CommodityCodeModifyLogService {
 
     public int saveCommodityCodeDifferenceBetween2(CommodityCodeEntity originOne, CommodityCodeEntity newOne, Long modifyUserId);
 
-    public PageUtils queryPage(QueryModifyLogDTO dto);
+    public QueryModifyLogResultDTO queryPage(QueryModifyLogDTO dto);
 
 
         public

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/service/impl/CommodityCodeModifyLogServiceImpl.java

@@ -11,6 +11,7 @@ import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeEntity;
 import com.dxhy.order.baseservice.module.commodity.model.CommodityCodeModifyLog;
 import com.dxhy.order.baseservice.module.commodity.model.GroupCommodity;
 import com.dxhy.order.baseservice.module.commodity.model.dto.QueryModifyLogDTO;
+import com.dxhy.order.baseservice.module.commodity.model.dto.QueryModifyLogResultDTO;
 import com.dxhy.order.baseservice.module.commodity.model.dto.UserInfoDTO;
 import com.dxhy.order.baseservice.module.commodity.service.CommodityCodeModifyLogService;
 import com.dxhy.order.constant.ConfigureConstant;
@@ -98,7 +99,7 @@ public class CommodityCodeModifyLogServiceImpl implements CommodityCodeModifyLog
 
     @Override
     @SneakyThrows
-    public PageUtils queryPage(QueryModifyLogDTO dto) {
+    public QueryModifyLogResultDTO queryPage(QueryModifyLogDTO dto) {
         int pageSize = dto.getPageSize();
         int currPage = dto.getCurrPage();
         PageHelper.startPage(currPage, pageSize);
@@ -148,8 +149,14 @@ public class CommodityCodeModifyLogServiceImpl implements CommodityCodeModifyLog
             });
         }
 
+        Date modifyDate = commodityCodeModifyLogs.size() > 0 ? commodityCodeModifyLogs.get(commodityCodeModifyLogs.size() - 1).getModifyTime() : null;
+        String modifyUserName = commodityCodeModifyLogs.size() > 0 ? commodityCodeModifyLogs.get(commodityCodeModifyLogs.size() - 1).getModifyUserName() : null;
         PageInfo<CommodityCodeModifyLog> pageInfo = new PageInfo<>(commodityCodeModifyLogs);
-        return new PageUtils(pageInfo.getList(), (int) pageInfo.getTotal(), pageInfo.getPageSize(), pageInfo.getPageNum());
+        QueryModifyLogResultDTO resultDTO = new QueryModifyLogResultDTO();
+        resultDTO.setPageUtils(new PageUtils(pageInfo.getList(), (int) pageInfo.getTotal(), pageInfo.getPageSize(), pageInfo.getPageNum()));
+        resultDTO.setModifyDate(modifyDate);
+        resultDTO.setModifyUserName(modifyUserName);
+        return resultDTO;
     }
 
     /**