isoftstone/lc_backend
3
2
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
yang chen
2025-10-23 16:46:42 +08:00
parent 70e214c1d8 5dc2ed592f
commit 13c8c5dc89
18 changed files with 6834 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

438
SQL/202510/20251023/lc_confined_space_operation.sql Normal file
View File

File diff suppressed because one or more lines are too long

423
SQL/202510/20251023/lc_drill_task.sql Normal file
View File

File diff suppressed because one or more lines are too long

260
SQL/202510/20251023/lc_emergency_plan.sql Normal file
View File

File diff suppressed because one or more lines are too long

327
SQL/202510/20251023/lc_exam_plan.sql Normal file
View File

File diff suppressed because one or more lines are too long

357
SQL/202510/20251023/lc_exam_record.sql Normal file
View File

File diff suppressed because one or more lines are too long

439
SQL/202510/20251023/lc_fire_operation.sql Normal file
View File

File diff suppressed because one or more lines are too long

482
SQL/202510/20251023/lc_high_operation.sql Normal file
View File

File diff suppressed because one or more lines are too long

379
SQL/202510/20251023/lc_land_operation.sql Normal file
View File

File diff suppressed because one or more lines are too long

394
SQL/202510/20251023/lc_lifting_operation.sql Normal file
View File

File diff suppressed because one or more lines are too long

424
SQL/202510/20251023/lc_outside_license.sql Normal file
View File

File diff suppressed because one or more lines are too long

716
SQL/202510/20251023/lc_outside_person.sql Normal file
View File

File diff suppressed because one or more lines are too long

652
SQL/202510/20251023/lc_risk_hazard_manage.sql Normal file
View File

File diff suppressed because one or more lines are too long

450
SQL/202510/20251023/lc_risk_identify_assessment.sql Normal file
View File

File diff suppressed because one or more lines are too long

383
SQL/202510/20251023/lc_temporary_power_operation.sql Normal file
View File

File diff suppressed because one or more lines are too long

437
SQL/202510/20251023/lc_training_plan.sql Normal file
View File

File diff suppressed because one or more lines are too long

269
SQL/202510/20251023/lc_training_record.sql Normal file
View File

File diff suppressed because one or more lines are too long

2
jeelowcode-module/jeelowcode-module-biz/src/main/java/com/jeelowcode/module/biz/controller/OutSidePersonController.java
View File

@@ -62,7 +62,7 @@ public class OutSidePersonController extends BaseController {
newLicense.put("supplierName", detail.get("supplierName")); newLicense.put("supplierName", detail.get("supplierName"));
newLicense.put("personName", detail.get("personName")); newLicense.put("personName", detail.get("personName"));
newLicense.put("personSex", detail.get("personSex")); newLicense.put("personSex", detail.get("personSex"));
newLicense.put("personNo", detail.get("personNo")); newLicense.put("personNo", detail.get("cardNo"));
newLicense.put("mobile", detail.get("mobile")); newLicense.put("mobile", detail.get("mobile"));
licenses.add(JSONUtil.parseObj(newLicense)); licenses.add(JSONUtil.parseObj(newLicense));
} }

4
jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/service/impl/BpmProcessInstanceCopyServiceImpl.java
View File

@@ -126,7 +126,9 @@ public class BpmProcessInstanceCopyServiceImpl implements IBpmProcessInstanceCop
// 2. 创建抄送流程 // 2. 创建抄送流程
BpmProcessInstanceCopyDO copy = new BpmProcessInstanceCopyDO() BpmProcessInstanceCopyDO copy = new BpmProcessInstanceCopyDO()
.setTaskId(reqVO.getTaskId()).setTaskName(task.getName()) .setTaskId(reqVO.getTaskId()).setTaskName(task.getName())
.setProcessInstanceId(processInstanceId).setStartUserId(Long.valueOf(processInstance.getStartUserId())) .setProcessInstanceId(processInstanceId)
.setStartUserId(Long.valueOf(processInstance.getStartUserId()))
.setUserId(userId)
.setProcessInstanceName(processInstance.getName()) .setProcessInstanceName(processInstance.getName())
.setCategory(null) // TODO 芋艿：貌似新版本，没 processInstance.getProcessDefinitionCategory() 字段？ .setCategory(null) // TODO 芋艿：貌似新版本，没 processInstance.getProcessDefinitionCategory() 字段？
.setReason(reqVO.getReason()); .setReason(reqVO.getReason());