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
Thursday 21 Dec 2017
2:03 下午

liuliben

分离高值耗材供应商，修改注册证与生产厂家关联
Options
    • -0
    • +224
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/expensiveGoodsSupplierView.js
    • -385
    • +7
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/supplierForm.js
    • -2
    • +2
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/RegistrationCertificationManager.java
    • -0
    • +247
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplier/ExpensiveGoodsSupplier.java
    • -4
    • +0
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/SupplierManagerImpl.java
    • -7
    • +7
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplier/RegistrationCertification.java
    • -0
    • +39
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/dwr/table/ExpensiveGoodsSupplierTableManager.java
    • -0
    • +80
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/expensiveGoodsSupplierView.jsp
    • -0
    • +578
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/expensiveGoodsSupplierForm.js
    • -0
    • +4
    /ssts-web/src/main/webapp/WEB-INF/dwr.xml
    • -0
    • +39
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/ExpensiveGoodsSupplierManager.java
    • -8
    • +0
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/supplierView.jsp
    • -0
    • +227
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/service/ExpensiveGoodsSupplierManagerImpl.java
    • -0
    • +389
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplier/action/ExpensiveGoodsSupplierAction.java
    • -0
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
  16. … 4 more files in changeset.
1:54 下午

chenjiaru

解决jira问题：FSFY-18 包定义中增加‘审核是否算工作量’
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -0
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
11:55 上午

alan.lee

修改签收页面在低分辨率的显示优化
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/invoice/signRecord.jsp
11:37 上午

shuyongfu

解决jira问题:GZFDZL-112 高值耗材在使用记录单内点【审核并生成申请单】失败

以及删除包含一次性物品高值耗材的未审核的使用记录删除报错的问题

Options
    • -2
    • +2
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
    • too large
    /ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
11:25 上午

alan.lee

'江门市中心医院'

江门市中心医院JMSZXYY-2

器械包签收功能优化

增加签收记录模块

Options
    • -0
    • +7
    /ssts-web/src/main/webapp/bootstrap-3.3.7/js/bootstrap.min.js
    • -0
    • +109
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/signRecord/action/signRecordAction.java
    • -0
    • +22
    /ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
    • -0
    • +205
    /ssts-web/src/main/webapp/bootstrap-3.3.7/css/bootstrap-directional-buttons.css
  5. /ssts-web/src/main/webapp/bootstrap-table/css
    • -0
    • +1492
    /ssts-web/src/main/webapp/bootstrap-3.3.7/css/buttons.css
  7. /ssts-web/src/main/webapp/bootstrap-datetimepicker/css
    • -0
    • +61
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/signRecord/SignRecord.java
  9. /ssts-web/src/main/webapp/bootstrap-datetimepicker/js
    • -0
    • +42
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/signRecord/service/SignRecordManager.java
    • -0
    • +5
    /ssts-web/src/main/webapp/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css
  12. /ssts-web/src/main/webapp/bootstrap-3.3.7/js
  13. /ssts-web/src/main/webapp/bootstrap-3.3.7/css
    • -0
    • +186
    /ssts-web/src/main/webapp/disinfectsystem/invoice/signRecord.jsp
    • -9
    • +50
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSign.jsp
  16. … 28 more files in changeset.
11:14 上午

shuyongfu

去掉不用的import语句
Options
    • -1
    • +0
    /forgon-knowledge/src/main/java/com/forgon/knowledge/service/KnowledgeViewManagerImpl.java
    • -1
    • +0
    /forgon-knowledge/src/main/java/com/forgon/knowledge/controller/KnowledgeFolderController.java
11:12 上午

shuyongfu

去掉不用的import语句
Options
    • -1
    • +0
    /forgon-core/src/main/java/com/forgon/security/model/Resource.java
    • -3
    • +1
    /forgon-core/src/main/java/com/forgon/servertime/action/ServerTimeAction.java
    • -2
    • +0
    /forgon-core/src/main/java/com/forgon/security/service/AclManager.java
    • -0
    • +2
    /forgon-core/src/main/java/com/forgon/portal/model/PortalPage.java
    • -1
    • +0
    /forgon-core/src/main/java/com/forgon/oa/vo/HomePageModelVO.java
    • -2
    • +0
    /forgon-core/src/main/java/com/forgon/systemsetting/xml/bean/SystemParamTextNodeOperateBean.java
    • -0
    • +1
    /forgon-core/src/main/java/com/forgon/portal/xmlbean/PortalPageXmlBean.java
    • -1
    • +0
    /forgon-core/src/main/java/com/forgon/excel/service/ExcelUtils.java
    • -5
    • +0
    /forgon-core/src/main/java/com/forgon/register/filter/VersionManagerFilter.java
    • -6
    • +3
    /forgon-core/src/main/java/com/forgon/filedownload/servlet/FileDownLoadServlet.java
    • -3
    • +0
    /forgon-core/src/main/java/com/forgon/oa/onlineusers/service/OnlineUserManager.java
    • -1
    • +0
    /forgon-core/src/main/java/com/forgon/systemsetting/controller/HttpOptionController.java
    • -1
    • +0
    /forgon-core/src/main/java/com/forgon/security/model/Operation.java
    • -2
    • +2
    /forgon-core/src/main/java/com/forgon/log/dwr/table/LogTableManager.java
    • -2
    • +4
    /forgon-core/src/main/java/com/forgon/portal/action/PortalPageAction.java
  16. … 6 more files in changeset.
11:07 上午

chenjiaru

解决jira问题：FSFY-18 包定义中增加‘审核是否算工作量’
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
11:07 上午

shuyongfu

去掉不用的import语句
Options
    • -1
    • +0
    /forgon-core/src/main/java/com/forgon/directory/service/DirectoryHelper.java
    • -1
    • +2
    /forgon-core/src/main/java/com/forgon/databaseadapter/service/DateQueryAdapter.java
    • -8
    • +0
    /forgon-core/src/main/java/com/forgon/directory/action/OrgUnitAction.java
    • -4
    • +3
    /forgon-core/src/main/java/com/forgon/directory/service/DirectoryManager.java
    • -1
    • +0
    /forgon-core/src/main/java/com/forgon/directory/service/PersonalSettingManagerImpl.java
10:33 上午

chenjiaru

解决jira问题：FSFY-18 包定义中增加‘审核是否算工作量’
Options
    • -1
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
Wednesday 20 Dec 2017
10:43 下午

terrykwan

修改定位删除按钮的方式，提高可靠性
Options
    • -14
    • +25
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Wash.java
10:38 下午

chenjiaru

解决jira问题：FSFY-18 包定义中增加‘审核是否算工作量’
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
    • -0
    • +44
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
    • -0
    • +12
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
8:04 下午

adairkang

CDSLQYQYYY-46 预处理不合格报表回收人获取清点人数据
Options
    • binary
    /ssts-web/src/main/webapp/jasperRtp/unqualifiedPretreatmentReport.jasper
    • -4
    • +4
    /ssts-web/src/main/webapp/jasperRtp/unqualifiedPretreatmentReport.jrxml
    • -6
    • +7
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/vo/UnqualifiedPretreatmentVo.java
    • -3
    • +3
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingItemManagerImpl.java
7:45 下午

adairkang

ZSYY-195 申请单打印发货计划增加勾选打印物品功能
Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
    • -0
    • +10
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
    • -1
    • +27
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • -0
    • +9
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
5:35 下午

jeffli

解决bug：

pc发货计划没有选择任何过滤条件，点了”刷新列表“之后，一次性物品申请单有些被过滤掉。

Options
    • -1
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js
3:43 下午

jeffli

标识牌装配增加扫描标识牌条码后自动点击装配按钮

中山一院消毒供应项目ZSYY-180

Options
    • -1
    • +11
    /ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
3:09 下午

chenjiaru

解决jira问题：DGSFYBJY-4 物品绑定需要能绑定器械包（部分代码的提交）
Options
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
    • -25
    • +26
    /ssts-web/src/main/webapp/disinfectsystem/goodsBindingConfig/goodsBindHandler.js
2:48 下午

chenjiaru

解决jira问题：DGSFYBJY-4 物品绑定需要能绑定器械包（部分代码的提交）
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
1:59 下午

shuyongfu

解决jira问题:DGSFYBJY-4 物品绑定需要能绑定器械包

使用记录转换申请单增加对一次性物品的绑定

Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
11:07 上午

chenjiaru

去掉英文的异常提示
Options
    • -6
    • +6
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/goodsBindingConfig/impl/GoodsBindSrvImpl.java
10:56 上午

jeffli

自定义装配光标优化

中山一院消毒供应项目ZSYY-181

Options
    • -1
    • +14
    /ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
Tuesday 19 Dec 2017
10:11 下午

terrykwan

retryingFind改为tryFind，缩短判断的时间
Options
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/chain/GdsyApplyHandler.java
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/chain/OtherApplyHandler.java
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/chain/GdsyApplyHandler3.java
10:10 下午

terrykwan

优化代码，增加非空断言
Options
    • -3
    • +8
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Login.java
9:26 下午

terrykwan

优化代码，增加非空断言
Options
    • -0
    • +7
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java
    • -4
    • +11
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java
9:25 下午

terrykwan

解决运行自动化测试脚本时，偶尔在打开发货计划列表页面时提示windowOnLoaded变量未定义的问题
Options
    • -1
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java
8:50 下午

shuyongfu

解决jira问题:DGSFYBJY-4 物品绑定需要能绑定器械包

使用记录转换申请单增加对一次性物品的绑定

Options
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
8:43 下午

shuyongfu

解决相关报表查询报错的问题及去掉不用的类的import语句
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -10
    • +2
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
8:17 下午

shuyongfu

解决jira问题:DGSFYBJY-4 物品绑定需要能绑定器械包

使用记录转换申请单增加对一次性物品的绑定

Options
    • -0
    • +39
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/tousseitem/TousseItem.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
8:06 下午

jeffli

装配任务左下角列表的数量增加外来器械待装配篮筐数

中山一院消毒供应项目ZSYY-182

Options
    • too large
    /ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
    • -1
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
8:03 下午

jeffli

装配任务左下角列表的数量增加外来器械待装配篮筐数

中山一院消毒供应项目ZSYY-182

Options
    • -1
    • +13
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskVo.java
    • too large
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
    • -0
    • +14
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskItemVo.java