修改模块绑定评审流程模版故障
This commit is contained in:
@@ -104,8 +104,8 @@ public class SystemApproveController implements IApproveFeignClient {
|
||||
}
|
||||
|
||||
@GetMapping("/deleteApproveFlowMap")
|
||||
public SdmResponse deleteApproveFlowMap(@RequestParam("mapId") long mapId) {
|
||||
return approveServer.deleteApproveFlowMap(mapId);
|
||||
public SdmResponse deleteApproveFlowMap(@RequestParam("moduleCode") String moduleCode) {
|
||||
return approveServer.deleteApproveFlowMap(moduleCode);
|
||||
}
|
||||
|
||||
@GetMapping("/queryAllApproveFlowMap")
|
||||
|
||||
@@ -42,6 +42,11 @@ public interface SimulationApproveMapper {
|
||||
@Delete("DELETE FROM simulation_approve_flow_map WHERE id=#{mapId}")
|
||||
int deleteModuleApproveFlowMap(@Param("mapId") long mapId);
|
||||
|
||||
|
||||
@Delete("DELETE FROM simulation_approve_flow_map WHERE moduleCode=#{moduleCode}")
|
||||
int deleteModuleApproveFlowMapByModuleCode(@Param("moduleCode") String moduleCode);
|
||||
|
||||
|
||||
@Update("UPDATE simulation_approve_flow_map SET moduleName=#{flowMapBean.moduleName},moduleCode=#{flowMapBean.moduleCode},flowName=#{flowMapBean.flowName},flowCode=#{flowMapBean.flowCode} WHERE id=#{flowMapBean.id}")
|
||||
int updateModuleApproveFlowMap(@Param("flowMapBean")SimulationApproveFlowMapBean flowMapBean);
|
||||
|
||||
|
||||
@@ -82,10 +82,10 @@ public interface ISimulatinoApprovalService {
|
||||
|
||||
/**
|
||||
* 删除审批流程映射
|
||||
* @param mapId
|
||||
* @param moduleCode
|
||||
* @return
|
||||
*/
|
||||
SdmResponse deleteApproveFlowMap(long mapId);
|
||||
SdmResponse deleteApproveFlowMap(String moduleCode);
|
||||
|
||||
|
||||
/**
|
||||
|
||||
@@ -583,13 +583,13 @@ public class SimulationApproveServiceImpl implements ISimulatinoApprovalService
|
||||
|
||||
/**
|
||||
* 删除审批流程映射
|
||||
* @param mapId
|
||||
* @param moduleCode
|
||||
* @return
|
||||
*/
|
||||
public SdmResponse deleteApproveFlowMap(long mapId)
|
||||
public SdmResponse deleteApproveFlowMap(String moduleCode)
|
||||
{
|
||||
SdmResponse response = SdmResponse.success();
|
||||
if(approveMapper.deleteModuleApproveFlowMap(mapId) < 0)
|
||||
if(approveMapper.deleteModuleApproveFlowMapByModuleCode(moduleCode) < 0)
|
||||
{
|
||||
response = SdmResponse.failed("删除模版审批流程失败");
|
||||
}
|
||||
@@ -606,7 +606,28 @@ public class SimulationApproveServiceImpl implements ISimulatinoApprovalService
|
||||
{
|
||||
SdmResponse response = SdmResponse.success();
|
||||
String moduleCode = mapBean.moduleCode;
|
||||
String flowCode = mapBean.flowCode;
|
||||
String moduleName = mapBean.moduleName;
|
||||
long tenantId = ThreadLocalContext.getTenantId();
|
||||
long creator = ThreadLocalContext.getUserId();
|
||||
if(approveMapper.deleteModuleApproveFlowMapByModuleCode(moduleCode) < 0)
|
||||
{
|
||||
response = SdmResponse.success("更新模块评审流程失败");
|
||||
}
|
||||
else
|
||||
{
|
||||
for(ApproveFlowBean flowBean : mapBean.flowList)
|
||||
{
|
||||
SimulationApproveFlowMapBean flowMapBean = new SimulationApproveFlowMapBean();
|
||||
flowMapBean.flowCode = flowBean.flowCode;
|
||||
flowMapBean.flowName = flowBean.flowName;
|
||||
flowMapBean.moduleCode = moduleCode;
|
||||
flowMapBean.moduleName = moduleName;
|
||||
flowMapBean.creator = creator;
|
||||
flowMapBean.tenantId = tenantId;
|
||||
approveMapper.addModuleApproveFlowMap(flowMapBean);
|
||||
}
|
||||
}
|
||||
/*String flowCode = mapBean.flowCode;
|
||||
SimulationApproveFlowMapBean oriMapBean = approveMapper.querySimulationApproveFlowMapById(mapBean.id);
|
||||
long tenantId = ThreadLocalContext.getTenantId();
|
||||
if(oriMapBean == null)
|
||||
@@ -629,7 +650,7 @@ public class SimulationApproveServiceImpl implements ISimulatinoApprovalService
|
||||
if (approveMapper.updateModuleApproveFlowMap(mapBean) < 0) {
|
||||
response = SdmResponse.failed("更新模块审批流程失败");
|
||||
}
|
||||
}
|
||||
}*/
|
||||
return response;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user