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

ZhongJi

common

Checkout Tools
More
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
星期一 26 九月 2022
8:48 下午

ciel

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

#提示信息显示处理

Options
    • -2
    • +2
    ./common-jbpm/src/main/java/com/sinba/common/jbpm/service/JbpmBPI.java
  2. … 5 more files in changeset.
星期五 23 九月 2022
9:19 上午

zane

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

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

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

Options
    • -6
    • +19
    ./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-security/src/main/java/com/sinba/common/security/service/SyncOrganizationJob.java
星期四 22 九月 2022
9:12 下午

ciel

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

zane

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

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

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

Options
    • -237
    • +0
    ./common-security/src/main/java/com/sinba/common/security/entity/Employee.java
    • -0
    • +132
    ./common-security/src/main/java/com/sinba/common/security/dto/PositionDTO.java
    • -129
    • +0
    ./common-security/src/main/java/com/sinba/common/security/entity/Position.java
    • -0
    • +258
    ./common-security/src/main/java/com/sinba/common/security/dto/EmployeeDTO.java
    • -69
    • +100
    ./common-security/src/main/java/com/sinba/common/security/service/SyncOrganizationJob.java
  6. … 11 more files in changeset.
2:14 下午

zane

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

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

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

Options
    • -0
    • +237
    ./common-security/src/main/java/com/sinba/common/security/entity/Employee.java
    • -3
    • +7
    ./pom.xml
    • -1
    • +4
    ./common-security/src/main/resources/spring/applicationContext-security.xml
    • -0
    • +10
    ./common-security/src/main/java/com/sinba/common/security/dto/OrganizationDTO.java
    • -11
    • +68
    ./common-security/src/main/java/com/sinba/common/security/service/OrganizationInnerService.java
    • -0
    • +129
    ./common-security/src/main/java/com/sinba/common/security/entity/Position.java
    • -3
    • +13
    ./common-security/src/main/java/com/sinba/common/security/entity/Organization.java
    • -0
    • +5
    ./common-security/src/main/java/com/sinba/common/security/service/IOrganizationInnerService.java
    • -0
    • +432
    ./common-security/src/main/java/com/sinba/common/security/service/SyncOrganizationJob.java
  10. … 14 more files in changeset.
9:52 上午

ciel

no_comment
Options
    • -2
    • +3
    ./common-jbpm/src/main/java/com/sinba/common/jbpm/service/ProcessTaskRecordServiceImpl.java
  2. … 1 more file in changeset.
9:44 上午

ciel

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

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

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

Options
    • -1
    • +10
    ./common-bpm/src/main/java/com/sinba/common/bpm/api/IProcessTaskRecordService.java
  2. ./common-tools
    • -0
    • +2
    ./common-security/src/main/java/com/sinba/common/security/service/IUserInfoService.java
    • -0
    • +12
    ./common-security/src/main/java/com/sinba/common/security/dao/UserDAO.java
    • -0
    • +13
    ./common-jbpm/src/main/java/com/sinba/common/jbpm/dao/ProcessTaskRecordDAO.java
  6. /common
    • -0
    • +4
    ./common-security/src/main/java/com/sinba/common/security/service/UserInfoService.java
    • -4
    • +41
    ./common-jbpm/src/main/java/com/sinba/common/jbpm/service/ProcessTaskRecordServiceImpl.java
    • -0
    • +2
    ./common-security/src/main/java/com/sinba/common/security/dao/IUserDAO.java
    • -9
    • +57
    ./common-jbpm/src/main/java/com/sinba/common/jbpm/service/JbpmBPI.java
    • -0
    • +2
    ./common-sla/src/main/java/com/sinba/common/sla/service/ISLARuleService.java
    • -0
    • +8
    ./common-sla/src/main/java/com/sinba/common/sla/service/SLARuleService.java
    • -0
    • +10
    ./common-bpm/src/main/java/com/sinba/common/bpm/entity/ProcessTaskRecord.java
    • -0
    • +1
    ./common-sla/src/main/java/com/sinba/common/sla/dao/SLARuleDAO.java
    • -0
    • +2
    ./common-jbpm/src/main/java/com/sinba/common/jbpm/dao/IProcessTaskRecordDAO.java
  16. … 44 more files in changeset.
星期三 21 九月 2022
4:16 下午

andy

中集二开

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

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

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

Options
    • -1
    • +1
    ./common-tools/src/main/java/com/sinba/common/tools/service/UserReturnVisitService.java
    • -1
    • +1
    ./common-security/src/main/java/com/sinba/common/security/dao/UserDAO.java
    • -1
    • +10
    ./common-security/src/main/java/com/sinba/common/security/dto/UserQueryDTO.java
    • -8
    • +0
    ./common-security/src/main/java/com/sinba/common/security/action/UserAction.java
  5. … 5 more files in changeset.
2:44 下午

sam

显示需求

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

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

Options
    • -0
    • +27
    ./common-tools/src/main/java/com/sinba/common/tools/util/ZhongJiUtils.java
  2. … 3 more files in changeset.
1:33 下午

sam

显示需求

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

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

Options
    • -0
    • +41
    ./common-tools/src/main/java/com/sinba/common/tools/util/ZhongJiUtils.java
  2. … 3 more files in changeset.
星期二 20 九月 2022
5:27 下午

andy

中集28人天二开：

需求三：修改终端用户新增请求时去掉紧急度，优先级，影响

Options
    • -0
    • +1
    ./common-tools/src/main/java/com/sinba/common/tools/service/UserReturnVisitService.java
  2. … 3 more files in changeset.
11:16 上午

andy

中集28人天二开需求7：

邮件回访评分可以二次编辑：

1.三个工作日不评价的默认满意

2.满意度选项调整为:满意、非常满意、不满意、非常不满意

3.满意度选项可以在回访事项中手动调整，调整按钮有权限才可以看到

导出请求数据添加回访字段：

1.请求导出添加2个字段：满意度和满意是否默认

2.满意度显示请求回访的满意度

3.满意是否默认显示是否是三个工作日不评价的默认满意

4.添加回访内容字段

Options
    • -3
    • +3
    ./common-tools/src/main/java/com/sinba/common/tools/service/UserReturnVisitService.java
    • -3
    • +3
    ./common-sla/src/main/java/com/sinba/common/sla/util/CalcPredictTimeUtils.java
    • -0
    • +8
    ./common-tools/src/main/java/com/sinba/common/tools/dao/UserReturnVisitDAO.java
    • -0
    • +2
    ./common-tools/src/main/java/com/sinba/common/tools/dao/IUserReturnVisitDAO.java
  5. … 35 more files in changeset.
星期五 16 九月 2022
10:29 上午

ciel

#1.请求编号生成规则调整为根据请求分类编码生成，原有旧数据不用做调整，保持原有编码

2.在标题未填写时，先请求分类不自动添加标题描述

3.编辑后重新匹配sla，未算挂起时间（非工作日情况处理）

Options
    • -0
    • +10
    ./common-tools/src/main/java/com/sinba/common/tools/dao/CostDAO.java
    • -0
    • +3
    ./common-tools/src/main/java/com/sinba/common/tools/service/ICostService.java
    • -0
    • +7
    ./common-tools/src/main/java/com/sinba/common/tools/dao/ICostDAO.java
    • -0
    • +5
    ./common-tools/src/main/java/com/sinba/common/tools/service/CostService.java
  5. … 13 more files in changeset.
星期二 13 九月 2022
11:22 上午

andy

中集二开：需求三
Options
    • -2
    • +17
    ./common-security/src/main/java/com/sinba/common/security/action/UserAction.java
  2. … 10 more files in changeset.
星期二 06 九月 2022
9:57 上午

ciel

#漏上传
Options
    • -0
    • +65
    ./common-security/src/main/java/com/sinba/common/security/dto/UserSyncDTO.java
星期三 24 八月 2022
11:56 上午

ciel

#附件后缀添加格式
Options
    • -1
    • +1
    ./common-tools/src/main/java/com/sinba/common/tools/action/UploadAction.java
  2. … 11 more files in changeset.
星期四 04 八月 2022
6:59 下午

ciel

#调整为MQ消费
Options
    • -226
    • +141
    ./common-security/src/main/java/com/sinba/common/security/service/LDAPService.java
    • -2
    • +2
    ./common-security/src/main/java/com/sinba/common/security/service/IUserInfoService.java
    • -4
    • +6
    ./common-security/src/main/java/com/sinba/common/security/service/ILDAPService.java
    • -7
    • +4
    ./common-tools/src/main/java/com/sinba/common/ldapusermq/LdapUserConsumer.java
    • -26
    • +26
    ./common-security/src/main/java/com/sinba/common/security/service/UserInfoService.java
1:53 下午

ciel

#AD同步链接数问题优化

#需求保存报错

Options
    • -1
    • +1
    ./common-security/src/main/java/com/sinba/common/security/service/UserInfoService.java
    • -1
    • +12
    ./common-security/src/main/java/com/sinba/common/security/dto/LDAPDTO.java
    • -23
    • +28
    ./common-security/src/main/java/com/sinba/common/security/service/LDAPService.java
    • -2
    • +3
    ./common-security/src/main/java/com/sinba/common/security/dao/LDAPDAO.java
  5. … 1 more file in changeset.
星期日 10 七月 2022
10:37 下午

ciel

#编号重复问题处理，504缓存问题处理
Options
    • -1
    • +1
    ./common-security/src/main/java/com/sinba/common/security/action/OrganizationAction.java
  2. … 11 more files in changeset.
星期四 07 七月 2022
6:19 下午

ciel

#请求导出优化迁移
Options
    • -1
    • +1
    ./common-security/src/main/java/com/sinba/common/security/dao/UserDAO.java
  2. … 1 more file in changeset.
星期一 20 六月 2022
11:57 上午

ciel

#导出慢问题优化
Options
    • -2
    • +2
    ./common-security/src/main/java/com/sinba/common/security/service/UserInfoService.java
    • -2
    • +6
    ./common-security/src/main/java/com/sinba/common/security/dao/UserDAO.java
    • -1
    • +1
    ./common-security/src/main/java/com/sinba/common/security/dao/IUserDAO.java
    • -1
    • +1
    ./common-security/src/main/java/com/sinba/common/security/service/IUserInfoService.java
  5. … 1 more file in changeset.
星期六 18 六月 2022
7:24 下午

ciel

#导出慢问题优化
Options
    • -1
    • +1
    ./common-security/src/main/java/com/sinba/common/security/dao/IUserDAO.java
    • -1
    • +1
    ./common-security/src/main/java/com/sinba/common/security/service/IUserInfoService.java
    • -0
    • +5
    ./common-security/src/main/java/com/sinba/common/security/service/UserInfoService.java
    • -0
    • +12
    ./common-security/src/main/java/com/sinba/common/security/dao/UserDAO.java
  5. … 1 more file in changeset.
星期三 25 五月 2022
10:53 下午

ciel

#讨论调整的代码
Options
    • -0
    • +4
    ./common-security/src/main/java/com/sinba/common/security/dao/UserDAO.java
    • -2
    • +0
    ./common-security/src/main/java/com/sinba/common/security/entity/User.java
    • -4
    • +1
    ./common-tools/src/main/java/com/sinba/common/noticeRule/service/NoticeRuleService.java
    • -2
    • +0
    ./common-security/src/main/java/com/sinba/common/security/entity/Holiday.java
    • -1
    • +0
    ./common-config/src/main/java/com/sinba/common/config/server/service/ServerUrlService.java
  6. … 3 more files in changeset.
星期一 23 五月 2022
11:18 下午

ciel

#日志调整

#统计调整

Options
    • -12
    • +12
    ./common-security/src/main/java/com/sinba/common/security/dao/UserDAO.java
    • -1
    • +1
    ./common-security/src/main/java/com/sinba/common/security/service/OperationService.java
    • -2
    • +3
    ./common-security/src/main/java/com/sinba/common/jaas/service/BTLoginModule.java
    • -2
    • +2
    ./common-tools/src/main/java/com/sinba/common/exportmq/ExportMessageProducer.java
    • -3
    • +6
    ./common-security/src/main/java/com/sinba/common/sso/util/utilproper.java
    • -1
    • +1
    ./common-security/src/main/java/com/sinba/common/security/service/FunctionService.java
    • -1
    • +3
    ./common-security/src/main/java/com/sinba/common/security/action/CompanyAction.java
    • -1
    • +1
    ./common-security/src/main/java/com/sinba/common/security/service/OrganizationService.java
    • -9
    • +12
    ./common-security/src/main/java/com/sinba/common/sso/service/LoginService.java
    • -0
    • +9
    ./common-tools/src/main/java/com/sinba/common/noticeRule/service/NoticeRuleService.java
    • -2
    • +2
    ./common-security/src/main/java/com/sinba/common/security/action/LoginFailureHandler.java
    • -1
    • +1
    ./common-security/src/main/java/com/sinba/common/security/service/CustomerService.java
    • -1
    • +1
    ./common-security/src/main/java/com/sinba/common/jaas/service/SaasDBLoginModule.java
    • -1
    • +1
    ./common-security/src/main/java/com/sinba/common/security/service/SupplierService.java
    • -2
    • +3
    ./common-security/src/main/java/com/sinba/common/jaas/service/SSOLoginModule.java
  16. … 16 more files in changeset.
星期三 18 五月 2022
9:25 下午

ciel

代码优化
Options
    • -190
    • +6
    ./common-security/src/main/java/com/sinba/common/security/service/UserInfoService.java
    • -1
    • +1
    ./common-security/src/main/java/com/sinba/common/security/service/IUserInfoService.java
    • -0
    • +3
    ./common-security/src/main/java/com/sinba/common/security/dao/IUserDAO.java
    • -26
    • +118
    ./common-security/src/main/java/com/sinba/common/security/service/LDAPService.java
    • -0
    • +12
    ./common-security/src/main/java/com/sinba/common/security/dao/UserDAO.java
    • -0
    • +1
    ./common-security/src/main/java/com/sinba/common/security/service/ILDAPService.java
星期二 17 五月 2022
9:40 下午

ciel

#添加休眠时间
Options
    • -10
    • +14
    ./common-security/src/main/java/com/sinba/common/security/service/UserInfoService.java
    • -5
    • +14
    ./common-security/src/main/java/com/sinba/common/security/service/LDAPService.java
    • -1
    • +2
    ./common-security/src/main/java/com/sinba/common/security/service/IUserInfoService.java
5:30 下午

ciel

#定期任务分组
Options
    • -0
    • +10
    ./common-security/src/main/java/com/sinba/common/security/dto/LDAPUserDTO.java
    • -1
    • +1
    ./common-tools/src/main/java/com/sinba/common/ldapusermq/LdapUserConsumer.java
    • -1
    • +8
    ./common-tools/src/main/java/com/sinba/common/scheduledTask/dto/ScheduledTaskDTO.java
    • -3
    • +6
    ./common-security/src/main/java/com/sinba/common/security/dao/LDAPDAO.java
    • -1
    • +11
    ./common-tools/src/main/java/com/sinba/common/tools/service/ADUpdateJob.java
    • -1
    • +9
    ./common-tools/src/main/java/com/sinba/common/scheduledTask/dto/ScheduledTaskRequestDTO.java
    • -7
    • +8
    ./common-security/src/main/java/com/sinba/common/security/service/UserInfoService.java
    • -0
    • +8
    ./common-tools/src/main/java/com/sinba/common/scheduledTask/entity/ScheduledTask.java
    • -52
    • +60
    ./common-security/src/main/java/com/sinba/common/security/service/LDAPService.java
    • -0
    • +2
    ./common-tools/src/main/java/com/sinba/common/scheduledTask/service/ScheduledTaskService.java
    • -1
    • +1
    ./common-security/src/main/java/com/sinba/common/security/service/IUserInfoService.java
    • -1
    • +8
    ./common-tools/src/main/java/com/sinba/common/scheduledTask/dto/ScheduledTaskGridDTO.java
    • -2
    • +2
    ./common-security/src/main/java/com/sinba/common/security/service/ILDAPService.java
  14. … 2 more files in changeset.
2:41 下午

ciel

#文件写入分段
Options
    • -56
    • +2
    ./common-security/src/main/java/com/sinba/common/security/service/LDAPService.java
    • -22
    • +186
    ./common-security/src/main/java/com/sinba/common/security/service/UserInfoService.java
9:39 上午

ciel

#初次同步时会存一份数据进行备份，后续同步会进行比对，只更新有变化的数据
Options
    • -7
    • +134
    ./common-security/src/main/java/com/sinba/common/security/service/LDAPService.java