智慧实验室优化版本
parent: 4ad865 | patch | commitdiff
gdg
2021-01-18 b02535c9a99324823812f6c2d08f066d8e1ba75f
refs
author gdg <764716047@qq.com>
Monday, January 18, 2021 09:57 +0800
committer gdg <764716047@qq.com>
Monday, January 18, 2021 09:57 +0800
commitb02535c9a99324823812f6c2d08f066d8e1ba75f
tree 4184bea913771dc63b54c4543271b53219d3507b tree | zip | gz
parent 4ad8653be79cb07fc7f450540ea20d82b3971b89 view | diff
61de83f769642ff7da3d7f32b39c5014167a2950 view | diff 
Merge remote-tracking branch 'origin/master' into master
50 files modified
8 files added
2618 ■■■■■ changed files
src/main/java/com/nanometer/smartlab/api/ApiAction.java 321 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/controller/HazardousWasteController.java 145 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/controller/ReagentMngController.java 13 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/controller/UserMngController.java 10 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java 198 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/converter/WasterConvert.java 38 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/dao/HazardousWasteMapper.java 15 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/dao/HazardousWasteMapper.xml 422 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/dao/OpeApplyDao.xml 60 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/dao/OpeLaboratoryReserveDao.java 1 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/dao/OpeLaboratoryReserveDao.xml 11 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/dao/OpeUseFlowDao.xml 11 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml 12 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/dao/SysLaboratoryDao.java 4 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/dao/SysLaboratoryDao.xml 11 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/dao/SysReagentDao.xml 7 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/dao/SysUserDao.java 6 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/dao/SysUserDao.xml 89 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/entity/HazardousWaste.java 102 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/entity/OpeApplyReserve.java 19 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/entity/SysUser.java 12 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/entity/dto/HazardousWasteUser.java 58 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/entity/dto/LaboratoryVo.java 65 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/entity/enumtype/ApplyStatusVo.java 39 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/entity/enumtype/OperateStatus.java 4 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/entity/enumtype/Waster.java 37 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/entity/handler/WasterHandler.java 33 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/service/HazardousWasteService.java 23 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/service/HazardousWasteServiceImpl.java 141 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/service/OpeApplyService.java 4 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java 10 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/service/OpeLaboratoryReserveService.java 4 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/service/OpeLaboratoryReserveServiceImpl.java 11 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/service/OpeReagentStatusService.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/service/OpeReagentStatusServiceImpl.java 5 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/service/OpeUseFlowService.java 1 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/service/OpeUseFlowServiceImpl.java 6 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveService.java 4 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/service/OpeWarehouseReserveServiceImpl.java 8 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/service/SysLaboratoryContainerServiceImpl.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/service/SysLaboratoryService.java 3 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/service/SysLaboratoryServiceImpl.java 8 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/service/SysReagentService.java 4 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/service/SysReagentServiceImpl.java 6 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/service/SysUserService.java 5 ●●●●● diff | view | raw | blame | history
src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java 10 ●●●●● diff | view | raw | blame | history
src/main/java/org/apache/shiro/web/filter/InvalidRequestFilter.java 186 ●●●●● diff | view | raw | blame | history
src/main/webapp/WEB-INF/config-mybatis.xml 3 ●●●●● diff | view | raw | blame | history
src/main/webapp/WEB-INF/ehcache.xml 97 ●●●●● diff | view | raw | blame | history
src/main/webapp/WEB-INF/spring-ehcache.xml 20 ●●●●● diff | view | raw | blame | history
src/main/webapp/WEB-INF/spring-shiro.xml 18 ●●●●● diff | view | raw | blame | history
src/main/webapp/reagent_mng.xhtml 11 ●●●●● diff | view | raw | blame | history
src/main/webapp/sys_hazardous_waste.xhtml 229 ●●●●● diff | view | raw | blame | history
src/main/webapp/user_mng.xhtml 12 ●●●●● diff | view | raw | blame | history
src/main/webapp/warehouse_reagent_direct_store.xhtml 7 ●●●●● diff | view | raw | blame | history
src/main/webapp/warehouse_stock_mng.xhtml 33 ●●●●● diff | view | raw | blame | history
智慧实验室接口.docx diff | view | raw | blame | history