bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
syruan 2025-02-21 02:26:52 +08:00
parent 8e5f712756 4d4015b2e5
commit 2ebb2d4202
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bonus-modules/bonus-material/src/main/java/com/bonus/material/work/service/impl/SysWorkflowNodeServiceImpl.java
View File

@ -88,9 +88,10 @@ public class SysWorkflowNodeServiceImpl implements SysWorkflowNodeService {
if (sysWorkflowNode.getConfigValues().isEmpty()){ if (sysWorkflowNode.getConfigValues().isEmpty()){
throw new ServiceException("请选择审核人员"); throw new ServiceException("请选择审核人员");
} }
sysWorkflowNodeMapper.deleteSysWorkflowNode(sysWorkflowNode); SysWorkflowConfig sysWorkflowConfig = new SysWorkflowConfig();
sysWorkflowConfig.setNodeId(sysWorkflowNode.getId());
sysWorkflowConfigMapper.deleteSysWorkflowConfig(sysWorkflowConfig);
for (int i = 0; i < ConfigValue.length; i++) { for (int i = 0; i < ConfigValue.length; i++) {
SysWorkflowConfig sysWorkflowConfig = new SysWorkflowConfig();
sysWorkflowConfig.setNodeId(sysWorkflowNode.getId()); sysWorkflowConfig.setNodeId(sysWorkflowNode.getId());
sysWorkflowConfig.setConfigType(sysWorkflowNode.getNodeSignType()); sysWorkflowConfig.setConfigType(sysWorkflowNode.getNodeSignType());
sysWorkflowConfig.setConfigValue(Integer.valueOf(ConfigValue[i])); sysWorkflowConfig.setConfigValue(Integer.valueOf(ConfigValue[i]));

2
bonus-modules/bonus-material/src/main/resources/mapper/material/lease/LeaseTaskMapper.xml
View File

@ -392,7 +392,7 @@
where m.del_flag = '0' where m.del_flag = '0'
and m.parent_id = #{typeId} and m.parent_id = #{typeId}
</select> </select>
<select id="selectAuditLeaseApplyInfoList" resultType="com.bonus.common.biz.domain.lease.LeaseApplyInfo"> <select id="selectAuditLeaseApplyInfoList" resultMap="LeaseApplyInfoResult">
select select
lai.id, lai.code, lai.task_id, lai.lease_person, lai.phone, lai.type, lai.company_audit_by,lai.apply_code, lai.id, lai.code, lai.task_id, lai.lease_person, lai.phone, lai.type, lai.company_audit_by,lai.apply_code,
lai.company_audit_time, lai.company_audit_remark, lai.dept_audit_by, lai.dept_audit_time, lai.company_audit_time, lai.company_audit_remark, lai.dept_audit_by, lai.dept_audit_time,