Merge branch 'master' of https://gitee.com/jishenghua/JSH_ERP

src/main/java/com/jsh/erp/controller/DepotHeadController.java

@@ -209,7 +209,7 @@ public class DepotHeadController {
         Map<String, Object> map = new HashMap<String, Object>();
         try {
             List<DepotHeadVo4InDetail> resList = new ArrayList<DepotHeadVo4InDetail>();
-            List<DepotHeadVo4InDetail> list = depotHeadService.findByAll(beginTime, endTime, type, pid, dids, oId, currentPage, pageSize);
+            List<DepotHeadVo4InDetail> list = depotHeadService.findByAll(beginTime, endTime, type, pid, dids, oId, (currentPage-1)*pageSize, pageSize);
             int total = depotHeadService.findByAllCount(beginTime, endTime, type, pid, dids, oId);
             map.put("total", total);
             //存放数据json数组
@@ -256,7 +256,7 @@ public class DepotHeadController {
         Map<String, Object> map = new HashMap<String, Object>();
         try {
             List<DepotHeadVo4InOutMCount> resList = new ArrayList<DepotHeadVo4InOutMCount>();
-            List<DepotHeadVo4InOutMCount> list = depotHeadService.findInOutMaterialCount(beginTime, endTime, type, pid, dids, oId, currentPage, pageSize);
+            List<DepotHeadVo4InOutMCount> list = depotHeadService.findInOutMaterialCount(beginTime, endTime, type, pid, dids, oId, (currentPage-1)*pageSize, pageSize);
             int total = depotHeadService.findInOutMaterialCountTotal(beginTime, endTime, type, pid, dids, oId);
             map.put("total", total);
             //存放数据json数组

src/main/java/com/jsh/erp/controller/UserController.java

@@ -13,6 +13,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.security.NoSuchAlgorithmException;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import static com.jsh.erp.utils.ResponseJsonUtil.returnJson;
 
@@ -183,4 +184,28 @@ public class UserController {
             return returnJson(objectMap, message, ErpInfo.ERROR.code);
         }
     }
+
+    /**
+     * 获取全部用户数据列表
+     * @param request
+     * @return
+     */
+    @GetMapping(value = "/getAllList")
+    public BaseResponseInfo getAllList(HttpServletRequest request) {
+        BaseResponseInfo res = new BaseResponseInfo();
+        try {
+            Map<String, Object> data = new HashMap<String, Object>();
+            List<User> dataList = userService.getUser();
+            if(dataList!=null) {
+                data.put("userList", dataList);
+            }
+            res.code = 200;
+            res.data = data;
+        } catch(Exception e){
+            e.printStackTrace();
+            res.code = 500;
+            res.data = "获取失败";
+        }
+        return res;
+    }
 }

src/main/java/com/jsh/erp/datasource/mappers/LogMapper.java

@@ -3,6 +3,8 @@ package com.jsh.erp.datasource.mappers;
 import com.jsh.erp.datasource.entities.Log;
 import com.jsh.erp.datasource.entities.LogExample;
 import java.util.List;
+
+import com.jsh.erp.datasource.vo.LogVo4List;
 import org.apache.ibatis.annotations.Param;
 
 public interface LogMapper {
@@ -94,7 +96,7 @@ public interface LogMapper {
      */
     int updateByPrimaryKey(Log record);
 
-    List<Log> selectByConditionLog(
+    List<LogVo4List> selectByConditionLog(
             @Param("operation") String operation,
             @Param("usernameID") Integer usernameID,
             @Param("clientIp") String clientIp,

src/main/java/com/jsh/erp/datasource/vo/LogVo4List.java

@@ -0,0 +1,96 @@
+package com.jsh.erp.datasource.vo;
+
+import java.util.Date;
+
+public class LogVo4List {
+
+    private Long id;
+
+    private Long userid;
+
+    private String operation;
+
+    private String clientip;
+
+    private Date createtime;
+
+    private Byte status;
+
+    private String contentdetails;
+
+    private String remark;
+
+    private String username;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getUserid() {
+        return userid;
+    }
+
+    public void setUserid(Long userid) {
+        this.userid = userid;
+    }
+
+    public String getOperation() {
+        return operation;
+    }
+
+    public void setOperation(String operation) {
+        this.operation = operation;
+    }
+
+    public String getClientip() {
+        return clientip;
+    }
+
+    public void setClientip(String clientip) {
+        this.clientip = clientip;
+    }
+
+    public Date getCreatetime() {
+        return createtime;
+    }
+
+    public void setCreatetime(Date createtime) {
+        this.createtime = createtime;
+    }
+
+    public Byte getStatus() {
+        return status;
+    }
+
+    public void setStatus(Byte status) {
+        this.status = status;
+    }
+
+    public String getContentdetails() {
+        return contentdetails;
+    }
+
+    public void setContentdetails(String contentdetails) {
+        this.contentdetails = contentdetails;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+}

src/main/java/com/jsh/erp/service/log/LogService.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.jsh.erp.datasource.entities.Log;
 import com.jsh.erp.datasource.entities.LogExample;
 import com.jsh.erp.datasource.mappers.LogMapper;
+import com.jsh.erp.datasource.vo.LogVo4List;
 import com.jsh.erp.utils.ExceptionCodeConstants;
 import com.jsh.erp.utils.JshException;
 import com.jsh.erp.utils.StringUtil;
@@ -33,8 +34,8 @@ public class LogService {
         return logMapper.selectByExample(example);
     }
 
-    public List<Log> select(String operation, Integer usernameID, String clientIp, Integer status, String beginTime, String endTime,
-                            String contentdetails, int offset, int rows) {
+    public List<LogVo4List> select(String operation, Integer usernameID, String clientIp, Integer status, String beginTime, String endTime,
+                                   String contentdetails, int offset, int rows) {
         return logMapper.selectByConditionLog(operation, usernameID, clientIp, status, beginTime, endTime,
                             contentdetails, offset, rows);
     }