Skip to content

A
amos-boot-biz
Commit 726e4760 authored by 李成龙's avatar 李成龙
Browse files
Options

王果 单位变更代码修改

parent 096a2f0a
Show whitespace changes
Inline Side-by-side
Showing with 134 additions and 177 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgChangeRegistrationUnitDto.java
View file @ 726e4760
......@@ -169,4 +169,7 @@ public class JgChangeRegistrationUnitDto extends BaseDto {
@ApiModelProperty(value = "公司类型")
private String companyType;
@ApiModelProperty(value = "使用登记证")
private String registrationCertificate;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgChangeRegistrationUnit.java
View file @ 726e4760
......@@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import com.yeejoin.amos.boot.module.jg.api.common.BizCustomDateSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
......@@ -265,4 +266,9 @@ public class JgChangeRegistrationUnit extends BaseEntity {
*/
@TableField("receive_company_org_code")
private String receiveCompanyOrgCode;
/**
* 使用登记证
*/
private String registrationCertificate;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgChangeRegistrationUnitService.java
View file @ 726e4760
......@@ -63,6 +63,6 @@ public interface IJgChangeRegistrationUnitService {
* @param model 数据
* @param submitType 保存类型
*/
List<JgChangeRegistrationUnit> saveNotice(String submitType, JSONObject model, ReginParams reginParams);
JgChangeRegistrationUnitDto saveNotice(String submitType, JSONObject model, ReginParams reginParams);
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationUnitServiceImpl.java
View file @ 726e4760
......@@ -126,7 +126,8 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
@Autowired
private IdxBizJgFactoryInfoServiceImpl idxBizJgFactoryInfoService;
@Autowired ICommonService commonService;
@Autowired
ICommonService commonService;
@Autowired
private RedissonClient redissonClient;
......@@ -145,7 +146,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
if (Objects.isNull(notice)) {
return null;
}
Map<String, Object> changeInfo = BeanUtil.beanToMap(notice, false ,true);
Map<String, Object> changeInfo = BeanUtil.beanToMap(notice, false, true);
if (!ValidationUtil.isEmpty(notice.getReceiveOrgCode()) && !ValidationUtil.isEmpty(notice.getReceiveOrgName())) {
changeInfo.put("receiveOrgCode", notice.getReceiveOrgCode() + "_" + notice.getReceiveOrgName());
......@@ -165,10 +166,10 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
private Map<String, Object> fillEquipInfoWithRuntimeOrHistoryData(JgChangeRegistrationUnit notice, Map<String, Object> changeInfo) {
// 已完成时显示历史数据
if(notice.getStatus().equals(FlowStatusEnum.TO_BE_FINISHED.getName())){
if (notice.getStatus().equals(FlowStatusEnum.TO_BE_FINISHED.getName())) {
JSONObject his = commonService.queryHistoryData(notice.getSequenceNbr());
// 兼容老数据
if(his == null){
if (his == null) {
return getEquipInfo(notice.getSequenceNbr(), changeInfo);
}
CommonServiceImpl.formatTime2StrDateForEquip(his);
......@@ -265,10 +266,10 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
notice.setStatus(WorkFlowStatusEnum.UNITCHANGE_RECEIVE.getPass());
notice.setNextExecuteUserIds(nextUserIds);
JgChangeRegistrationUnitMapper.updateById(notice);
commonServiceImpl.deleteTasksByRelationId(notice.getSequenceNbr()+"");
createTaskModel(notice,taskname,"1", nextUserIds);
commonServiceImpl.deleteTasksByRelationId(notice.getSequenceNbr() + "");
createTaskModel(notice, taskname, "1", nextUserIds);
commonServiceImpl.saveExecuteFlowData2Redis(notice.getInstanceId(), buildInstanceRuntimeData(notice));
}else {
} else {
ArrayList<String> roleList = new ArrayList<>();
String taskId = noticeDto.getNextTaskId();
//组装信息
......@@ -295,7 +296,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
this.buildRoleList(Collections.singletonList(processTaskDTO), roleList, roleListAll);
List<WorkflowResultDto> workflowResultDtos = commonServiceImpl.buildWorkFlowInfo(Collections.singletonList(processTaskDTO));
String nextUserIds = workflowResultDtos.get(0).getNextExecutorUserIds();
if(processTaskDTO != null && processTaskDTO.getNextTask() != null && processTaskDTO.getNextTask().size() >0){
if (processTaskDTO != null && processTaskDTO.getNextTask() != null && processTaskDTO.getNextTask().size() > 0) {
taskCode = processTaskDTO.getNextTask().get(0).getKey();
taskName1 = processTaskDTO.getNextTask().get(0).getName();
nextTaskId = processTaskDTO.getNextTask().get(0).getId();
......@@ -323,8 +324,8 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
return noticeDto;
}
private void updateHistorySingle(Long seq){
List<JgChangeRegistrationUnitEq> eqs = jgChangeRegistrationUnitEqMapper.selectList(new LambdaQueryWrapper<JgChangeRegistrationUnitEq>().eq(JgChangeRegistrationUnitEq::getUnitChangeRegistrationId,seq));
private void updateHistorySingle(Long seq) {
List<JgChangeRegistrationUnitEq> eqs = jgChangeRegistrationUnitEqMapper.selectList(new LambdaQueryWrapper<JgChangeRegistrationUnitEq>().eq(JgChangeRegistrationUnitEq::getUnitChangeRegistrationId, seq));
this.updateHistoryAsync(eqs);
}
......@@ -349,7 +350,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
String companyType = reginParams.getCompany().getCompanyType();
String currentUserId = reginParams.getUserModel().getUserId();
SortVo sortMap = commonServiceImpl.sortFieldConversion(sort);
Page<JgChangeRegistrationUnit> noticePage = JgChangeRegistrationUnitMapper.queryForPage(page,sortMap, model, type, orgCode, model.getRoleIds(),currentUserId);
Page<JgChangeRegistrationUnit> noticePage = JgChangeRegistrationUnitMapper.queryForPage(page, sortMap, model, type, orgCode, model.getRoleIds(), currentUserId);
Page<JgChangeRegistrationUnitDto> noticeDtoPage = new Page<>();
BeanUtils.copyProperties(noticePage, noticeDtoPage, "records");
......@@ -386,7 +387,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
for (Long sequenceNbr : sequenceNbrs) {
JgChangeRegistrationUnit changeRegistrationUnit = this.baseMapper.selectById(sequenceNbr);
// 删除代办 + 中止流程
commonServiceImpl.deleteTaskModel(String.valueOf(sequenceNbr),changeRegistrationUnit.getInstanceId());
commonServiceImpl.deleteTaskModel(String.valueOf(sequenceNbr), changeRegistrationUnit.getInstanceId());
// 删除单子
this.baseMapper.deleteById(sequenceNbr);
// 删除单子对应eq
......@@ -401,9 +402,8 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
@Override
@SuppressWarnings({"Duplicates", "rawtypes"})
@Transactional(rollbackFor = Exception.class)
public List<JgChangeRegistrationUnit> saveNotice(String submitType, JSONObject map, ReginParams reginParams) {
public JgChangeRegistrationUnitDto saveNotice(String submitType, JSONObject map, ReginParams reginParams) {
JgChangeRegistrationUnitDto model = BeanUtil.toBeanIgnoreError(map.get("changeRegisInfo"), JgChangeRegistrationUnitDto.class);
String[] taskName = new String[]{"流程结束"};
......@@ -418,15 +418,15 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
}
// 获取单位变更单号
ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.DWBG.getCode(), deviceList.size());
ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.DWBG.getCode(), 1);
List<String> applyNoList = listResponseModel.getResult();
if (CollectionUtils.isEmpty(applyNoList)) {
log.error("生成申请变更单位编失败");
return new ArrayList<>();
return null;
}
ArrayList<String> roleListFirst = new ArrayList<>();
ArrayList<String> roleListSecond = new ArrayList<>();
// ArrayList<String> roleListSecond = new ArrayList<>();
// 判断当前是否为提交
List<String> instanceIdList = new ArrayList<>();
......@@ -439,15 +439,15 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
// ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
List<ActWorkflowStartDTO> list = new ArrayList<>();
for (int i = 0; i < deviceList.size(); i++
) {
// for (int i = 0; i < deviceList.size(); i++
// ) {
ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
dto.setBusinessKey(String.valueOf(i));
dto.setBusinessKey(String.valueOf(new Date().getTime()));
dto.setNextExecuteUserCompanyCode(model.getReceiveCompanyCode());
dto.setCompleteFirstTask(true);
list.add(dto);
}
// }
actWorkflowBatchDTO.setProcess(list);
List<ProcessTaskDTO> processTaskDTOS = cmWorkflowService.startBatch(actWorkflowBatchDTO);
workflowResultDtos = commonServiceImpl.buildWorkFlowInfo(processTaskDTOS);
......@@ -457,72 +457,19 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
instanceIdList.add(processTaskDTO.getInstanceId());
taskIds.add(processTaskDTO.getNextTaskId());
}
// if (CollectionUtil.isNotEmpty(processTaskDTOS)){
// for (ProcessTaskDTO processTaskDTO : processTaskDTOS) {
// instanceIdList.add(processTaskDTO.getProcessInstance().getId());
// }
// roleListFirst.addAll(processTaskDTOS.get(0).getCandidateGroups());
// Map<String, List<String>> nextCandidateGroups = processTaskDTOS.get(0).getNextCandidateGroups();
// for (String s : nextCandidateGroups.keySet()) {
// roleListSecond.addAll(nextCandidateGroups.get(s));
// }
// String id = processTaskDTOS.get(0).getNextTask().get(0).getId();
// List<AgencyUserModel> agencyUserModels = processTaskDTOS.get(0).getNextTaskExecutor().get(id);
// if ()
// }
// try {
// FeignClientResult result = Workflow.taskV2Client.startByVariableBatch(actWorkflowBatchDTO);
// List<Object> returnList = (List<Object>) result.getResult();
// for (Object obj : returnList
// ) {
// JSONObject jsonObject = JSON.parseObject(JSONObject.toJSONString(obj));
// String instanceId = jsonObject.getString("id");
// instanceIdList.add(instanceId);
// // 查询下节点任务
// if (returnList.get(0).equals(obj)) {
// getNext(roleListFirst, instanceId, taskName);
// }
// // 推动下一个节点
// AjaxResult ajaxResult = Workflow.taskClient.getTask(instanceId);
// JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
// String taskId = dataObject.getString("id");
// //组装信息
// TaskResultDTO dto = new TaskResultDTO();
// dto.setResultCode("approvalStatus");
// dto.setTaskId(taskId);
// dto.setComment("");
// HashMap<String, Object> stringObjectHashMap = new HashMap<>();
// stringObjectHashMap.put("approvalStatus", "0");
// dto.setVariable(stringObjectHashMap);
// //执行流程
// AjaxResult ajaxResult1 = null;
// try {
// ajaxResult1 = Workflow.taskClient.completeByTask(taskId, dto);
// if (ajaxResult1.get("code").equals(200)) {
// getNext(roleListSecond, instanceId, taskName);
// } else {
// log.error("提交失败");
// }
// } catch (Exception e) {
// log.error("提交失败：{}", e);
// }
// }
// } catch (Exception e) {
// log.error("提交失败：{}", e);
// }
}
List<JgChangeRegistrationUnit> list = new ArrayList<>();
List<JgChangeRegistrationUnitEq> equipList = new ArrayList<>();
// List<JgChangeRegistrationUnit> list = new ArrayList<>();
// List<JgChangeRegistrationUnitEq> equipList = new ArrayList<>();
String finalNextExecutorRoleIds = nextExecutorRoleIds;
CompanyBo companyBo = commonServiceImpl.getOneCompany(model.getReceiveCompanyCode());
deviceList.forEach(obj -> {
JgChangeRegistrationUnitEq jgRelationEquip = new JgChangeRegistrationUnitEq();
// deviceList.forEach(obj -> {
// JgChangeRegistrationUnitEq jgRelationEquip = new JgChangeRegistrationUnitEq();
JgChangeRegistrationUnit dto = new JgChangeRegistrationUnit();
BeanUtils.copyProperties(model, dto);
int i = deviceList.indexOf(obj);
String applyNo = applyNoList.get(i);
dto.setApplyNo(applyNo);
// int i = deviceList.indexOf(obj);
// String applyNo = applyNoList.get(i);
dto.setApplyNo(applyNoList.get(0));
dto.setReceiveCompanyOrgCode(companyBo.getOrgCode());
dto.setCreateUserId(RequestContext.getExeUserId());
dto.setApplyDate(new Date());
......@@ -534,111 +481,112 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
}
dto.setNewUseUnitName(reginParams.getCompany().getCompanyName());
dto.setNewUseUnitCreditCode(reginParams.getCompany().getCompanyCode());
dto.setEquType((String.valueOf(obj.get("EQU_CATEGORY"))));
dto.setProductNameB((String.valueOf(obj.get("PRODUCT_NAME"))));
dto.setEquCodeB((String.valueOf(obj.get("EQU_CODE"))));
dto.setUseInnerCode(ValidationUtil.isEmpty(obj.get("USE_INNER_CODE")) ? "" : String.valueOf(obj.get("USE_INNER_CODE")));
dto.setEquAddress((String.valueOf(obj.get("ADDRESS"))));
dto.setSupervisoryCode(String.valueOf(obj.get("SUPERVISORY_CODE")));
dto.setEquList(String.valueOf(obj.get("EQU_LIST")));
jgRelationEquip.setEquId(String.valueOf(obj.get("SEQUENCE_NBR")));
jgRelationEquip.setUnitChangeRegistrationId(applyNo);
// dto.setEquType((String.valueOf(obj.get("EQU_CATEGORY"))));
// dto.setProductNameB((String.valueOf(obj.get("PRODUCT_NAME"))));
// dto.setEquCodeB((String.valueOf(obj.get("EQU_CODE"))));
// dto.setUseInnerCode(ValidationUtil.isEmpty(obj.get("USE_INNER_CODE")) ? "" : String.valueOf(obj.get("USE_INNER_CODE")));
// dto.setEquAddress((String.valueOf(obj.get("ADDRESS"))));
// dto.setSupervisoryCode(String.valueOf(obj.get("SUPERVISORY_CODE")));
// dto.setEquList(String.valueOf(obj.get("EQU_LIST")));
// jgRelationEquip.setEquId(String.valueOf(obj.get("SEQUENCE_NBR")));
// jgRelationEquip.setUnitChangeRegistrationId(applyNo);
if (!CollectionUtils.isEmpty(nextExecutorUserIds)) {
dto.setNextExecuteUserIds(nextExecutorUserIds.get(0));
}
if (!CollectionUtils.isEmpty(instanceIdList)) {
dto.setInstanceId(instanceIdList.get(i));
dto.setInstanceId(instanceIdList.get(0));
dto.setStatus(WorkFlowStatusEnum.UNITCHANGE_RECEIVE.getPass());
} else {
dto.setStatus(WorkFlowStatusEnum.UNITCHANGE_SUBMIT.getPass());
} if (!CollectionUtils.isEmpty(taskIds)) {
dto.setNextTaskId(taskIds.get(i));
} else {
}
list.add(dto);
equipList.add(jgRelationEquip);
});
if (!CollectionUtils.isEmpty(taskIds)) {
dto.setNextTaskId(taskIds.get(0));
}
// list.add(dto);
// equipList.add(jgRelationEquip);
// });
WorkflowResultDto workDto = new WorkflowResultDto();
JgChangeRegistrationUnitMapper.insertBatchSomeColumn(list);
// WorkflowResultDto workDto = new WorkflowResultDto();
// JgChangeRegistrationUnitMapper.insertBatchSomeColumn(list);
List<TaskModelDto> modelDtos = new ArrayList<>();
if (SUBMIT_TYPE_FLOW.equals(submitType)) {
for (JgChangeRegistrationUnit obj : list) {
TaskModelDto dto = new TaskModelDto();
// for (JgChangeRegistrationUnit obj : list) {
TaskModelDto taskModelDto = new TaskModelDto();
TaskMessageDto ta = new TaskMessageDto();
ta.setInstanceId(obj.getInstanceId());
ta.setStatus(obj.getStatus());
ta.setPromoter(obj.getPromoter());
ta.setNextExecuteUserIds(obj.getNextExecuteUserIds());
ta.setSequenceNbr(obj.getSequenceNbr());
ta.setNextTaskId(obj.getNextTaskId());
dto.setModel(ta);
ta.setInstanceId(dto.getInstanceId());
ta.setStatus(dto.getStatus());
ta.setPromoter(dto.getPromoter());
ta.setNextExecuteUserIds(dto.getNextExecuteUserIds());
ta.setSequenceNbr(dto.getSequenceNbr());
ta.setNextTaskId(dto.getNextTaskId());
taskModelDto.setModel(ta);
// dto.setModel(obj);
dto.setFlowCreateDate(new Date());
dto.setTaskName(workflowResultDtos.get(0).getNextTaskName());
dto.setFlowCode(obj.getNextTaskId());
dto.setTaskContent("来自"+obj.getEquList()+"【"+obj.getSupervisoryCode()+"】的业务办理,【申请单号:"+obj.getApplyNo()+"】");
dto.setTaskCode(obj.getApplyNo());
dto.setTaskType(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getCode());
dto.setTaskTypeLabel(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getName());
dto.setRelationId(obj.getInstanceId());
dto.setExecuteUserIds(workflowResultDtos.get(0).getNextExecutorUserIds());
dto.setTaskStatusLabel("未处理");
dto.setFlowStatus(commonServiceImpl.getDictionaryCodeByName(WorkFlowStatusEnum.UNITCHANGE_RECEIVE.getPass()));
dto.setFlowStatusLabel(WorkFlowStatusEnum.UNITCHANGE_RECEIVE.getPass());
dto.setStartUserId(RequestContext.getExeUserId());
dto.setStartUser(workflowResultDtos.get(0).getStartUserName());
dto.setStartUserCompanyName(reginParams.getCompany().getCompanyName());
dto.setStartDate(new Date());
dto.setNextExecuteUser(workflowResultDtos.get(0).getNextExecutorRoleIds());
modelDtos.add(dto);
}
}else {
for (JgChangeRegistrationUnit obj : list) {
TaskModelDto dto = new TaskModelDto();
taskModelDto.setFlowCreateDate(new Date());
taskModelDto.setTaskName(workflowResultDtos.get(0).getNextTaskName());
taskModelDto.setFlowCode(dto.getNextTaskId());
taskModelDto.setTaskContent("来自" + dto.getEquList() + "【" + dto.getSupervisoryCode() + "】的业务办理,【申请单号:" + dto.getApplyNo() + "】");
taskModelDto.setTaskCode(dto.getApplyNo());
taskModelDto.setTaskType(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getCode());
taskModelDto.setTaskTypeLabel(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getName());
taskModelDto.setRelationId(dto.getInstanceId());
taskModelDto.setExecuteUserIds(workflowResultDtos.get(0).getNextExecutorUserIds());
taskModelDto.setTaskStatusLabel("未处理");
taskModelDto.setFlowStatus(commonServiceImpl.getDictionaryCodeByName(WorkFlowStatusEnum.UNITCHANGE_RECEIVE.getPass()));
taskModelDto.setFlowStatusLabel(WorkFlowStatusEnum.UNITCHANGE_RECEIVE.getPass());
taskModelDto.setStartUserId(RequestContext.getExeUserId());
taskModelDto.setStartUser(workflowResultDtos.get(0).getStartUserName());
taskModelDto.setStartUserCompanyName(reginParams.getCompany().getCompanyName());
taskModelDto.setStartDate(new Date());
taskModelDto.setNextExecuteUser(workflowResultDtos.get(0).getNextExecutorRoleIds());
modelDtos.add(taskModelDto);
// }
} else {
// for (JgChangeRegistrationUnit obj : list) {
TaskModelDto taskModelDto = new TaskModelDto();
//行数据
dto.setModel(obj);
taskModelDto.setModel(dto);
//摘要 按原有规则组装
dto.setTaskContent("来自"+obj.getEquList()+"【"+obj.getSupervisoryCode()+"】的业务办理,【申请单号:"+obj.getApplyNo()+"】");
taskModelDto.setTaskContent("来自" + dto.getEquList() + "【" + dto.getSupervisoryCode() + "】的业务办理,【申请单号:" + dto.getApplyNo() + "】");
//申请单号
dto.setTaskCode(obj.getApplyNo());
taskModelDto.setTaskCode(dto.getApplyNo());
//业务类型枚举code值
dto.setTaskType(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getCode());
taskModelDto.setTaskType(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getCode());
////业务主键
dto.setRelationId(obj.getSequenceNbr()+"");
modelDtos.add(dto);
}
taskModelDto.setRelationId(dto.getSequenceNbr() + "");
modelDtos.add(taskModelDto);
// }
}
for(JgChangeRegistrationUnit obj : list) {
commonServiceImpl.saveExecuteFlowData2Redis(obj.getInstanceId(), buildInstanceRuntimeData(obj));
}
// for(JgChangeRegistrationUnit obj : list) {
commonServiceImpl.saveExecuteFlowData2Redis(dto.getInstanceId(), buildInstanceRuntimeData(dto));
// }
commonServiceImpl.buildTaskModel(modelDtos);
List<JgChangeRegistrationUnitEq> jgRelationEquipList = equipList.stream().map(jgRelationEquip -> {
List<JgChangeRegistrationUnit> collect = list.stream().filter(jgChangeRegistrationUnit -> jgRelationEquip.getUnitChangeRegistrationId().equals(jgChangeRegistrationUnit.getApplyNo())).collect(Collectors.toList());
Long sequenceNbr = collect.get(0).getSequenceNbr();
insertOrUpdateHis(JSON.parseObject(JSONObject.toJSONString(collect.get(0))), jgRelationEquip.getEquId());
return jgRelationEquip.setUnitChangeRegistrationId(String.valueOf(sequenceNbr));
}).collect(Collectors.toList());
// List<JgChangeRegistrationUnitEq> jgRelationEquipList = equipList.stream().map(jgRelationEquip -> {
// List<JgChangeRegistrationUnit> collect = list.stream().filter(jgChangeRegistrationUnit -> jgRelationEquip.getUnitChangeRegistrationId().equals(jgChangeRegistrationUnit.getApplyNo())).collect(Collectors.toList());
// Long sequenceNbr = collect.get(0).getSequenceNbr();
// insertOrUpdateHis(JSON.parseObject(JSONObject.toJSONString(collect.get(0))), jgRelationEquip.getEquId());
// return jgRelationEquip.setUnitChangeRegistrationId(String.valueOf(sequenceNbr));
// }).collect(Collectors.toList());
JgChangeRegistrationUnitEqMapper.insertBatchSomeColumn(jgRelationEquipList);
this.updateHistoryAsync(jgRelationEquipList);
return list;
// JgChangeRegistrationUnitEqMapper.insertBatchSomeColumn(jgRelationEquipList);
// this.updateHistoryAsync(jgRelationEquipList);
return model;
}
private void updateHistoryAsync(List<JgChangeRegistrationUnitEq> jgRelationEquipList) {
jgRelationEquipList.forEach(j->{
commonService.saveOrUpdateHistory(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getName(),getEquipInfoJson(j.getUnitChangeRegistrationId()) , j.getEquId(), j.getUnitChangeRegistrationId());
jgRelationEquipList.forEach(j -> {
commonService.saveOrUpdateHistory(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getName(),
getEquipInfoJson(j.getUnitChangeRegistrationId()), j.getEquId(), j.getUnitChangeRegistrationId());
});
}
private JSONObject getEquipInfoJson(String id){
return new JSONObject(getEquipInfo(Long.parseLong(id),new HashMap<>()));
private JSONObject getEquipInfoJson(String id) {
return new JSONObject(getEquipInfo(Long.parseLong(id), new HashMap<>()));
}
......@@ -774,7 +722,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
try {
boolean isLocked = lock.tryLock(0, 180, TimeUnit.SECONDS);
// 解决并发问题：多个人同时操作一个流程（并发执行通过、驳回、撤回）
if(!isLocked){
if (!isLocked) {
throw new BadRequest("当前流程已经被执行！请重新打开页面查看并执行！");
}
// 撤回校验
......@@ -811,7 +759,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
} catch (InterruptedException e) {
e.printStackTrace();
} finally {
if(lock.isHeldByCurrentThread()){
if (lock.isHeldByCurrentThread()) {
lock.unlock();
}
}
......@@ -832,7 +780,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
try {
boolean isLocked = lock.tryLock(0, 180, TimeUnit.SECONDS);
// 解决并发问题：多个人同时操作一个流程（并发执行通过、驳回、撤回）
if(!isLocked){
if (!isLocked) {
throw new BadRequest("当前流程已经被执行！请重新打开页面查看并执行！");
}
// 流程执行时，状态及权限校验
......@@ -854,8 +802,8 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
TaskResultDTO task = new TaskResultDTO();
task.setResultCode("approvalStatus");
task.setTaskId(taskId);
task.setComment(StringUtils.isEmpty(dto.getProcessAdvice())?"":dto.getProcessAdvice());
task.setNextExecuteUserCompanyCode(this.getNextUserOrgCode(op,jgChangeRegistrationUnit));
task.setComment(StringUtils.isEmpty(dto.getProcessAdvice()) ? "" : dto.getProcessAdvice());
task.setNextExecuteUserCompanyCode(this.getNextUserOrgCode(op, jgChangeRegistrationUnit));
HashMap<String, Object> map = new HashMap<>();
map.put("approvalStatus", op);
......@@ -873,7 +821,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
this.buildRoleList(Collections.singletonList(processTaskDTO), roleList, roleListAll);
List<WorkflowResultDto> workflowResultDtos = commonServiceImpl.buildWorkFlowInfo(Collections.singletonList(processTaskDTO));
String nextUserIds = workflowResultDtos.get(0).getNextExecutorUserIds();
if(processTaskDTO != null && processTaskDTO.getNextTask() != null && processTaskDTO.getNextTask().size() >0){
if (processTaskDTO != null && processTaskDTO.getNextTask() != null && processTaskDTO.getNextTask().size() > 0) {
taskCode = processTaskDTO.getNextTask().get(0).getKey();
taskName1 = processTaskDTO.getNextTask().get(0).getName();
nextTaskId = processTaskDTO.getNextTask().get(0).getId();
......@@ -940,7 +888,8 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
jgChangeRegistrationUnit.setNextExecuteUserIds(nextUserIds);
jgChangeRegistrationUnit.setNextTaskId(nextTaskId);
jgChangeRegistrationUnit.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getPass());
executeOneStep(jgChangeRegistrationUnit, taskName1, nextUserIds, op); }
executeOneStep(jgChangeRegistrationUnit, taskName1, nextUserIds, op);
}
} else {
jgChangeRegistrationUnit.setPromoter("");
jgChangeRegistrationUnit.setNextExecutorIds(String.join(",", roleList));
......@@ -956,7 +905,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
} catch (InterruptedException e) {
e.printStackTrace();
} finally {
if(lock.isHeldByCurrentThread()){
if (lock.isHeldByCurrentThread()) {
lock.unlock();
}
}
......@@ -1078,25 +1027,23 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
exportParamsMap.put("factoryNum", factoryInfo.getFactoryNum());
}
//调用生成使用登记证
exportParamsMap.put("excelType","变更登记");
exportParamsMap.put("tableName","特种设备单位变更登记");
exportParamsMap.put("excelType", "变更登记");
exportParamsMap.put("tableName", "特种设备单位变更登记");
exportParamsMap.put("applyNo", transfer.getApplyNo());
if ("0".equals(printType)) {
//调用生成使用登记证
commonService.generateCertificateReport(exportParamsMap, response);
}else{
} else {
commonService.generatePdfPrint(exportParamsMap, response);
}
}
private String buildTaskContent(JgChangeRegistrationUnit obj) {
return "来自"+ EquipmentClassifityEnum.getNameByCode(obj.getEquList()) +"【"+obj.getSupervisoryCode()+"】的业务办理,【申请单号:"+obj.getApplyNo()+"】";
return "来自" + EquipmentClassifityEnum.getNameByCode(obj.getEquList()) + "【" + obj.getSupervisoryCode() + "】的业务办理,【申请单号:" + obj.getApplyNo() + "】";
}
private void createTaskModel(JgChangeRegistrationUnit dto, String taskName, String submitType, String nextUserIds) {
ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
if ("1".equals(submitType)) {
......@@ -1192,7 +1139,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
TaskModelDto modelDto = new TaskModelDto();
BeanUtil.copyProperties(taskV2Model, modelDto);
modelDto.setNextExecuteUser(jgChangeRegistrationName.getNextExecutorIds());
if (jgChangeRegistrationName.getStatus().equals(WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getReject())){
if (jgChangeRegistrationName.getStatus().equals(WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getReject())) {
modelDto.setPageType("edit");
}
TaskMessageDto obj = new TaskMessageDto();
......@@ -1211,17 +1158,17 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
private TaskV2Model updateTaskModel(JgChangeRegistrationUnit jgChangeRegistrationName, String operate) {
Map<String, Object> params = new HashMap<>();
FlowStatusEnum flowStatusEnum = this.getTaskStatus(operate);
params.put("relationId",jgChangeRegistrationName.getInstanceId());
params.put("relationId", jgChangeRegistrationName.getInstanceId());
params.put("taskStatus", flowStatusEnum.getCode());
params.put("taskStatusLabel", flowStatusEnum.getName());
params.put("flowStatus",this.getTaskStatusByName(jgChangeRegistrationName.getStatus()));
params.put("flowStatusLabel",jgChangeRegistrationName.getStatus());
params.put("model",jgChangeRegistrationName);
params.put("flowStatus", this.getTaskStatusByName(jgChangeRegistrationName.getStatus()));
params.put("flowStatusLabel", jgChangeRegistrationName.getStatus());
params.put("model", jgChangeRegistrationName);
return commonServiceImpl.updateTaskModel(params);
}
private FlowStatusEnum getTaskStatus(String operate) {
if("0".equals(operate)){
if ("0".equals(operate)) {
return FlowStatusEnum.TO_BE_FINISHED;
} else {
return FlowStatusEnum.REJECTED;
......@@ -1230,19 +1177,20 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
private String getNextUserOrgCode(String operate, JgChangeRegistrationUnit jgChangeRegistrationName) {
if("0".equals(operate)){
if ("0".equals(operate)) {
// 执行通过节点，单位code为接收机构单位信息
return jgChangeRegistrationName.getReceiveOrgCode();
}
if(jgChangeRegistrationName.getStatus().equals(WorkFlowStatusEnum.UNIT_RENAME_RECEIVE.getPass())
if (jgChangeRegistrationName.getStatus().equals(WorkFlowStatusEnum.UNIT_RENAME_RECEIVE.getPass())
|| jgChangeRegistrationName.getStatus().equals(WorkFlowStatusEnum.UNIT_RENAME_RECEIVE.getReject())
|| jgChangeRegistrationName.getStatus().equals(WorkFlowStatusEnum.UNIT_RENAME_RECEIVE.getRollBack())){
|| jgChangeRegistrationName.getStatus().equals(WorkFlowStatusEnum.UNIT_RENAME_RECEIVE.getRollBack())) {
// 驳回且当前节点为一键节点时，单位code为发起人单位信息
return jgChangeRegistrationName.getUseUnitCreditCode();
}
// 2、3级驳回时，单位code为接收单位code
return jgChangeRegistrationName.getReceiveOrgCode();
}
private Integer getTaskStatusByName(String auditStatus) {
return commonServiceImpl.getDictionaryCodeByName(auditStatus);
}
......
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