Evaluation license expires Fri Dec 24 21:00:00 CST 2337

ZhongJi

itsm

Checkout Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 7
Last Commit: 22 九月 22
Commits this week: 0
Total Lines of Code (LoC): 8,082
Net change in LoC this week: 0

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

2 properties
  • svn:ignore = webapps
  • svn:mergeinfo = /CODE/branch/2.5.2RC/itsm:24004-24504 /CODE/branch/2.6GA/itsm:25307-25469 /CODE/branch/2.9.1GA/itsm:29056-29683 /CODE/branch/2.9RC/itsm:28357-28553 /CODE/branch/2.9RC/itsm/itsm:28354-28355 /CODE/branch/2.9RC/itsmq/itsm:28356 /CODE/branch/3.1GA/itsm/itsm:32788-32881 /CODE/branch/3.1RC/itsm/itsm:32187-32371 /CODE/branch/3.5RC/itsm/itsm:40708-40785 /CODE/branch/Customer/2.9GA2Saas/itsm:29685-31799 /CODE/branch/Customer/中集更新/zhongji3.5.7GA/itsm/itsm:52451-52550 /CODE/branch/Guoyu_ITSM/2.6.2GA/itsm:27094-27663 /CODE/branch/Guoyu_Person_Work/lywork/3.2GA/itsm/itsm:35063-35220 /CODE/branch/dameng/itsm/itsm:48190-48480 /CODE/branch/liucheng/itsm/itsm:48089-49485,49487-49565 /CODE/branch/lywork/2.5RC/itsm:24898-24938 /CODE/branch/xlp/2.1GA/itsm:14206-14255 /CODE/tags/ITSM/2.9GA/itsm:28850-29055 /CODE/tags/ITSM/2.9GA2/itsm:29684 /CODE/tags/ITSM/3.1GA/itsm/itsm:32882-33037
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
星期六 08 十月 2022
3:19 下午

steven

#如果有权限，可修改优先级且不重新匹配SLA
Options
    • -2
    • +9
    ./itsm-request/src/main/java/com/sinba/itsm/request/service/RequestService.java
    • -1
    • +8
    ./itsm-request/src/main/java/com/sinba/itsm/request/dto/RequestDTO.java
    • -0
    • +5
    ./itsm-webapp/src/main/webapp/pages/itsm/request/editRequestFormCustom.jsp
    • -1
    • +1
    ./itsm-webapp/src/main/webapp/WEB-INF/classes/com/sinba/itsm/config/updatelevel/action/UpdateLevelUtils.smcf
  5. … 1 more file in changeset.
星期四 29 九月 2022
4:29 下午

steven

##修改请求的导出时长
Options
    • -7
    • +9
    ./itsm-request/src/main/java/com/sinba/itsm/request/service/RequestService.java
星期二 27 九月 2022
5:57 下午

ciel

#时间显示转换
Options
    • -2
    • +2
    ./itsm-request/src/main/java/com/sinba/itsm/request/service/RequestService.java
3:59 下午

steven

#修改请求导出时长的问题
Options
    • -4
    • +5
    ./itsm-webapp/src/main/resources/i18n/itilbase_zh_TW.properties
    • -3
    • +5
    ./itsm-webapp/src/main/resources/i18n/itilbase_tw.properties
    • -4
    • +5
    ./itsm-webapp/src/main/resources/i18n/itilbase_en_US.properties
    • -24
    • +54
    ./itsm-request/src/main/java/com/sinba/itsm/request/service/RequestService.java
    • -3
    • +5
    ./itsm-webapp/src/main/resources/i18n/itilbase_cn.properties
    • -4
    • +5
    ./itsm-webapp/src/main/resources/i18n/itilbase_ja_JP.properties
    • -3
    • +5
    ./itsm-webapp/src/main/resources/i18n/itilbase_jp.properties
    • -4
    • +5
    ./itsm-webapp/src/main/resources/i18n/itilbase_zh_CN.properties
  9. … 7 more files in changeset.
2:17 下午

sam

ITSM读取iworkflow 审批类深情itsm自动建单、派代、关单（客户梳理iworkflow申请产品清单、建单、派单、关单规则） 删除logger.error 输出
Options
    • -1
    • +0
    ./itsm-change/src/main/java/com/sinba/itsm/change/service/ChangeService.java
2:15 下午

sam

ITSM读取iworkflow 审批类深情itsm自动建单、派代、关单（客户梳理iworkflow申请产品清单、建单、派单、关单规则） (无法修改变更是因为乱码导致 ，修改创建变更结束时间比开始时间小的问题，优化代码提示，删除json中的斜杠，修改变更完成后 前端页面还多显示两个按钮问题)
Options
    • -1
    • +0
    ./itsm-change/src/main/java/com/sinba/itsm/change/action/ChangeAction.java
    • -1
    • +5
    ./itsm-webapp/src/main/webapp/pages/itsm/change/changeDetail.jsp
    • -12
    • +20
    ./itsm-change/src/main/java/com/sinba/itsm/change/service/ChangeService.java
10:26 上午

andy

去掉console.log
Options
    • -1
    • +0
    ./itsm-webapp/src/main/webapp/scripts/common/security/userUtil.js
10:14 上午

andy

修复 选择变更拥有者所在工作组后，变更拥有者无法指派终端用户
Options
    • -0
    • +1
    ./itsm-webapp/src/main/webapp/scripts/basics/jquery_common.js
    • -1
    • +1
    ./itsm-webapp/src/main/webapp/scripts/common/jbpm/processCommon.js
    • -2
    • +2
    ./itsm-webapp/src/main/webapp/scripts/common/security/userUtil.js
星期一 26 九月 2022
8:48 下午

ciel

#任务重新指派导出计算问题处理

#提示信息显示处理

Options
    • -1
    • +3
    ./itsm-release/src/main/java/com/sinba/itsm/release/action/ReleaseAction.java
    • -0
    • +4
    ./itsm-request/src/main/java/com/sinba/itsm/request/action/RequestAction.java
    • -1
    • +1
    ./itsm-webapp/src/main/webapp/scripts/index.js
    • -0
    • +2
    ./itsm-problem/src/main/java/com/sinba/itsm/problem/action/ProblemAction.java
    • -0
    • +2
    ./itsm-change/src/main/java/com/sinba/itsm/change/action/ChangeAction.java
  6. … 1 more file in changeset.
星期五 23 九月 2022
6:20 下午

andy

解决变更指派终端用户BUG
Options
    • -2
    • +10
    ./itsm-webapp/src/main/webapp/scripts/common/security/userUtil.js
    • -0
    • +1
    ./itsm-webapp/src/main/webapp/scripts/common/jbpm/processCommon.js
4:39 下午

andy

修改终端用户指派BUG
Options
    • -1
    • +1
    ./itsm-webapp/src/main/webapp/scripts/common/security/userUtil.js
3:36 下午

andy

中集二开：

修复终端用户提交变更后，技术员变更拥有者中点击组查不到终端用户信息

修复变更搜索请求类型没有隐藏

修复如果添加了自定义表单，请求类型字段不能修改

Options
    • -1
    • +1
    ./itsm-webapp/src/main/webapp/scripts/common/config/formCustom/formControlImpl.js
    • -5
    • +9
    ./itsm-webapp/src/main/webapp/scripts/common/security/userUtil.js
    • -3
    • +3
    ./itsm-webapp/src/main/webapp/pages/itsm/request/requestMain.jsp
3:29 下午

sam

ITSM读取iworkflow 审批类申请itsm自动建单、派代、关单（客户梳理iworkflow申请产品清单、建单、派单、关单规则）
Options
    • -0
    • +2
    ./itsm-webapp/pom.xml
    • -46
    • +9
    ./itsm-change/src/main/java/com/sinba/itsm/change/action/ChangeAction.java
    • -0
    • +9
    ./itsm-change/src/main/resources/struts/struts-change.xml
    • -2
    • +15
    ./itsm-change/src/main/java/com/sinba/itsm/change/service/ChangeService.java
星期四 22 九月 2022
6:34 下午

andy

修改请求列表中，外出字段没有隐藏
Options
    • -2
    • +2
    ./itsm-webapp/src/main/webapp/scripts/itsm/request/requestMain.js
6:34 下午

andy

修改编辑用户回访时，如果不选点击保存状态会改变BUG
Options
    • -1
    • +1
    ./itsm-webapp/src/main/webapp/scripts/common/tools/visit/returnVisitManage.js
6:32 下午

andy

修改国际化文件：

回访事项扫描 =》 定期自动回访

意见建议 =》 用户反馈内容

Options
    • -2
    • +1
    ./itsm-webapp/src/main/resources/i18n/itilbase_jp.properties
    • -2
    • +2
    ./itsm-webapp/src/main/resources/i18n/itilbase_en_US.properties
    • -1
    • +1
    ./itsm-webapp/src/main/webapp/scripts/i18n/i18n_ja_JP.js
    • -0
    • +0
    ./itsm-webapp/src/main/resources/i18n/itilbase_zh_CN.properties
    • -4
    • +4
    ./itsm-webapp/src/main/resources/i18n/itilbase_cn.properties
    • -2
    • +2
    ./itsm-webapp/src/main/resources/i18n/itilbase_zh_TW.properties
    • -1
    • +1
    ./itsm-webapp/src/main/webapp/scripts/i18n/i18n_zh_TW.js
    • -2
    • +2
    ./itsm-webapp/src/main/resources/i18n/itilbase_tw.properties
    • -1
    • +1
    ./itsm-webapp/src/main/webapp/scripts/i18n/i18n_en_US.js
    • -1
    • +1
    ./itsm-webapp/src/main/webapp/scripts/i18n/i18n_zh_CN.js
    • -2
    • +2
    ./itsm-webapp/src/main/resources/i18n/itilbase_ja_JP.properties
  12. … 7 more files in changeset.
6:00 下午

steven

#解决处理方式不能为空的问题
Options
    • -11
    • +12
    ./itsm-webapp/src/main/webapp/scripts/itsm/request/requestDetailsFormCustom.js
5:58 下午

sam

ITSM读取iworkflow 审批类申请itsm自动建单、派代、关单（客户梳理iworkflow申请产品清单、建单、派单、关单规则）
Options
    • -13
    • +35
    ./itsm-change/src/main/java/com/sinba/itsm/change/action/ChangeAction.java
    • -11
    • +38
    ./itsm-change/src/main/java/com/sinba/itsm/change/service/ChangeService.java
    • -21
    • +34
    ./itsm-change/src/main/java/com/sinba/itsm/change/dto/ChangeHttpDTO.java
5:57 下午

zane

ZJ-5 中集需求一：与HR系统对接

1.HR提供返回机构以及机构对应领导信息的接口（API接口对接）

2.ITSM新增定期任务，定期同步HR提供返回机构以及机构对应领导信息的接口

Options
    • -1
    • +1
    ./itsm-webapp/src/main/webapp/scripts/i18n/i18n_ja_JP.js
    • -1
    • +1
    ./itsm-webapp/src/main/resources/i18n/itilbase_zh_TW.properties
    • -0
    • +1
    ./itsm-webapp/src/main/resources/i18n/itilbase_jp.properties
    • -1
    • +1
    ./itsm-webapp/src/main/resources/i18n/itilbase_ja_JP.properties
    • -1
    • +1
    ./itsm-webapp/src/main/webapp/scripts/i18n/i18n_zh_TW.js
    • -1
    • +1
    ./itsm-webapp/src/main/resources/i18n/itilbase_zh_CN.properties
    • -0
    • +1
    ./itsm-webapp/src/main/resources/i18n/itilbase_tw.properties
    • -1
    • +1
    ./itsm-webapp/src/main/webapp/scripts/i18n/i18n_en_US.js
    • -1
    • +1
    ./itsm-webapp/src/main/resources/i18n/itilbase_en_US.properties
    • -1
    • +1
    ./itsm-webapp/src/main/resources/i18n/itilbase_cn.properties
    • -1
    • +1
    ./itsm-webapp/src/main/webapp/scripts/i18n/i18n_zh_CN.js
  12. … 5 more files in changeset.
5:47 下午

steven

#修改请求的升级脚本
Options
    • -7
    • +10
    ./itsm-request/src/main/java/com/sinba/itsm/request/service/RequestService.java
5:02 下午

steven

#导出添加分钟
Options
    • -3
    • +4
    ./itsm-webapp/src/main/resources/i18n/itilbase_cn.properties
    • -3
    • +4
    ./itsm-webapp/src/main/resources/i18n/itilbase_jp.properties
    • -4
    • +4
    ./itsm-webapp/src/main/resources/i18n/itilbase_en_US.properties
    • -3
    • +4
    ./itsm-webapp/src/main/resources/i18n/itilbase_tw.properties
    • -4
    • +4
    ./itsm-webapp/src/main/resources/i18n/itilbase_ja_JP.properties
    • -4
    • +4
    ./itsm-webapp/src/main/resources/i18n/itilbase_zh_CN.properties
    • -4
    • +4
    ./itsm-webapp/src/main/resources/i18n/itilbase_zh_TW.properties
  8. … 7 more files in changeset.
4:59 下午

steven

#添加编辑，修改用户自动补全的问题
Options
    • -1
    • +1
    ./itsm-webapp/src/main/webapp/scripts/itsm/app/autocomplete/autocomplete.js
2:46 下午

sam

ITSM读取iworkflow 审批类深情itsm自动建单、派代、关单（客户梳理iworkflow申请产品清单、建单、派单、关单规则）(修改提示)
Options
    • -1
    • +1
    ./itsm-change/src/main/java/com/sinba/itsm/change/service/ChangeService.java
2:14 下午

zane

ZJ-5 中集需求一：与HR系统对接

1.HR提供返回机构以及机构对应领导信息的接口（API接口对接）

2.ITSM新增定期任务，定期同步HR提供返回机构以及机构对应领导信息的接口

Options
    • -0
    • +17
    ./itsm-webapp/src/main/webapp/scripts/common/tools/scheduledTask/scheduledTasksManage.js
    • -0
    • +0
    ./itsm-webapp/src/main/resources/i18n/itilbase_jp.properties
    • -0
    • +1
    ./itsm-webapp/src/main/webapp/scripts/i18n/i18n_zh_CN.js
    • -0
    • +1
    ./itsm-webapp/src/main/webapp/scripts/i18n/i18n_zh_TW.js
    • -0
    • +1
    ./itsm-webapp/src/main/resources/i18n/itilbase_ja_JP.properties
    • -0
    • +1
    ./itsm-webapp/src/main/resources/i18n/itilbase_zh_CN.properties
    • -0
    • +2
    ./itsm-webapp/src/main/webapp/pages/common/tools/scheduledTask/scheduledTasksManage.jsp
    • -0
    • +1
    ./itsm-webapp/src/main/resources/i18n/itilbase_zh_TW.properties
    • -0
    • +1
    ./itsm-webapp/src/main/resources/i18n/itilbase_cn.properties
    • -0
    • +1
    ./itsm-webapp/src/main/resources/i18n/itilbase_en_US.properties
    • -0
    • +1
    ./itsm-webapp/src/main/webapp/scripts/i18n/i18n_ja_JP.js
    • -0
    • +1
    ./itsm-webapp/src/main/webapp/scripts/i18n/i18n_en_US.js
    • -0
    • +0
    ./itsm-webapp/src/main/resources/i18n/itilbase_tw.properties
  14. … 10 more files in changeset.
2:03 下午

sam

ITSM读取iworkflow 审批类深情itsm自动建单、派代、关单（客户梳理iworkflow申请产品清单、建单、派单、关单规则）
Options
    • -29
    • +62
    ./itsm-change/src/main/java/com/sinba/itsm/change/action/ChangeAction.java
    • -5
    • +43
    ./itsm-change/src/main/java/com/sinba/itsm/change/service/ChangeService.java
    • -0
    • +9
    ./itsm-change/src/main/java/com/sinba/itsm/change/dto/ChangeHttpDTO.java
12:38 下午

steven

#单点登录的代码
Options
    • -5
    • +2
    ./itsm-webapp/src/main/webapp/jaas/login.conf
    • -7
    • +23
    ./itsm-webapp/src/main/webapp/pages/autoLogin.jsp
  3. … 1 more file in changeset.
9:52 上午

ciel

no_comment
Options
    • -1
    • +1
    ./itsm-request/src/main/java/com/sinba/itsm/request/service/RequestService.java
  2. … 1 more file in changeset.
9:44 上午

ciel

#ZJ-4需求5 二次指派后回到开启流程之前的状态

1、点击任务重新指派后，分段式统计并体现任务情况

2、导出的数据 是否把所有参与人与处理时效都导出来（涉及多人分多列）

Options
  1. ./itsm-change
    • -0
    • +12
    ./itsm-demand/src/main/java/com/sinba/itsm/demand/service/DemandService.java
    • -32
    • +150
    ./itsm-request/src/main/java/com/sinba/itsm/request/service/RequestService.java
  4. ./itsm-request
    • -0
    • +12
    ./itsm-release/src/main/java/com/sinba/itsm/release/service/ReleaseService.java
    • -1
    • +2
    ./itsm-webapp/src/main/resources/i18n/itilbase_en_US.properties
    • -0
    • +1
    ./itsm-webapp/src/main/resources/i18n/itilbase_zh_CN.properties
    • -1
    • +8
    ./itsm-change/src/main/java/com/sinba/itsm/change/dto/ChangeDTO.java
    • -1
    • +1
    ./itsm-webapp/src/main/webapp/WEB-INF/classes/md5/md5.properties
    • -0
    • +12
    ./itsm-request/src/main/java/com/sinba/itsm/request/service/RequestActionService.java
  11. ./itsm-problem
    • -0
    • +1
    ./itsm-webapp/src/main/resources/i18n/itilbase_ja_JP.properties
    • -0
    • +12
    ./itsm-problem/src/main/java/com/sinba/itsm/problem/service/ProblemService.java
    • -2
    • +8
    ./itsm-domain/src/main/java/com/sinba/itsm/domain/entity/Event.java
  15. ./itsm-webapp/src/main/webapp/pages
  16. … 44 more files in changeset.
星期三 21 九月 2022
4:16 下午

andy

中集二开

***修改变更指派时，重复查询以及循环遍历问题

***优化修改变更回访时，参数固定问题

***修改用户只要有终端角色，页面显示BUG

Options
    • -1
    • +1
    ./itsm-webapp/src/main/webapp/pages/itsm/portal/helpdeskPortal.jsp
    • -1
    • +1
    ./itsm-webapp/src/main/webapp/scripts/itsm/portal/helpdeskPortal.js
    • -3
    • +3
    ./itsm-webapp/src/main/webapp/pages/common/config/formCustom/defaultField.jsp
    • -1
    • +2
    ./itsm-webapp/src/main/webapp/scripts/itsm/request/requestDetailsFormCustom.js
    • -4
    • +5
    ./itsm-webapp/src/main/webapp/scripts/common/security/userUtil.js
  6. … 4 more files in changeset.
2:52 下午

steven

no_comment
Options
    • -0
    • +3
    ./itsm-app/src/main/java/com/sinba/itsm/config/autoComplete/dao/AutoCompleteDAO.java