有冲突的

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();

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<UserMapper, User> 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<UserMapper, User> 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<String> roles = new ArrayList<>();

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  #设置开启热部署

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});
+     }
+   },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

IOReportSysMP/miniprogram/pages/audit/detail/index.wxml

@@ -1,15 +1,15 @@
 <navigationBar title="审核详情"></navigationBar>
 <view class="report-info-container">
   <view class="card-col-1">
-    <yinput onlyRead padding="6px" label="工号:" defaultValue="{{id}}" />
-    <yinput onlyRead padding="6px" label="姓名:" defaultValue="{{name}}" />
+    <yinput onlyRead padding="6px" label="工号:" Value="{{id}}" />
+    <yinput onlyRead padding="6px" label="姓名:" Value="{{name}}" />
   </view>
-  <yinput onlyRead padding="6px" label="手机号:" defaultValue="{{phone}}" />
-  <yinput onlyRead padding="6px" label="类型:" defaultValue="{{reportType}}" />
-  <yinput onlyRead padding="6px" label="状态:" defaultValue="{{reportStatus}}" />
-  <yinput onlyRead padding="6px" label="校内居住地:" defaultValue="{{phone}}" />
-  <yinput onlyRead padding="6px" label="校外居住地:" defaultValue="{{outerLocation}}" />
-  <yinput onlyRead padding="6px" label="事由:" defaultValue="{{reason}}" />
+  <yinput onlyRead padding="6px" label="手机号:" Value="{{phone}}" />
+  <yinput onlyRead padding="6px" label="类型:" Value="{{reportType}}" />
+  <yinput onlyRead padding="6px" label="状态:" Value="{{reportStatus}}" />
+  <yinput onlyRead padding="6px" label="校内居住地:" Value="{{phone}}" />
+  <yinput onlyRead padding="6px" label="校外居住地:" Value="{{outerLocation}}" />
+  <yinput onlyRead padding="6px" label="事由:" Value="{{reason}}" />
 </view>
 <view class="submit-button">
   <ybutton bindtap="onPass" class="button-item" lineHeight="50px" title="通过" bgColor="var(--color-primary)" />

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<string, string> }) {
-    // 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||[]})
+    }
   },
 
   /**

IOReportSysMP/miniprogram/pages/audit/list/auditList.wxml

@@ -1,8 +1,9 @@
+<wxs src="../../../utils/filter.wxs" module="filter" />
 <view class="content-container">
   <navigationBar title="审核列表" bindtap="bindTestTap"></navigationBar>
   <sysFilterBar bindonSubmit="onSubmit"></sysFilterBar>
   <view class="cards-container">
-    <sysCard wx:for="{{reportInfos}}" reportStatus="{{item.reportStatus}}" reportType="{{item.reportType == '0' ? '出校报备' : '进校报备'}}" reportDateTime="{{item.reportDateTime}}" reviewer="{{item.reviewer}}" data-reportID="{{item.reportID}}" bindtap="bindtap" wx:key="reportID" />
+    <sysCard wx:for="{{reportInfos}}" reportStatus="{{item.Status}}" reportType="{{item.ioType == '0' ? '出校报备' : '进校报备'}}" reportDateTime="{{filter.formatTime(item.commitTime,'Y-M-D h:m')}}" reviewer="{{item.schoolAuditorID==0?'无':item.schoolAuditorID}}" data-reportID="{{item.id}}" bindtap="bindtap" wx:key="id" />
   </view>
 </view>