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

ZhongJi

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): 14,376
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

3 properties
  • svn:global-ignores = *.bat RSA Test1 maven-encryption-plugin maven-hello-plugin test test2 test3 更新文件
  • svn:ignore = .metadata .recommenders RemoteSystemsTempFiles Test Test.rar Test2 ahoovaHome configData html5 liuchengtu
  • svn:mergeinfo = /CODE/branch/2.6.2GA:27066-27093 /CODE/branch/2.6.2RC:27065 /CODE/branch/2.9.1GA:29057-29570 /CODE/branch/3.1GA/itsm:32788-32881 /CODE/branch/3.1RC/itsm:32187-32371 /CODE/branch/3.5RC/itsm:40708-40785 /CODE/branch/Customer/2.9GA2Saas:31621-31799 /CODE/branch/Customer/中集更新/zhongji3.5.7GA/itsm:52451-52550 /CODE/branch/Guoyu_ITSM/2.6.2GA:27094-27663 /CODE/branch/Guoyu_Person_Work/lywork/3.2GA/itsm:35063-35220 /CODE/branch/dameng/itsm:48190-48480 /CODE/branch/liucheng/itsm:48089-49485 /CODE/tags/ITSM/3.1GA/itsm:32882-33037 /CODE/tags/ITSM/3.5.4GA/itsm:48089-48189
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
星期五 23 九月 2022
4:39 下午

andy

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

andy

中集二开升级语句
Options
    • -0
    • +2
    /二开升级语句以及升级脚本/终端用户权限控制.txt
3:36 下午

andy

中集二开：

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

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

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

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

sam

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

zane

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

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

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

Options
    • -6
    • +19
    /common/common-security/src/main/java/com/sinba/common/security/service/SyncOrganizationJob.java
8:54 上午

zane

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

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

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

Options
    • -3
    • +3
    /common/common-security/src/main/java/com/sinba/common/security/service/SyncOrganizationJob.java
星期四 22 九月 2022
9:12 下午

ciel

#处理任务重新指派完成时间不变
Options
    • -6
    • +8
    /common/common-jbpm/src/main/java/com/sinba/common/jbpm/service/JbpmBPI.java
    • -5
    • +5
    /common/common-jbpm/src/main/java/com/sinba/common/jbpm/service/JbpmService.java
    • -1
    • +1
    /common/common-bpm/src/main/java/com/sinba/common/bpm/api/IBPI.java
6:35 下午

andy

中集28人天二开需求三和七Sql升级语句
Options
    • -3
    • +12
    /二开升级语句以及升级脚本/终端用户权限控制.txt
    • -3
    • +3
    /二开升级语句以及升级脚本/编辑用户回访权限控制.txt
6:34 下午

andy

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

andy

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

andy

修改国际化文件：

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

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

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

steven

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

sam

ITSM读取iworkflow 审批类申请itsm自动建单、派代、关单（客户梳理iworkflow申请产品清单、建单、派单、关单规则）
Options
    • -13
    • +35
    /itsm/itsm-change/src/main/java/com/sinba/itsm/change/action/ChangeAction.java
    • -11
    • +38
    /itsm/itsm-change/src/main/java/com/sinba/itsm/change/service/ChangeService.java
    • -21
    • +34
    /itsm/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/itsm-webapp/src/main/webapp/scripts/i18n/i18n_ja_JP.js
    • -1
    • +1
    /itsm/itsm-webapp/src/main/resources/i18n/itilbase_zh_TW.properties
    • -0
    • +1
    /itsm/itsm-webapp/src/main/resources/i18n/itilbase_jp.properties
    • -237
    • +0
    /common/common-security/src/main/java/com/sinba/common/security/entity/Employee.java
    • -1
    • +1
    /itsm/itsm-webapp/src/main/resources/i18n/itilbase_ja_JP.properties
    • -1
    • +1
    /itsm/itsm-webapp/src/main/webapp/scripts/i18n/i18n_zh_TW.js
    • -1
    • +1
    /itsm/itsm-webapp/src/main/resources/i18n/itilbase_zh_CN.properties
    • -0
    • +132
    /common/common-security/src/main/java/com/sinba/common/security/dto/PositionDTO.java
    • -0
    • +1
    /itsm/itsm-webapp/src/main/resources/i18n/itilbase_tw.properties
    • -129
    • +0
    /common/common-security/src/main/java/com/sinba/common/security/entity/Position.java
    • -1
    • +1
    /itsm/itsm-webapp/src/main/webapp/scripts/i18n/i18n_en_US.js
    • -1
    • +1
    /itsm/itsm-webapp/src/main/resources/i18n/itilbase_en_US.properties
    • -0
    • +258
    /common/common-security/src/main/java/com/sinba/common/security/dto/EmployeeDTO.java
    • -1
    • +1
    /itsm/itsm-webapp/src/main/resources/i18n/itilbase_cn.properties
    • -69
    • +100
    /common/common-security/src/main/java/com/sinba/common/security/service/SyncOrganizationJob.java
    • -1
    • +1
    /itsm/itsm-webapp/src/main/webapp/scripts/i18n/i18n_zh_CN.js
5:47 下午

steven

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

steven

#添加取消状态升级语句
Options
    • -0
    • +1
    /二开升级语句以及升级脚本/状态取消的升级语句.sql
5:02 下午

steven

#导出添加分钟
Options
    • -3
    • +4
    /itsm/itsm-webapp/src/main/resources/i18n/itilbase_cn.properties
    • -3
    • +4
    /itsm/itsm-webapp/src/main/resources/i18n/itilbase_jp.properties
    • -4
    • +5
    /itsm-dependency/itsm-activemq/i18n/itilbase_ja_JP.properties
    • -3
    • +5
    /itsm-dependency/itsm-activemq/i18n/itilbase_cn.properties
    • -4
    • +5
    /itsm-dependency/itsm-activemq/i18n/itilbase_en_US.properties
    • -4
    • +4
    /itsm/itsm-webapp/src/main/resources/i18n/itilbase_en_US.properties
    • -3
    • +4
    /itsm/itsm-webapp/src/main/resources/i18n/itilbase_tw.properties
    • -4
    • +4
    /itsm/itsm-webapp/src/main/resources/i18n/itilbase_ja_JP.properties
    • -3
    • +4
    /itsm-dependency/itsm-activemq/i18n/itilbase_jp.properties
    • -4
    • +4
    /itsm/itsm-webapp/src/main/resources/i18n/itilbase_zh_CN.properties
    • -4
    • +5
    /itsm-dependency/itsm-activemq/i18n/itilbase_zh_TW.properties
    • -3
    • +4
    /itsm-dependency/itsm-activemq/i18n/itilbase_tw.properties
    • -4
    • +5
    /itsm-dependency/itsm-activemq/i18n/itilbase_zh_CN.properties
    • -4
    • +4
    /itsm/itsm-webapp/src/main/resources/i18n/itilbase_zh_TW.properties
4:59 下午

steven

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

andy

中集二开，终端用户与编辑用户回访权限升级语句
Options
    • -0
    • +5
    /二开升级语句以及升级脚本/终端用户权限控制.txt
    • -0
    • +4
    /二开升级语句以及升级脚本/编辑用户回访权限控制.txt
2:46 下午

sam

ITSM读取iworkflow 审批类深情itsm自动建单、派代、关单（客户梳理iworkflow申请产品清单、建单、派单、关单规则）(修改提示)
Options
    • -1
    • +1
    /itsm/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
    • +237
    /common/common-security/src/main/java/com/sinba/common/security/entity/Employee.java
    • -0
    • +17
    /itsm/itsm-webapp/src/main/webapp/scripts/common/tools/scheduledTask/scheduledTasksManage.js
    • -3
    • +7
    /common/pom.xml
    • -0
    • +0
    /itsm/itsm-webapp/src/main/resources/i18n/itilbase_jp.properties
    • -0
    • +1
    /itsm/itsm-webapp/src/main/webapp/scripts/i18n/i18n_zh_CN.js
    • -1
    • +4
    /common/common-security/src/main/resources/spring/applicationContext-security.xml
    • -0
    • +1
    /itsm/itsm-webapp/src/main/webapp/scripts/i18n/i18n_zh_TW.js
    • -0
    • +1
    /itsm/itsm-webapp/src/main/resources/i18n/itilbase_ja_JP.properties
    • -0
    • +1
    /itsm/itsm-webapp/src/main/resources/i18n/itilbase_zh_CN.properties
    • -0
    • +10
    /common/common-security/src/main/java/com/sinba/common/security/dto/OrganizationDTO.java
    • -0
    • +2
    /itsm/itsm-webapp/src/main/webapp/pages/common/tools/scheduledTask/scheduledTasksManage.jsp
    • -0
    • +3
    /itsm-dependency/itsm-activemq/src/main/resources/springAll/applicationContext-security.xml
    • -0
    • +1
    /itsm/itsm-webapp/src/main/resources/i18n/itilbase_zh_TW.properties
    • -11
    • +68
    /common/common-security/src/main/java/com/sinba/common/security/service/OrganizationInnerService.java
    • -0
    • +1
    /itsm/itsm-webapp/src/main/resources/i18n/itilbase_cn.properties
  16. … 8 more files in changeset.
2:03 下午

sam

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

steven

#单点登录的代码
Options
    • -1
    • +3
    /二开升级语句以及升级脚本/挂起、响应、完成时长的计算.txt
    • -5
    • +2
    /itsm/itsm-webapp/src/main/webapp/jaas/login.conf
    • -7
    • +23
    /itsm/itsm-webapp/src/main/webapp/pages/autoLogin.jsp
9:52 上午

ciel

no_comment
Options
    • -1
    • +1
    /itsm/itsm-request/src/main/java/com/sinba/itsm/request/service/RequestService.java
    • -2
    • +3
    /common/common-jbpm/src/main/java/com/sinba/common/jbpm/service/ProcessTaskRecordServiceImpl.java
9:44 上午

ciel

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

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

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

Options
  1. /itsm/itsm-change
    • -0
    • +12
    /itsm/itsm-demand/src/main/java/com/sinba/itsm/demand/service/DemandService.java
    • -32
    • +150
    /itsm/itsm-request/src/main/java/com/sinba/itsm/request/service/RequestService.java
  4. /itsm/itsm-request
    • -0
    • +12
    /itsm/itsm-release/src/main/java/com/sinba/itsm/release/service/ReleaseService.java
    • -1
    • +10
    /common/common-bpm/src/main/java/com/sinba/common/bpm/api/IProcessTaskRecordService.java
  7. /common/common-tools
    • -0
    • +1
    /二开升级语句以及升级脚本/技术员处理任务的计算升级脚本.txt
    • -0
    • +2
    /common/common-security/src/main/java/com/sinba/common/security/service/IUserInfoService.java
    • -1
    • +2
    /itsm/itsm-webapp/src/main/resources/i18n/itilbase_en_US.properties
    • -0
    • +12
    /common/common-security/src/main/java/com/sinba/common/security/dao/UserDAO.java
  12. /
    • -0
    • +13
    /common/common-jbpm/src/main/java/com/sinba/common/jbpm/dao/ProcessTaskRecordDAO.java
    • -0
    • +1
    /itsm-dependency/itsm-activemq/i18n/itilbase_cn.properties
    • -5
    • +19
    /itsm-dependency/itsm-activemq/application/libs/i18n/itilbase_cn.properties
  16. … 44 more files in changeset.
8:35 上午

steven

#升级语句以及升级脚本
Options
  1. /二开升级语句以及升级脚本
    • -0
    • +4
    /二开升级语句以及升级脚本/状态取消的升级语句.sql
    • -0
    • +1
    /二开升级语句以及升级脚本/挂起、响应、完成时长的计算.txt
星期三 21 九月 2022
4:16 下午

andy

中集二开

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

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

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

Options
    • -1
    • +1
    /itsm/itsm-webapp/src/main/webapp/pages/itsm/portal/helpdeskPortal.jsp
    • -1
    • +1
    /itsm/itsm-webapp/src/main/webapp/scripts/itsm/portal/helpdeskPortal.js
    • -1
    • +1
    /common/common-tools/src/main/java/com/sinba/common/tools/service/UserReturnVisitService.java
    • -1
    • +1
    /common/common-security/src/main/java/com/sinba/common/security/dao/UserDAO.java
    • -3
    • +3
    /itsm/itsm-webapp/src/main/webapp/pages/common/config/formCustom/defaultField.jsp
    • -1
    • +2
    /itsm/itsm-webapp/src/main/webapp/scripts/itsm/request/requestDetailsFormCustom.js
    • -1
    • +10
    /common/common-security/src/main/java/com/sinba/common/security/dto/UserQueryDTO.java
    • -8
    • +0
    /common/common-security/src/main/java/com/sinba/common/security/action/UserAction.java
    • -4
    • +5
    /itsm/itsm-webapp/src/main/webapp/scripts/common/security/userUtil.js
2:52 下午

steven

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

sam

显示需求

1、请求详细、请求列表 中请求人所属机构字段（显示分公司名称、所属产业）

2、在导出基础数据时，列表中新增请求人邮箱、所属产业、企业名称，将请求人所属机构信息导出

Options
    • -30
    • +4
    /itsm/itsm-change/src/main/java/com/sinba/itsm/change/service/ChangeService.java
    • -30
    • +4
    /itsm/itsm-problem/src/main/java/com/sinba/itsm/problem/service/ProblemService.java
    • -36
    • +9
    /itsm/itsm-request/src/main/java/com/sinba/itsm/request/service/RequestService.java
    • -0
    • +27
    /common/common-tools/src/main/java/com/sinba/common/tools/util/ZhongJiUtils.java
1:33 下午

sam

显示需求

1、请求详细、请求列表 中请求人所属机构字段（显示分公司名称、所属产业）

2、在导出基础数据时，列表中新增请求人邮箱、所属产业、企业名称，将请求人所属机构信息导出

Options
    • -20
    • +5
    /itsm/itsm-problem/src/main/java/com/sinba/itsm/problem/service/ProblemService.java
    • -59
    • +18
    /itsm/itsm-request/src/main/java/com/sinba/itsm/request/service/RequestService.java
    • -19
    • +5
    /itsm/itsm-change/src/main/java/com/sinba/itsm/change/service/ChangeService.java
    • -0
    • +41
    /common/common-tools/src/main/java/com/sinba/common/tools/util/ZhongJiUtils.java