forgon-ssts-v4.1.0

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 59
Total Committers: 60
Last Commit: 14 Feb 16
Commits this week: 59
Total Lines of Code (LoC): 4,711,364
Net change in LoC this week: 3,161

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading

Subversion Details

1 property
  • svn:global-ignores = .gradle .settings bin build rebel.xml
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Monday 29 Jan 2018
8:44 下午

yanweining

高值耗材：高值耗材发票警告
Options
    • -39
    • +48
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManagerImpl.java
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBill/expensiveGoodsBillForm.js
    • -0
    • +218
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBillWarning/expensiveGoodsBIllInstanceWarningView.js
    • -1
    • +44
    /ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java
  5. /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBillWarning
    • -37
    • +12
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsBillAction.java
    • -1
    • +6
    /ssts-web/src/main/webapp/homepage/menu.jsp
    • -0
    • +1
    /ssts-web/src/main/resources/systemset/operationDefine.xml
    • -0
    • +2
    /ssts-web/src/main/webapp/homepage/portalPage.js
    • -1
    • +2
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -0
    • +1
    /ssts-web/src/main/webapp/homepage/portalPage.jsp
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/ExpensiveGodownEntryReceivingReportItemVO.java
    • -0
    • +20
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBillWarning/expensiveGoodsBIllInstanceWarningView.jsp
    • -0
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/systemwarning/SystemWarningItemVO.java
    • -4
    • +3
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManager.java
6:28 下午

ZhuangQinLiu

去掉是否已经修改属性，默认值false。这样升级脚本才适应
Options
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/security/model/User.java
5:43 下午

liuliben

修改高值耗材属性列宽
Options
    • -5
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/expensiveGoodsSupplierView.js
5:30 下午

liuliben

修改高值耗材供应商注册证显示宽度
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/expensiveGoodsSupplierForm.js
4:50 下午

ZhuangQinLiu

修改用户密码表并加上日志
Options
    • -3
    • +37
    /forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java
    • -1
    • +3
    /ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByUnmodified.js
    • -1
    • +3
    /ssts-web/src/main/webapp/personalSetting/modifyPWDByExt.js
    • -0
    • +1
    /ssts-web/src/main/java/com/forgon/disinfectsystem/directory/dwr/table/UserTableManager.java
    • -1
    • +3
    /forgon-core/src/main/java/com/forgon/log/model/Log.java
    • -0
    • +7
    /forgon-core/src/main/java/com/forgon/security/service/UserManager.java
    • -0
    • +97
    /forgon-core/src/main/java/com/forgon/security/model/ModifyPwdRecord.java
    • -1
    • +3
    /ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByExt.js
3:12 下午

ZhuangQinLiu

流程定义加上序列号不能为0的前后台判断
Options
    • -0
    • +5
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowForm.js
    • -0
    • +3
    /forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowManagerImpl.java
2:47 下午

liuliben

修改时间格式方法
Options
    • -1
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/ExpensiveGoodsSupplierManagerImpl.java
2:33 下午

adairkang

器械包图片，可以不用解码。如果添加解码，当字符串为空的话，会报错
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/tousseImage.jsp
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp
2:31 下午

adairkang

材料定义的查找添加返回值判断
Options
    • -6
    • +11
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialdefinition/action/MaterialDefinitionAction.java
2:13 下午

yanweining

高值耗材：高值耗材代码优化
Options
    • -40
    • +40
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java
    • -13
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBill/expensiveGoodsBillForm.js
    • -4
    • +9
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/ExpensiveGodownEntryReceivingReportItemVO.java
2:01 下午

liuliben

修改代码格式
Options
    • -24
    • +24
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/ExpensiveGoodsSupplierManagerImpl.java
1:54 下午

ZhuangQinLiu

JMSZXYY-20 密码安全性问题优化， 代码优化以及流程定义等模块a标签样式修改
Options
    • -9
    • +2
    /ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByUnmodified.js
    • -9
    • +3
    /forgon-core/src/main/java/com/forgon/security/action/UserAction.java
    • -6
    • +3
    /ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByExt.js
    • -1
    • +1
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskView.js
    • -1
    • +1
    /ssts-web/src/main/webapp/systemmanage/workFlow/finishedApprovalTaskRecordView.js
    • -8
    • +8
    /forgon-core/src/main/java/com/forgon/security/model/User.java
    • -16
    • +18
    /ssts-web/src/main/webapp/systemmanage/userFormExt.js
    • -0
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.9.8_4.9.9.sql
    • -1
    • +0
    /forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java
    • -15
    • +14
    /forgon-core/src/main/java/com/forgon/directory/action/PersonalSettingAction.java
    • -1
    • +1
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowView.js
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/Constants.java
    • -2
    • +2
    /ssts-web/src/main/webapp/homepage/portalPage.js
    • -1
    • +3
    /ssts-web/src/main/webapp/personalSetting/modifyPWDByExt.js
1:46 下午

adairkang

器械包名称有特殊字符导致申请时看不到图片

ZSSXLRMYY-153

Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/showTousseImage/ext4ShowTousseImage.js
11:38 上午

liuliben

修改方法注释和删除不用的方法
Options
    • -5
    • +1
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManagerImpl.java
    • -10
    • +0
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/UploadImageFileAction.java
11:07 上午

liuliben

补交高值耗材供应商界面添加授权证
Options
    • -0
    • +14
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/UploadImageFileAction.java
    • -4
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/uploadImageManager.js
11:06 上午

liuliben

高值耗材供应商界面添加授权证的显示和图片的显示
Options
    • -2
    • +22
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/ExpensiveGoodsSupplierManagerImpl.java
    • -0
    • +5
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/action/ExpensiveGoodsSupplierAction.java
    • -2
    • +8
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/ExpensiveGoodsSupplierManager.java
    • -19
    • +72
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/expensiveGoodsSupplierForm.js
    • -2
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplier/ExpensiveGoodsSupplier.java
    • -2
    • +16
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/imagefilemanager/ImageFile.java
    • -0
    • +20
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/service/ImageFileManagerImpl.java
    • -1
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/expensiveGoodsSupplierView.jsp
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsAuthorizationForm.js
11:04 上午

liuliben

还原授权证添加验证方法
Options
    • -30
    • +45
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManagerImpl.java
    • -6
    • +0
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManager.java
    • too large
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
9:52 上午

ZhuangQinLiu

JMSZXYY-20 密码安全性问题优化 代码补提交
Options
    • -1
    • +16
    /forgon-core/src/main/java/com/forgon/security/model/User.java
Sunday 28 Jan 2018
11:43 下午

ZhuangQinLiu

JMSZXYY-20 密码安全性问题优化 问题解决
Options
    • -0
    • +21
    /forgon-core/src/main/java/com/forgon/security/action/UserAction.java
    • -1
    • +1
    /ssts-web/src/main/webapp/js/common.js
    • -17
    • +24
    /forgon-core/src/main/java/com/forgon/directory/action/PersonalSettingAction.java
    • -0
    • +6
    /forgon-core/src/main/java/com/forgon/security/service/UserManager.java
    • -2
    • +2
    /ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByExt.js
    • -1
    • +10
    /forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java
    • -4
    • +4
    /ssts-web/src/main/webapp/systemmanage/adminModifyPWDByExt.js
    • -2
    • +2
    /ssts-web/src/main/webapp/personalSetting/modifyPWDByExt.js
    • -0
    • +151
    /ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByUnmodified.js
    • -0
    • +1
    /ssts-web/src/main/webapp/homepage/portalPage.jsp
    • -2
    • +1
    /forgon-core/src/main/java/com/forgon/directory/action/UserAction.java
    • -0
    • +17
    /ssts-web/src/main/webapp/homepage/portalPage.js
Friday 26 Jan 2018
7:14 下午

niutou_ren

暂时注释掉由于嵌套引用manager导致的tomcat无法启动的代码
Options
    • too large
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
5:44 下午

adairkang

器械包和材料名称中有特殊字符导致图片显示不了的问题
Options
    • -6
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
    • -6
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/tousseImage.jsp
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionGoodsRecycleForTouchScreen.jsp
5:26 下午

chenguina

pda版本更新至4.6.16
Options
    • -2
    • +2
    /ssts-web/src/main/webapp/mobileClient/clientForAndroid.json
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.14_20180123_v4_1_release.apk
    • binary
    /ssts-web/src/main/webapp/mobileClient/SterileSupplySystem_Android_V4.6.16_20180126_v4_1_release.apk
4:39 下午

yanweining

高值耗材：高值耗材入库页面修改
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryForm.js
3:34 下午

niutou_ren

高值耗材定义修改，添加供应商列表（此次提交，只有只后台实现）
Options
    • -12
    • +13
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/dwr/table/ExpensiveGoodsTableManager.java
    • -9
    • +55
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsAction.java
    • too large
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManagerImpl.java
    • -0
    • +20
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/RegistrationCertificationManagerImpl.java
    • -46
    • +30
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManagerImpl.java
    • -0
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/RegistrationCertificationManager.java
    • -0
    • +9
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsAuthorizationManager.java
    • -0
    • +8
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsManager.java
10:57 上午

adairkang

ZSYY-215 历史签收记录打印
Options
    • -4
    • +13
    /ssts-web/src/main/webapp/disinfectsystem/invoice/signRecord.jsp
    • -0
    • +44
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/signRecord/service/SignRecordManagerImpl.java
    • -1
    • +31
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/signRecord/action/signRecordAction.java
    • -0
    • +13
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDao.java
    • -8
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/signRecord/SignRecord.java
    • -0
    • +131
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/signRecord/vo/SignRecordPrintTousseVo.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/print/print.js
    • -1
    • +46
    /ssts-web/src/main/webapp/disinfectsystem/invoice/signRecord.js
    • -0
    • +9
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManagerImpl.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js
    • -0
    • +7
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/signRecord/service/SignRecordManager.java
    • -0
    • +16
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/BasePoManager.java
    • -0
    • +44
    /forgon-tools/src/main/java/com/forgon/tools/hibernate/ObjectDaoImpl.java
    • -7
    • +35
    /forgon-tools/src/main/java/com/forgon/tools/json/JSONUtil.java
10:36 上午

ZhuangQinLiu

注释调整和代码优化

Options
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/workflow/service/WorkFlowApprovalTaskManagerImpl.java
    • -1
    • +1
    /forgon-core/src/main/java/com/forgon/workflow/service/NodeDefinitionManager.java
10:19 上午

yanweining

高值耗材：高值耗材入库，发票修改
Options
    • -1
    • +14
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBill/expensiveGoodsBillView.js
    • -3
    • +5
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsBillAction.java
    • too large
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
    • -8
    • +19
    /ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManager.java
    • -2
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsInstance.java
    • -5
    • +5
    /ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/print/printConfig.js
    • -11
    • +9
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java
    • -47
    • +74
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.js
    • -2
    • +27
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManager.java
    • -144
    • +189
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryForm.js
    • -4
    • +44
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/commonExpensiveGoodsEntry.js
    • -3
    • +2
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsBillManagerImpl.java
    • too large
    /ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
    • -1
    • +13
    /ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBill/expensiveGoodsBillForm.js
  16. … 3 more files in changeset.
9:56 上午

ZhuangQinLiu

待办任务iframe加载过慢问题优化
Options
    • -3
    • +3
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowView.js
    • -109
    • +99
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskChooseNextOneForm.js
    • -15
    • +23
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskForm.js
    • -5
    • +1
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskRecord.jsp
    • -15
    • +2
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskView.js
    • -2
    • +2
    /ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskRecordView.js
Thursday 25 Jan 2018
7:49 下午

adairkang

注释
Options
    • -2
    • +4
    /forgon-core/src/main/java/com/forgon/directory/model/BarcodeDevice.java
7:48 下午

adairkang

添加注释
Options
    • -1
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java