Skip to content

A
amos-boot-biz
Commit 34ba53be authored by chenzhao's avatar chenzhao
Browse files
Options

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

parents 4feac7b5 f1c89115
Show whitespace changes
Inline Side-by-side
Showing with 165 additions and 58 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/JgEquipTransferDto.java
View file @ 34ba53be
......@@ -130,4 +130,10 @@ public class JgEquipTransferDto extends BaseDto {
@ApiModelProperty(value = "施工单位统一信用代码-数据隔离使用")
private String installUnitCodeFilter;
/**
* 下一节点可执行人逗号分割
*/
@ApiModelProperty(value = "下一节点可执行人逗号分割-数据隔离使用")
private String nextExecuteUserIds;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgInstallationNoticeDto.java
View file @ 34ba53be
......@@ -260,4 +260,8 @@ public class JgInstallationNoticeDto extends BaseDto {
private String factoryNum;
@ApiModelProperty (value = "下一节点可执行人")
private String nextExecuteUserIds;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgTransferNoticeDto.java
View file @ 34ba53be
......@@ -224,4 +224,8 @@ public class JgTransferNoticeDto extends BaseDto {
private String equList;
@ApiModelProperty (value = "下一节点可执行人")
private String nextExecuteUserIds;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgInstallationNotice.java
View file @ 34ba53be
......@@ -417,10 +417,13 @@ public class JgInstallationNotice extends BaseEntity {
/**
* 设备出场编号
*/
// @TableField("\"factory_num\"")
@TableField(exist = false)
private String factoryNum;
/**
* 下一节点可执行人
*/
@TableField("\"next_execute_user_ids\"")
private String nextExecuteUserIds;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgTransferNotice.java
View file @ 34ba53be
......@@ -313,4 +313,11 @@ public class JgTransferNotice extends BaseEntity {
@TableField(exist = false)
private String equList;
/**
* 下一节点可执行人
*/
@TableField("\"next_execute_user_ids\"")
private String nextExecuteUserIds;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgChangeRegistrationReformService.java
View file @ 34ba53be
......@@ -19,12 +19,64 @@ import java.util.Map;
* @date 2023-12-20
*/
public interface IJgChangeRegistrationReformService {
/**
*
* @param dto
* @param page
* @param roleIds
* @return
*/
Page<Map<String, Object>> getList(JgChangeRegistrationReformDto dto, Page<Map<String, Object>> page, List<String> roleIds);
/**
* @deprecated 保存数据-根据入参判断是暂存还是执行流程
* @param map
* @return
*/
List<Map<String, Object>> save(JSONObject map);
/**
* @deprecated 根据流程执行情况推动工作流或者
* @param instanceId
* @param jgChangeRegistrationReform
* @param operate
* @param processTaskDTO
*/
void updateExecuteIds(String instanceId, JgChangeRegistrationReform jgChangeRegistrationReform, String operate, ProcessTaskDTO processTaskDTO);
/**
* @deprecated 流程执行
* @param id
* @param instanceId
* @param operate
* @param comment
*/
void flowExecute(Long id, String instanceId, String operate, String comment);
/**
* @deprecated 根据流程id执行撤回操作
* @param instanceId
*/
void withdraw(String instanceId);
/**
* @deprecated 根据id批量删除数据
* @param ids
*/
void deleteBatch(List<Long> ids);
/**
* @deprecated 根据当前的数据id获取详情
* @param currentDocumentId
* @param equipId
* @return
*/
Map<String, Object> getDetail(String currentDocumentId, String equipId);
/**
* @deprecated 根据当前的数据id导出使用登记证
* @param sequenceNbr
* @param response
*/
void exportUseRegistrationCertificate(String sequenceNbr, HttpServletResponse response);
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgEquipTransferMapper.xml
View file @ 34ba53be
......@@ -54,7 +54,8 @@
tec2.name AS equCategory,
tec1.name AS equList,
tec.name AS equDefine,
jet.create_date AS createDate
jet.create_date AS createDate,
jet.next_execute_user_ids as nextExecuteUserIds
FROM
tzs_jg_equip_transfer jet
LEFT JOIN tzs_jg_equip_transfer_eq ete ON ete.equip_transfer_id = jet.sequence_nbr
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgChangeRegistrationReformController.java
View file @ 34ba53be
......@@ -106,20 +106,6 @@ public class JgChangeRegistrationReformController extends BaseController {
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "获取设备列表", notes = "获取设备列表")
@GetMapping(value = "/getEquipList")
public ResponseModel<Page<Map<String, Object>>> getEquipList(
@RequestParam(value = "current") int current,
@RequestParam(value = "size") int size,
@RequestParam(value = "factoryNum", required = false) String factoryNum,
@RequestParam(value = "equList", required = false) String equList,
@RequestParam(value = "equCategory", required = false) String equCategory) {
Page<Map<String, Object>> page = new Page<>(current, size);
return ResponseHelper.buildResponse(jgChangeRegistrationReformServiceImpl.getEquipList(page, factoryNum, equList, equCategory));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "获取详情", notes = "获取详情")
@GetMapping(value = "/getDetail")
......
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/JgChangeRegistrationNameServiceImpl.java
View file @ 34ba53be
......@@ -427,7 +427,11 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
}
@Transactional(rollbackFor = Exception.class)
public void deleteBatch(List<Long> ids) {
// 删除待办
this.deleteTaskBatch(ids);
// 删除业务数据
JgChangeRegistrationName jgChangeRegistrationName = new JgChangeRegistrationName();
jgChangeRegistrationName.setIsDelete(true);
LambdaQueryWrapper<JgChangeRegistrationName> lambda = new QueryWrapper<JgChangeRegistrationName>().lambda();
......@@ -435,6 +439,10 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
this.update(jgChangeRegistrationName, lambda);
}
private void deleteTaskBatch(List<Long> ids) {
ids.forEach(id-> commonService.deleteTaskModel(id + ""));
}
public void revocation(String instanceId) {
// 执行流程
......
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/JgChangeRegistrationReformServiceImpl.java
View file @ 34ba53be
package com.yeejoin.amos.boot.module.jg.biz.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
......@@ -32,7 +31,6 @@ import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService;
......@@ -63,6 +61,22 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
@Autowired
ICmWorkflowService iCmWorkflowService;
@Autowired
IIdxBizJgTechParamsElevatorService iIdxBizJgTechParamsElevatorService;
@Autowired
IIdxBizJgTechParamsVehicleService iIdxBizJgTechParamsVehicleService;
@Autowired
IIdxBizJgTechParamsRopewayService iIdxBizJgTechParamsRopewayService;
@Autowired
IIdxBizJgTechParamsRidesService iIdxBizJgTechParamsRidesService;
@Autowired
IIdxBizJgTechParamsBoilerService iIdxBizJgTechParamsBoilerService;
@Autowired
IIdxBizJgTechParamsVesselService iIdxBizJgTechParamsVesselService;
@Autowired
IIdxBizJgTechParamsPipelineService iIdxBizJgTechParamsPipelineService;
@Autowired
IIdxBizJgTechParamsLiftingService iIdxBizJgTechParamsLiftingService;
@Autowired
private IdxBizJgUseInfoServiceImpl idxBizJgUseInfoService;
@Autowired
private IdxBizJgRegisterInfoServiceImpl idxBizJgRegisterInfoService;
......@@ -92,35 +106,18 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
@Autowired
private JgChangeRegistrationNameEqMapper jgChangeRegistrationNameEqMapper;
@Autowired
IIdxBizJgTechParamsElevatorService iIdxBizJgTechParamsElevatorService;
@Autowired
IIdxBizJgTechParamsVehicleService iIdxBizJgTechParamsVehicleService;
@Autowired
IIdxBizJgTechParamsRopewayService iIdxBizJgTechParamsRopewayService;
@Autowired
IIdxBizJgTechParamsRidesService iIdxBizJgTechParamsRidesService;
@Autowired
IIdxBizJgTechParamsBoilerService iIdxBizJgTechParamsBoilerService;
@Autowired
IIdxBizJgTechParamsVesselService iIdxBizJgTechParamsVesselService;
@Autowired
IIdxBizJgTechParamsPipelineService iIdxBizJgTechParamsPipelineService;
@Autowired
IIdxBizJgTechParamsLiftingService iIdxBizJgTechParamsLiftingService;
/**
* 分页查询
/***
* @deprecated 根据查询调教获取分页对象
* @param dto 查询的dto对象
* @param page 分页对象
* @param roleIds 当前登陆人的角色id值
* @return
*/
public Page<Map<String, Object>> getList(JgChangeRegistrationReformDto dto, Page<Map<String, Object>> page, List<String> roleIds) {
Page<Map<String, Object>> listPage = this.baseMapper.getListPage(page, dto, roleIds);
return listPage;
}
public Page<Map<String, Object>> getEquipList(Page<Map<String, Object>> page, String factoryNum, String equList, String equCategory) {
return this.baseMapper.getEquipListPage(page, factoryNum, equList, equCategory);
}
@Transactional
public List<Map<String, Object>> save(JSONObject map) {
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
......@@ -423,6 +420,8 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
lambda1.in(JgChangeRegistrationReformEq::getEquipTransferId, ids);
jgChangeRegistrationReformEqMapper.delete(lambda1);
jgRegistrationHistoryMapper.delete(new QueryWrapper<JgRegistrationHistory>().in("current_document_id", applyNos));
//删除暂存的待办
ids.forEach(id -> commonServiceImpl.deleteTaskModel(String.valueOf(id)));
}
public Map<String, Object> getDetail(String currentDocumentId, String equipId) {
......@@ -454,6 +453,8 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
if (!ObjectUtils.isEmpty(detail.get("renovationSupervisioninspectionCertificate"))) {
detail.put("renovationSupervisioninspectionCertificate", JSONObject.parse(detail.get("renovationSupervisioninspectionCertificate").toString()));
}
detail.remove("submit");
detail.remove("instanceId");
return detail;
}
......@@ -503,7 +504,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
IdxBizJgTechParamsElevator elevator = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsElevator.class);
if (!ValidationUtil.isEmpty(elevator)) {
elevator.setSequenceNbr( String.valueOf(techInfo.get("ELEVATOR_SEQ")));
elevator.setSequenceNbr(String.valueOf(techInfo.get("ELEVATOR_SEQ")));
iIdxBizJgTechParamsElevatorService.saveOrUpdateData(elevator);
}
}
......@@ -511,7 +512,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
else if (EquipmentClassifityEnum.CC.getCode().equals(equList)) {
IdxBizJgTechParamsVehicle vehicle = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsVehicle.class);
if (!ValidationUtil.isEmpty(vehicle)) {
vehicle.setSequenceNbr( String.valueOf(techInfo.get("VEHICLE_SEQ")));
vehicle.setSequenceNbr(String.valueOf(techInfo.get("VEHICLE_SEQ")));
iIdxBizJgTechParamsVehicleService.saveOrUpdateData(vehicle);
}
......@@ -526,7 +527,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
else if (EquipmentClassifityEnum.KYSD.getCode().equals(equList)) {
IdxBizJgTechParamsRopeway ropeway = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsRopeway.class);
if (!ValidationUtil.isEmpty(ropeway)) {
ropeway.setSequenceNbr( String.valueOf(techInfo.get("ROPEWAY_SEQ")));
ropeway.setSequenceNbr(String.valueOf(techInfo.get("ROPEWAY_SEQ")));
iIdxBizJgTechParamsRopewayService.saveOrUpdateData(ropeway);
}
......@@ -548,7 +549,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
else if (EquipmentClassifityEnum.GL.getCode().equals(equList)) {
IdxBizJgTechParamsBoiler boiler = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsBoiler.class);
if (!ValidationUtil.isEmpty(boiler)) {
boiler.setSequenceNbr( String.valueOf(techInfo.get("BOILER_SEQ")));
boiler.setSequenceNbr(String.valueOf(techInfo.get("BOILER_SEQ")));
iIdxBizJgTechParamsBoilerService.saveOrUpdateData(boiler);
}
......@@ -580,7 +581,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
else if (EquipmentClassifityEnum.YLGD.getCode().equals(equList)) {
IdxBizJgTechParamsPipeline pipeline = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsPipeline.class);
if (!ValidationUtil.isEmpty(pipeline)) {
pipeline.setSequenceNbr( String.valueOf(techInfo.get("PIPELINE_SEQ")));
pipeline.setSequenceNbr(String.valueOf(techInfo.get("PIPELINE_SEQ")));
iIdxBizJgTechParamsPipelineService.saveOrUpdateData(pipeline);
}
......@@ -594,7 +595,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
else if (EquipmentClassifityEnum.QZJX.getCode().equals(equList)) {
IdxBizJgTechParamsLifting lifting = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsLifting.class);
if (!ValidationUtil.isEmpty(lifting)) {
lifting.setSequenceNbr( String.valueOf(techInfo.get("LIFTING_SEQ")));
lifting.setSequenceNbr(String.valueOf(techInfo.get("LIFTING_SEQ")));
iIdxBizJgTechParamsLiftingService.saveOrUpdateData(lifting);
}
......@@ -652,8 +653,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
}
/**
* 参数为监管码
*
* @deprecated 根据监管码或者新的使用登记编码
* @param supervisoryCode
* @return
*/
......@@ -891,7 +891,12 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
return taskMessageDto;
}
/**
* @deprecated 根据流程执行情况获取下一步执行公司code用于工作流过滤人员
* @param operate
* @param jgChangeRegistrationReform
* @return
*/
private String getNextUserOrgCode(String operate, JgChangeRegistrationReform jgChangeRegistrationReform) {
if ("0".equals(operate)) {
// 执行通过节点，单位code为接收机构单位信息
......
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/JgChangeRegistrationTransferServiceImpl.java
View file @ 34ba53be
......@@ -455,12 +455,20 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
}
}
// 删除待办
this.deleteTaskBatch(Arrays.asList(sequenceNbrs));
} catch (Exception e) {
return false;
}
return true;
}
// 删除待办
private void deleteTaskBatch(List<Long> ids) {
ids.forEach(id-> commonService.deleteTaskModel(id + ""));
}
/**
* 根据移装变更记录sequenceNbr查询详情
*
......
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/JgEnableDisableServiceImpl.java
View file @ 34ba53be
......@@ -189,7 +189,7 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
jgEnableDisable.setRemark(map.get("remark") == null ? "" : map.get("remark").toString());
jgEnableDisable.setApplyDate(new Date());
jgEnableDisable.setApplyType(String.valueOf(map.get("applyType")));
jgEnableDisable.setAuditStatus(FlowStatusEnum.TO_BE_SUBMITTED.getName());
jgEnableDisable.setAuditStatus(ObjectUtils.isEmpty(jgEnableDisable.getAuditStatus()) ? FlowStatusEnum.TO_BE_SUBMITTED.getName() : jgEnableDisable.getAuditStatus());
}
// 仅保存
this.saveOrUpdate(jgEnableDisable);
......
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/JgEquipTransferServiceImpl.java
View file @ 34ba53be
......@@ -272,6 +272,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
transfer.setApplyStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
transfer.setNextTaskId(workflowResultDto.getNextTaskId());
transfer.setInstanceId(workflowResultDto.getInstanceId());
transfer.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
updateById(transfer);
//删除暂存
......@@ -305,6 +306,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
transfer.setNextExecuteIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
transfer.setApplyStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
transfer.setNextTaskId(workflowResultDto.getNextTaskId());
transfer.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
//transfer.setInstanceId(workflowResultDto.getInstanceId());
updateById(transfer);
......@@ -392,6 +394,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
jgEquipTransfer.setSupervisoryCode(jgEquipTransferDto.getSupervisoryCode());
jgEquipTransfer.setEquList(jgEquipTransferDto.getEquList());
jgEquipTransfer.setNextTaskId(workflowResultDto.getNextTaskId());
jgEquipTransfer.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
//jgEquipTransfer.setInstanceId(workflowResultDto.getInstanceId());
// 上个代办改为驳回
taskV2Model = this.updateLastTodo(jgEquipTransfer, FlowStatusEnum.REJECTED);
......@@ -414,6 +417,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
WorkflowResultDto workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
equipTransfer.setPromoter("");
equipTransfer.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
equipTransfer.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
equipTransfer.setApplyStatus(String.valueOf(FlowStatusEnum.ROLLBACK.getCode()));
equipTransfer.setNextTaskId(workflowResultDto.getNextTaskId());
baseMapper.updateById(equipTransfer);
......@@ -557,6 +561,8 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
dto.setPromoter(reginParams.getUserModel().getUserId());
dto.setNextTaskId(workflowResult.getNextTaskId());
dto.setNextExecuteUserIds(workflowResult.getNextExecutorUserIds());
}else{
dto.setNextExecuteUserIds(RequestContext.getExeUserId());
}
if (!CollectionUtils.isEmpty(workflowResultList)) {
dto.setInstanceId(workflowResultList.get(i).getInstanceId());
......
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/JgInstallationNoticeServiceImpl.java
View file @ 34ba53be
......@@ -251,6 +251,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
}
notice.setPromoter(RequestContext.getExeUserId());
notice.setNextExecuteIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
notice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
notice.setNextTaskId(workflowResultDto.getNextTaskId());
notice.setInstanceId(workflowResultDto.getInstanceId());
......@@ -285,6 +286,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
}
notice.setPromoter(RequestContext.getExeUserId());
notice.setNextExecuteIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
notice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
notice.setNextTaskId(workflowResultDto.getNextTaskId());
this.updateById(notice);
......@@ -590,6 +592,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
dto.setNoticeDate(new Date());
if(SUBMIT_TYPE_FLOW.equals(submitType)) {
dto.setNextExecuteIds(workflowResultList.get(i).getNextExecutorRoleIds());
dto.setNextExecuteUserIds(workflowResultList.get(i).getNextExecutorUserIds());
dto.setInstanceStatus(workflowResultList.get(i).getNextExecutorRoleIds() + "," + workflowResultList.get(i).getExecutorRoleIds());
dto.setPromoter(reginParams.getUserModel().getUserId());
dto.setNextTaskId(workflowResultList.get(i).getNextTaskId());
......@@ -739,10 +742,13 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
WorkflowResultDto workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
jgInstallationNotice.setPromoter("");
jgInstallationNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
jgInstallationNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.ROLLBACK.getCode()));
jgInstallationNotice.setNextTaskId(workflowResultDto.getNextTaskId());
this.updateById(jgInstallationNotice);
JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(jgInstallationNotice));
TaskMessageDto taskMessageDto = new TaskMessageDto();
BeanUtils.copyProperties(jgInstallationNotice, taskMessageDto);
JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(taskMessageDto));
jsonObject.put("taskType", BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getCode());
jsonObject.put("nextExecuteUser", jgInstallationNotice.getNextExecuteIds());
jsonObject.put("flowStatusLabel", FlowStatusEnum.ROLLBACK.getName());
......@@ -856,6 +862,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
} else {
jgInstallationNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
jgInstallationNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
if (!ObjectUtils.isEmpty(jgInstallationNotice.getInstanceStatus())) {
jgInstallationNotice.setInstanceStatus(jgInstallationNotice.getInstanceStatus() + "," + workflowResultDto.getNextExecutorRoleIds());
} else {
......
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/JgMaintainNoticeServiceImpl.java
View file @ 34ba53be
......@@ -198,6 +198,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
notice.setNextExecuteIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
notice.setInstanceId(workflowResultDto.getInstanceId());
notice.setNextTaskId(workflowResultDto.getNextTaskId());
jgMaintainNoticeMapper.updateById(notice);
// 如果为保存并提交，则创建代办
buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto), Boolean.TRUE);
......
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/JgMaintenanceContractServiceImpl.java
View file @ 34ba53be
......@@ -218,6 +218,8 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
.eq(JgMaintenanceContractEq::getIsDelete, false);
List<Long> listSeq = jgMaintenanceContractEqService.list(queryWrapper).stream()
.map(JgMaintenanceContractEq::getSequenceNbr).collect(Collectors.toList());
commonService.deleteTaskModel(String.valueOf(jgMaintenanceContract.getSequenceNbr()));
maintenanceContractEqMapper.deleteForBatch(listSeq);
});
maintenanceContractMapper.deleteForBatch(list);
......
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/JgTransferNoticeServiceImpl.java
View file @ 34ba53be
......@@ -283,6 +283,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
}
notice.setPromoter(RequestContext.getExeUserId());
notice.setNextExecuteIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
notice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
notice.setNextTaskId(workflowResultDto.getNextTaskId());
notice.setInstanceId(workflowResultDto.getInstanceId());
......@@ -316,6 +317,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
}
notice.setPromoter(RequestContext.getExeUserId());
notice.setNextExecuteIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
notice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
notice.setNextTaskId(workflowResultDto.getNextTaskId());
jgTransferNoticeMapper.updateById(notice);
......@@ -463,6 +465,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
dto.setNoticeDate(new Date());
if (SUBMIT_TYPE_FLOW.equals(submitType)) {
dto.setNextExecuteIds(workflowResultList.get(i).getNextExecutorRoleIds());
dto.setNextExecuteUserIds(workflowResultList.get(i).getNextExecutorUserIds());
dto.setInstanceStatus(workflowResultList.get(i).getNextExecutorRoleIds() + "," + workflowResultList.get(i).getExecutorRoleIds());
dto.setPromoter(reginParams.getUserModel().getUserId());
dto.setNextTaskId(workflowResultList.get(i).getNextTaskId());
......@@ -636,10 +639,13 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
WorkflowResultDto workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
jgInstallationNotice.setPromoter("");
jgInstallationNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
jgInstallationNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.ROLLBACK.getCode()));
jgInstallationNotice.setNextTaskId(workflowResultDto.getNextTaskId());
jgTransferNoticeMapper.updateById(jgInstallationNotice);
JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(jgInstallationNotice));
TaskMessageDto taskMessageDto = new TaskMessageDto();
BeanUtils.copyProperties(jgInstallationNotice, taskMessageDto);
JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(taskMessageDto));
jsonObject.put("taskType", BusinessTypeEnum.JG_ADVICE_REMOVAL.getCode());
jsonObject.put("nextExecuteUser", jgInstallationNotice.getNextExecuteIds());
jsonObject.put("flowStatusLabel", FlowStatusEnum.ROLLBACK.getName());
......@@ -691,6 +697,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
taskV2Model = commonService.updateTaskModel(taskMap);
} else {
jgTransferNotice.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
jgTransferNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
if (!ObjectUtils.isEmpty(jgTransferNotice.getInstanceStatus())) {
jgTransferNotice.setInstanceStatus(jgTransferNotice.getInstanceStatus() + "," + workflowResultDto.getNextExecutorRoleIds());
} else {
......
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/JgUseRegistrationServiceImpl.java
View file @ 34ba53be
......@@ -209,7 +209,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
// 删除暂存代办
commonServiceImpl.deleteTaskModel(String.valueOf(jgUseRegistration.getSequenceNbr()));
String instanceId = "";
if (map.containsKey("instanceId")) {
if (!ObjectUtils.isEmpty(map.get("instanceId"))) {
instanceId = map.get("instanceId").toString();
} else {
// 启动并执行流程
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/urlInfo.json
View file @ 34ba53be
......@@ -3,7 +3,7 @@
"type": "101",
"pageType": "draft",
"name": "设备移交",
"url": "/mixuap?appId=1742358052905971713&id=1737399017643470849&formType=edit&roleIds={roleIds}&userId={userId}"
"url": "/mixuap?appId=1742358052905971713&id=1737398917965836290&formType=edit&roleIds={roleIds}&userId={userId}"
},
{
"type": "101",
......@@ -21,7 +21,7 @@
"type": "102",
"pageType": "draft",
"name": "安装告知",
"url": "/mixuap?appId=1742358052905971713&id=1735246137364869121&roleIds={roleIds}&userId={userId}&formType=edit"
"url": "/mixuap?appId=1742358052905971713&id=1734127099570057217&roleIds={roleIds}&userId={userId}&formType=edit"
},
{
"type": "102",
......@@ -111,7 +111,7 @@
"type": "107",
"pageType": "draft",
"name": "使用登记",
"url": "/mixuap?appId=1742358052905971713&id=1734864899516952578&roleIds={roleIds}&userId={userId}&pageType=edit"
"url": "/mixuap?appId=1742358052905971713&id=1735202405437435906&roleIds={roleIds}&userId={userId}&pageType=edit"
},
{
"type": "107",
......
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