diff --git a/IOReportSysBE/WW_verify_oybSbwfJxjOnBTrL.txt b/IOReportSysBE/WW_verify_oybSbwfJxjOnBTrL.txt new file mode 100644 index 0000000..4b98075 --- /dev/null +++ b/IOReportSysBE/WW_verify_oybSbwfJxjOnBTrL.txt @@ -0,0 +1 @@ +oybSbwfJxjOnBTrL \ No newline at end of file diff --git a/IOReportSysBE/src/main/java/edu/ncst/ioreport/controller/IORecordsController.java b/IOReportSysBE/src/main/java/edu/ncst/ioreport/controller/IORecordsController.java index 5bf02ac..04027ee 100644 --- a/IOReportSysBE/src/main/java/edu/ncst/ioreport/controller/IORecordsController.java +++ b/IOReportSysBE/src/main/java/edu/ncst/ioreport/controller/IORecordsController.java @@ -30,7 +30,12 @@ public class IORecordsController { List ioRecordsList = iioRecordService.getIORecordsList(param); return ResultUtils.success(ioRecordsList); } - + @ApiOperation("获取报备记录列表") + @PostMapping("/audit-list") + public ResultVO> getIORecordsAuditList(@RequestBody QRecord param){ + List ioRecordsList = iioRecordService.getIORecordsAuditList(param); + return ResultUtils.success(ioRecordsList); + } @ApiOperation("根据记录ID获取记录详细信息") @GetMapping("/detail") public ResultVO getIORecordByID(@RequestParam(name = "ID") Integer ID){ @@ -38,7 +43,7 @@ public class IORecordsController { return ResultUtils.success(record); } - @ApiOperation("根据记录ID获取记录详细信息") + @ApiOperation("新增一条报备记录") @PostMapping("/add") public ResultVO addIORecord(@RequestBody IORecords param){ int id = iioRecordService.addIORecord(param); diff --git a/IOReportSysBE/src/main/java/edu/ncst/ioreport/mapper/IORecordsMapper.java b/IOReportSysBE/src/main/java/edu/ncst/ioreport/mapper/IORecordsMapper.java index 65561ae..236f134 100644 --- a/IOReportSysBE/src/main/java/edu/ncst/ioreport/mapper/IORecordsMapper.java +++ b/IOReportSysBE/src/main/java/edu/ncst/ioreport/mapper/IORecordsMapper.java @@ -1,11 +1,19 @@ package edu.ncst.ioreport.mapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; import edu.ncst.ioreport.model.IORecords; import edu.ncst.ioreport.model.Resource; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; +import java.util.List; + @Repository public interface IORecordsMapper extends BaseMapper { int insertAndGetId(IORecords record); + + List selectAuditList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + IORecords selectDetail(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/IOReportSysBE/src/main/java/edu/ncst/ioreport/model/IORecords.java b/IOReportSysBE/src/main/java/edu/ncst/ioreport/model/IORecords.java index 0167a20..c483be3 100644 --- a/IOReportSysBE/src/main/java/edu/ncst/ioreport/model/IORecords.java +++ b/IOReportSysBE/src/main/java/edu/ncst/ioreport/model/IORecords.java @@ -1,6 +1,8 @@ package edu.ncst.ioreport.model; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; import edu.ncst.ioreport.vo.QRToken; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -46,27 +48,31 @@ public class IORecords { @ApiModelProperty(value = "出入校时间") @NotNull(message = "出入校时间不能为空") + @JSONField(format = "yyyy-MM-dd HH:mm") private Date commitTime; @ApiModelProperty(value = "院级审核人") private Integer deptAuditorID; @ApiModelProperty(value = "院级审核时间") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private Date deptAuditTime; @ApiModelProperty(value = "校级审核人") private Integer schoolAuditorID; @ApiModelProperty(value = "校级审核时间") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private Date schoolAuditTime; @ApiModelProperty(value = "核验人") private Integer validatorID; @ApiModelProperty(value = "核验时间") + @JSONField(format = "yyyy-MM-dd HH:mm:ss") private Date validateTime; - @ApiModelProperty(value = "单据状态:0-保存;1-提交待审核;2-院级审核通过;3-校级审核通过;4-核验通过;9-院级审核不通过;8-校级审核不通过;7-核验不通过") + @ApiModelProperty(value = "单据状态:SUBMIT-提交待审核;DEPT_PASS-院级审核通过;SCHOOL_PASS-校级审核通过;VERIFY_PASS-核验通过;DEPT_DENY-院级审核不通过;SCHOOL_DENY-校级审核不通过;VERIFY_DENY-核验不通过;INVALID-无效") private String status; @ApiModelProperty(value = "教师") diff --git a/IOReportSysBE/src/main/java/edu/ncst/ioreport/service/IIORecordService.java b/IOReportSysBE/src/main/java/edu/ncst/ioreport/service/IIORecordService.java index e208379..4189446 100644 --- a/IOReportSysBE/src/main/java/edu/ncst/ioreport/service/IIORecordService.java +++ b/IOReportSysBE/src/main/java/edu/ncst/ioreport/service/IIORecordService.java @@ -12,4 +12,6 @@ public interface IIORecordService { IORecords getIORecordsDetail(Integer ID); int addIORecord(IORecords record); + + List getIORecordsAuditList(QRecord param); } 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..39461c3 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 @@ -3,6 +3,7 @@ package edu.ncst.ioreport.service.impl; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import com.sun.org.apache.xpath.internal.operations.Bool; import edu.ncst.ioreport.exception.BusinessException; import edu.ncst.ioreport.exception.CodeMsg; import edu.ncst.ioreport.mapper.IORecordsMapper; @@ -38,14 +39,52 @@ public class IORecordServiceImpl implements IIORecordService { return list; } + @Override + public List getIORecordsAuditList(QRecord query) { + IORecords ioRecords = new IORecords(); + UserInfoVO user = SessionUtils.getCurrentUser(); + if(user.getTeacherID().compareTo(query.getTeacherID()) !=0){ + throw new BusinessException(CodeMsg.BUSINESS_ERROR.fillArgs("用户信息不匹配")); + } + + Boolean canAccess = false; + Boolean schoolAudit = false; + for(String role:user.getRoles()){ + if(role.contains("ADMIN")){ + canAccess=true; + if(role.compareTo("S_ADMIN")==0){ + schoolAudit = true; + } + } + } + if(!canAccess){ + throw new BusinessException(CodeMsg.CAN_NOT_DATA_ACCESS); + } + QueryWrapper queryWrapper = new QueryWrapper(ioRecords); + queryWrapper.eq(query.getStatus()!=null,"status",query.getStatus()); + queryWrapper.eq(query.getType()!=null,"ioType",query.getType()); + + if(schoolAudit){ + queryWrapper.eq(query.getStatus()==null,"status","DEPT_PASS"); + }else{ + queryWrapper.eq("uu.departmentID",user.getDepartmentID()); + queryWrapper.eq(query.getStatus()==null,"status","SUBMIT"); + } + + List list = recordsMapper.selectAuditList(queryWrapper); + + return list; + } @Override public IORecords getIORecordsDetail(Integer ID) { if(null==ID){ throw new BusinessException(CodeMsg.PARAM_ERROR.fillArgs("记录单ID为空")); } - IORecords records = recordsMapper.selectById(ID); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("id",ID); + IORecords records = recordsMapper.selectDetail(queryWrapper); if(records.getStatus().compareTo("SCHOOL_PASS")==0){ if(!stringRedisTemplate.hasKey("qrToken_"+ID)){ @@ -72,7 +111,7 @@ public class IORecordServiceImpl implements IIORecordService { public int addIORecord(IORecords record) { UserInfoVO user = SessionUtils.getCurrentUser(); List roles = user.getRoles(); - if(roles==null||(roles.size()==1&&user.getRoles().get(0).compareTo("DOOR_GUARD")==0)){ + if(roles==null||(roles.size()==1&&user.getRoles().get(0).compareTo("DOORMEN")==0)){ throw new BusinessException(CodeMsg.CAN_NOT_DATA_ACCESS); } if(user.getTeacherID().compareTo(record.getTeacherID())!=0){ diff --git a/IOReportSysBE/src/main/java/edu/ncst/ioreport/service/impl/ResourceServiceImpl.java b/IOReportSysBE/src/main/java/edu/ncst/ioreport/service/impl/ResourceServiceImpl.java index 9537da2..5e0a453 100644 --- a/IOReportSysBE/src/main/java/edu/ncst/ioreport/service/impl/ResourceServiceImpl.java +++ b/IOReportSysBE/src/main/java/edu/ncst/ioreport/service/impl/ResourceServiceImpl.java @@ -57,6 +57,7 @@ public class ResourceServiceImpl implements IResourceService { urls.add("/api/user/current"); urls.add("/api/records/detail"); urls.add("/api/records/list"); + urls.add("/api/records/audit-list"); urls.add("/api/records/add"); return urls; } 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..1da75e7 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 @@ -25,7 +25,7 @@ public class UserServiceImpl extends ServiceImpl implements IU @Override public User getUserInfo(QUser query) { User vo = new User(); - vo.setTeacherID("1001"); + vo.setTeacherID("1"); vo.setAddress("address 1111111"); vo.setUserName("zhangsan"); vo.setName("张三"); @@ -36,7 +36,7 @@ public class UserServiceImpl extends ServiceImpl implements IU public ListResultVO getUserList(QUser query) { User user = new User(); user.setAddress("address 1111111"); - user.setTeacherID("1001"); + user.setTeacherID("1"); user.setName("张三"); user.setIsInSchool(true); ListResultVO listResultVO = new ListResultVO(); @@ -57,7 +57,7 @@ public class UserServiceImpl extends ServiceImpl implements IU BeanUtils.copyProperties(userinfo,user); Department dept =new Department(); dept.setDepartment("人工智能"); - dept.setDepartmentID("01"); + dept.setDepartmentID("1"); user.setDept(dept); user.setMobile("123344444"); return user; @@ -65,18 +65,19 @@ public class UserServiceImpl extends ServiceImpl implements IU @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<>(); - roles.add("Admin");//Teacher;Doorman + roles.add("S_ADMIN");//Teacher;DOORMEN;D_ADMIN;ADMIN user.setRoles(roles); user.setIsInSchool(true); Department dept =new Department(); dept.setDepartment("人工智能"); - dept.setDepartmentID("01"); + dept.setDepartmentID("1"); user.setDept(dept); return user; } @@ -85,10 +86,10 @@ public class UserServiceImpl extends ServiceImpl implements IU public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { User user = new User(); user.setAddress("address 1111111"); - user.setTeacherID("1001"); + user.setTeacherID("1"); user.setName("张三"); List roles = new ArrayList<>(); - roles.add("Admin"); + roles.add("S_ADMIN"); user.setIsInSchool(true); return user; } diff --git a/IOReportSysBE/src/main/java/edu/ncst/ioreport/vo/param/QRecord.java b/IOReportSysBE/src/main/java/edu/ncst/ioreport/vo/param/QRecord.java index b4e6891..9d7e934 100644 --- a/IOReportSysBE/src/main/java/edu/ncst/ioreport/vo/param/QRecord.java +++ b/IOReportSysBE/src/main/java/edu/ncst/ioreport/vo/param/QRecord.java @@ -11,6 +11,9 @@ import java.util.Date; @ApiModel(description = "出入报备记录查询对象") @Data public class QRecord extends Query { + @ApiModelProperty(value = "用户id") + private Integer userID; + @ApiModelProperty(value = "教师工号") private String teacherID; diff --git a/IOReportSysBE/src/main/resources/application.yml b/IOReportSysBE/src/main/resources/application.yml index 3b78fab..cd63d17 100644 --- a/IOReportSysBE/src/main/resources/application.yml +++ b/IOReportSysBE/src/main/resources/application.yml @@ -18,6 +18,12 @@ spring: matching-strategy: ant_path_matcher async: request-timeout: 120000 #设置restful的api超时时间为60秒 + jackson: + date-format: + ## 格式为yyyy-MM-dd HH:mm:ss + date-format: yyyy-MM-dd HH:mm:ss + ## 定时区,解决8小时的时间差问题 + time-zone: GMT+8 server: port: 8085 tomcat: diff --git a/IOReportSysBE/src/main/resources/mapping/IORecordMapper.xml b/IOReportSysBE/src/main/resources/mapping/IORecordMapper.xml index 035ffb5..0f1133e 100644 --- a/IOReportSysBE/src/main/resources/mapping/IORecordMapper.xml +++ b/IOReportSysBE/src/main/resources/mapping/IORecordMapper.xml @@ -1,7 +1,7 @@ - + @@ -12,4 +12,40 @@ insert into iorecords (teacherid,iotype,outerResidence,innerResidence,reason,committime,status) values(#{teacherID},#{ioType},#{outerResidence},#{innerResidence},#{reason},#{commitTime},#{status}) + + + + \ No newline at end of file diff --git a/IOReportSysMP/miniprogram/components/yinput/yinput.js b/IOReportSysMP/miniprogram/components/yinput/yinput.js index 2e37ca7..5ff825c 100644 --- a/IOReportSysMP/miniprogram/components/yinput/yinput.js +++ b/IOReportSysMP/miniprogram/components/yinput/yinput.js @@ -36,7 +36,7 @@ Component({ }, lifetimes: { ready: function () { - var initValue = this.data.defaultValue || ''; + var initValue = this.data.value || this.data.defaultValue || ''; this.dataset[this.data.bindValue] = initValue; this.setData({ value: initValue }); }, diff --git a/IOReportSysMP/miniprogram/pages/audit/detail/index.js b/IOReportSysMP/miniprogram/pages/audit/detail/index.js index 9e81017..97704ce 100644 --- a/IOReportSysMP/miniprogram/pages/audit/detail/index.js +++ b/IOReportSysMP/miniprogram/pages/audit/detail/index.js @@ -1,27 +1,89 @@ "use strict"; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var __generator = (this && this.__generator) || function (thisArg, body) { + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g; + return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; + function verb(n) { return function (v) { return step([n, v]); }; } + function step(op) { + if (f) throw new TypeError("Generator is already executing."); + while (_) try { + if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t; + if (y = 0, t) op = [op[0] & 2, t.value]; + switch (op[0]) { + case 0: case 1: t = op; break; + case 4: _.label++; return { value: op[1], done: false }; + case 5: _.label++; y = op[1]; op = [0]; continue; + case 7: op = _.ops.pop(); _.trys.pop(); continue; + default: + if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } + if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } + if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } + if (t[2]) _.ops.pop(); + _.trys.pop(); continue; + } + op = body.call(thisArg, _); + } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } + if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; + } +}; var __importDefault = (this && this.__importDefault) || function (mod) { return (mod && mod.__esModule) ? mod : { "default": mod }; }; Object.defineProperty(exports, "__esModule", { value: true }); -var orderApi_1 = __importDefault(require("../../../api/orderApi/orderApi")); -var orderType = ['出校报备', '进校报备']; -var reportStatus = ['通过', '院级审核', '校级审核', '退回']; +var index_1 = __importDefault(require("../../../services/index")); +var ioRecordStatus = { + SAVE: '保存', + SUBMIT: "待审核", + DEPT_PASS: '院审通过', + SCHOOL_PASS: '校审通过', + VERIFY_PASS: '核验通过', + DEPT_DENY: '院审不通过', + SCHOOL_DENY: '校审不通过', + VERIFY_DENY: '核验不通过', +}; +var ioRecordType = ['入校', '出校']; Page({ - data: {}, + data: { + ioRecord: {}, + teacher: {}, + ioRecordType: ioRecordType, + ioRecordStatus: ioRecordStatus, + }, onLoad: function () { - var _this = this; - var reportID = wx.getStorageSync("auditList/auditList"); - orderApi_1.default.getOrderDetailByOrderID(reportID).then(function (res) { - res.reportStatus = reportStatus[res.reportStatus]; - res.reportType = orderType[res.reportType]; - _this.setData(res); + return __awaiter(this, void 0, void 0, function () { + var reportID, res, record; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + reportID = wx.getStorageSync("auditList/auditList"); + return [4 /*yield*/, index_1.default.API.iORecords.getIORecordByID.request({ ID: reportID })]; + case 1: + res = _a.sent(); + if (res && res.data) { + record = res.data; + console.log(record); + this.setData({ ioRecord: record ? record : null }); + this.setData({ teacher: record ? record.teacher : null }); + } + return [2 /*return*/]; + } + }); }); }, onPass: function (event) { - orderApi_1.default.passOrder(event.currentTarget.dataset.reportID); + //orderApi.passOrder(event.currentTarget.dataset.reportID) }, onDeny: function (event) { - orderApi_1.default.denyOrder(event.currentTarget.dataset.reportID); + //orderApi.denyOrder(event.currentTarget.dataset.reportID) }, /** * 生命周期函数--监听页面初次渲染完成 diff --git a/IOReportSysMP/miniprogram/pages/audit/detail/index.ts b/IOReportSysMP/miniprogram/pages/audit/detail/index.ts index 06e28c3..3cc51f5 100644 --- a/IOReportSysMP/miniprogram/pages/audit/detail/index.ts +++ b/IOReportSysMP/miniprogram/pages/audit/detail/index.ts @@ -1,24 +1,38 @@ -import orderApi from "../../../api/orderApi/orderApi" -const orderType = ['出校报备', '进校报备'] -const reportStatus = ['通过', '院级审核', '校级审核', '退回'] +import services from "../../../services/index" +const ioRecordStatus = { + SAVE: '保存', + SUBMIT: "待审核", + DEPT_PASS:'院审通过', + SCHOOL_PASS:'校审通过', + VERIFY_PASS:'核验通过', + DEPT_DENY:'院审不通过', + SCHOOL_DENY:'校审不通过', + VERIFY_DENY:'核验不通过', +} +const ioRecordType = ['入校','出校'] Page({ data: { - + ioRecord : {}, + teacher:{}, + ioRecordType, + ioRecordStatus, }, - onLoad() { + onLoad:async function() { 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) - }) + 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}); + this.setData({teacher:record?record.teacher:null}); + } }, onPass(event: WechatMiniprogram.Input) { - orderApi.passOrder(event.currentTarget.dataset.reportID) + //orderApi.passOrder(event.currentTarget.dataset.reportID) }, onDeny(event: WechatMiniprogram.Input) { - orderApi.denyOrder(event.currentTarget.dataset.reportID) + //orderApi.denyOrder(event.currentTarget.dataset.reportID) }, /** * 生命周期函数--监听页面初次渲染完成 diff --git a/IOReportSysMP/miniprogram/pages/audit/detail/index.wxml b/IOReportSysMP/miniprogram/pages/audit/detail/index.wxml index 9fcb1a5..ca7a4c6 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.js b/IOReportSysMP/miniprogram/pages/audit/list/auditList.js index 3283d69..97b029d 100644 --- a/IOReportSysMP/miniprogram/pages/audit/list/auditList.js +++ b/IOReportSysMP/miniprogram/pages/audit/list/auditList.js @@ -1,5 +1,46 @@ "use strict"; -// pages/my-report/myReport.ts +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var __generator = (this && this.__generator) || function (thisArg, body) { + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g; + return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; + function verb(n) { return function (v) { return step([n, v]); }; } + function step(op) { + if (f) throw new TypeError("Generator is already executing."); + while (_) try { + if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t; + if (y = 0, t) op = [op[0] & 2, t.value]; + switch (op[0]) { + case 0: case 1: t = op; break; + case 4: _.label++; return { value: op[1], done: false }; + case 5: _.label++; y = op[1]; op = [0]; continue; + case 7: op = _.ops.pop(); _.trys.pop(); continue; + default: + if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } + if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } + if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } + if (t[2]) _.ops.pop(); + _.trys.pop(); continue; + } + op = body.call(thisArg, _); + } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } + if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; + } +}; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; +Object.defineProperty(exports, "__esModule", { value: true }); +var index_1 = __importDefault(require("../../../services/index")); +var constant_1 = __importDefault(require("../../../utils/constant")); Page({ /** * 页面的初始数据 @@ -16,23 +57,52 @@ Page({ } }, bindtap: function (event) { - var reportID = event.currentTarget.dataset.reportID; - wx.setStorageSync("auditList/auditList", reportID); - wx.navigateTo({ url: "../auditDetail/auditDetail" }); + var reportid = event.currentTarget.dataset.reportid; + wx.setStorageSync("auditList/auditList", reportid); + wx.navigateTo({ url: "../detail/index" }); }, - onSubmit: function (_a) { - var detail = _a.detail; - // orderApi.getOrderDetailFilter(detail.reportType, detail.reportStatus).then(res => { - // this.setData({reportInfos:res || []}) - // }) + onSubmit: function (detail) { + return __awaiter(this, void 0, void 0, function () { + var res; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: return [4 /*yield*/, index_1.default.API.iORecords.getIORecordsList.request(detail)]; + case 1: + res = _a.sent(); + if (res && res.data) { + console.log(res.data); + this.setData({ reportInfos: res.data || [] }); + } + return [2 /*return*/]; + } + }); + }); }, /** * 生命周期函数--监听页面加载 */ onLoad: function () { - // 单据id 报备时间 报备类型 审核人 审核状态 - // 锁? 多人同时操作一个订单怎么办 - // orderApi.getOrderInfo().then(res => this.setData({ reportInfos: res || [] })) + return __awaiter(this, void 0, void 0, function () { + var user, res; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + user = wx.getStorageSync(constant_1.default.USER_INFO); + console.log("user", user); + if (!user || !user.teacherID) { + wx.navigateTo({ url: "../../index/index.ts" }); + } + return [4 /*yield*/, index_1.default.API.iORecords.getIORecordsAuditList.request({ teacherID: user.teacherID })]; + case 1: + res = _a.sent(); + if (res && res.data) { + console.log(res.data); + this.setData({ reportInfos: res.data || [] }); + } + return [2 /*return*/]; + } + }); + }); }, /** * 生命周期函数--监听页面初次渲染完成 diff --git a/IOReportSysMP/miniprogram/pages/audit/list/auditList.ts b/IOReportSysMP/miniprogram/pages/audit/list/auditList.ts index 8914e4b..f9f4f0a 100644 --- a/IOReportSysMP/miniprogram/pages/audit/list/auditList.ts +++ b/IOReportSysMP/miniprogram/pages/audit/list/auditList.ts @@ -1,4 +1,8 @@ // pages/my-report/myReport.ts +import { QRecord } from "../../../services/baseClass" +import services from "../../../services/index" +import constant from "../../../utils/constant" + Page({ /** @@ -16,22 +20,34 @@ 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.getIORecordsAuditList.request({teacherID:user.teacherID}); + if(res&&res.data){ + console.log(res.data) + this.setData({reportInfos:res.data||[]}) + } }, /** @@ -81,4 +97,5 @@ Page({ onShareAppMessage() { } -}) \ No newline at end of file +}) + \ No newline at end of file diff --git a/IOReportSysMP/miniprogram/pages/audit/list/auditList.wxml b/IOReportSysMP/miniprogram/pages/audit/list/auditList.wxml index bf656a4..be2f1f3 100644 --- a/IOReportSysMP/miniprogram/pages/audit/list/auditList.wxml +++ b/IOReportSysMP/miniprogram/pages/audit/list/auditList.wxml @@ -1,8 +1,8 @@ - + - + diff --git a/IOReportSysMP/miniprogram/pages/index/index.scss b/IOReportSysMP/miniprogram/pages/index/index.scss index 8a4cd2c..33b5927 100644 --- a/IOReportSysMP/miniprogram/pages/index/index.scss +++ b/IOReportSysMP/miniprogram/pages/index/index.scss @@ -17,8 +17,8 @@ .btn-list { display: flex; flex-direction: column; - $btn-item-height: 120rpx; - $btn-item-icon: 116rpx; + $btn-item-height: 110rpx; + $btn-item-icon: 80rpx; .btn-item { display: flex; @@ -42,7 +42,7 @@ border-radius: 25rpx; height: $btn-item-height; line-height: $btn-item-height; - font-size: 32px; + font-size: 40rpx; font-weight: 600; color: black; display: block; diff --git a/IOReportSysMP/miniprogram/pages/report/detail/reportDetail.js b/IOReportSysMP/miniprogram/pages/report/detail/reportDetail.js index 2997ab0..eb5086e 100644 --- a/IOReportSysMP/miniprogram/pages/report/detail/reportDetail.js +++ b/IOReportSysMP/miniprogram/pages/report/detail/reportDetail.js @@ -43,6 +43,18 @@ var baseClass_1 = require("../../../services/baseClass"); var weapp_qrcode_1 = __importDefault(require("../../../utils/weapp-qrcode/weapp-qrcode")); var index_1 = __importDefault(require("../../../services/index")); var util_1 = require("../../../utils/util"); +// 字典数据 +var ioRecordType = ['入校', '出校']; +var ioRecordStatus = { + SAVE: '保存', + SUBMIT: "待审核", + DEPT_PASS: '院审通过', + SCHOOL_PASS: '校审通过', + VERIFY_PASS: '核验通过', + DEPT_DENY: '院审不通过', + SCHOOL_DENY: '校审不通过', + VERIFY_DENY: '核验不通过', +}; Page({ /** * 页面的初始数据 @@ -50,7 +62,9 @@ Page({ data: { showQrcode: false, ioRecord: baseClass_1.IORecords, - expireTime: null + expireTime: null, + ioRecordType: ioRecordType, + ioRecordStatus: ioRecordStatus, }, onTest: function () { console.log(this.data); @@ -83,8 +97,9 @@ Page({ res = _a.sent(); if (res && res.data) { record = res.data; + console.log(record); if (record.status == 'SCHOOL_PASS') { - console.log(record); + console.log('SCHOOL_PASS'); this.setData({ showQrcode: true }); qrToken = record.qrToken; this.drawQrcode(qrToken); @@ -135,8 +150,8 @@ Page({ /** * 生命周期函数--监听页面初次渲染完成 */ - onReady: function () { - }, + // onReady() { + // }, /** * 生命周期函数--监听页面显示 */ diff --git a/IOReportSysMP/miniprogram/pages/report/detail/reportDetail.ts b/IOReportSysMP/miniprogram/pages/report/detail/reportDetail.ts index fe899dd..851b3d5 100644 --- a/IOReportSysMP/miniprogram/pages/report/detail/reportDetail.ts +++ b/IOReportSysMP/miniprogram/pages/report/detail/reportDetail.ts @@ -3,16 +3,16 @@ import QR from '../../../utils/weapp-qrcode/weapp-qrcode' import services from "../../../services/index" import { formatDateTimeStr } from '../../../utils/util' // 字典数据 -const ioRecordType = ['入','出'] +const ioRecordType = ['入校','出校'] const ioRecordStatus = { SAVE: '保存', - SUBMIT: "提交待审核", - HOSPITAL_PASS:'院级审核通过', - SCHOOL_PASS:'校级审核通过', - VERIFICATION_PASS:'核验通过', - HOSPITAL_NOT_PASS:'院级审核不通过', - SCHOOL_NOT_PASS:'校级审核不通过', - VERIFICATION_NOT_PASS:'核验不通过', + SUBMIT: "待审核", + DEPT_PASS:'院审通过', + SCHOOL_PASS:'校审通过', + VERIFY_PASS:'核验通过', + DEPT_DENY:'院审不通过', + SCHOOL_DENY:'校审不通过', + VERIFY_DENY:'核验不通过', } Page({ @@ -46,9 +46,9 @@ Page({ let res = await services.API.iORecords.getIORecordByID.request({ID:reportID}); if(res&&res.data){ let record = res.data; - + console.log(record); if (record.status == 'SCHOOL_PASS') { - console.log(record); + console.log('SCHOOL_PASS'); this.setData({ showQrcode: true }) const qrToken = record.qrToken; this.drawQrcode(qrToken); diff --git a/IOReportSysMP/miniprogram/pages/report/detail/reportDetail.wxml b/IOReportSysMP/miniprogram/pages/report/detail/reportDetail.wxml index 2f90a70..6da0862 100644 --- a/IOReportSysMP/miniprogram/pages/report/detail/reportDetail.wxml +++ b/IOReportSysMP/miniprogram/pages/report/detail/reportDetail.wxml @@ -5,22 +5,21 @@ 到期时间:{{expireTime}} - 审核人: {{ioRecord.deptAuditorID}} - 审核时间: {{ioRecord.deptAuditorTime}} + 审核人: {{ioRecord.deptAuditor?ioRecord.deptAuditor.name:'无'}} + 审核时间: {{ioRecord.deptAuditorTime?ioRecord.deptAuditorTime:'无'}} + 状态: {{ioRecordStatus[ioRecord.status]}} - + - - - + diff --git a/IOReportSysMP/miniprogram/pages/report/enter/enterReport.js b/IOReportSysMP/miniprogram/pages/report/enter/enterReport.js index 80b3782..36f9c0d 100644 --- a/IOReportSysMP/miniprogram/pages/report/enter/enterReport.js +++ b/IOReportSysMP/miniprogram/pages/report/enter/enterReport.js @@ -77,11 +77,6 @@ Page({ applyTime: e.detail.value, }); }, - ioTypeChange: function (e) { - this.setData({ - ioType: this.data.ioTypesArray[e.detail.value], - }); - }, // 获取文本框字数 inputs: function (e) { var _a; diff --git a/IOReportSysMP/miniprogram/pages/report/enter/enterReport.wxml b/IOReportSysMP/miniprogram/pages/report/enter/enterReport.wxml index f307a31..950e6ce 100644 --- a/IOReportSysMP/miniprogram/pages/report/enter/enterReport.wxml +++ b/IOReportSysMP/miniprogram/pages/report/enter/enterReport.wxml @@ -3,7 +3,7 @@ - + @@ -15,7 +15,7 @@ - + @@ -25,7 +25,7 @@ - + @@ -51,7 +51,7 @@ - 已输入{{text_len?text_len:0}}字/50 diff --git a/IOReportSysMP/miniprogram/pages/report/out/outerReport.js b/IOReportSysMP/miniprogram/pages/report/out/outerReport.js index 8fea59d..ca6c7b6 100644 --- a/IOReportSysMP/miniprogram/pages/report/out/outerReport.js +++ b/IOReportSysMP/miniprogram/pages/report/out/outerReport.js @@ -10,36 +10,123 @@ var __assign = (this && this.__assign) || function () { }; return __assign.apply(this, arguments); }; +var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { + function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } + return new (P || (P = Promise))(function (resolve, reject) { + function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } } + function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } } + function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); } + step((generator = generator.apply(thisArg, _arguments || [])).next()); + }); +}; +var __generator = (this && this.__generator) || function (thisArg, body) { + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g; + return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; + function verb(n) { return function (v) { return step([n, v]); }; } + function step(op) { + if (f) throw new TypeError("Generator is already executing."); + while (_) try { + if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t; + if (y = 0, t) op = [op[0] & 2, t.value]; + switch (op[0]) { + case 0: case 1: t = op; break; + case 4: _.label++; return { value: op[1], done: false }; + case 5: _.label++; y = op[1]; op = [0]; continue; + case 7: op = _.ops.pop(); _.trys.pop(); continue; + default: + if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } + if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } + if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } + if (t[2]) _.ops.pop(); + _.trys.pop(); continue; + } + op = body.call(thisArg, _); + } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } + if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; + } +}; var __importDefault = (this && this.__importDefault) || function (mod) { return (mod && mod.__esModule) ? mod : { "default": mod }; }; Object.defineProperty(exports, "__esModule", { value: true }); -var orderApi_1 = __importDefault(require("../../../api/orderApi/orderApi")); var constant_1 = __importDefault(require("../../../utils/constant")); +var util_1 = require("../../../utils/util"); +var index_1 = __importDefault(require("../../../services/index")); +var today = util_1.formatDateStr(); // pages/enterReport/enterReport.ts Page({ /** * 页面的初始数据 */ data: { - rules: { - enterDate: { require: { value: true, } }, - innerLocation: { require: { value: true, } }, - outerLocation: { require: { value: true, } }, - reason: { require: { value: true, } }, - } + startDate: today, + applyDate: today, + applyTime: '08:30', + ioTypesArray: ['进校', '出校'], + ioRecord: {}, + ioType: '进校' + }, + bindDateChange: function (e) { + this.setData({ + applyDate: e.detail.value, + }); + }, + bindTimeChange: function (e) { + this.setData({ + applyTime: e.detail.value, + }); + }, + // 获取文本框字数 + inputs: function (e) { + var _a; + var value = e.detail.value; + this.setData((_a = { + text_len: value.length, + detail: value + }, + _a["formData.detail"] = value, + _a)); }, onSubmit: function (_a) { var detail = _a.detail; - // TODO gen order - var submitDate = __assign(__assign({}, detail), { reportDateTime: detail.enterDate + ' ' + detail.enterTime }); - orderApi_1.default.submitOrder(submitDate); + return __awaiter(this, void 0, void 0, function () { + var submitRecord, res, reportid; + return __generator(this, function (_b) { + switch (_b.label) { + case 0: + // TODO gen order + if (!this.data.teacherID) { + wx.showToast({ + title: '提交失败,缺少用户信息', + icon: 'none' + }); + } + submitRecord = __assign(__assign({}, detail.value), { ioType: '1', teacherID: this.data.teacherID, commitTime: this.data.applyDate + ' ' + this.data.applyTime + ":00" }); + return [4 /*yield*/, index_1.default.API.iORecords.addIORecord.request(submitRecord)]; + case 1: + res = _b.sent(); + console.log(res); + if (res && res.data) { + reportid = res.data; + wx.setStorageSync("myReport/myReport", reportid); + wx.navigateTo({ url: "../detail/reportDetail" }); + } + return [2 /*return*/]; + } + }); + }); }, /** * 生命周期函数--监听页面加载 */ onLoad: function () { - this.setData(__assign(__assign({}, this.data), wx.getStorageSync(constant_1.default.USER_INFO))); + // wx.removeStorageSync(constant.USER_INFO); + var user = wx.getStorageSync(constant_1.default.USER_INFO); + if (!user) { + wx.navigateTo({ url: "../../index/index" }); + } + this.setData(__assign(__assign({}, this.data), user)); }, /** * 生命周期函数--监听页面初次渲染完成 diff --git a/IOReportSysMP/miniprogram/pages/report/out/outerReport.scss b/IOReportSysMP/miniprogram/pages/report/out/outerReport.scss index ea98b4f..ab8b917 100644 --- a/IOReportSysMP/miniprogram/pages/report/out/outerReport.scss +++ b/IOReportSysMP/miniprogram/pages/report/out/outerReport.scss @@ -1,28 +1,49 @@ .card-container { - margin: 20px; + margin: 20rpx; background-color: var(--color-gray-0); box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25); + font-size: 17px; + // font-weight: 550; .card-col-1 { + padding: 24rpx 0; display: flex; + width: auto; + + & yinput:nth-child(1) { + flex: 4 1 50px; + margin: 0 5rpx; + } + + & yinput:nth-child(2) { + flex: 7 1 50px; + margin:0 5rpx; + } } } + .input-container { + padding-bottom: 80rpx; + .card-col-1 { display: flex; margin: 0 2px; - :nth-child(n){ + + :nth-child(n) { flex: 1 1 0; } } } .submit-button { - position: absolute; + position: fixed; bottom: 0; left: 0; - right: 0; - display: flex; + background-color: var(--color-primary); + color: white; + width: 100%; + border-radius: 0; + z-index: 99; } \ No newline at end of file diff --git a/IOReportSysMP/miniprogram/pages/report/out/outerReport.ts b/IOReportSysMP/miniprogram/pages/report/out/outerReport.ts index d62f7f5..e4c1667 100644 --- a/IOReportSysMP/miniprogram/pages/report/out/outerReport.ts +++ b/IOReportSysMP/miniprogram/pages/report/out/outerReport.ts @@ -1,39 +1,95 @@ -import orderApi from "../../../api/orderApi/orderApi" import constant from "../../../utils/constant" - +import { IORecords, User } from '../../../services/baseClass' +import { formatDateStr} from "../../../utils/util" +import services from "../../../services/index" +const today = formatDateStr(); +interface IPageData { + ioTypesArray:any[], + ioRecord:IORecords, + startDate:String, + applyDate:String, + applyTime:String, + ioType:String +} +interface IPage { + +} // pages/enterReport/enterReport.ts -Page({ +Page({ /** * 页面的初始数据 */ data: { - rules: { - enterDate: { require: { value: true, } }, - innerLocation: { require: { value: true, } }, - outerLocation: { require: { value: true, } }, - reason: { require: { value: true, } }, - } + startDate:today, + applyDate:today, + applyTime:'08:30', + ioTypesArray:['进校','出校'], + ioRecord:{}, + ioType:'进校' }, - - onSubmit({ detail }: { detail: Order.submitEventDetail }) { + bindDateChange(e:any) { + this.setData({ + applyDate: e.detail.value, + }); + }, + bindTimeChange(e:any) { + this.setData({ + applyTime: e.detail.value, + }); + }, + // 获取文本框字数 + inputs: function (e: any) { + var value = e.detail.value; + this.setData({ + text_len: value.length, + detail: value, + [`formData.detail`]: value + }) + }, + + + onSubmit:async function({ detail }: { detail: any}) { // TODO gen order - const submitDate: Order.submitDetail = { - ...detail, - reportDateTime: detail.enterDate + ' ' + detail.enterTime, + if(!this.data.teacherID){ + wx.showToast({ + title: '提交失败,缺少用户信息', + icon: 'none' + }); + } + const submitRecord: IORecords = { + ...detail.value, + ioType:'1', + teacherID:this.data.teacherID, + commitTime: this.data.applyDate + ' ' + this.data.applyTime+":00", + } + let res = await services.API.iORecords.addIORecord.request(submitRecord); + console.log(res); + + if(res&&res.data){ + + let reportid = res.data; + wx.setStorageSync("myReport/myReport", reportid) + wx.navigateTo({url:"../detail/reportDetail"}); } - orderApi.submitOrder(submitDate) }, /** * 生命周期函数--监听页面加载 */ onLoad() { + // wx.removeStorageSync(constant.USER_INFO); + let user = wx.getStorageSync(constant.USER_INFO); + if(!user){ + wx.navigateTo({url:"../../index/index"}) + } this.setData({ ...this.data, - ...(wx.getStorageSync(constant.USER_INFO) as User.userInfo) + ...(user as User) }) }, + + /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/IOReportSysMP/miniprogram/pages/report/out/outerReport.wxml b/IOReportSysMP/miniprogram/pages/report/out/outerReport.wxml index 9bd738c..897df44 100644 --- a/IOReportSysMP/miniprogram/pages/report/out/outerReport.wxml +++ b/IOReportSysMP/miniprogram/pages/report/out/outerReport.wxml @@ -1,22 +1,63 @@ - - - - - - - - + + + + + - - - - - + + + + +
+ + + + + + + + + {{applyDate}} + + + + + + + + + + {{applyTime}} + + + + + + + + + + + + + + + + + + + + + + + + 已输入{{text_len?text_len:0}}字/50 + + + + - - - - - - \ No newline at end of file + + \ No newline at end of file diff --git a/IOReportSysMP/miniprogram/pages/report/out/outerReport.wxss b/IOReportSysMP/miniprogram/pages/report/out/outerReport.wxss deleted file mode 100644 index 554d099..0000000 --- a/IOReportSysMP/miniprogram/pages/report/out/outerReport.wxss +++ /dev/null @@ -1 +0,0 @@ -/* pages/report/out/outerReport.wxss */ \ No newline at end of file diff --git a/IOReportSysMP/miniprogram/services/api-lock.json b/IOReportSysMP/miniprogram/services/api-lock.json index 1e51d3a..92e45f1 100644 --- a/IOReportSysMP/miniprogram/services/api-lock.json +++ b/IOReportSysMP/miniprogram/services/api-lock.json @@ -9,13 +9,36 @@ "consumes": [ "application/json" ], - "description": "根据记录ID获取记录详细信息", + "description": "新增一条报备记录", "name": "addIORecord", "method": "post", "path": "/api/records/add", "response": { "typeArgs": [ { + "typeArgs": [], + "typeName": "number", + "isDefsType": false, + "templateIndex": -1, + "compileTemplateKeyword": "#/definitions/", + "enum": [], + "typeProperties": [] + } + ], + "typeName": "ResultVO", + "isDefsType": true, + "templateIndex": -1, + "compileTemplateKeyword": "#/definitions/", + "enum": [], + "typeProperties": [] + }, + "parameters": [ + { + "in": "body", + "description": "param", + "name": "param", + "required": true, + "dataType": { "typeArgs": [], "typeName": "IORecords", "isDefsType": true, @@ -24,6 +47,38 @@ "enum": [], "typeProperties": [] } + } + ] + }, + { + "consumes": [ + "application/json" + ], + "description": "获取报备记录列表", + "name": "getIORecordsAuditList", + "method": "post", + "path": "/api/records/audit-list", + "response": { + "typeArgs": [ + { + "typeArgs": [ + { + "typeArgs": [], + "typeName": "IORecords", + "isDefsType": true, + "templateIndex": -1, + "compileTemplateKeyword": "#/definitions/", + "enum": [], + "typeProperties": [] + } + ], + "typeName": "Array", + "isDefsType": false, + "templateIndex": -1, + "compileTemplateKeyword": "#/definitions/", + "enum": [], + "typeProperties": [] + } ], "typeName": "ResultVO", "isDefsType": true, @@ -40,7 +95,7 @@ "required": true, "dataType": { "typeArgs": [], - "typeName": "IORecords", + "typeName": "QRecord", "isDefsType": true, "templateIndex": -1, "compileTemplateKeyword": "#/definitions/", @@ -881,7 +936,7 @@ "typeProperties": [] }, "name": "status", - "description": "单据状态:0-保存;1-提交待审核;2-院级审核通过;3-校级审核通过;4-核验通过;9-院级审核不通过;8-校级审核不通过;7-核验不通过", + "description": "单据状态:SUBMIT-提交待审核;DEPT_PASS-院级审核通过;SCHOOL_PASS-校级审核通过;VERIFY_PASS-核验通过;DEPT_DENY-院级审核不通过;SCHOOL_DENY-校级审核不通过;VERIFY_DENY-核验不通过;INVALID-无效", "required": false }, { @@ -1046,7 +1101,7 @@ { "dataType": { "typeArgs": [], - "typeName": "string", + "typeName": "number", "isDefsType": false, "templateIndex": -1, "compileTemplateKeyword": "#/definitions/", @@ -1156,6 +1211,20 @@ "name": "type", "description": "记录类型", "required": false + }, + { + "dataType": { + "typeArgs": [], + "typeName": "number", + "isDefsType": false, + "templateIndex": -1, + "compileTemplateKeyword": "#/definitions/", + "enum": [], + "typeProperties": [] + }, + "name": "userID", + "description": "用户id", + "required": false } ] }, @@ -1520,7 +1589,7 @@ "typeProperties": [] }, "name": "dept", - "description": "角色列表", + "description": "所属学院", "required": false }, { @@ -1534,6 +1603,7 @@ "typeProperties": [] }, "name": "enabled", + "description": "是否在校 1:在校 0:未在", "required": false }, { diff --git a/IOReportSysMP/miniprogram/services/api.d.ts b/IOReportSysMP/miniprogram/services/api.d.ts index 97a1352..1cb0cea 100644 --- a/IOReportSysMP/miniprogram/services/api.d.ts +++ b/IOReportSysMP/miniprogram/services/api.d.ts @@ -56,7 +56,7 @@ declare namespace defs { /** 校级审核人 */ schoolAuditorID?: number; - /** 单据状态:0-保存;1-提交待审核;2-院级审核通过;3-校级审核通过;4-核验通过;9-院级审核不通过;8-校级审核不通过;7-核验不通过 */ + /** 单据状态:SUBMIT-提交待审核;DEPT_PASS-院级审核通过;SCHOOL_PASS-校级审核通过;VERIFY_PASS-核验通过;DEPT_DENY-院级审核不通过;SCHOOL_DENY-校级审核不通过;VERIFY_DENY-核验不通过;INVALID-无效 */ status?: string; /** 教师 */ @@ -91,7 +91,7 @@ declare namespace defs { export class QRToken { /** expireTime */ - expireTime?: string; + expireTime?: number; /** recordID */ recordID?: number; @@ -115,6 +115,9 @@ declare namespace defs { /** 记录类型 */ type?: string; + + /** 用户id */ + userID?: number; } export class QUser { @@ -189,10 +192,10 @@ declare namespace defs { /** 所属单位 */ departmentID?: number; - /** 角色列表 */ + /** 所属学院 */ dept?: defs.Department; - /** enabled */ + /** 是否在校 1:在校 0:未在 */ enabled?: boolean; /** 是否在校 1:在校 0:未在 */ @@ -230,11 +233,11 @@ declare namespace API { */ export namespace iORecords { /** - * 根据记录ID获取记录详细信息 + * 新增一条报备记录 * /api/records/add */ export namespace addIORecord { - export type ResponseType = Promise>; + export type ResponseType = Promise>; export const URL: string; @@ -244,6 +247,21 @@ declare namespace API { ): ResponseType; } + /** + * 获取报备记录列表 + * /api/records/audit-list + */ + export namespace getIORecordsAuditList { + export type ResponseType = Promise>>; + + export const URL: string; + + export function request( + bodyParams: defs.QRecord, + options?: WechatMiniprogram.RequestOption, + ): ResponseType; + } + /** * 根据记录ID获取记录详细信息 * /api/records/detail diff --git a/IOReportSysMP/miniprogram/services/baseClass.js b/IOReportSysMP/miniprogram/services/baseClass.js index d978841..563a02c 100644 --- a/IOReportSysMP/miniprogram/services/baseClass.js +++ b/IOReportSysMP/miniprogram/services/baseClass.js @@ -47,7 +47,7 @@ var IORecords = /** @class */ (function () { this.schoolAuditor = new User(); /** 校级审核人 */ this.schoolAuditorID = undefined; - /** 单据状态:0-保存;1-提交待审核;2-院级审核通过;3-校级审核通过;4-核验通过;9-院级审核不通过;8-校级审核不通过;7-核验不通过 */ + /** 单据状态:SUBMIT-提交待审核;DEPT_PASS-院级审核通过;SCHOOL_PASS-校级审核通过;VERIFY_PASS-核验通过;DEPT_DENY-院级审核不通过;SCHOOL_DENY-校级审核不通过;VERIFY_DENY-核验不通过;INVALID-无效 */ this.status = ''; /** 教师 */ this.teacher = new User(); @@ -80,7 +80,7 @@ exports.ListResultVO = ListResultVO; var QRToken = /** @class */ (function () { function QRToken() { /** expireTime */ - this.expireTime = ''; + this.expireTime = undefined; /** recordID */ this.recordID = undefined; } @@ -101,6 +101,8 @@ var QRecord = /** @class */ (function () { this.teacherID = ''; /** 记录类型 */ this.type = ''; + /** 用户id */ + this.userID = undefined; } return QRecord; }()); @@ -173,9 +175,9 @@ var User = /** @class */ (function () { this.authorities = []; /** 所属单位 */ this.departmentID = undefined; - /** 角色列表 */ + /** 所属学院 */ this.dept = new Department(); - /** enabled */ + /** 是否在校 1:在校 0:未在 */ this.enabled = false; /** 是否在校 1:在校 0:未在 */ this.isInSchool = false; diff --git a/IOReportSysMP/miniprogram/services/baseClass.ts b/IOReportSysMP/miniprogram/services/baseClass.ts index a03b179..c335fb5 100644 --- a/IOReportSysMP/miniprogram/services/baseClass.ts +++ b/IOReportSysMP/miniprogram/services/baseClass.ts @@ -51,7 +51,7 @@ export class IORecords { /** 校级审核人 */ schoolAuditorID = undefined; - /** 单据状态:0-保存;1-提交待审核;2-院级审核通过;3-校级审核通过;4-核验通过;9-院级审核不通过;8-校级审核不通过;7-核验不通过 */ + /** 单据状态:SUBMIT-提交待审核;DEPT_PASS-院级审核通过;SCHOOL_PASS-校级审核通过;VERIFY_PASS-核验通过;DEPT_DENY-院级审核不通过;SCHOOL_DENY-校级审核不通过;VERIFY_DENY-核验不通过;INVALID-无效 */ status = ''; /** 教师 */ @@ -86,7 +86,7 @@ export class ListResultVO { export class QRToken { /** expireTime */ - expireTime = ''; + expireTime = undefined; /** recordID */ recordID = undefined; @@ -110,6 +110,9 @@ export class QRecord { /** 记录类型 */ type = ''; + + /** 用户id */ + userID = undefined; } export class QUser { @@ -184,10 +187,10 @@ export class User { /** 所属单位 */ departmentID = undefined; - /** 角色列表 */ + /** 所属学院 */ dept = new Department(); - /** enabled */ + /** 是否在校 1:在校 0:未在 */ enabled = false; /** 是否在校 1:在校 0:未在 */ diff --git a/IOReportSysMP/miniprogram/services/mods/iORecords/addIORecord.js b/IOReportSysMP/miniprogram/services/mods/iORecords/addIORecord.js index 4309bc7..d4ff810 100644 --- a/IOReportSysMP/miniprogram/services/mods/iORecords/addIORecord.js +++ b/IOReportSysMP/miniprogram/services/mods/iORecords/addIORecord.js @@ -4,7 +4,7 @@ exports.request = exports.URL = void 0; var util_1 = require("../../../utils/util"); exports.URL = '/api/records/add'; /** - * @desc 根据记录ID获取记录详细信息 + * @desc 新增一条报备记录 */ function request(bodyParams, options) { var url = '/api/records/add'; diff --git a/IOReportSysMP/miniprogram/services/mods/iORecords/addIORecord.ts b/IOReportSysMP/miniprogram/services/mods/iORecords/addIORecord.ts index 03b3f39..85bec85 100644 --- a/IOReportSysMP/miniprogram/services/mods/iORecords/addIORecord.ts +++ b/IOReportSysMP/miniprogram/services/mods/iORecords/addIORecord.ts @@ -1,11 +1,11 @@ import { fetch } from '../../../utils/util'; -export type ResponseType = Promise>; +export type ResponseType = Promise>; export const URL = '/api/records/add'; /** - * @desc 根据记录ID获取记录详细信息 + * @desc 新增一条报备记录 */ export function request( bodyParams: defs.IORecords, diff --git a/IOReportSysMP/miniprogram/services/mods/iORecords/getIORecordsAuditList.js b/IOReportSysMP/miniprogram/services/mods/iORecords/getIORecordsAuditList.js new file mode 100644 index 0000000..5b704db --- /dev/null +++ b/IOReportSysMP/miniprogram/services/mods/iORecords/getIORecordsAuditList.js @@ -0,0 +1,21 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.request = exports.URL = void 0; +var util_1 = require("../../../utils/util"); +exports.URL = '/api/records/audit-list'; +/** + * @desc 获取报备记录列表 + */ +function request(bodyParams, options) { + var url = '/api/records/audit-list'; + var fetchOption = Object.assign({ + url: url, + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + data: bodyParams, + }, options); + return util_1.fetch(fetchOption); +} +exports.request = request; diff --git a/IOReportSysMP/miniprogram/services/mods/iORecords/getIORecordsAuditList.ts b/IOReportSysMP/miniprogram/services/mods/iORecords/getIORecordsAuditList.ts new file mode 100644 index 0000000..c31c955 --- /dev/null +++ b/IOReportSysMP/miniprogram/services/mods/iORecords/getIORecordsAuditList.ts @@ -0,0 +1,29 @@ +import { fetch } from '../../../utils/util'; + +export type ResponseType = Promise>>; + +export const URL = '/api/records/audit-list'; + +/** + * @desc 获取报备记录列表 + */ +export function request( + bodyParams: defs.QRecord, + options?: WechatMiniprogram.RequestOption, +): ResponseType { + let url = '/api/records/audit-list'; + + const fetchOption = Object.assign( + { + url: url, + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + + data: bodyParams, + }, + options, + ); + return fetch(fetchOption); +} diff --git a/IOReportSysMP/miniprogram/services/mods/iORecords/index.js b/IOReportSysMP/miniprogram/services/mods/iORecords/index.js index aaabfa7..0e3d2ef 100644 --- a/IOReportSysMP/miniprogram/services/mods/iORecords/index.js +++ b/IOReportSysMP/miniprogram/services/mods/iORecords/index.js @@ -19,12 +19,14 @@ var __importStar = (this && this.__importStar) || function (mod) { return result; }; Object.defineProperty(exports, "__esModule", { value: true }); -exports.getIORecordsList = exports.getIORecordByID = exports.addIORecord = void 0; +exports.getIORecordsList = exports.getIORecordByID = exports.getIORecordsAuditList = exports.addIORecord = void 0; /** * @description 出入校报备记录控制器 */ var addIORecord = __importStar(require("./addIORecord")); exports.addIORecord = addIORecord; +var getIORecordsAuditList = __importStar(require("./getIORecordsAuditList")); +exports.getIORecordsAuditList = getIORecordsAuditList; var getIORecordByID = __importStar(require("./getIORecordByID")); exports.getIORecordByID = getIORecordByID; var getIORecordsList = __importStar(require("./getIORecordsList")); diff --git a/IOReportSysMP/miniprogram/services/mods/iORecords/index.ts b/IOReportSysMP/miniprogram/services/mods/iORecords/index.ts index eef71a8..17df622 100644 --- a/IOReportSysMP/miniprogram/services/mods/iORecords/index.ts +++ b/IOReportSysMP/miniprogram/services/mods/iORecords/index.ts @@ -2,7 +2,13 @@ * @description 出入校报备记录控制器 */ import * as addIORecord from './addIORecord'; +import * as getIORecordsAuditList from './getIORecordsAuditList'; import * as getIORecordByID from './getIORecordByID'; import * as getIORecordsList from './getIORecordsList'; -export { addIORecord, getIORecordByID, getIORecordsList }; +export { + addIORecord, + getIORecordsAuditList, + getIORecordByID, + getIORecordsList, +};