From 17bf3edee87ba7da6f82a7de92d952ab5e93bb54 Mon Sep 17 00:00:00 2001 From: erdanergou Date: Mon, 10 Apr 2023 10:01:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E6=B6=88=E6=81=AF=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=88=91=E7=9A=84=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PageController.java | 48 +++++++ .../depository_manage/pojo/SimpleTaskP.java | 17 +++ src/main/resources/static/css/public.css | 10 +- .../templates/pages/self/message.html | 105 ++++++++++++++- .../depository_manage/OtherTest.java | 78 +++++++++++ .../depository_manage/TestForOther.java | 122 ------------------ 6 files changed, 251 insertions(+), 129 deletions(-) create mode 100644 src/test/java/com/dreamchaser/depository_manage/OtherTest.java delete mode 100644 src/test/java/com/dreamchaser/depository_manage/TestForOther.java 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 1a60928c..edf0670a 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -266,7 +266,10 @@ public class PageController { } UserByPort userToken = AuthenticationTokenPool.getUserToken(token); List list = getUserSimpleTaskP(userToken); + List userSimpleApplyP = getUserSimpleApplyP(userToken); + mv.addObject("myTaskList", list); + mv.addObject("myApplyList", userSimpleApplyP); Map map = new HashMap<>(); map.put("begin", 0); map.put("size", 6); @@ -3147,6 +3150,51 @@ public class PageController { return list; } + + /** + * 用于获取当前用户的部分申请列表 + * @param userToken 当前用户 + * @return + */ + public List getUserSimpleApplyP(UserByPort userToken){ + Map paramForApply = new HashMap<>(); + paramForApply.put("applicantId", userToken.getId()); + paramForApply.put("size", 4); + paramForApply.put("page", 1); + + // 定义任务列表 + List list = new ArrayList<>(); + + // 查询入库申请 + List applicationInRecordPByCondition = depositoryRecordService.findApplicationInRecordPByCondition(paramForApply, userToken); + for (ApplicationInRecordP applicationInRecordP : applicationInRecordPByCondition) { + SimpleTaskP simpleTask = new SimpleTaskP(applicationInRecordP); + list.add(simpleTask); + } + + + List applicationOutRecordPlist = depositoryRecordService.findApplicationOutRecordPByCondition(paramForApply, userToken); + for (ApplicationOutRecordP applicationOutRecordP : applicationOutRecordPlist) { + SimpleTaskP simpleTask = new SimpleTaskP(applicationOutRecordP); + list.add(simpleTask); + } + + paramForApply.put("originator",userToken.getId()); + List stockTakingByCondition = stockTakingService.findStockTakingByCondition(paramForApply); + for (StockTaking stockTaking : stockTakingByCondition) { + SimpleTaskP simpleTask = new SimpleTaskP(new SimpleStockTakingP(stockTaking)); + list.add(simpleTask); + } + return list; + } + + + + + /** + * 跳转到移动端功能页面 + * @return + */ @GetMapping("/userAuthorityMenus") public ModelAndView userAuthorityMenus(){ ModelAndView mv = new ModelAndView(); diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/SimpleTaskP.java b/src/main/java/com/dreamchaser/depository_manage/pojo/SimpleTaskP.java index 0b04d34c..01d0da58 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/SimpleTaskP.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/SimpleTaskP.java @@ -1,5 +1,6 @@ package com.dreamchaser.depository_manage.pojo; +import com.dreamchaser.depository_manage.entity.ApplicationInRecord; import com.dreamchaser.depository_manage.entity.ApplicationOutRecordMin; import com.dreamchaser.depository_manage.utils.DateUtil; import lombok.Data; @@ -71,6 +72,22 @@ public class SimpleTaskP { this.applicantTime = DateUtil.TimeStampToDateTime(Long.valueOf(aor.getApplicantTime())); this.applicantName = aor.getApplicantName(); this.type = "物料出库请求"; + } + public SimpleTaskP(ApplicationOutRecordP aor){ + this.id = Long.valueOf(aor.getId()); + this.code = aor.getCode(); + this.applicantTime = aor.getApplicantTime(); + this.applicantName = aor.getApplicantName(); + this.type = "物料出库申请"; } + + public SimpleTaskP(ApplicationInRecordP aip) { + this.id = Long.valueOf(aip.getId()); + this.code = aip.getCode(); + this.applicantTime = aip.getApplicantTime(); + this.applicantName = aip.getApplicantName(); + this.type = "物料入库请求"; + } + } diff --git a/src/main/resources/static/css/public.css b/src/main/resources/static/css/public.css index 5773cc0a..afa8533a 100644 --- a/src/main/resources/static/css/public.css +++ b/src/main/resources/static/css/public.css @@ -190,11 +190,11 @@ body { } -.layuimini-notice:hover, .layuimini-myTask:hover { +.layuimini-notice:hover, .layuimini-myTask:hover,.layuimini-myApply:hover { background: #f6f6f6; } -.layuimini-notice, .layuimini-myTask { +.layuimini-notice, .layuimini-myTask,.layuimini-myApply { padding: 7px 16px; clear: both; font-size: 12px !important; @@ -203,19 +203,19 @@ body { transition: background 0.2s ease-in-out; } -.layuimini-notice-title, .layuimini-notice-label, .layuimini-myTask-type { +.layuimini-notice-title, .layuimini-notice-label, .layuimini-myTask-type,.layuimini-myApply-type { padding-right: 70px !important; text-overflow: ellipsis !important; overflow: hidden !important; white-space: nowrap !important; } -.layuimini-notice-title, .layuimini-myTask-type { +.layuimini-notice-title, .layuimini-myTask-type,.layuimini-myApply-type { line-height: 28px; font-size: 14px; } -.layuimini-notice-extra, .layuimini-myTask-extra { +.layuimini-notice-extra, .layuimini-myTask-extra ,layuimini-myApply-extra{ position: absolute; top: 50%; margin-top: -8px; diff --git a/src/main/resources/templates/pages/self/message.html b/src/main/resources/templates/pages/self/message.html index 53ebc2de..a8702a95 100644 --- a/src/main/resources/templates/pages/self/message.html +++ b/src/main/resources/templates/pages/self/message.html @@ -188,6 +188,26 @@ +
+
+
+ 我的申请 + +
+
+
+
+
+
+
+
+
+
+
+ +
+ @@ -203,6 +223,10 @@ } + function showAllMyApply() { + + } + layui.use(['layer', 'miniTab', 'echarts'], function () { var $ = layui.jquery, layer = layui.layer, @@ -334,6 +358,69 @@ }); + /** + * 查看申请信息 + **/ + $('body').on('click', '.layuimini-myApply', function () { + var id = $(this).children('.layuimini-myApply-id').text(); + var type = $(this).children('.layuimini-myApply-type').text(); + if (type === '物料出库申请') { + var index = layer.open({ + title: '请求详情', + type: 2, + shade: 0.2, + maxmin: true, + shadeClose: true, + area: ['100%', '100%'], + content: '/ApplicationOutView?id=' + id, + end: function () { + location.reload() + } + }); + + $(window).on("resize", function () { + layer.full(index); + }); + } + else if (type === '物料入库请求') { + var index = layer.open({ + title: '请求详情', + type: 2, + shade: 0.2, + maxmin: true, + shadeClose: true, + area: ['100%', '100%'], + content: '/form_step_look?id=' + id, + end: function () { + location.reload() + } + }); + + $(window).on("resize", function () { + layer.full(index); + }); + } + else if (type === "库存盘点请求") { + var index = layer.open({ + title: '请求详情', + type: 2, + shade: 0.2, + maxmin: true, + shadeClose: true, + area: ['100%', '100%'], + content: '/StockTakingView?id=' + id, + end: function () { + location.reload() + } + }); + $(window).on("resize", function () { + layer.full(index); + }); + } + + }); + + showAllNotice = function () { var index = layer.open({ title: '所有公告', @@ -344,12 +431,12 @@ area: ['100%', '100%'], content: '/noticeAll', }); - } + }; showAllMyTask = function () { layer.open({ type: 2, - title: '弹窗内容', + title: '我的任务', skin: 'layui-layer-rim', maxmin: true, shadeClose: true, //点击遮罩关闭层 @@ -360,6 +447,20 @@ }); } + showAllMyApply = function () { + layer.open({ + type: 2, + title: '我的申请', + skin: 'layui-layer-rim', + maxmin: true, + shadeClose: true, //点击遮罩关闭层 + area: ['100%', '100%'], + move: '.layui-layer-title', + fixed: false, + content: '/my_apply', + }); + } + }); diff --git a/src/test/java/com/dreamchaser/depository_manage/OtherTest.java b/src/test/java/com/dreamchaser/depository_manage/OtherTest.java new file mode 100644 index 00000000..112c4113 --- /dev/null +++ b/src/test/java/com/dreamchaser/depository_manage/OtherTest.java @@ -0,0 +1,78 @@ +package com.dreamchaser.depository_manage; + +import com.dreamchaser.depository_manage.entity.StockTaking; +import com.dreamchaser.depository_manage.entity.UserByPort; +import com.dreamchaser.depository_manage.pojo.*; +import com.dreamchaser.depository_manage.service.DepositoryRecordService; +import com.dreamchaser.depository_manage.service.StockTakingService; +import com.dreamchaser.depository_manage.utils.LinkInterfaceUtil; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.test.context.junit4.SpringRunner; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@RunWith(SpringRunner.class) +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +public class OtherTest { + + @Autowired + DepositoryRecordService depositoryRecordService; + + @Autowired + StockTakingService stockTakingService; + @Autowired + RedisTemplate redisTemplateForHash; + + @Test + public void Test(){ + UserByPort userByPort = LinkInterfaceUtil.FindUserById(78, null); + List userSimpleTaskP = getUserSimpleApplyP(userByPort); + System.out.println(userSimpleTaskP); + } + + + /** + * 用于获取当前用户的任务列表 + * @param userToken 当前用户 + * @return + */ + public List getUserSimpleApplyP(UserByPort userToken){ + Map paramForApply = new HashMap<>(); + paramForApply.put("applicantId", userToken.getId()); + paramForApply.put("size", 4); + paramForApply.put("page", 1); + + // 定义任务列表 + List list = new ArrayList<>(); + + // 查询入库申请 + List applicationInRecordPByCondition = depositoryRecordService.findApplicationInRecordPByCondition(paramForApply, userToken); + for (ApplicationInRecordP applicationInRecordP : applicationInRecordPByCondition) { + SimpleTaskP simpleTask = new SimpleTaskP(applicationInRecordP); + list.add(simpleTask); + } + + + List applicationOutRecordPlist = depositoryRecordService.findApplicationOutRecordPByCondition(paramForApply, userToken); + for (ApplicationOutRecordP applicationOutRecordP : applicationOutRecordPlist) { + SimpleTaskP simpleTask = new SimpleTaskP(applicationOutRecordP); + list.add(simpleTask); + } + + paramForApply.put("originator",userToken.getId()); + List stockTakingByCondition = stockTakingService.findStockTakingByCondition(paramForApply); + for (StockTaking stockTaking : stockTakingByCondition) { + SimpleTaskP simpleTask = new SimpleTaskP(new SimpleStockTakingP(stockTaking)); + list.add(simpleTask); + } + return list; + } + +} diff --git a/src/test/java/com/dreamchaser/depository_manage/TestForOther.java b/src/test/java/com/dreamchaser/depository_manage/TestForOther.java deleted file mode 100644 index 28fafccf..00000000 --- a/src/test/java/com/dreamchaser/depository_manage/TestForOther.java +++ /dev/null @@ -1,122 +0,0 @@ -package com.dreamchaser.depository_manage; - -import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.ExcelWriter; -import com.alibaba.excel.enums.WriteDirectionEnum; -import com.alibaba.excel.util.ListUtils; -import com.alibaba.excel.write.metadata.WriteSheet; -import com.alibaba.excel.write.metadata.fill.FillConfig; -import com.alibaba.excel.write.metadata.fill.FillWrapper; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.JSONPObject; -import com.dreamchaser.depository_manage.config.PortConfig; -import com.dreamchaser.depository_manage.config.QyWxConfig; -import com.dreamchaser.depository_manage.entity.*; -import com.dreamchaser.depository_manage.mapper.DepositoryMapper; -import com.dreamchaser.depository_manage.mapper.DepositoryRecordMapper; -import com.dreamchaser.depository_manage.mapper.MaterialMapper; -import com.dreamchaser.depository_manage.pojo.ApplicationOutRecordP; -import com.dreamchaser.depository_manage.pojo.RestResponse; -import com.dreamchaser.depository_manage.pojo.callBackXml.approvalCallBackXml.ApprovalInfo; -import com.dreamchaser.depository_manage.pojo.callBackXml.approvalCallBackXml.ApprovalInfo_Details; -import com.dreamchaser.depository_manage.pojo.callBackXml.approvalCallBackXml.ApprovalInfo_Details_Approver; -import com.dreamchaser.depository_manage.service.*; -import com.dreamchaser.depository_manage.service.impl.QyWxOperationService; -import com.dreamchaser.depository_manage.utils.CreateQrCodeUtil; -import com.dreamchaser.depository_manage.utils.HttpUtils; -import com.dreamchaser.depository_manage.utils.LinkInterfaceUtil; -import com.dreamchaser.depository_manage.utils.ZipMultiFileUtil; -import javafx.scene.paint.Material; -import org.apache.http.protocol.HTTP; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.test.context.junit4.SpringRunner; -import org.springframework.web.jsf.FacesContextUtils; - -import java.io.File; -import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.lang.reflect.Array; -import java.net.URLEncoder; -import java.text.SimpleDateFormat; -import java.util.*; -import java.util.concurrent.*; - -@RunWith(SpringRunner.class) -@SpringBootTest -public class TestForOther { - - - @Autowired - AccessAddressService accessAddressService; - - - /** - * 获取当月的开始和结束时间 - */ - - - @Test - public void run() { - UserByPort userToken = LinkInterfaceUtil.FindUserById(78, null); - //定义链接地址 - String url = PortConfig.external_url_6666 + "/system_authorizing/obtain_authorization"; - Map param = new HashMap<>(); - param.put("system", "cangchu"); - String jsonString = JSONObject.toJSONString(param); - JSONObject paramObject = JSONObject.parseObject(jsonString); - String post = null; - try { - post = HttpUtils.send(url, paramObject, HTTP.UTF_8, userToken); - } catch (IOException e) { - e.printStackTrace(); - } - JSONObject jsonObject = JSONObject.parseObject(post); - JSONObject data = (JSONObject) jsonObject.get("data"); - JSONArray powerid = (JSONArray) data.get("powerid"); - if (powerid == null) { - powerid = new JSONArray(); - } - List stringList = JSONObject.parseArray(powerid.toJSONString(), String.class); - List accessToAddressByList = accessAddressService.findAccessToAddressByList(stringList); - } - - - /** - * 根据父级菜单获取子菜单 - * - * @param accessToAddressByList - * @param address - * @return - */ - public List childAddress(List accessToAddressByList, AccesstoAddress address) { - List accessstoAddressByParent = new ArrayList<>(); - for (AccesstoAddress accesstoAddress : accessToAddressByList) { - if (Integer.compare(accesstoAddress.getMenuparent(), address.getId()) == 0) { - accessstoAddressByParent.add(accesstoAddress); - } - } - return accessstoAddressByParent; - } - - /** - * 用于菜单构造 - * - * @param address - * @return - */ - public Map MenuConstructor(AccesstoAddress address) { - Map menu = new HashMap<>(); - menu.put("title", address.getName()); - menu.put("href", address.getUrl()); - menu.put("icon", address.getIcon()); - menu.put("target", address.getTarget()); - return menu; - } - - -}