diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java index bc8a0155..719ec7b4 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -1094,6 +1094,12 @@ public class PageController { } else { mv.addObject("display", "none"); } + String userAgent = request.getHeader("user-agent"); + // 判断当前使用的设备为移动端还是pc端 + boolean b = DeviceUtil.checkAgentIsMobile(userAgent); + if(b){ + mv.setViewName("pages/group/group-out_mobile"); + } return mv; } @@ -1142,6 +1148,13 @@ public class PageController { } mv.addObject("id", id); mv.addObject("record", group); + String userAgent = request.getHeader("user-agent"); + // 判断当前使用的设备为移动端还是pc端 + boolean b = DeviceUtil.checkAgentIsMobile(userAgent); + if(b){ + mv.setViewName("pages/group/group_edit_mobile"); + } + return mv; } diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/GroupInfo.java b/src/main/java/com/dreamchaser/depository_manage/entity/GroupInfo.java index 30a11c57..9a7ef918 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/GroupInfo.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/GroupInfo.java @@ -84,6 +84,11 @@ public class GroupInfo { */ private Long createTime; + /** + * 组合创建时间 + */ + private String showCreateTime; + /** * 组合状态（1启用2禁用3删除） */ diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java index fc756942..9cd7142c 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java @@ -129,6 +129,15 @@ public class GroupServiceImpl implements GroupService { } else { groupInfo.setShowUnit(groupInfo.getUnit()); } + if(groupInfo.getVersion() == null){ + groupInfo.setVersion(""); + } + if(groupInfo.getBrand() == null){ + groupInfo.setBrand(""); + } + if(groupInfo.getCreateTime() != null){ + groupInfo.setShowCreateTime(DateUtil.TimeStampToDateTime(groupInfo.getCreateTime())); + } } return groupByCondition; } diff --git a/src/main/resources/templates/pages/group/group-out_mobile.html b/src/main/resources/templates/pages/group/group-out_mobile.html new file mode 100644 index 00000000..69b409e3 --- /dev/null +++ b/src/main/resources/templates/pages/group/group-out_mobile.html @@ -0,0 +1,170 @@ + + + + + layui + + + + + + + +
+
+
+ 搜索信息 +
+
+
+ + +
+ +
+ +
+
+ +
+ +
+ +
+
+ + +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+
+
+
+
+ +
+
+ + + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/pages/group/group_edit_mobile.html b/src/main/resources/templates/pages/group/group_edit_mobile.html new file mode 100644 index 00000000..63fb3e5b --- /dev/null +++ b/src/main/resources/templates/pages/group/group_edit_mobile.html @@ -0,0 +1,196 @@ + + + + + layui + + + + + + + +
+
+ + +
+ 基本信息 +
+
+
+
+ +
+ + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+
+
+ + +
+
+ + + + + + + + \ No newline at end of file