ak/zn-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(bpm): 添加薪资审批打印功能

Browse Source 
- 在 BpmOAPrintDataRespVO 中添加薪资业务数据字段
- 在 BpmProcessInstanceServiceImpl 中实现薪资审批打印数据获取逻辑
- 优化工厂信息获取方式，使用 FactoryInfoApi接口
This commit is contained in:
furongxin 2025-06-30 09:42:52 +08:00
parent 4dc538054c
commit f9cf93ff69
6 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/print/BpmOAPrintDataRespVO.java
View File

@ -4,6 +4,7 @@ import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.BpmOABaseRespVO;
import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.cash.BpmOACashRespVO;
import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.payment.BpmOAPaymentRespVO;
import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.reimbursement.BpmOAReimbursementRespVO;
import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.salary.BpmOASalaryRespVO;
import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.BpmTaskRespVO;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@ -27,6 +28,9 @@ public class BpmOAPrintDataRespVO extends BpmOABaseRespVO {
@Schema(description = "付款业务数据")
private BpmOAPaymentRespVO bpmOAPaymentRespVO;
@Schema(description = "薪资业务数据")
private BpmOASalaryRespVO bpmOASalaryRespVO;
@Schema(description = "流程审批节点信息【包含人员签名地址】")
List<BpmTaskRespVO> processTasks ;

2
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
View File

File diff suppressed because one or more lines are too long

2
zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/application-dev.yaml
View File

@ -173,7 +173,7 @@ justauth:
#海康威视的相关配置
isc:
previewUrl: https://api.znkj.ispt.com.cn
host: 111.75.51.123:10443
host: 113.105.111.100:10443
appKey: 24991430
appSecret: jQd4pIYZBzwW8cnuI9IN
#视频资源

2
zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/application-hik.yaml
View File

@ -1,6 +1,6 @@
#海康威视的相关配置
isc:
host: hik.znkj.ispt.com.cn:10443
host: 10.10.2.4:10443
appKey: 24991430
appSecret: jQd4pIYZBzwW8cnuI9IN
#视频资源

2
zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/application-local.yaml
View File

@ -123,7 +123,7 @@ yudao:
#海康威视的相关配置
isc:
previewUrl: https://api.znkj.ispt.com.cn
host: 111.75.51.123:10443
host: 113.105.111.100:10443
appKey: 24991430
appSecret: jQd4pIYZBzwW8cnuI9IN
#视频资源

2
zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/application-prod.yaml
View File

@ -161,7 +161,7 @@ yudao:
#海康威视的相关配置
isc:
previewUrl: https://api.znkj.ispt.com.cn
host: 111.75.51.123:10443
host: 113.105.111.100:10443
appKey: 24991430
appSecret: jQd4pIYZBzwW8cnuI9IN
#视频资源