diff --git a/erp_web/pages/manage/log.html b/erp_web/pages/manage/log.html index ead19bcf..0ee225be 100644 --- a/erp_web/pages/manage/log.html +++ b/erp_web/pages/manage/log.html @@ -178,18 +178,15 @@ //初始化系统基础信息 function initSystemData() { $.ajax({ - type: "post", - url: "/log/getBasicData.action", + type: "get", + url: "/user/getAllList", //设置为同步 async: false, dataType: "json", - success: function (systemInfo) { + success: function (res) { //成功关闭loading - userList = systemInfo.showModel.map.userList; - var msgTip = systemInfo.showModel.msgTip; - if (msgTip == "exceptoin") { - $.messager.alert('提示', '查找系统基础信息异常,请与管理员联系！', 'error'); - return; + if(res && res.code === 200){ + userList = res.data.userList; } } }); @@ -198,7 +195,6 @@ //初始化页面选项卡 function initSelectInfo() { var options = ""; - if (userList != null) { options = ""; for (var i = 0; i < userList.length; i++) { diff --git a/erp_web/pages/reports/in_detail.html b/erp_web/pages/reports/in_detail.html index be21a76b..97e7d3a3 100644 --- a/erp_web/pages/reports/in_detail.html +++ b/erp_web/pages/reports/in_detail.html @@ -292,7 +292,7 @@ }), success: function (res) { if(res && res.code === 200 && res.data) { - $("#tableData").datagrid('loadData', res.data.rows); + $("#tableData").datagrid('loadData', res.data); } }, //此处添加错误处理 diff --git a/erp_web/pages/reports/in_material_count.html b/erp_web/pages/reports/in_material_count.html index 40c61202..6a2e7d34 100644 --- a/erp_web/pages/reports/in_material_count.html +++ b/erp_web/pages/reports/in_material_count.html @@ -281,7 +281,7 @@ }), success: function (res) { if(res && res.code === 200 && res.data) { - $("#tableData").datagrid('loadData', res.data.rows); + $("#tableData").datagrid('loadData', res.data); } }, //此处添加错误处理 diff --git a/erp_web/pages/reports/out_detail.html b/erp_web/pages/reports/out_detail.html index 4e46feab..0238eb2c 100644 --- a/erp_web/pages/reports/out_detail.html +++ b/erp_web/pages/reports/out_detail.html @@ -292,7 +292,7 @@ }), success: function (res) { if(res && res.code === 200 && res.data) { - $("#tableData").datagrid('loadData', res.data.rows); + $("#tableData").datagrid('loadData', res.data); } }, //此处添加错误处理 diff --git a/erp_web/pages/reports/out_material_count.html b/erp_web/pages/reports/out_material_count.html index 7aeba618..b13c6ea2 100644 --- a/erp_web/pages/reports/out_material_count.html +++ b/erp_web/pages/reports/out_material_count.html @@ -281,7 +281,7 @@ }), success: function (res) { if(res && res.code === 200 && res.data) { - $("#tableData").datagrid('loadData', res.data.rows); + $("#tableData").datagrid('loadData', res.data); } }, //此处添加错误处理 diff --git a/src/main/assembly/package.xml b/src/main/assembly/package.xml index af6ab2f5..c10a94c7 100644 --- a/src/main/assembly/package.xml +++ b/src/main/assembly/package.xml @@ -30,22 +30,6 @@ http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 "> src/main/resources/application.yml /conf - - src/main/resources/application.properties - /conf - - - src/main/resources/application-dev.properties - /conf - - - src/main/resources/application-prod.properties - /conf - - - src/main/resources/application-test.properties - /conf - diff --git a/src/main/java/com/jsh/erp/controller/DepotHeadController.java b/src/main/java/com/jsh/erp/controller/DepotHeadController.java index 7a1cb3fb..28e21a2d 100644 --- a/src/main/java/com/jsh/erp/controller/DepotHeadController.java +++ b/src/main/java/com/jsh/erp/controller/DepotHeadController.java @@ -209,7 +209,7 @@ public class DepotHeadController { Map map = new HashMap(); try { List resList = new ArrayList(); - List list = depotHeadService.findByAll(beginTime, endTime, type, pid, dids, oId, currentPage, pageSize); + List 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 map = new HashMap(); try { List resList = new ArrayList(); - List list = depotHeadService.findInOutMaterialCount(beginTime, endTime, type, pid, dids, oId, currentPage, pageSize); + List 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数组 diff --git a/src/main/java/com/jsh/erp/controller/UserController.java b/src/main/java/com/jsh/erp/controller/UserController.java index 31fb9fc2..542b1877 100644 --- a/src/main/java/com/jsh/erp/controller/UserController.java +++ b/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 data = new HashMap(); + List 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; + } } diff --git a/src/main/java/com/jsh/erp/datasource/mappers/LogMapper.java b/src/main/java/com/jsh/erp/datasource/mappers/LogMapper.java index 5dc679e1..6de21f7a 100644 --- a/src/main/java/com/jsh/erp/datasource/mappers/LogMapper.java +++ b/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 selectByConditionLog( + List selectByConditionLog( @Param("operation") String operation, @Param("usernameID") Integer usernameID, @Param("clientIp") String clientIp, diff --git a/src/main/java/com/jsh/erp/datasource/vo/LogVo4List.java b/src/main/java/com/jsh/erp/datasource/vo/LogVo4List.java new file mode 100644 index 00000000..30b3f36b --- /dev/null +++ b/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; + } +} \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/service/log/LogService.java b/src/main/java/com/jsh/erp/service/log/LogService.java index eb52fcab..911b4e68 100644 --- a/src/main/java/com/jsh/erp/service/log/LogService.java +++ b/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 select(String operation, Integer usernameID, String clientIp, Integer status, String beginTime, String endTime, - String contentdetails, int offset, int rows) { + public List 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); } diff --git a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml index 5e62d500..2209360c 100644 --- a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml +++ b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml @@ -205,8 +205,8 @@ - select * - FROM jsh_log + + + + +