From c941dc26c7aab6e4d5c3ec222cd46b4c20f5e5f9 Mon Sep 17 00:00:00 2001 From: 18603301327 Date: Mon, 17 Oct 2022 16:49:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=89=E5=86=B2=E7=AA=81=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IORecordServiceImpl.java | 4 +++ .../service/impl/UserServiceImpl.java | 18 +++++++++- .../src/main/resources/application.yml | 10 +++--- .../miniprogram/pages/audit/detail/index.ts | 33 +++++++++---------- .../miniprogram/pages/audit/detail/index.wxml | 16 ++++----- .../miniprogram/pages/audit/list/auditList.ts | 32 +++++++++++++----- .../pages/audit/list/auditList.wxml | 3 +- 7 files changed, 74 insertions(+), 42 deletions(-) diff --git a/IOReportSysBE/src/main/java/edu/ncst/ioreport/service/impl/IORecordServiceImpl.java b/IOReportSysBE/src/main/java/edu/ncst/ioreport/service/impl/IORecordServiceImpl.java index e1e71fc..2facf7a 100644 --- a/IOReportSysBE/src/main/java/edu/ncst/ioreport/service/impl/IORecordServiceImpl.java +++ b/IOReportSysBE/src/main/java/edu/ncst/ioreport/service/impl/IORecordServiceImpl.java @@ -68,6 +68,10 @@ public class IORecordServiceImpl implements IIORecordService { return records; } + public IORecords getIORecordsDetail(String states){ + return null; + } + @Override public int addIORecord(IORecords record) { UserInfoVO user = SessionUtils.getCurrentUser(); diff --git a/IOReportSysBE/src/main/java/edu/ncst/ioreport/service/impl/UserServiceImpl.java b/IOReportSysBE/src/main/java/edu/ncst/ioreport/service/impl/UserServiceImpl.java index f244b84..ddf76a2 100644 --- a/IOReportSysBE/src/main/java/edu/ncst/ioreport/service/impl/UserServiceImpl.java +++ b/IOReportSysBE/src/main/java/edu/ncst/ioreport/service/impl/UserServiceImpl.java @@ -22,6 +22,13 @@ import java.util.List; @Service public class UserServiceImpl extends ServiceImpl implements IUserService, UserDetailsService { + + private final UserMapper userMapper; + + public UserServiceImpl(UserMapper userMapper) { + this.userMapper = userMapper; + } + @Override public User getUserInfo(QUser query) { User vo = new User(); @@ -63,11 +70,20 @@ public class UserServiceImpl extends ServiceImpl implements IU return user; } + //根据wechatID获取用户信息 + public UserDetails loadUserByWechatId2(String wechatId){ + if(wechatId == null){ + throw new BusinessException(CodeMsg.NOT_GET_CURRENT_USER_INFO); + } + User user = userMapper.getByWechatId(wechatId); + return user; + } + @Override public UserDetails loadUserByWechatId(String wechatId) { User user = new User(); user.setAddress("address 1111111"); - user.setTeacherID("1001"); + user.setTeacherID("1"); user.setUserID(Integer.valueOf(1)); user.setName("张三"); List roles = new ArrayList<>(); diff --git a/IOReportSysBE/src/main/resources/application.yml b/IOReportSysBE/src/main/resources/application.yml index 3b78fab..14dc933 100644 --- a/IOReportSysBE/src/main/resources/application.yml +++ b/IOReportSysBE/src/main/resources/application.yml @@ -1,11 +1,9 @@ spring: datasource: - url: jdbc:mysql://localhost:3306/iorecordsys?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai - username: smart - password: hblgjg@2020 - driver-class-name: com.mysql.cj.jdbc.Driver - hikari: - max-lifetime: 300000 + driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver + url: jdbc:sqlserver://localhost:1433;DatabaseName=IORecordsDB + username: sa + password: 123456 devtools: restart: enabled: true #设置开启热部署 diff --git a/IOReportSysMP/miniprogram/pages/audit/detail/index.ts b/IOReportSysMP/miniprogram/pages/audit/detail/index.ts index 06e28c3..1cf546c 100644 --- a/IOReportSysMP/miniprogram/pages/audit/detail/index.ts +++ b/IOReportSysMP/miniprogram/pages/audit/detail/index.ts @@ -1,25 +1,24 @@ -import orderApi from "../../../api/orderApi/orderApi" -const orderType = ['出校报备', '进校报备'] -const reportStatus = ['通过', '院级审核', '校级审核', '退回'] +import services from "../../../services/index" +import { IORecords} from '../../../services/baseClass' Page({ data: { - - }, - onLoad() { - const reportID = wx.getStorageSync("auditList/auditList") - orderApi.getOrderDetailByOrderID(reportID).then(res => { - res.reportStatus = reportStatus[res.reportStatus as any] as any - res.reportType = orderType[res.reportType as any] as any - this.setData(res) - }) + ioRecord : IORecords, }, - onPass(event: WechatMiniprogram.Input) { - orderApi.passOrder(event.currentTarget.dataset.reportID) - }, - onDeny(event: WechatMiniprogram.Input) { - orderApi.denyOrder(event.currentTarget.dataset.reportID) + onLoad:async function() { + this.getRecordDetail(); }, + + //获取审核详情 + getRecordDetail : async function(){ + const reportID = wx.getStorageSync("auditList/auditList") + let res = await services.API.iORecords.getIORecordByID.request({ID:reportID}); + if(res&&res.data){ + let record = res.data; + console.log(record) + this.setData({ioRecord:record?record:null}); + } + }, /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/IOReportSysMP/miniprogram/pages/audit/detail/index.wxml b/IOReportSysMP/miniprogram/pages/audit/detail/index.wxml index 9fcb1a5..c751b20 100644 --- a/IOReportSysMP/miniprogram/pages/audit/detail/index.wxml +++ b/IOReportSysMP/miniprogram/pages/audit/detail/index.wxml @@ -1,15 +1,15 @@ - - + + - - - - - - + + + + + + diff --git a/IOReportSysMP/miniprogram/pages/audit/list/auditList.ts b/IOReportSysMP/miniprogram/pages/audit/list/auditList.ts index 8914e4b..d3dfce7 100644 --- a/IOReportSysMP/miniprogram/pages/audit/list/auditList.ts +++ b/IOReportSysMP/miniprogram/pages/audit/list/auditList.ts @@ -1,4 +1,7 @@ // pages/my-report/myReport.ts +import services from "../../../services/index" +import { QRecord } from "../../../services/baseClass" +import constant from "../../../utils/constant" Page({ /** @@ -16,22 +19,33 @@ Page({ } }, bindtap(event: WechatMiniprogram.Input) { - const { reportID } = event.currentTarget.dataset - wx.setStorageSync("auditList/auditList", reportID) - wx.navigateTo({ url: "../auditDetail/auditDetail" }) + const { reportid } = event.currentTarget.dataset + wx.setStorageSync("auditList/auditList", reportid) + wx.navigateTo({ url: "../detail/index" }) }, - onSubmit({ detail }: { detail: Record }) { - // orderApi.getOrderDetailFilter(detail.reportType, detail.reportStatus).then(res => { - // this.setData({reportInfos:res || []}) - // }) + onSubmit:async function( detail : QRecord) { + let res = await services.API.iORecords.getIORecordsList.request(detail); + if(res&&res.data){ + console.log(res.data) + this.setData({reportInfos:res.data||[]}) + } }, /** * 生命周期函数--监听页面加载 */ - onLoad() { + onLoad:async function() { // 单据id 报备时间 报备类型 审核人 审核状态 // 锁? 多人同时操作一个订单怎么办 - // orderApi.getOrderInfo().then(res => this.setData({ reportInfos: res || [] })) + const user = wx.getStorageSync(constant.USER_INFO); + console.log("user",user); + if(!user||!user.teacherID){ + wx.navigateTo({url:"../../index/index.ts"}) + } + let res = await services.API.iORecords.getIORecordsList.request({teacherID:user.teacherID}); + if(res&&res.data){ + console.log(res.data) + this.setData({reportInfos:res.data||[]}) + } }, /** diff --git a/IOReportSysMP/miniprogram/pages/audit/list/auditList.wxml b/IOReportSysMP/miniprogram/pages/audit/list/auditList.wxml index bf656a4..53aab32 100644 --- a/IOReportSysMP/miniprogram/pages/audit/list/auditList.wxml +++ b/IOReportSysMP/miniprogram/pages/audit/list/auditList.wxml @@ -1,8 +1,9 @@ + - +