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
Wednesday 14 Jun 2017
11:04 上午

chenjiaru

解决jira问题：ZSSXLRMYY-97 器械包数量预警或自动加急功能
Options
    • -0
    • +15
    /ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
    • -0
    • +18
    /ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
  3. /ssts-web/src/main/java/com/forgon/disinfectsystem/urgentgoodswarning
    • -0
    • +44
    /ssts-web/src/main/java/com/forgon/disinfectsystem/urgentgoodswarning/action/UrgentGoodsWarningAction.java
    • -0
    • +39
    /ssts-web/src/main/java/com/forgon/disinfectsystem/urgentgoodswarning/service/UrgentGoodsWarningManager.java
    • -0
    • +59
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/urgentgoodswarning/UrgentGoodsWarning.java
    • -0
    • +118
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/urgentGoodsHintView.js
    • -1
    • +12
    /ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
  9. /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/urgentgoodswarning
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
  11. /ssts-web/src/main/java/com/forgon/disinfectsystem/urgentgoodswarning/action
    • too large
    /ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
    • -0
    • +1
    /ssts-web/src/main/webapp/homepage/portalPage.jsp
    • -0
    • +78
    /ssts-web/src/main/java/com/forgon/disinfectsystem/urgentgoodswarning/service/UrgentGoodsWarningManagerImpl.java
    • -0
    • +23
    /ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/urgentGoodsHintView.jsp
  16. … 8 more files in changeset.
10:36 上午

adairkang

器械包信息界面 状态的显示
Options
    • -2
    • +6
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
    • -0
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp
Tuesday 13 Jun 2017
11:22 下午

shuyongfu

李健平发回来的成都五冶项目同步科室人员接口配置文件
Options
    • -10
    • +8
    /ssts-web/src/main/resources/config/cdswyyy/mybatis/SyncOrgUnitAndUserMapper.xml
    • -4
    • +4
    /ssts-web/src/main/resources/spring/projects/cdswyyy/applicationContext-his-cdswyyy.xml
11:18 下午

shuyongfu

陈国强发回的现场项目配置:

添加回收申请单是否加载申领模板及回收一键入筐

Options
    • -0
    • +4
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
8:52 下午

zengjc

1.修正质量监测月报查询到不同科室的数据的问题；

2.修正监测项配多个细则类型为多选，却都只有一个选项时，查询数据不对的问题.

3.质量监测月报年月查询的列加宽.

Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -2
    • +2
    /ssts-web/src/main/webapp/jasperRtp/QualityMonitoringInspectDayOfMonthReportView.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/QualityMonitoringInspectDayOfMonthReportView.jasper
8:00 下午

jeffli

解决：ZSYY-85

新增标签打印格式

Options
    • -1
    • +1
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/PackingTableManager.java
    • -44
    • +66
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js
6:38 下午

adairkang

ZSYY-84 科室申领中打印发货计划单格式调整
Options
    • -45
    • +41
    /ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js
3:31 下午

shuyongfu

解决质量监测旧数据action升级的问题
Options
    • -4
    • +9
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/action/MaintainAction.java
3:12 下午

zengjc

添加设备维护表单，‘表单元素’改为‘设备维护表单元素’
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomInsForm.js
3:01 下午

zengjc

设备维护数据录入页，‘表单元素’改为'设备维护元素'
Options
    • -1
    • +1
    /ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomInsForm.js
2:59 下午

zengjc

添加设备维护自定义表单一些注释.
Options
    • -1
    • +5
    /ssts-web/src/main/java/com/forgon/disinfectsystem/devicemaintenancecus/devicemaintenancecusins/service/DeviceMaintenanceCusInsManager.java
    • -11
    • +23
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/devicemaintenance/DeviceMaintenanceCusI.java
    • -1
    • +7
    /ssts-web/src/main/java/com/forgon/disinfectsystem/devicemaintenancecus/devicemaintenancecusdef/service/DeviceMaintenanceCusDefManager.java
    • -2
    • +4
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/devicemaintenance/DeviceMaintenanceCusD.java
    • -2
    • +7
    /ssts-web/src/main/java/com/forgon/disinfectsystem/devicemaintenancecus/devicemaintenancecusins/action/DeviceMaintenanceCusInsAction.java
    • -27
    • +3
    /ssts-web/src/main/java/com/forgon/disinfectsystem/devicemaintenancecus/devicemaintenancecusdef/action/DeviceMaintenanceCusDefAction.java
2:40 下午

cherry

1.流畅等待修改为调用通用方法

2.把一次性物品入库调整到申请前

Options
    • -23
    • +25
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/factory/WaitFactory.java
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/apply/service/GdsyApplyServiceImpl.java
    • -54
    • +18
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java
    • -10
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/One_use.java
    • -50
    • +9
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Recyle.java
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Login.java
    • -1
    • +1
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/PackingHistory.java
    • -25
    • +29
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Delivery.java
    • -19
    • +31
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
    • -41
    • +8
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Wash.java
    • -11
    • +2
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/UserRecord.java
    • -27
    • +5
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Apply.java
    • -25
    • +5
    /ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Disinfection.java
2:22 下午

shuyongfu

解决质量监测旧数据action升级的问题
Options
    • -5
    • +6
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/action/MaintainAction.java
2:05 下午

zengjc

设备维护的时间精确到秒，报表的查询也精确到秒.
Options
    • -0
    • +17
    /forgon-core/src/main/java/com/forgon/databaseadapter/service/DateQueryAdapter.java
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomInsForm.js
    • -2
    • +3
    /ssts-web/src/main/java/com/forgon/disinfectsystem/devicemaintenancecus/devicemaintenancecusins/service/DeviceMaintenanceCusInsManagerImpl.java
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomInsView.js
12:59 下午

adairkang

PDA登录的时候，将sstsConfig传到前台,不用每次使用的时候再去请求
Options
    • -1
    • +1
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
12:45 下午

adairkang

ZSYY-81 PDA预回收功能增加添加（新建）回收单功能
Options
    • -26
    • +3
    /ssts-web/src/test/java/test/forgon/disinfectsystem/toussetransition/service/TousseTransitionModelTestsBase.java
    • -22
    • +160
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionRecordManagerImpl.java
    • too large
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
    • too large
    /ssts-web/src/main/java/test/forgon/disinfectsystem/CSSDTestDataProcess.java
    • -0
    • +8
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManager.java
    • -11
    • +17
    /ssts-web/src/test/java/test/forgon/disinfectsystem/erroranddamage/RecyclingErrorAndDamageTests.java
    • -39
    • +37
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
    • -4
    • +21
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionItemManagerImpl.java
    • too large
    /ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
    • too large
    /ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
    • -1
    • +4
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java
    • -1
    • +25
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
    • -0
    • +5
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
    • too large
    /forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
    • -4
    • +9
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
  16. … 7 more files in changeset.
10:59 上午

zengjc

设备维护报表查询结果显示的时间精确到时分.
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
    • -0
    • +17
    /forgon-core/src/main/java/com/forgon/databaseadapter/service/DateQueryAdapter.java
    • binary
    /ssts-web/src/main/webapp/jasperRtp/deviceMaintenanceCusReport.jasper
    • -1
    • +1
    /ssts-web/src/main/webapp/jasperRtp/deviceMaintenanceCusReport.jrxml
    • -2
    • +4
    /ssts-web/src/main/java/com/forgon/disinfectsystem/devicemaintenancecus/devicemaintenancecusins/service/DeviceMaintenanceCusInsManagerImpl.java
10:45 上午

chenjiaru

调整器械包信息，里面的器械包的各个环节的tab位置
Options
    • -108
    • +125
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js
10:14 上午

zengjc

修复设备维护保存的记录打开再保存时，登记时间变化的问题，设备维护报表现在内容宽度加大.
Options
    • binary
    /ssts-web/src/main/webapp/jasperRtp/deviceMaintenanceCusReport.jasper
    • -0
    • +3
    /ssts-web/src/main/java/com/forgon/disinfectsystem/devicemaintenancecus/devicemaintenancecusins/service/DeviceMaintenanceCusInsManagerImpl.java
    • -8
    • +8
    /ssts-web/src/main/webapp/jasperRtp/deviceMaintenanceCusReport.jrxml
9:42 上午

shuyongfu

中山眼科升级4.1的相关问题处理
Options
    • -0
    • +1
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
    • -1
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.7.5_4.7.6_oracle.sql
    • -0
    • +3
    /ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakerecordmanager/StockTakeRecord.java
    • -7
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.3.5_4.3.6_oracle.sql
    • -1
    • +4
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.1.5_4.1.6_oracle.sql
    • -1
    • +14
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/action/MaintainAction.java
    • -1
    • +0
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.4.1_4.4.2_oracle.sql
    • -1
    • +0
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.4.1_4.4.2_sqlserver.sql
    • -3
    • +1
    /ssts-web/src/main/webapp/dataUpdater/sqls/4.3.5_4.3.6_sqlserver.sql
9:40 上午

jeffli

增加仪器班物品管理功能
Options
    • -0
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/position/changePosition.js
9:39 上午

jeffli

增加仪器班物品管理功能
Options
  1. /ssts-web/src/main/webapp/disinfectsystem/toussemanager/instrumentGoodsManagement
    • -0
    • +36
    /ssts-web/src/main/java/com/forgon/disinfectsystem/component/grid/GridManagerImpl.java
    • -0
    • +90
    /ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
    • -2
    • +1
    /ssts-web/src/main/webapp/homepage/menuconfigure.js
    • -0
    • +74
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/instrumentGoodsManagement/instrumentRoomGoodsManagement.jsp
    • -0
    • +3
    /forgon-core/src/main/java/com/forgon/component/grid/GridManager.java
    • -0
    • +394
    /ssts-web/src/main/webapp/disinfectsystem/toussemanager/instrumentGoodsManagement/instrumentRoomGoodsManagement.js
9:33 上午

jeffli

根据配置项来显示/隐藏 器械包信息选项卡中的流转记录
Options
    • -12
    • +15
    /ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js
Monday 12 Jun 2017
11:04 下午

terrykwan

去掉ssts-selenium-test模块
Options
    • -1
    • +1
    /settings.gradle
9:31 下午

chenjiaru

解决jira问题：ZSYY-69 增加急用物品处理周期统计报表
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
9:00 下午

zengjc

修复一下问题：

1.设备维护数据录入界面'表单名称'改为'设备维护名称'

2.设备维护数据录入界面项目下拉框显示不全的问题

3.设备维护‘项目名称’在列表上显示不了的问题

4.设备维护报表显示有些空框的问题

Options
    • -2
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomInsView.js
    • -3
    • +3
    /ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomDefView.js
    • -17
    • +17
    /ssts-web/src/main/webapp/jasperRtp/deviceMaintenanceCusReport.jrxml
    • binary
    /ssts-web/src/main/webapp/jasperRtp/deviceMaintenanceCusReport.jasper
    • -2
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomInsForm.js
8:59 下午

zengjc

质量检测支持录入多个器械包升级数据方法的优化.
Options
    • -0
    • +5
    /ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/action/MaintainAction.java
8:22 下午

chenjiaru

解决jira问题：ZSYY-69 增加急用物品处理周期统计报表
Options
    • too large
    /ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
7:33 下午

zengjc

解决jira问题：ZSSZYY-106，修复定期检测重新装配器械包，生成两条装配任务的问题.
Options
    • -7
    • +2
    /ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js
4:23 下午

adairkang

删除不用的代码
Options
    • -7
    • +1
    /ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/toussetransition/service/TousseTransitionItemManagerImpl.java