Skip to content

A
amos-boot-zx-biz
Commit a8b1de4d authored by tangwei's avatar tangwei
Browse files
Options

修改工作流

parent dfb525ab
Hide whitespace changes
Inline Side-by-side
Showing with 464 additions and 129 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/PowerStationEnum.java 0 → 100644
View file @ a8b1de4d
package com.yeejoin.amos.boot.module.hygf.api.Enum;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* @description: 验收状态枚举
*/
@Getter
@AllArgsConstructor
@SuppressWarnings("ALL")
public enum PowerStationEnum {
经销商确认("经销商确认", "1","hygf_02",""),
设计审核("设计审核", "2", "hygf_03","hygf/Sjsh"),
投融审核("投融审核", "3", "hygf_05","hygf/Sjsh"),
法务审核("法务审核", "4","hygf_07","hygf/Sjsh"),
设计上传典型图纸("设计上传典型图纸", "5", "hygf_09","hygf/Trsh"),
经销商设计上传设计图纸("经销商设计上传设计图纸", "6", "hygf_10","hygf/Fwsh"),
设计图纸审核("设计图纸审核", "7", "hygf_11","hygf/Sjsh"),
完成("完成", "11", "hygf_13","");
/**
* 名称，描述
*/
private final String name;
/**
* 编码
*/
private final String code;
//节点key
private final String key;
//路由r
private final String routing;
public static PowerStationEnum getNodeByCode(String code) {
PowerStationEnum acceptanceStatusEnum = null;
for (PowerStationEnum type : PowerStationEnum.values()) {
if (code.equals(type.getCode())) {
acceptanceStatusEnum = type;
break;
}
}
return acceptanceStatusEnum;
}
public static String getNodeByKey(String Key) {
PowerStationEnum acceptanceStatusEnum = null;
for (PowerStationEnum type : PowerStationEnum.values()) {
if (type.getKey().contains(Key)) {
acceptanceStatusEnum = type;
break;
}
}
return acceptanceStatusEnum.getRouting();
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/util/NumberUtil.java
View file @ a8b1de4d
...@@ -40,13 +40,16 @@ public class NumberUtil { ...@@ -40,13 +40,16 @@ public class NumberUtil {
needQueryResProductList.put("num",num); needQueryResProductList.put("num",num);
return num; return num;
}else{ }else{
int num= 1000+ rand.nextInt(100) + 1; int num = rand.nextInt(9000) + 1;
needQueryResProductList.put("num",num); needQueryResProductList.put("num",num);
return num; return num;
} }
} }
public static String getCode(String type,String code, String address ){ public static String getCode(String type,String code, String address ){
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PowerStationServiceImpl.java
View file @ a8b1de4d
...@@ -8,22 +8,19 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; ...@@ -8,22 +8,19 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.yeejoin.amos.boot.module.hygf.api.Enum.HouseholdContractEnum; import com.yeejoin.amos.boot.module.hygf.api.Enum.*;
import com.yeejoin.amos.boot.module.hygf.api.Enum.PowerStationNodeEnum; import com.yeejoin.amos.boot.module.hygf.api.dto.*;
import com.yeejoin.amos.boot.module.hygf.api.Enum.PowerStationProcessStateEnum;
import com.yeejoin.amos.boot.module.hygf.api.Enum.TaskTypeStationEnum;
import com.yeejoin.amos.boot.module.hygf.api.dto.PowerStationDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.UserUnitInformationDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.WorkDto;
import com.yeejoin.amos.boot.module.hygf.api.entity.*; import com.yeejoin.amos.boot.module.hygf.api.entity.*;
import com.yeejoin.amos.boot.module.hygf.api.fegin.IdxFeginService; import com.yeejoin.amos.boot.module.hygf.api.fegin.IdxFeginService;
import com.yeejoin.amos.boot.module.hygf.api.mapper.*; import com.yeejoin.amos.boot.module.hygf.api.mapper.*;
import com.yeejoin.amos.boot.module.hygf.api.service.IPowerStationService; import com.yeejoin.amos.boot.module.hygf.api.service.IPowerStationService;
import com.yeejoin.amos.boot.module.hygf.biz.feign.WorkflowFeignClient; import com.yeejoin.amos.boot.module.hygf.biz.feign.WorkflowFeignClient;
import com.yeejoin.amos.component.feign.model.FeignClientResult; import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.component.robot.AmosRequestContext;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel; import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
...@@ -81,7 +78,10 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS ...@@ -81,7 +78,10 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
UserMessageMapper userMessageMapper; UserMessageMapper userMessageMapper;
@Autowired @Autowired
PowerStationMapper powerStationMapper; PowerStationMapper powerStationMapper;
@Autowired
AmosRequestContext requestContext;
@Autowired
WorkflowImpl workflow;
public Page<PowerStationDto> queryForPowerStationUserRoles(Page<PowerStationDto> page, String powerStationCode, String ownersName, AgencyUserModel userInfo){ public Page<PowerStationDto> queryForPowerStationUserRoles(Page<PowerStationDto> page, String powerStationCode, String ownersName, AgencyUserModel userInfo){
String serviceAgent =null; String serviceAgent =null;
...@@ -152,13 +152,13 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS ...@@ -152,13 +152,13 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
public boolean savePowerStation(PowerStation powerStation, boolean flag,String name,String meg) { public boolean savePowerStation(PowerStation powerStation, boolean flag,String name,String meg) {
try{ try{
//流程节点code //流程节点code
if (flag) { // if (flag) {
String flowTaskIdnext = this.getTaskNoAuth(powerStation.getProcessInstanceId()); // String flowTaskIdnext = this.getTaskNoAuth(powerStation.getProcessInstanceId());
WorkDto workDto=this.getNodeInfoCode(flowTaskIdnext); // WorkDto workDto=this.getNodeInfoCode(flowTaskIdnext);
powerStation.setNextProcessNode(workDto.getNextProcessNode()); // powerStation.setNextProcessNode(workDto.getNextProcessNode());
powerStation.setNodeRole(workDto.getNodeRole()); // powerStation.setNodeRole(workDto.getNodeRole());
powerStation.setNodeRouting(workDto.getNodeRouting()); // powerStation.setNodeRouting(workDto.getNodeRouting());
} // }
powerStation.setRecDate(new Date()); powerStation.setRecDate(new Date());
...@@ -271,17 +271,39 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS ...@@ -271,17 +271,39 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
String code = null; String code = null;
try{ try{
// 3. 工作流执行 // 3. 工作流执行
FeignClientResult<String> submit = idxFeginService.submit(pageId, taskId, planInstanceId, null, null, null, kv); // FeignClientResult<String> submit = idxFeginService.submit(pageId, taskId, planInstanceId, null, null, null, kv);
if (IDX_REQUEST_STATE.equals(String.valueOf(submit.getStatus()))) { // if (IDX_REQUEST_STATE.equals(String.valueOf(submit.getStatus()))) {
code = submit.getResult(); // code = submit.getResult();
log.info("流程执行成功：{}", code); // log.info("流程执行成功：{}", code);
// 获取流程信息 // 获取流程信息
FeignClientResult<JSONObject> record = idxFeginService.getRecord(code); // FeignClientResult<JSONObject> record = idxFeginService.getRecord(code);
if (IDX_REQUEST_STATE.equals(String.valueOf(record.getStatus()))) { // if (IDX_REQUEST_STATE.equals(String.valueOf(record.getStatus()))) {
JSONObject resultObj = record.getResult(); // JSONObject resultObj = record.getResult();
String flowTaskId = String.valueOf(resultObj.get("flowTaskId")); // String flowTaskId = String.valueOf(resultObj.get("flowTaskId"));
powerStation.setFlowTaskId(flowTaskId); //
} // }
//执行工作流
BasicGridAcceptance basicGridAcceptance=new BasicGridAcceptance();
StandardDto standardDto = new StandardDto();
standardDto.setComment(String.valueOf(kv.get("approveInfo")));
standardDto.setResult(String.valueOf(kv.get("approvalStatus")));
standardDto.setTaskId(powerStation.getFlowTaskId());
VariableDto variable = new VariableDto();
variable.setApprovalStatus(String.valueOf(kv.get("approvalStatus")));
variable.setComment(String.valueOf(kv.get("approveInfo")));
variable.setOperationTime(String.valueOf(kv.get("approveDate")));
variable.setOperator(String.valueOf(kv.get("approveName")));
standardDto.setVariable(variable);
BasicGridAcceptance workBasicGridAcceptance = workflow.standard(basicGridAcceptance, standardDto, requestContext.getUserId());
powerStation.setFlowTaskId(basicGridAcceptance.getNextTaskId());
powerStation.setNodeRole(basicGridAcceptance.getNextExecutorIds());
powerStation.setNodeRouting(PowerStationEnum.getNodeByKey(basicGridAcceptance.getNextNodeKey()));
powerStationService.savePowerStation(powerStation, flag,powerStation.getOwnersName(),meg); powerStationService.savePowerStation(powerStation, flag,powerStation.getOwnersName(),meg);
if(!flag){ if(!flag){
//更新农户状态 //更新农户状态
...@@ -290,12 +312,93 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS ...@@ -290,12 +312,93 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
peasantHousehold.setSurveyOrNot(3); peasantHousehold.setSurveyOrNot(3);
peasantHouseholdService.saveOrUpdate(peasantHousehold); peasantHouseholdService.saveOrUpdate(peasantHousehold);
} }
} //}
}catch (Exception e){ }catch (Exception e){
throw new BaseException("获取工作流节点失败！","400","获取工作流节点失败！"); throw new BaseException("获取工作流节点失败！","400","获取工作流节点失败！");
} }
return code; return code;
// String meg="";
// // 1. 业务相关数据落表
// PowerStation powerStation = this.baseMapper.selectById(stationId);
// PowerStationNodeEnum nodeByCode = PowerStationNodeEnum.getNodeByCode(nodeCode);
// String result = String.valueOf(kv.get("approvalStatus"));
// boolean flag = true;
// if (PowerStationNodeEnum.设计上传图纸.getCode().equals(nodeCode)||PowerStationNodeEnum.经销商上传图纸.getCode().equals(nodeCode)) {
//
// powerStation.setProcessStatus(PowerStationProcessStateEnum.进行中.getName());
//
// this.updateSeve(nodeCode,powerStation.getPeasantHouseholdId(),kv);
// } else {
//
// if (VERIFY_RESULT_NO.equals(result)) {
// powerStation.setProcessStatus(PowerStationProcessStateEnum.不通过.getName());
// }
// PowerStationProcessStateEnum resultObj = PowerStationProcessStateEnum.getStateByResult(result);
// switch (nodeByCode) {
// case 设计审核:
// powerStation.setTechnologyStatus(resultObj.getName());
// break;
// case 投融审核:
// powerStation.setDesignStatus(resultObj.getName());
// break;
// case 法务审核:
// powerStation.setBusinessStatus(resultObj.getName());
//
// if (VERIFY_RESULT_YES.equals(result)) {
// LambdaUpdateWrapper<HouseholdContract> lambdaUw = new LambdaUpdateWrapper<>();
// lambdaUw.eq(HouseholdContract::getPeasantHouseholdId, powerStation.getPeasantHouseholdId());
// lambdaUw.set(HouseholdContract::getSurveyStatus, HouseholdContractEnum.勘察状态_已勘察.getCode());
// householdContractServiceImpl.update(lambdaUw);
// }
//
// break;
// case 文件审核:
// if (VERIFY_RESULT_YES.equals(result)) {
// flag = false;
// powerStation.setProcessStatus(PowerStationProcessStateEnum.完成.getName());
// }
// powerStation.setDrawingReview(resultObj.getName());
// break;
// default:
// break;
// }
// }
// meg="任务明细："+nodeByCode+(VERIFY_RESULT_YES.equals(result)?"通过":"不通过");
// // 2. 更新流程状态
// String code = null;
// try{
// // 3. 工作流执行
// FeignClientResult<String> submit = idxFeginService.submit(pageId, taskId, planInstanceId, null, null, null, kv);
// if (IDX_REQUEST_STATE.equals(String.valueOf(submit.getStatus()))) {
// code = submit.getResult();
// log.info("流程执行成功：{}", code);
// // 获取流程信息
// FeignClientResult<JSONObject> record = idxFeginService.getRecord(code);
// if (IDX_REQUEST_STATE.equals(String.valueOf(record.getStatus()))) {
// JSONObject resultObj = record.getResult();
// String flowTaskId = String.valueOf(resultObj.get("flowTaskId"));
// powerStation.setFlowTaskId(flowTaskId);
// }
// powerStationService.savePowerStation(powerStation, flag,powerStation.getOwnersName(),meg);
// if(!flag){
// //更新农户状态
// String peasantHouseholdId = powerStation.getPeasantHouseholdId();
// PeasantHousehold peasantHousehold = peasantHouseholdService.getBaseMapper().selectById(Long.valueOf(peasantHouseholdId));
// peasantHousehold.setSurveyOrNot(3);
// peasantHouseholdService.saveOrUpdate(peasantHousehold);
// }
// }
// }catch (Exception e){
// throw new BaseException("获取工作流节点失败！","400","获取工作流节点失败！");
//
// }
// return code;
} }
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/UnitInfoServiceImpl.java
View file @ a8b1de4d
...@@ -124,6 +124,8 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn ...@@ -124,6 +124,8 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
@Autowired @Autowired
PersonnelBusinessMapper personnelBusinessMapper; PersonnelBusinessMapper personnelBusinessMapper;
@Autowired
WorkflowImpl workflow;
@Autowired @Autowired
UserEmpowerMapper userEmpowerMapper; UserEmpowerMapper userEmpowerMapper;
...@@ -468,6 +470,9 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn ...@@ -468,6 +470,9 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
private void submitExamine( UnitInfoDto regUnitInfo) { private void submitExamine( UnitInfoDto regUnitInfo) {
String taskId = null; String taskId = null;
Map<String, Object> objectMap = new HashMap<>(1); Map<String, Object> objectMap = new HashMap<>(1);
objectMap.put("describe", "经销商已上传信息"); objectMap.put("describe", "经销商已上传信息");
...@@ -475,34 +480,71 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn ...@@ -475,34 +480,71 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
DealerReview dealerReview = new DealerReview(); DealerReview dealerReview = new DealerReview();
// 保存并审核 // 保存并审核
try { try {
FeignClientResult<String> submit = idxFeginService.tokenSubmit(AMOS_STUDIO, AMOS_STUDIO_WEB,requestContext.getToken(),pageId, taskId, planId, null, "DEALER_EXAMINE", null, objectMap);
//发起工作流
// 调用工作流执行第一个节点
System.out.println("经销商注册发起"+AMOS_STUDIO+"@"+AMOS_STUDIO_WEB+"@"+requestContext.getToken()); ProcessDto processDto = new ProcessDto();
if (IDX_REQUEST_STATE.equals(String.valueOf(submit.getStatus()))) { processDto.setBusinessKey(String.valueOf(regUnitInfo.getSequenceNbr()));
String code = submit.getResult(); processDto.setProcessDefinitionKey("JXS_SH");
// 插入记录表 StartProcessDto startProcessDto = new StartProcessDto();
dealerReview.setPlanInstanceId(planId); List<ProcessDto> process=new ArrayList<>();
dealerReview.setUnitInfoId(regUnitInfo.getSequenceNbr()); process.add(processDto);
// 获取流程信息 startProcessDto.setProcess(process);
FeignClientResult<JSONObject> record = idxFeginService.getRecordtoken(AMOS_STUDIO, AMOS_STUDIO_WEB,requestContext.getToken(),code); BasicGridAcceptance basicGridAcceptance=new BasicGridAcceptance();
if (IDX_REQUEST_STATE.equals(String.valueOf(record.getStatus()))) { workflow.startProcess(basicGridAcceptance, startProcessDto,requestContext.getUserId());
JSONObject resultObj = record.getResult(); // 插入记录表
String taskIdNew = String.valueOf(resultObj.get("taskId")); dealerReview.setPlanInstanceId(planId);
String processInstanceId = String.valueOf(resultObj.get("processInstanceId")); dealerReview.setUnitInfoId(regUnitInfo.getSequenceNbr());
String flowTaskId = String.valueOf(resultObj.get("flowTaskId")); dealerReview.setTaskId(basicGridAcceptance.getNextTaskId());
dealerReview.setTaskId(taskIdNew); dealerReview.setProcessInstanceId(basicGridAcceptance.getInstanceId());
dealerReview.setProcessInstanceId(processInstanceId); dealerReview.setFlowTaskId(basicGridAcceptance.getNextTaskId());
dealerReview.setFlowTaskId(flowTaskId); dealerReview.setNodeRole(basicGridAcceptance.getNextExecutorIds());
dealerReview.setNextProcessNode(DealerReviewEnum.经销商管理员审核.getCode()); dealerReview.setNextProcessNode(DealerReviewEnum.经销商管理员审核.getCode());
} dealerReviewService.saveDealerReview(dealerReview,true,false,regUnitInfo.getName(),"任务明细：经销商已上传信息");
dealerReviewService.saveDealerReview(dealerReview,true,false,regUnitInfo.getName(),"任务明细：经销商已上传信息");
}else{
throw new BaseException("获取工作流节点失败！","400","获取工作流节点失败！");
}
} catch (Exception e){ } catch (Exception e){
throw new BaseException("获取工作流节点失败！","400","获取工作流节点失败！"); throw new BaseException("获取工作流节点失败！","400","获取工作流节点失败！");
} }
//
// String taskId = null;
// Map<String, Object> objectMap = new HashMap<>(1);
// objectMap.put("describe", "经销商已上传信息");
// // 第一步启动工作流
// DealerReview dealerReview = new DealerReview();
// // 保存并审核
// try {
// FeignClientResult<String> submit = idxFeginService.tokenSubmit(AMOS_STUDIO, AMOS_STUDIO_WEB,requestContext.getToken(),pageId, taskId, planId, null, "DEALER_EXAMINE", null, objectMap);
//
//
// System.out.println("发起"+AMOS_STUDIO+"@"+AMOS_STUDIO_WEB+"@"+requestContext.getToken());
// if (IDX_REQUEST_STATE.equals(String.valueOf(submit.getStatus()))) {
// String code = submit.getResult();
// // 插入记录表
// dealerReview.setPlanInstanceId(planId);
// dealerReview.setUnitInfoId(regUnitInfo.getSequenceNbr());
// // 获取流程信息
// FeignClientResult<JSONObject> record = idxFeginService.getRecordtoken(AMOS_STUDIO, AMOS_STUDIO_WEB,requestContext.getToken(),code);
// if (IDX_REQUEST_STATE.equals(String.valueOf(record.getStatus()))) {
// JSONObject resultObj = record.getResult();
// String taskIdNew = String.valueOf(resultObj.get("taskId"));
// String processInstanceId = String.valueOf(resultObj.get("processInstanceId"));
// String flowTaskId = String.valueOf(resultObj.get("flowTaskId"));
// dealerReview.setTaskId(taskIdNew);
// dealerReview.setProcessInstanceId(processInstanceId);
// dealerReview.setFlowTaskId(flowTaskId);
// dealerReview.setNextProcessNode(DealerReviewEnum.经销商管理员审核.getCode());
// }
// dealerReviewService.saveDealerReview(dealerReview,true,false,regUnitInfo.getName(),"任务明细：经销商已上传信息");
// }else{
// throw new BaseException("获取工作流节点失败！","400","获取工作流节点失败！");
// }
// } catch (Exception e){
// throw new BaseException("获取工作流节点失败！","400","获取工作流节点失败！");
// }
} }
...@@ -514,89 +556,99 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn ...@@ -514,89 +556,99 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
// 2.更新审核记录表 // 2.更新审核记录表
UnitInfo unitInfo=null; UnitInfo unitInfo=null;
try{ try{
DealerReview dealerReview= dealerReviewMapper.selectOne(new QueryWrapper<DealerReview>().eq("unit_info_id", stationId)); DealerReview dealerReview= dealerReviewMapper.selectOne(new QueryWrapper<DealerReview>().eq("unit_info_id", stationId));
unitInfo= this.getById(stationId); unitInfo= this.getById(stationId);
DealerReviewEnum nodeByCode = DealerReviewEnum.getNodeByCode(nodeCode); DealerReviewEnum nodeByCode = DealerReviewEnum.getNodeByCode(nodeCode);
String approvalStatue=""; String approvalStatue="";
if (DealerReviewEnum.经销商管理员审核.getCode().equals(nodeCode)) { if (DealerReviewEnum.经销商管理员审核.getCode().equals(nodeCode)) {
String result = String.valueOf(kv.get("approvalStatus")); String result = String.valueOf(kv.get("approvalStatus"));
if (VERIFY_RESULT_NO.equals(result)) { if (VERIFY_RESULT_NO.equals(result)) {
// 1. 更新经销商状态 // 1. 更新经销商状态
unitInfo.setAuditStatus(3); unitInfo.setAuditStatus(3);
//发送断线 //发送断线
Boolean flag = true; Boolean flag = true;
HashMap<String, String> params = new HashMap<>(3); HashMap<String, String> params = new HashMap<>(3);
String meg= String.valueOf(kv.get("approveInfo")); String meg= String.valueOf(kv.get("approveInfo"));
params.put("code","不通过"); params.put("code","不通过");
params.put("mobile",unitInfo.getAdminPhone()); params.put("mobile",unitInfo.getAdminPhone());
params.put("smsCode", smsTempCode); params.put("smsCode", smsTempCode);
approvalStatue="任务明细："+DealerReviewEnum.经销商管理员审核.getName()+"审核不通过"; approvalStatue="任务明细："+DealerReviewEnum.经销商管理员审核.getName()+"审核不通过";
FeignClientResult<SmsRecordModel> date= Systemctl.smsClient.sendCommonSms(params); FeignClientResult<SmsRecordModel> date= Systemctl.smsClient.sendCommonSms(params);
}else{ }else{
// 1. 更新经销商状态 // 1. 更新经销商状态
unitInfo.setAuditStatus(2); unitInfo.setAuditStatus(2);
unitInfo.setBlacklist(0); unitInfo.setBlacklist(0);
this.createCompanyAndUsernew(unitInfo); this.createCompanyAndUsernew(unitInfo);
PublicAgencyUser publicAgencyUser=new PublicAgencyUser(); PublicAgencyUser publicAgencyUser=new PublicAgencyUser();
publicAgencyUser.setAmosUserId(unitInfo.getAdminUserId()); publicAgencyUser.setAmosUserId(unitInfo.getAdminUserId());
publicAgencyUser.setAmosUserName(unitInfo.getAdminLoginName()); publicAgencyUser.setAmosUserName(unitInfo.getAdminLoginName());
publicAgencyUser.setRealName(unitInfo.getAdminLoginName()); publicAgencyUser.setRealName(unitInfo.getAdminLoginName());
publicAgencyUser.setRole("["+unitInfo.getRoleId()+"]"); publicAgencyUser.setRole("["+unitInfo.getRoleId()+"]");
publicAgencyUser.setEmergencyTelephone(unitInfo.getAdminPhone()); publicAgencyUser.setEmergencyTelephone(unitInfo.getAdminPhone());
publicAgencyUser.setLockStatus("UNLOCK"); publicAgencyUser.setLockStatus("UNLOCK");
publicAgencyUserMapper.insert(publicAgencyUser); publicAgencyUserMapper.insert(publicAgencyUser);
List<String> lis=new ArrayList<>(); List<String> lis=new ArrayList<>();
lis.add(unitInfo.getAmosCompanyCode()); lis.add(unitInfo.getAmosCompanyCode());
LambdaQueryWrapper<RegionalCompanies> queryWrapper = new LambdaQueryWrapper<RegionalCompanies>(); LambdaQueryWrapper<RegionalCompanies> queryWrapper = new LambdaQueryWrapper<RegionalCompanies>();
queryWrapper.eq(RegionalCompanies::getUnitInfoId, unitInfo.getSequenceNbr()); queryWrapper.eq(RegionalCompanies::getUnitInfoId, unitInfo.getSequenceNbr());
List<RegionalCompanies> list= regionalCompaniesMapper.selectList(queryWrapper); List<RegionalCompanies> list= regionalCompaniesMapper.selectList(queryWrapper);
for (RegionalCompanies companies : list) { for (RegionalCompanies companies : list) {
companies.setUnitId(unitInfo.getAmosCompanySeq()); companies.setUnitId(unitInfo.getAmosCompanySeq());
lis.add(companies.getRegionalCompaniesCode()); lis.add(companies.getRegionalCompaniesCode());
}
regionalCompaniesService.saveOrUpdateBatch(list);
PersonnelBusiness re=new PersonnelBusiness();
re.setAmosDealerId(unitInfo.getAmosCompanySeq());
re.setAmosUnitId(unitInfo.getAmosCompanySeq());
re.setAmosUnitName(unitInfo.getName());
re.setAmosUnitOrgCode(unitInfo.getAmosCompanyCode());
re.setFoundationId(publicAgencyUser.getSequenceNbr());
re.setUserType("2");
personnelBusinessMapper.insert(re);
//管理员绑定角色权限
StdUserEmpower stdUserEmpower=new StdUserEmpower();
stdUserEmpower.setAmosUserId(unitInfo.getAdminUserId());
stdUserEmpower.setAmosOrgCode(lis);
userEmpowerMapper.insert(stdUserEmpower);
// Privilege.agencyUserClient.unlockUsers(unitInfo.getAdminUserId());
approvalStatue="任务明细："+DealerReviewEnum.经销商管理员审核.getName()+"审核通过";
} }
regionalCompaniesService.saveOrUpdateBatch(list);
PersonnelBusiness re=new PersonnelBusiness();
re.setAmosDealerId(unitInfo.getAmosCompanySeq());
re.setAmosUnitId(unitInfo.getAmosCompanySeq());
re.setAmosUnitName(unitInfo.getName());
re.setAmosUnitOrgCode(unitInfo.getAmosCompanyCode());
re.setFoundationId(publicAgencyUser.getSequenceNbr());
re.setUserType("2");
personnelBusinessMapper.insert(re);
//管理员绑定角色权限
StdUserEmpower stdUserEmpower=new StdUserEmpower();
stdUserEmpower.setAmosUserId(unitInfo.getAdminUserId());
stdUserEmpower.setAmosOrgCode(lis);
userEmpowerMapper.insert(stdUserEmpower);
// Privilege.agencyUserClient.unlockUsers(unitInfo.getAdminUserId());
approvalStatue="任务明细："+DealerReviewEnum.经销商管理员审核.getName()+"审核通过";
} }
} // 2. 更新流程状态
// 2. 更新流程状态 String code = null;
String code = null;
// 3. 工作流执行 // 3. 工作流执行
FeignClientResult<String> submit = idxFeginService.submit(pageId, taskId, planInstanceId, null, "DEALER_EXAMINE", null, kv);
if (IDX_REQUEST_STATE.equals(String.valueOf(submit.getStatus()))) { //执行工作流
code = submit.getResult(); BasicGridAcceptance basicGridAcceptance=new BasicGridAcceptance();
// 获取流程信息
FeignClientResult<JSONObject> record = idxFeginService.getRecord(code); StandardDto standardDto = new StandardDto();
if (IDX_REQUEST_STATE.equals(String.valueOf(record.getStatus()))) { standardDto.setComment(String.valueOf(kv.get("approveInfo")));
JSONObject resultObj = record.getResult(); standardDto.setResult(String.valueOf(kv.get("approvalStatus")));
String flowTaskId = String.valueOf(resultObj.get("flowTaskId")); standardDto.setTaskId(dealerReview.getFlowTaskId());
dealerReview.setFlowTaskId(flowTaskId); VariableDto variable = new VariableDto();
} variable.setApprovalStatus(String.valueOf(kv.get("approvalStatus")));
dealerReviewService.saveDealerReview(dealerReview,false,true,unitInfo.getName(),approvalStatue); variable.setComment(String.valueOf(kv.get("approveInfo")));
} variable.setOperationTime(String.valueOf(kv.get("approveDate")));
variable.setOperator(String.valueOf(kv.get("approveName")));
standardDto.setVariable(variable);
BasicGridAcceptance workBasicGridAcceptance = workflow.standard(basicGridAcceptance, standardDto, requestContext.getUserId());
dealerReview.setFlowTaskId(basicGridAcceptance.getNextTaskId());
dealerReviewService.saveDealerReview(dealerReview,false,true,unitInfo.getName(),approvalStatue);
this.saveOrUpdate(unitInfo); this.saveOrUpdate(unitInfo);
}catch (Exception e){ }catch (Exception e){
if (!ObjectUtils.isEmpty(unitInfo.getAmosCompanySeq())) { if (!ObjectUtils.isEmpty(unitInfo.getAmosCompanySeq())) {
FeignClientResult<CompanyModel> feignClientResult = Privilege.companyClient FeignClientResult<CompanyModel> feignClientResult = Privilege.companyClient
.seleteOne(unitInfo.getAmosCompanySeq()); .seleteOne(unitInfo.getAmosCompanySeq());
if (feignClientResult != null) { if (feignClientResult != null) {
...@@ -618,6 +670,117 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn ...@@ -618,6 +670,117 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
throw new BaseException("获取工作流节点失败！","400","获取工作流节点失败！"); throw new BaseException("获取工作流节点失败！","400","获取工作流节点失败！");
} }
// // 2.更新审核记录表
// UnitInfo unitInfo=null;
// try{
// DealerReview dealerReview= dealerReviewMapper.selectOne(new QueryWrapper<DealerReview>().eq("unit_info_id", stationId));
// unitInfo= this.getById(stationId);
// DealerReviewEnum nodeByCode = DealerReviewEnum.getNodeByCode(nodeCode);
// String approvalStatue="";
// if (DealerReviewEnum.经销商管理员审核.getCode().equals(nodeCode)) {
// String result = String.valueOf(kv.get("approvalStatus"));
// if (VERIFY_RESULT_NO.equals(result)) {
// // 1. 更新经销商状态
// unitInfo.setAuditStatus(3);
// //发送断线
// Boolean flag = true;
// HashMap<String, String> params = new HashMap<>(3);
// String meg= String.valueOf(kv.get("approveInfo"));
// params.put("code","不通过");
// params.put("mobile",unitInfo.getAdminPhone());
// params.put("smsCode", smsTempCode);
// approvalStatue="任务明细："+DealerReviewEnum.经销商管理员审核.getName()+"审核不通过";
// FeignClientResult<SmsRecordModel> date= Systemctl.smsClient.sendCommonSms(params);
// }else{
// // 1. 更新经销商状态
// unitInfo.setAuditStatus(2);
// unitInfo.setBlacklist(0);
//
//
// this.createCompanyAndUsernew(unitInfo);
// PublicAgencyUser publicAgencyUser=new PublicAgencyUser();
// publicAgencyUser.setAmosUserId(unitInfo.getAdminUserId());
// publicAgencyUser.setAmosUserName(unitInfo.getAdminLoginName());
// publicAgencyUser.setRealName(unitInfo.getAdminLoginName());
// publicAgencyUser.setRole("["+unitInfo.getRoleId()+"]");
// publicAgencyUser.setEmergencyTelephone(unitInfo.getAdminPhone());
// publicAgencyUser.setLockStatus("UNLOCK");
// publicAgencyUserMapper.insert(publicAgencyUser);
//
// List<String> lis=new ArrayList<>();
// lis.add(unitInfo.getAmosCompanyCode());
// LambdaQueryWrapper<RegionalCompanies> queryWrapper = new LambdaQueryWrapper<RegionalCompanies>();
// queryWrapper.eq(RegionalCompanies::getUnitInfoId, unitInfo.getSequenceNbr());
// List<RegionalCompanies> list= regionalCompaniesMapper.selectList(queryWrapper);
// for (RegionalCompanies companies : list) {
// companies.setUnitId(unitInfo.getAmosCompanySeq());
// lis.add(companies.getRegionalCompaniesCode());
// }
// regionalCompaniesService.saveOrUpdateBatch(list);
//
// PersonnelBusiness re=new PersonnelBusiness();
// re.setAmosDealerId(unitInfo.getAmosCompanySeq());
// re.setAmosUnitId(unitInfo.getAmosCompanySeq());
// re.setAmosUnitName(unitInfo.getName());
// re.setAmosUnitOrgCode(unitInfo.getAmosCompanyCode());
// re.setFoundationId(publicAgencyUser.getSequenceNbr());
// re.setUserType("2");
// personnelBusinessMapper.insert(re);
//
// //管理员绑定角色权限
// StdUserEmpower stdUserEmpower=new StdUserEmpower();
// stdUserEmpower.setAmosUserId(unitInfo.getAdminUserId());
// stdUserEmpower.setAmosOrgCode(lis);
// userEmpowerMapper.insert(stdUserEmpower);
//
// // Privilege.agencyUserClient.unlockUsers(unitInfo.getAdminUserId());
// approvalStatue="任务明细："+DealerReviewEnum.经销商管理员审核.getName()+"审核通过";
// }
// }
// // 2. 更新流程状态
// String code = null;
// // 3. 工作流执行
// FeignClientResult<String> submit = idxFeginService.submit(pageId, taskId, planInstanceId, null, "DEALER_EXAMINE", null, kv);
// if (IDX_REQUEST_STATE.equals(String.valueOf(submit.getStatus()))) {
// code = submit.getResult();
// // 获取流程信息
// FeignClientResult<JSONObject> record = idxFeginService.getRecord(code);
// if (IDX_REQUEST_STATE.equals(String.valueOf(record.getStatus()))) {
// JSONObject resultObj = record.getResult();
// String flowTaskId = String.valueOf(resultObj.get("flowTaskId"));
// dealerReview.setFlowTaskId(flowTaskId);
// }
// dealerReviewService.saveDealerReview(dealerReview,false,true,unitInfo.getName(),approvalStatue);
// }
// this.saveOrUpdate(unitInfo);
// }catch (Exception e){
//
// if (!ObjectUtils.isEmpty(unitInfo.getAmosCompanySeq())) {
// FeignClientResult<CompanyModel> feignClientResult = Privilege.companyClient
// .seleteOne(unitInfo.getAmosCompanySeq());
// if (feignClientResult != null) {
// Privilege.companyClient.deleteCompany(unitInfo.getAmosCompanySeq().toString());
// }
// }
// // 失败后回滚：删除已经创建的管理员账号
// if (StringUtils.isNotEmpty(unitInfo.getAdminUserId())) {
// FeignClientResult<AgencyUserModel> feignClientResult = Privilege.agencyUserClient
// .queryByUserId(unitInfo.getAdminUserId());
// if (feignClientResult != null) {
// Privilege.agencyUserClient.multDeleteUser(unitInfo.getAdminUserId());
// }
// }
//
//
//
//
// throw new BaseException("获取工作流节点失败！","400","获取工作流节点失败！");
//
// }
return code; return code;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment