Skip to content

A
amos-boot-biz
Commit a60e9f7d authored by 王果's avatar 王果
Browse files
Options

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

parents a0888c0a 65c03d01
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 503 additions and 80 deletions
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/entity/BaseEntity.java
View file @ a60e9f7d
......@@ -15,7 +15,7 @@ import java.util.Date;
* @author DELL
*/
@Data
public class BaseEntity implements Serializable{
public class BaseEntity implements Serializable{
private static final long serialVersionUID = 1L;
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/TaskModelDto.java
View file @ a60e9f7d
......@@ -103,5 +103,9 @@ public class TaskModelDto {
* 下一节点执行角色
*/
private String nextExecuteUser;
/**
* 是否跳转编辑页面
* */
private String pageType;
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgChangeRegistrationName.java
View file @ a60e9f7d
......@@ -2,10 +2,15 @@ package com.yeejoin.amos.boot.module.jg.api.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
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 lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
......@@ -79,6 +84,8 @@ public class JgChangeRegistrationName extends BaseEntity {
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@JsonSerialize(using = BizCustomDateSerializer.class)
@TableField("create_date")
private Date createDate;
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgEnableDisableMapper.xml
View file @ a60e9f7d
......@@ -64,6 +64,8 @@
concat(use."PROVINCE_NAME", use."CITY_NAME", use."COUNTY_NAME", use."ADDRESS",
use.STREET_NAME) as fullAddress,
jri.EQU_CODE as equCode,
jed.audit_status as auditStatus,
jed.apply_no as applyNo,
jed.apply_type as applyType,
jed.remark,
use.RECORD as record,
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgMaintainNoticeMapper.xml
View file @ a60e9f7d
......@@ -36,7 +36,7 @@
</if>
<if test="type != 'company'">
AND isn.instance_id is not null
AND isn.receive_org_code = #{orgCode}
AND isn.receive_company_code = #{orgCode}
</if>
<if test="type == 'company'">
AND isn.install_unit_credit_code = #{orgCode}
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgReformNoticeMapper.xml
View file @ a60e9f7d
......@@ -59,7 +59,7 @@
AND (isn.notice_status in ('6612', '6613', '6614', '6616') )
AND isn.receive_org_code = #{orgCode}
</if>
<if test="type == 'enterprise'">
<if test="type == 'company'">
AND isn.install_unit_credit_code = #{orgCode}
</if>
</where>
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgScrapCancelMapper.xml
View file @ a60e9f7d
......@@ -64,8 +64,8 @@
<if test="roleIds != null and dto.type == 'supervision'">
<foreach collection='roleIds' item='role' open='and (' close=')' separator='or'>
ur.instance_status like concat('%',#{role},'%')
or ur.create_user_id = #{dto.createUserId}
</foreach>
or ur.create_user_id = #{dto.createUserId}
</if>
<if test="dto.type == 'supervision'">
AND ur.receive_org_code = #{orgCode}
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgTransferNoticeMapper.xml
View file @ a60e9f7d
......@@ -106,12 +106,13 @@
tjtn.street_name AS streetName,
tjtn.promoter AS promoter,
tjtn.plan_date AS installStartDate,
tec2.name AS equCategory,
tec1.name AS equList,
tec.name AS equDefine,
oi.SUPERVISORY_CODE as supervisoryCode,
tjtn.construction_manager AS installLeaderName,
tjtn.construction_manager_phone AS installLeaderPhone,
ri.equ_code AS equRegisterCode,
ri.equ_list AS equList,
ri.equ_category AS equCategory,
ri.EQU_DEFINE AS equDefine,
ri.product_name AS productName,
ri.brand_name AS brandName,
ri.equ_type AS equType,
......@@ -152,8 +153,12 @@
LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = re.equ_id
LEFT JOIN idx_biz_jg_inspection_detection_info idi ON idi.record = re.equ_id
LEFT JOIN idx_biz_jg_use_info ui ON ui.record = re.equ_id
left join idx_biz_jg_other_info oi on oi.RECORD = re.equ_id
LEFT JOIN tz_base_enterprise_info ei ON ei.use_code = tjtn.use_unit_credit_code
LEFT JOIN tz_base_enterprise_info eio ON eio.use_code = tjtn.install_unit_credit_code
LEFT JOIN amos_tzs_biz.tz_equipment_category tec ON ri."EQU_CATEGORY"::text = tec.code::text
LEFT JOIN amos_tzs_biz.tz_equipment_category tec1 ON ri."EQU_LIST"::text = tec1.code::text
LEFT JOIN amos_tzs_biz.tz_equipment_category tec2 ON ri."EQU_DEFINE"::text = tec2.code::text
WHERE
tjtn.sequence_nbr = #{sequenceNbr}
LIMIT 1
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/CommonController.java
View file @ a60e9f7d
......@@ -189,8 +189,8 @@ public class CommonController extends BaseController {
public ResponseModel<Object> save(@RequestParam(value = "submitType", required = false) String submitType,
@RequestBody Map<String, Object> map) {
ReginParams reginParams = getSelectedOrgInfo();
commonService.invokeBusinessProcess(submitType, map, reginParams);
return ResponseHelper.buildResponse("");
Object result = commonService.invokeBusinessProcess(submitType, map, reginParams);
return ResponseHelper.buildResponse(result);
}
}
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgReformNoticeController.java
View file @ a60e9f7d
......@@ -4,6 +4,7 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
import com.yeejoin.amos.boot.module.jg.api.dto.JgReformNoticeDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgReformNotice;
import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.RequestMapping;
import io.swagger.annotations.ApiOperation;
......@@ -35,6 +36,9 @@ public class JgReformNoticeController extends BaseController {
@Autowired
JgReformNoticeServiceImpl jgReformNoticeService;
@Autowired
IJgInstallationNoticeService iJgInstallationNoticeService;
/**
* 新增改造告知
*
......@@ -122,11 +126,11 @@ public class JgReformNoticeController extends BaseController {
public ResponseModel<Page<JgReformNoticeDto>> queryForPage(
@ApiParam (value = "当前页码", required = true) @RequestParam (value = "current", defaultValue = "1") int current,
@ApiParam (value = "每页大小", required = true) @RequestParam (value = "size", defaultValue = "20") int size,
@ApiParam (value = "类型：enterprise-企业端、supervision-监管端", required = true) @RequestParam (value = "type", defaultValue = "enterprise") String type,
@RequestBody (required = false) JgReformNoticeDto model
) {
Page<JgReformNotice> page = new Page<>(current, size);
ReginParams reginParams = getSelectedOrgInfo();
String type = (String) iJgInstallationNoticeService.getCompanyType().get("companyLevel");
return ResponseHelper.buildResponse(jgReformNoticeService.queryForJgReformNoticePage(page, model, type, 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/ICommonService.java
View file @ a60e9f7d
......@@ -42,5 +42,5 @@ public interface ICommonService {
List<Map<String, Object>> superviseBusinessCategory(String type);
void invokeBusinessProcess(String submitType, Map<String, Object> obj, ReginParams reginParams);
Object invokeBusinessProcess(String submitType, Map<String, Object> obj, 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/CommonServiceImpl.java
View file @ a60e9f7d
package com.yeejoin.amos.boot.module.jg.biz.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.aspose.words.SaveFormat;
......@@ -529,7 +530,7 @@ public class CommonServiceImpl implements ICommonService {
@Override
public void invokeBusinessProcess(String submitType, Map<String, Object> map, ReginParams reginParams) {
public Object invokeBusinessProcess(String submitType, Map<String, Object> map, ReginParams reginParams) {
Map<String, Object> basicObj = (Map<String, Object>) map.get(basic);
Map<String, Object> noticeObj = (Map<String, Object>) map.get(notice);
Map<String, Object> techInfoObj = (Map<String, Object>) map.get(techInfo);
......@@ -614,7 +615,7 @@ public class CommonServiceImpl implements ICommonService {
noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
provideMap.put(GMBG_PAGE_ID, noticeObj);
JSONObject jsonObject = new JSONObject(provideMap);
jgChangeRegistrationNameService.save2(submitType, jsonObject);
return jgChangeRegistrationNameService.save2(submitType, jsonObject);
} else if (type.equals(ApplicationFormTypeEnum.SBQY.getBusinessCode()) || type.equals(ApplicationFormTypeEnum.SBTY.getBusinessCode())) {
noticeObj.put("submit", submitType);
noticeObj.put("formType", "add");
......@@ -622,6 +623,7 @@ public class CommonServiceImpl implements ICommonService {
JSONObject jsonObject = new JSONObject(noticeObj);
jgEnableDisableServiceImpl.saveOrUpdate(jsonObject, reginParams);
}
return null;
}
......@@ -629,7 +631,7 @@ public class CommonServiceImpl implements ICommonService {
List<TaskV2Model> result = Systemctl.taskV2Client.selectListByRelationId(id).getResult();
if (result.size() >0 ){
List<Long> idList= result.stream().map(TaskV2Model::getSequenceNbr).collect(Collectors.toList());
String ids = String.join(",",idList.stream().map(x->x.toString()).collect(Collectors.toList()));
String ids = idList.stream().map(Object::toString).collect(Collectors.joining(","));
Systemctl.taskV2Client.delete(ids);
}
}
......@@ -640,9 +642,15 @@ public class CommonServiceImpl implements ICommonService {
**/
public void buildTaskModel(List<TaskModelDto> list) {
List<TaskV2Model> taskV2Models = new ArrayList<>();
list.forEach(obj -> {
for (TaskModelDto obj : list) {
//判断是否是暂存 新增若无下一节点执行人即为暂存
boolean flag = StringUtils.isEmpty(obj.getNextExecuteUser())? true:false;
if (flag){
List<TaskV2Model> result = Systemctl.taskV2Client.selectListByRelationId(obj.getRelationId()).getResult();
if (CollectionUtil.isNotEmpty(result) && result.size() > 0){
break;
}
}
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
TaskV2Model model = new TaskV2Model();
BeanUtil.copyProperties(obj, model);
......@@ -670,7 +678,7 @@ public class CommonServiceImpl implements ICommonService {
}
//其他逻辑均按详情页面获取
else if (map.get("type").equals(obj.getTaskType())
&& map.get("pageType").equals("look")) {
&& map.get("pageType").equals(null == obj.getPageType()?"look":obj.getPageType())) {
model.setRoutePath(map.get("url").toString().replace("{roleIds}", obj.getNextExecuteUser()) + urlParams + "&nextExecuteUserIds=" + model.getExecuteUserIds());
break;
}
......@@ -689,7 +697,7 @@ public class CommonServiceImpl implements ICommonService {
model.setTaskTitle("有一条待提交的草稿");
model.setTaskName(BusinessTypeEnum.getNameByType(obj.getTaskType()));
model.setTaskTypeLabel(BusinessTypeEnum.getNameByType(obj.getTaskType()));
// model.setTaskContent("【申请单号:"+obj.getTaskCode()+"】待提交");
// model.setTaskContent("【申请单号:"+obj.getTaskCode()+"】待提交");
}else {
model.setTaskStatus(0);
model.setTaskTitle(obj.getStartUser() + "发起了" + obj.getTaskName());
......@@ -703,7 +711,7 @@ public class CommonServiceImpl implements ICommonService {
model.setAgencyCode(RequestContext.getAgencyCode());
taskV2Models.add(model);
});
}
Systemctl.taskV2Client.batchAdd(taskV2Models);
}
......@@ -878,7 +886,7 @@ public class CommonServiceImpl implements ICommonService {
if (map.get("type").equals(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getCode()) && obj.getString("taskType").equals(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getCode()) && map.get("pageType").equals("edit")) {
lastTaskModel.setRoutePath(map.get("url").toString().replace("{roleIds}", obj.getString("nextExecuteUser")) + urlParams + "&nextExecuteUserIds=" + model.getExecuteUserIds());
break;
} else if (map.get("type").equals(obj.get("taskType")) && map.get("pageType").equals("edit")) {
} else if (map.get("type").equals(obj.get("taskType")) && map.get("pageType").equals(obj.getOrDefault("pageType","edit"))) {
lastTaskModel.setRoutePath(map.get("url").toString().replace("{roleIds}", obj.get("nextExecuteUser").toString()) + urlParams);
break;
}
......
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 @ a60e9f7d
......@@ -37,7 +37,6 @@ import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
import com.yeejoin.amos.feign.workflow.model.ProcessTaskDTO;
import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
import org.apache.commons.lang3.SerializationUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
......@@ -113,13 +112,13 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
@Transactional(rollbackFor = Exception.class)
public void save2(String submitType, JSONObject requestParam) {
public List<JgChangeRegistrationName> save2(String submitType, JSONObject requestParam) {
Map<String, JSONObject> jgRegistrationInfoMap = (Map<String, JSONObject>) JSONObject.parseObject(JSONObject.toJSONString(requestParam), Map.class);
this.save(submitType, jgRegistrationInfoMap);
return Collections.singletonList(this.save(submitType, jgRegistrationInfoMap));
}
public void save(String submitType, Map<String, JSONObject> jgRegistrationInfoMap) {
public JgChangeRegistrationName save(String submitType, Map<String, JSONObject> jgRegistrationInfoMap) {
ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
String[] taskName = new String[]{"流程结束"};
JSONObject jgRegistrationInfo = jgRegistrationInfoMap.get("jgRegistrationInfo");
......@@ -132,7 +131,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
}
List<String> applyNoList = listResponseModel.getResult();
if (CollectionUtils.isEmpty(applyNoList)) {
return;
return null;
}
List<ProcessTaskDTO> processTasks = new ArrayList<>();
// 判断当前是否为提交
......@@ -191,6 +190,7 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
this.save(dto);
// 创建代办
this.createTaskModel(dto, taskName[0], submitType, nextUserIds);
return dto;
}
private String getReceiveCompanyCode(JgChangeRegistrationNameDto model) {
......@@ -216,7 +216,11 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
private void createTaskModel(JgChangeRegistrationName 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)) {
//提交时先删除之前的暂存待办数据
commonService.deleteTaskModel(dto.getSequenceNbr()+"");
// 创建待办
TaskModelDto taskModelDto = new TaskModelDto();
taskModelDto.setFlowCreateDate(dto.getApplyDate());
taskModelDto.setTaskName(taskName);
......@@ -243,6 +247,24 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
taskModelDto.setModel(taskMessageDto);
commonService.buildTaskModel(Collections.singletonList(taskModelDto));
}
// 暂存创建待办逻辑
if ("0".equals(submitType)) {
// 暂存 创建待办逻辑
TaskModelDto taskModelDto = new TaskModelDto();
//行数据
//附件太大赋空
dto.setChangeCertificate(null);
taskModelDto.setModel(dto);
//摘要 按原有规则组装
taskModelDto.setTaskContent("来自"+dto.getUseUnitCreditCode()+"【"+dto.getReceiveOrgName()+"】的业务办理,【申请单号:"+dto.getApplyNo()+"】");
//申请单号
taskModelDto.setTaskCode(dto.getApplyNo());
//业务类型枚举code值
taskModelDto.setTaskType(BusinessTypeEnum.JG_NAME_CHANGE_REGISTRATION.getCode());
//业务主键
taskModelDto.setRelationId(dto.getSequenceNbr()+"");
commonService.buildTaskModel(Collections.singletonList(taskModelDto));
}
}
private Integer getTaskCodeByName(String auditStatus) {
......@@ -328,6 +350,8 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
}
this.updateById(jgChangeRegistrationName);
} else {
// 暂存逻辑
createTaskModel(jgChangeRegistrationName, null, "0", null);
this.updateById(jgChangeRegistrationName);
}
return jgChangeRegistrationNameDto;
......@@ -361,10 +385,27 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
TaskMessageDto taskMessageDto = new TaskMessageDto();
BeanUtil.copyProperties(jgChangeRegistrationName, taskMessageDto);
modelDto.setModel(taskMessageDto);
modelDto.setPageType(this.getPageTypeForReject(operate, jgChangeRegistrationName.getAuditStatus()));
// 再插入新代办、数据待定
commonService.buildTaskModel(Collections.singletonList(modelDto));
}
private String getPageTypeForReject(String operate, String auditStatus) {
// 驳回
if("1".equals(operate)){
// 且驳回到的节点为使用单位提交 则可编辑
if(WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getPass().equals(auditStatus) ||
WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getReject().equals(auditStatus) ||
WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getRollBack().equals(auditStatus)
){
// urlInfo.json 文件的 pageType
return "edit";
}
return "look";
}
return "look";
}
public ProcessTaskDTO submit(String operate, JgChangeRegistrationName jgChangeRegistrationName) {
//组装信息
......@@ -436,9 +477,24 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
jsonObject.put("flowStatus", this.getTaskCodeByName(jgChangeRegistrationName.getAuditStatus()));
jsonObject.put("flowStatusLabel", jgChangeRegistrationName.getAuditStatus());
jsonObject.put("changeCertificate",null);
// 判断撤回后当前的节点，如果当前节点为提交节点则页面可编辑
jsonObject.put("pageType",this.getPageTypeByCurrentNode(jgChangeRegistrationName.getAuditStatus()));
commonService.rollbackTask(instanceId, jsonObject);
}
private String getPageTypeByCurrentNode(String auditStatus) {
if(WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getPass().equals(auditStatus) ||
WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getReject().equals(auditStatus) ||
WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getRollBack().equals(auditStatus)
){
// urlInfo.json 文件的 pageType
return "edit";
} else {
// urlInfo.json 文件的 pageType
return "look";
}
}
public void flowExecute(Long id, String instanceId, String operate, String comment) {
try {
......
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 @ a60e9f7d
......@@ -135,8 +135,6 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
ICmWorkflowService icmWorkflowService;
@Autowired
CommonServiceImpl commonService;
@Value("classpath:/json/urlInfo.json")
private Resource bizTypeInfo;
/**
* 新增移装变更登记
......@@ -299,6 +297,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
//发起流程
if ("1".equals(submitType)) {
String instanceId = "";
if (!ValidationUtil.isEmpty(oldTransfer.getSequenceNbr()) && !ValidationUtil.isEmpty(oldTransfer.getInstanceId())) {
this.flowExecute(oldTransfer.getSequenceNbr(), oldTransfer.getInstanceId(), "0", "");
} else {
......@@ -314,9 +313,21 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
WorkflowResultDto workflowResult = this.startWorkFlork(oldTransfer.getReceiveOrgCode());
this.updateExecuteIds(instanceId, oldTransfer, "startWorkfow", workflowResult);
//删除旧的代办
commonService.deleteTaskModel(oldTransfer.getSequenceNbr().toString());
//生成代办
this.createToDoTask(Arrays.asList(workflowResult), oldTransfer, submitType);
}
}else {
List<TaskModelDto> modelDtos = new ArrayList<>();
TaskModelDto dto = new TaskModelDto();
dto.setModel(oldTransfer);
dto.setTaskContent(this.getSummaryInfo(oldTransfer));
dto.setTaskCode(oldTransfer.getApplyNo());
dto.setTaskType(BusinessTypeEnum.JG_CHANGE_REGISTRATION.getCode());
dto.setRelationId(oldTransfer.getSequenceNbr() + "");
modelDtos.add(dto);
commonService.buildTaskModel(modelDtos);
}
return true;
}
......@@ -378,7 +389,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
JgChangeRegistrationTransfer jgTransfer = new JgChangeRegistrationTransfer();
LambdaQueryWrapper<JgChangeRegistrationTransfer> lambda = new QueryWrapper<JgChangeRegistrationTransfer>().lambda();
lambda.eq(JgChangeRegistrationTransfer::getInstanceId, instanceId);
jgTransfer = this.getOne(lambda);
ProcessTaskDTO processTask = icmWorkflowService.rollBack(instanceId);
WorkflowResultDto workflowResult = commonService.buildWorkFlowInfo(Collections.singletonList(processTask)).get(0);
String taskCode = "";
......@@ -396,7 +407,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
}
jgTransfer.setPromoter(reginParams.getUserModel().getUserId());
jgTransfer.setNextExecutorIds(role);
this.update(jgTransfer, lambda);
this.updateById(jgTransfer);
//待办 撤回
JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(jgTransfer));
jsonObject.put("flowStatus", commonService.getDictionaryCodeByName(jgTransfer.getAuditStatus()));
......@@ -404,6 +415,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
jsonObject.put("nextTaskId", jgTransfer.getNextTaskId());
jsonObject.put("nextExecuteUser", jgTransfer.getNextExecutorIds());
jsonObject.put("taskType", BusinessTypeEnum.JG_CHANGE_REGISTRATION.getCode());
// 判断撤回后当前的节点，如果当前节点为提交节点则页面可编辑
jsonObject.put("pageType",this.getPageTypeByCurrentNode(jgTransfer.getAuditStatus()));
commonService.rollbackTask(instanceId, jsonObject);
}
......@@ -1090,7 +1103,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
*/
public String getSummaryInfo(JgChangeRegistrationTransfer transfer) {
String result = "来自%s【%s】的业务办理，【申请单号：%s】";
return String.format(result, transfer.getEquipListName(), transfer.getSupervisoryCode(), transfer.getApplyNo());
return String.format(result, Optional.ofNullable(transfer.getEquipListName()).orElse("无"), transfer.getSupervisoryCode(), transfer.getApplyNo());
}
public String getNextUserOrgCode(String operate, JgChangeRegistrationTransfer contract) {
......@@ -1107,4 +1120,17 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
}
return code == null ? contract.getReceiveOrgCode() : code;
}
private String getPageTypeByCurrentNode(String auditStatus) {
if(WorkFlowStatusEnum.TRANSFER_SUBMIT.getPass().equals(auditStatus) ||
WorkFlowStatusEnum.TRANSFER_SUBMIT.getReject().equals(auditStatus) ||
WorkFlowStatusEnum.TRANSFER_SUBMIT.getRollBack().equals(auditStatus)
){
// urlInfo.json 文件的 pageType
return "edit";
} else {
// urlInfo.json 文件的 pageType
return "look";
}
}
}
\ No newline at end of file
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 @ a60e9f7d
......@@ -12,10 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.jg.api.dto.ByteArrayMultipartFile;
import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationUnitDto;
import com.yeejoin.amos.boot.module.jg.api.dto.TaskModelDto;
import com.yeejoin.amos.boot.module.jg.api.dto.WorkflowResultDto;
import com.yeejoin.amos.boot.module.jg.api.dto.*;
import com.yeejoin.amos.boot.module.jg.api.entity.*;
import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
import com.yeejoin.amos.boot.module.jg.api.enums.EquipTypeEnum;
......@@ -231,6 +228,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
dto.setCompleteFirstTask(true);
list.add(dto);
actWorkflowBatchDTO.setProcess(list);
dto.setNextExecuteUserCompanyCode(noticeDto.getReceiveOrgCode());
processTasks = cmWorkflowService.startBatch(actWorkflowBatchDTO);
String instanceId = processTasks.get(0).getProcessInstance().getId();
String nextTaskId = processTasks.get(0).getNextTask().get(0).getId();
......@@ -278,6 +276,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
}
task.setVariable(map);
//执行流程
task.setNextExecuteUserCompanyCode(noticeDto.getReceiveOrgCode());
ProcessTaskDTO processTaskDTO = cmWorkflowService.complete(taskId, task);
JgChangeRegistrationUnit bean = new JgChangeRegistrationUnit();
BeanUtils.copyProperties(noticeDto, bean);
......@@ -412,6 +411,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
dto.setBusinessKey(String.valueOf(i));
dto.setNextExecuteUserCompanyCode(model.getReceiveOrgCode());
dto.setCompleteFirstTask(true);
list.add(dto);
}
......@@ -530,7 +530,15 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
if (SUBMIT_TYPE_FLOW.equals(submitType)) {
for (JgChangeRegistrationUnit obj : list) {
TaskModelDto dto = new TaskModelDto();
dto.setModel(obj);
TaskMessageDto ta = new TaskMessageDto();
ta.setInstanceId(obj.getInstanceId());
ta.setStatus(obj.getStatus());
ta.setPromoter(obj.getPromoter());
ta.setNextExecuteUserIds(obj.getNextExecuteUserIds());
ta.setSequenceNbr(obj.getSequenceNbr());
dto.setModel(ta);
// dto.setModel(obj);
dto.setFlowCreateDate(new Date());
dto.setTaskName(workflowResultDtos.get(0).getNextTaskName());
dto.setFlowCode(obj.getNextTaskId());
......@@ -553,10 +561,15 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
}else {
for (JgChangeRegistrationUnit obj : list) {
TaskModelDto dto = new TaskModelDto();
//行数据
dto.setModel(obj);
//摘要 按原有规则组装
dto.setTaskContent("来自"+obj.getEquType()+"【"+obj.getSupervisoryCode()+"】的业务办理,【申请单号:"+obj.getApplyNo()+"】");
//申请单号
dto.setTaskCode(obj.getApplyNo());
//业务类型枚举code值
dto.setTaskType(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getCode());
////业务主键
dto.setRelationId(obj.getSequenceNbr()+"");
modelDtos.add(dto);
}
......@@ -749,6 +762,9 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
task.setResultCode("approvalStatus");
task.setTaskId(taskId);
task.setComment("");
task.setNextExecuteUserCompanyCode(this.getNextUserOrgCode(op,dto));
task.setNextExecuteUserCompanyCode(dto.getReceiveOrgCode());
HashMap<String, Object> map = new HashMap<>();
map.put("approvalStatus", op);
if (!ObjectUtils.isEmpty(jgChangeRegistrationUnit.getInstanceStatus()) &&
......@@ -995,7 +1011,13 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
taskModelDto.setStartUserCompanyName(dto.getUseUnitName());
taskModelDto.setNextExecuteUser(dto.getNextExecutorIds());
taskModelDto.setStartDate(dto.getCreateDate());
taskModelDto.setModel(dto);
TaskMessageDto obj = new TaskMessageDto();
obj.setInstanceId(dto.getInstanceId());
obj.setStatus(dto.getStatus());
obj.setPromoter(dto.getPromoter());
obj.setNextExecuteUserIds(dto.getNextExecuteUserIds());
obj.setSequenceNbr(dto.getSequenceNbr());
taskModelDto.setModel(obj);
commonServiceImpl.buildTaskModel(Collections.singletonList(taskModelDto));
}
}
......@@ -1062,7 +1084,16 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
TaskModelDto modelDto = new TaskModelDto();
BeanUtil.copyProperties(taskV2Model, modelDto);
modelDto.setNextExecuteUser(jgChangeRegistrationName.getNextExecutorIds());
modelDto.setModel(jgChangeRegistrationName);
if (jgChangeRegistrationName.getStatus().equals(WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getReject())){
modelDto.setPageType("edit");
}
TaskMessageDto obj = new TaskMessageDto();
obj.setInstanceId(jgChangeRegistrationName.getInstanceId());
obj.setStatus(jgChangeRegistrationName.getStatus());
obj.setPromoter(jgChangeRegistrationName.getPromoter());
obj.setNextExecuteUserIds(jgChangeRegistrationName.getNextExecuteUserIds());
obj.setSequenceNbr(jgChangeRegistrationName.getSequenceNbr());
modelDto.setModel(obj);
// 再插入新代办、数据待定
commonServiceImpl.buildTaskModel(Collections.singletonList(modelDto));
}
......@@ -1089,7 +1120,20 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
}
private String getNextUserOrgCode(String operate, JgChangeRegistrationUnitDto jgChangeRegistrationName) {
if("0".equals(operate)){
// 执行通过节点，单位code为接收机构单位信息
return jgChangeRegistrationName.getReceiveOrgCode();
}
if(jgChangeRegistrationName.getStatus().equals(WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getPass())
|| jgChangeRegistrationName.getStatus().equals(WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getReject())
|| jgChangeRegistrationName.getStatus().equals(WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getRollBack())){
// 驳回且当前节点为一键节点时，单位code为发起人单位信息
return jgChangeRegistrationName.getUseUnitCreditCode();
}
// 2、3级驳回时，单位code为接收单位code
return jgChangeRegistrationName.getReceiveOrgCode();
}
private Integer getTaskStatusByName(String auditStatus) {
return commonServiceImpl.getDictionaryCodeByName(auditStatus);
}
......
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 @ a60e9f7d
......@@ -85,7 +85,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
this.handleApplyNoList(applyNoList);
//启动工作流
List<WorkflowResultDto> workflowResultList = this.startWorkFlow(submitType, deviceList);
List<WorkflowResultDto> workflowResultList = this.startWorkFlow(model.getInstallUnitCreditCode(), submitType, deviceList);
List<JgEquipTransfer> transferList = new ArrayList<>();
List<JgEquipTransferEq> equipTransferEqList = new ArrayList<>();
......@@ -104,6 +104,9 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
baseMapper.insertBatchSomeColumn(transferList);
if (SUBMIT_TYPE_FLOW.equals(submitType)) {
this.buildTask(transferList, workflowResultList);
} else{
//批量暂存
this.saveTempTransfer(transferList);
}
List<JgEquipTransferEq> jgEquipTransferEqList = this.buildJgEquipTransferEqList(equipTransferEqList, transferList);
......@@ -111,6 +114,29 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
}
/**
* 批量暂存
* @param transferList 移交信息
*/
private void saveTempTransfer(List<JgEquipTransfer> transferList) {
if (CollectionUtils.isEmpty(transferList)) {
return;
}
List<TaskModelDto> taskModelDtoList = transferList.stream().map(this::buildTempTaskModelDto).collect(Collectors.toList());
commonService.buildTaskModel(taskModelDtoList);
}
private TaskModelDto buildTempTaskModelDto(JgEquipTransfer item) {
return TaskModelDto.builder()
.model(item)
.taskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), item.getSupervisoryCode(), item.getApplyNo()))
.taskCode(item.getApplyNo())
.taskType(BusinessTypeEnum.JG_EQUIPMENT_HANDOVER.getCode())
.relationId(item.getSequenceNbr()+"")
.build();
}
/**
* 上个代办改为已办
*
* @param transfer 设备信息
......@@ -135,13 +161,14 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
* @return 代办信息
*/
private TaskModelDto buildTaskModelDto(JgEquipTransfer item, WorkflowResultDto workflowResultDto) {
item.setInstanceId(workflowResultDto.getInstanceId());
return TaskModelDto.builder()
.flowCreateDate(item.getCreateDate())
.taskName(workflowResultDto.getNextTaskName())
.taskCode(item.getApplyNo())
.taskType(BusinessTypeEnum.JG_EQUIPMENT_HANDOVER.getCode())
.taskTypeLabel(BusinessTypeEnum.JG_EQUIPMENT_HANDOVER.getName())
.relationId(item.getInstanceId())
.relationId(workflowResultDto.getInstanceId())
.executeUserIds(workflowResultDto.getNextExecutorUserIds())
.taskStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode())
.taskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName())
......@@ -166,6 +193,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
* @param taskV2Model 代办信息
*/
private void createNewTodo(JgEquipTransfer transfer, WorkflowResultDto workflowResultDto, TaskV2Model taskV2Model, FlowStatusEnum statusEnum) {
transfer.setInstanceId(workflowResultDto.getInstanceId());
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
TaskModelDto taskModelDto = TaskModelDto.builder()
.flowCreateDate(taskV2Model.getFlowCreateDate())
......@@ -215,6 +243,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
dto.setProcessDefinitionKey(EQUIP_TRANSFER_PROCESS_KEY);
dto.setBusinessKey(equipTransferDto.getSequenceNbr().toString());
dto.setCompleteFirstTask(Boolean.TRUE);
dto.setNextExecuteUserCompanyCode(equipTransferDto.getInstallUnitCreditCode());
list.add(dto);
actWorkflowBatchDTO.setProcess(list);
ProcessTaskDTO processTaskDTO = cmWorkflowService.startBatch(actWorkflowBatchDTO).get(0);
......@@ -232,6 +261,9 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
transfer.setNextTaskId(workflowResultDto.getNextTaskId());
updateById(transfer);
//删除暂存
commonService.deleteTaskModel(transfer.getSequenceNbr()+"");
// 如果为保存并提交，则创建代办
this.buildTask(Collections.singletonList(transfer), Collections.singletonList(workflowResultDto));
} else {
......@@ -245,6 +277,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
commMap.put("approvalStatus", op);
}
dto.setVariable(commMap);
dto.setNextExecuteUserCompanyCode(transfer.getInstallUnitCreditCode());
ProcessTaskDTO processTaskDTO = cmWorkflowService.complete(transfer.getNextTaskId(), dto);
// 提取节点等信息
WorkflowResultDto workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
......@@ -293,6 +326,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
} else {
commMap.put("approvalStatus", op);
}
workDto.setNextExecuteUserCompanyCode("1".equals(op) ? jgEquipTransfer.getUseUnitCreditCode() : jgEquipTransfer.getInstallUnitCreditCode());
workDto.setVariable(commMap);
workDto.setComment(jgEquipTransferDto.getProcessAdvice());
ProcessTaskDTO processTaskDTO = cmWorkflowService.complete(jgEquipTransfer.getNextTaskId(), workDto);
......@@ -443,7 +477,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
* @param deviceList 设备列表
* @return 工作流信息
*/
private List<WorkflowResultDto> startWorkFlow(String submitType, List<Map<String, Object>> deviceList) {
private List<WorkflowResultDto> startWorkFlow(String receiveOrgCode, String submitType, List<Map<String, Object>> deviceList) {
if (!SUBMIT_TYPE_FLOW.equals(submitType)) {
return new ArrayList<>();
}
......@@ -454,6 +488,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
dto.setProcessDefinitionKey(EQUIP_TRANSFER_PROCESS_KEY);
dto.setBusinessKey(item.get("SEQUENCE_NBR").toString());
dto.setCompleteFirstTask(Boolean.TRUE);
dto.setNextExecuteUserCompanyCode(receiveOrgCode);
return dto;
})
.collect(Collectors.toList());
......
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 @ a60e9f7d
......@@ -252,9 +252,10 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
notice.setNextExecuteIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
notice.setNextTaskId(workflowResultDto.getNextTaskId());
notice.setInstanceId(workflowResultDto.getInstanceId());
this.updateById(notice);
// 如果为保存并提交，则创建代办
buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto));
buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto), Boolean.TRUE);
} else {
ProcessTaskDTO processTaskDTO = new ProcessTaskDTO();
WorkflowResultDto workflowResultDto = new WorkflowResultDto();
......@@ -296,7 +297,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
TaskV2Model taskV2Model = commonService.updateTaskModel(map);
if (ObjectUtils.isEmpty(taskV2Model)) {
// 如果为保存并提交，则创建代办
buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto));
buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto), Boolean.FALSE);
} else {
TaskModelDto taskModelDto = new TaskModelDto();
BeanUtils.copyProperties(taskV2Model, taskModelDto);
......@@ -503,7 +504,10 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
jgInstallationNoticeMapper.insertBatchSomeColumn(list);
// 如果为保存并提交，则创建代办
if (SUBMIT_TYPE_FLOW.equals(submitType)) {
buildTask(list, workflowResultList);
buildTask(list, workflowResultList, Boolean.TRUE);
} else {
// 暂存任务
buildTaskDraft(list);
}
List<JgInstallationNoticeEq> jgRelationEquipList = equipList.stream().map(jgRelationEquip -> {
......@@ -514,7 +518,32 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
jgInstallationNoticeEqMapper.insertBatchSomeColumn(jgRelationEquipList);
}
private void buildTask(List<JgInstallationNotice> list, List<WorkflowResultDto> workflowResultList) {
/**
* 暂存任务生成待办
* @param list 业务信息
*/
private void buildTaskDraft(List<JgInstallationNotice> list) {
List<TaskModelDto> modelDtos = new ArrayList<>();
list.forEach(obj -> {
TaskModelDto dto = new TaskModelDto();
//行数据
TaskMessageDto taskMessageDto = new TaskMessageDto();
BeanUtils.copyProperties(obj, taskMessageDto);
dto.setModel(taskMessageDto);
//摘要 按原有规则组装
dto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", obj.getEquList(), StringUtils.isEmpty(obj.getFactoryNum()) ? "" : obj.getFactoryNum(), obj.getApplyNo()));
//申请单号
dto.setTaskCode(obj.getApplyNo());
//业务类型枚举code值
dto.setTaskType(BusinessTypeEnum.JG_INSTALLATION_NOTIFICATION.getCode());
////业务主键
dto.setRelationId(obj.getSequenceNbr() + "");
modelDtos.add(dto);
});
commonService.buildTaskModel(modelDtos);
}
private void buildTask(List<JgInstallationNotice> list, List<WorkflowResultDto> workflowResultList, Boolean isDeleteDraft) {
List<TaskModelDto> taskModelDtoList = new ArrayList<>();
WorkflowResultDto workflowResultDto = workflowResultList.get(0);
list.forEach(item -> {
......@@ -540,6 +569,10 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
BeanUtils.copyProperties(item, taskMessageDto);
taskModelDto.setModel(taskMessageDto);
taskModelDtoList.add(taskModelDto);
if (isDeleteDraft) {
// 删除暂存时生成的待办
commonService.deleteTaskModel(item.getSequenceNbr()+"");
}
});
commonService.buildTaskModel(taskModelDtoList);
}
......@@ -752,11 +785,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
Map<String, Object> mapCode;
ResponseModel<Map<String, Object>> code = tzsServiceFeignClient.createCode(map);
mapCode = code.getResult();
LambdaQueryWrapper<SupervisoryCodeInfo> queryWrapper3 = new LambdaQueryWrapper<>();
queryWrapper3.eq(SupervisoryCodeInfo::getSupervisoryCode,mapCode.get("superviseCode").toString());
SupervisoryCodeInfo supervisoryCodeInfo = supervisoryCodeInfoMapper.selectOne(queryWrapper3);
supervisoryCodeInfo.setStatus("1");
supervisoryCodeInfoMapper.updateById(supervisoryCodeInfo);
supervisoryCodeInfoMapper.updateStatusBySuperviseCode(mapCode.get("superviseCode").toString());
jgInstallationNotice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_FINISHED.getCode()));
jgInstallationNotice.setHandleDate(new Date());
Map<String,Object> map1 =new HashMap<>();
......@@ -868,6 +897,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
taskModelDto.setFlowStatusLabel(FlowStatusEnum.REJECTED.getName());
taskModelDto.setFlowCode(workflowResultDto.getNextTaskId());
taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
taskModelDto.setPageType("edit");
TaskMessageDto taskMessageDto = new TaskMessageDto();
BeanUtils.copyProperties(jgInstallationNotice, taskMessageDto);
taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
......
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/JgReformNoticeServiceImpl.java
View file @ a60e9f7d
......@@ -164,6 +164,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
dto.setBusinessKey(noticeDto.getSequenceNbr().toString());
dto.setCompleteFirstTask(Boolean.TRUE);
dto.setNextExecuteUserCompanyCode(noticeDto.getReceiveCompanyCode());
list.add(dto);
actWorkflowBatchDTO.setProcess(list);
ProcessTaskDTO processTaskDTO = cmWorkflowService.startBatch(actWorkflowBatchDTO).get(0);
......@@ -180,6 +181,8 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
notice.setNextTaskId(workflowResultDto.getNextTaskId());
jgReformNoticeMapper.updateById(notice);
//删除暂存
commonService.deleteTaskModel(notice.getSequenceNbr()+"");
// 如果为保存并提交，则创建代办
this.buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto));
}else {
......@@ -192,6 +195,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
} else {
commMap.put("approvalStatus", op);
}
dto.setNextExecuteUserCompanyCode(notice.getReceiveCompanyCode());
dto.setVariable(commMap);
ProcessTaskDTO processTaskDTO = cmWorkflowService.complete(notice.getNextTaskId(), dto);
// 提取节点等信息
......@@ -391,7 +395,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
}
//启动工作流
List<WorkflowResultDto> workflowResultList = this.startWorkFlow(submitType, deviceList);
List<WorkflowResultDto> workflowResultList = this.startWorkFlow(model.getReceiveCompanyCode(), submitType, deviceList);
List<JgReformNotice> list = new ArrayList<>();
List<JgReformNoticeEq> equipList = new ArrayList<>();
......@@ -442,6 +446,8 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
if (SUBMIT_TYPE_FLOW.equals(submitType)) {
this.buildTask(list, workflowResultList);
}else {
this.saveTempReformNotice(list);
}
List<JgReformNoticeEq> jgRelationEquipList = equipList.stream().map(jgRelationEquip -> {
......@@ -455,6 +461,29 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
}
/**
* 批量暂存
* @param noticeList 移交信息
*/
private void saveTempReformNotice(List<JgReformNotice> noticeList) {
if (CollectionUtils.isEmpty(noticeList)) {
return;
}
List<TaskModelDto> taskModelDtoList = noticeList.stream().map(this::buildTempTaskModelDto).collect(Collectors.toList());
commonService.buildTaskModel(taskModelDtoList);
}
private TaskModelDto buildTempTaskModelDto(JgReformNotice item) {
return TaskModelDto.builder()
.model(item)
.taskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), item.getSupervisoryCode(), item.getApplyNo()))
.taskCode(item.getApplyNo())
.taskType(BusinessTypeEnum.JG_MODIFICATION_NOTIFICATION.getCode())
.relationId(item.getSequenceNbr()+"")
.build();
}
/**
* 插入代办
*/
private void buildTask(List<JgReformNotice> list, List<WorkflowResultDto> workflowResultList) {
......@@ -505,7 +534,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
* @param deviceList 设备列表
* @return 工作流信息
*/
private List<WorkflowResultDto> startWorkFlow(String submitType, List<Map<String, Object>> deviceList) {
private List<WorkflowResultDto> startWorkFlow(String receiveOrgCode, String submitType, List<Map<String, Object>> deviceList) {
if (!SUBMIT_TYPE_FLOW.equals(submitType)) {
return new ArrayList<>();
}
......@@ -516,6 +545,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
dto.setBusinessKey(item.get("SEQUENCE_NBR").toString());
dto.setCompleteFirstTask(Boolean.TRUE);
dto.setNextExecuteUserCompanyCode(receiveOrgCode);
return dto;
})
.collect(Collectors.toList());
......@@ -589,6 +619,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
if (receiveOrgIdList.length > 1) {
model.setReceiveOrgCode(receiveOrgIdList[0]);
model.setReceiveOrgName(receiveOrgIdList[1]);
model.setReceiveCompanyCode(receiveOrgIdList[0]);
}
}
String constructionManagerId = model.getConstructionManagerId();
......@@ -672,6 +703,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
} else {
commMap.put("approvalStatus", op);
}
workDto.setNextExecuteUserCompanyCode("1".equals(op) ? jgReformNotice.getInstallUnitCreditCode() : jgReformNotice.getReceiveOrgCode());
workDto.setVariable(commMap);
workDto.setComment(jgReformNotice.getRemark());
ProcessTaskDTO processTaskDTO = cmWorkflowService.complete(jgReformNotice.getNextTaskId(), workDto);
......
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/JgScrapCancelServiceImpl.java
View file @ a60e9f7d
......@@ -253,11 +253,9 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
equipList.add(jgRelationEquip);
}
this.saveBatch(list);
if (SUBMIT_TYPE_FLOW.equals(submitType)) {
// 新增代办
for (JgScrapCancel jgScrapCancel : list) {
this.createTaskModel(jgScrapCancel, taskName[0], submitType, nextUserIds);
}
// 新增代办
for (JgScrapCancel jgScrapCancel : list) {
this.createTaskModel(jgScrapCancel, taskName[0], submitType, nextUserIds);
}
List<JgScrapCancelEq> jgScrapCancelEqList = equipList.stream().map(t -> {
List<JgScrapCancel> collect = list.stream().filter(item -> t.getEquipTransferId().equals(item.getApplyNo())).collect(Collectors.toList());
......@@ -269,8 +267,8 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
private void createTaskModel(JgScrapCancel scrapCancel, String taskName, String submitType, String nextUserIds) {
ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
TaskModelDto taskModelDto = new TaskModelDto();
if ("1".equals(submitType)) {
TaskModelDto taskModelDto = new TaskModelDto();
taskModelDto.setFlowCreateDate(scrapCancel.getCreateDate());
taskModelDto.setTaskName(taskName);
taskModelDto.setTaskCode(scrapCancel.getApplyNo());
......@@ -295,8 +293,18 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
TaskMessageDto taskMessageDto = new TaskMessageDto();
BeanUtils.copyProperties(scrapCancel, taskMessageDto);
taskModelDto.setModel(taskMessageDto);
commonService.buildTaskModel(Collections.singletonList(taskModelDto));
} else {
TaskMessageDto taskMessageDto = new TaskMessageDto();
BeanUtils.copyProperties(scrapCancel, taskMessageDto);
taskModelDto.setModel(taskMessageDto);
taskModelDto.setTaskContent(this.buildTaskContent(scrapCancel.getSupervisoryCode(),
scrapCancel.getCancelType(), scrapCancel.getApplyNo()));
taskModelDto.setTaskCode(scrapCancel.getApplyNo());
taskModelDto.setTaskType(businessTypeJudgment(scrapCancel.getCancelType()).getCode());
taskModelDto.setNextExecuteUser(scrapCancel.getNextExecuteIds());
taskModelDto.setRelationId(taskMessageDto.getSequenceNbr() + "");
}
commonService.buildTaskModel(Collections.singletonList(taskModelDto));
}
private void buildRoleList(List<ProcessTaskDTO> processTasks, List<String> roleListNext, List<String> roleListAll) {
......@@ -346,7 +354,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
List<ActWorkflowStartDTO> list = new ArrayList<>();
ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
dto.setProcessDefinitionKey("unitRename");
dto.setProcessDefinitionKey("scrapCancelNew");
dto.setBusinessKey(jgScrapCancelDto.getApplyNo());
dto.setCompleteFirstTask(true);
dto.setNextExecuteUserCompanyCode(jgScrapCancelDto.getReceiveOrgCode());
......@@ -368,6 +376,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
// 创建待办
JgScrapCancel bean = new JgScrapCancel();
BeanUtil.copyProperties(jgScrapCancelDto, bean);
commonService.deleteTaskModel(String.valueOf(jgScrapCancelDto.getSequenceNbr()));
createTaskModel(bean, taskName, "1", nextUserIds);
} catch (Exception e) {
log.error("提交失败：{}", e);
......@@ -454,6 +463,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
TaskMessageDto taskMessageDto = new TaskMessageDto();
BeanUtils.copyProperties(jgScrapCancelDto, taskMessageDto);
modelDto.setModel(taskMessageDto);
modelDto.setPageType(this.getPageTypeForReject(operate, jgScrapCancelDto.getAuditStatus()));
commonService.buildTaskModel(Collections.singletonList(modelDto));
}
......@@ -461,6 +471,21 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
return commonService.getDictionaryCodeByName(auditStatus);
}
private String getPageTypeForReject(String operate, String auditStatus) {
// 驳回
if ("1".equals(operate)) {
// 且驳回到的节点为使用单位提交 则可编辑
if (WorkFlowStatusEnum.CANCEL_SUBMIT.getPass().equals(auditStatus) ||
WorkFlowStatusEnum.CANCEL_SUBMIT.getReject().equals(auditStatus) ||
WorkFlowStatusEnum.CANCEL_SUBMIT.getRollBack().equals(auditStatus)
) {
return "edit";
}
return "look";
}
return "look";
}
private TaskV2Model updateTaskModel(JgScrapCancelDto jgScrapCancelDto, String operate) {
Map<String, Object> params = new HashMap<>();
FlowStatusEnum flowStatusEnum = this.getTaskStatus(operate);
......@@ -524,9 +549,9 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
@Transactional
public void revocation(String instanceId) {
ReginParams reginParams = this.getSelectedOrgInfo();
JgScrapCancel jgScrapCancel = new JgScrapCancel();
LambdaQueryWrapper<JgScrapCancel> lambda = new QueryWrapper<JgScrapCancel>().lambda();
lambda.eq(JgScrapCancel::getInstanceId, instanceId);
JgScrapCancel jgScrapCancel = this.baseMapper.selectOne(lambda);
ProcessTaskDTO processTaskDTO = cmWorkflowService.rollBack(instanceId);
WorkflowResultDto workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
if (!FlowStatusEnum.TO_BE_FINISHED.getName().equals(workflowResultDto.getNextTaskName())) {
......@@ -539,7 +564,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
jgScrapCancel.setNextExecuteUserIds(nextUserIds);
jgScrapCancel.setPromoter(reginParams.getUserModel().getUserId());
jgScrapCancel.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
this.update(jgScrapCancel, lambda);
this.updateById(jgScrapCancel);
// 删除待办
JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(jgScrapCancel));
......@@ -548,6 +573,8 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
jsonObject.put("taskType", businessTypeJudgment(jgScrapCancel.getCancelType()).getCode());
jsonObject.put("flowStatus", this.getTaskCodeByName(jgScrapCancel.getAuditStatus()));
jsonObject.put("flowStatusLabel", jgScrapCancel.getAuditStatus());
// 判断撤回后当前的节点，如果当前节点为提交节点则页面可编辑
jsonObject.put("pageType", this.getPageTypeByCurrentNode(jgScrapCancel.getAuditStatus()));
commonService.rollbackTask(instanceId, jsonObject);
}
......@@ -555,6 +582,17 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
return commonService.getDictionaryCodeByName(auditStatus);
}
private String getPageTypeByCurrentNode(String auditStatus) {
if (WorkFlowStatusEnum.CANCEL_SUBMIT.getPass().equals(auditStatus)
|| WorkFlowStatusEnum.CANCEL_SUBMIT.getReject().equals(auditStatus)
|| WorkFlowStatusEnum.CANCEL_SUBMIT.getRollBack().equals(auditStatus)
) {
return "edit";
} else {
return "look";
}
}
@Transactional
public void flowExecute(Long id, String instanceId, String operate, String comment) {
try {
......
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 @ a60e9f7d
......@@ -283,9 +283,10 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
notice.setNextExecuteIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
notice.setNextTaskId(workflowResultDto.getNextTaskId());
notice.setInstanceId(workflowResultDto.getInstanceId());
jgTransferNoticeMapper.updateById(notice);
// 如果为保存并提交，则创建代办
buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto));
buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto), Boolean.TRUE);
} else {
ProcessTaskDTO processTaskDTO = new ProcessTaskDTO();
WorkflowResultDto workflowResultDto = new WorkflowResultDto();
......@@ -326,7 +327,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
TaskV2Model taskV2Model = commonService.updateTaskModel(map);
if (ObjectUtils.isEmpty(taskV2Model)) {
// 如果为保存并提交，则创建代办
buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto));
buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto), Boolean.FALSE);
} else {
TaskModelDto taskModelDto = new TaskModelDto();
BeanUtils.copyProperties(taskV2Model, taskModelDto);
......@@ -403,7 +404,10 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
jgTransferNoticeMapper.insertBatchSomeColumn(list);
// 如果为保存并提交，则创建代办
if (SUBMIT_TYPE_FLOW.equals(submitType)) {
buildTask(list, workflowResultList);
buildTask(list, workflowResultList, Boolean.TRUE);
} else {
// 暂存任务
buildTaskDraft(list);
}
List<JgTransferNoticeEq> jgRelationEquipList = equipList.stream().map(jgRelationEquip -> {
List<JgTransferNotice> collect = list.stream().filter(JgTransferNotice -> jgRelationEquip.getEquipTransferId().equals(JgTransferNotice.getApplyNo())).collect(Collectors.toList());
......@@ -415,6 +419,31 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
}
/**
* 暂存任务生成待办
* @param list 业务信息
*/
private void buildTaskDraft(List<JgTransferNotice> list) {
List<TaskModelDto> modelDtos = new ArrayList<>();
list.forEach(obj -> {
TaskModelDto dto = new TaskModelDto();
//行数据
TaskMessageDto taskMessageDto = new TaskMessageDto();
BeanUtils.copyProperties(obj, taskMessageDto);
dto.setModel(taskMessageDto);
//摘要 按原有规则组装
dto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", obj.getEquList(), obj.getSupervisoryCode(), obj.getApplyNo()));
//申请单号
dto.setTaskCode(obj.getApplyNo());
//业务类型枚举code值
dto.setTaskType(BusinessTypeEnum.JG_ADVICE_REMOVAL.getCode());
////业务主键
dto.setRelationId(obj.getSequenceNbr() + "");
modelDtos.add(dto);
});
commonService.buildTaskModel(modelDtos);
}
/**
* 组装业务数据
*/
private void businessData(String submitType, ReginParams reginParams, JgTransferNoticeDto model, List<Map<String, Object>> deviceList, ResponseModel<List<String>> responseModel, List<WorkflowResultDto> workflowResultList, List<JgTransferNotice> list, List<JgTransferNoticeEq> equipList) {
......@@ -457,7 +486,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
/**
* 插入代办
*/
private void buildTask(List<JgTransferNotice> list, List<WorkflowResultDto> workflowResultList) {
private void buildTask(List<JgTransferNotice> list, List<WorkflowResultDto> workflowResultList, Boolean isDeleteDraft) {
List<TaskModelDto> taskModelDtoList = new ArrayList<>();
WorkflowResultDto workflowResultDto = workflowResultList.get(0);
list.forEach(item -> {
......@@ -483,12 +512,17 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
BeanUtils.copyProperties(item, taskMessageDto);
taskModelDto.setModel(taskMessageDto);
taskModelDtoList.add(taskModelDto);
if (isDeleteDraft) {
// 删除暂存时生成的待办
commonService.deleteTaskModel(item.getSequenceNbr()+"");
}
});
commonService.buildTaskModel(taskModelDtoList);
}
/**
* 工作流启动并执行
*
* @param submitType 是否提交
* @param deviceList 设备信息
* @return 工作流返回相关数据
......@@ -698,6 +732,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
taskModelDto.setFlowStatusLabel(FlowStatusEnum.REJECTED.getName());
taskModelDto.setFlowCode(workflowResultDto.getNextTaskId());
taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
taskModelDto.setPageType("edit");
TaskMessageDto taskMessageDto = new TaskMessageDto();
BeanUtils.copyProperties(jgTransferNotice, taskMessageDto);
taskModelDto.setModel(taskMessageDto);
......@@ -710,8 +745,9 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
/**
* 执行工作流并返回组装好的工作流信息
* @param op 是否通过
* @param opinion 备注信息
*
* @param op 是否通过
* @param opinion 备注信息
* @param jgTransferNotice 业务信息
* @return 返回组装好的工作流信息
*/
......
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 @ a60e9f7d
......@@ -209,6 +209,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
// 暂存历史表
updateHistory(map, map.get("equipId").toString(), String.valueOf(jgUseRegistration.getSequenceNbr()), jgUseRegistration.getSupervisoryCode());
if (!ObjectUtils.isEmpty(map.get("submit"))) {
// 删除暂存代办
commonServiceImpl.deleteTaskModel(String.valueOf(jgUseRegistration.getSequenceNbr()));
String instanceId = "";
if (map.containsKey("instanceId")) {
instanceId = map.get("instanceId").toString();
......@@ -238,6 +240,25 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
// 执行流程
flowExecute(jgUseRegistration.getSequenceNbr(), instanceId, "0", "");
}
} else {
ArrayList<TaskModelDto> list = new ArrayList<>();
TaskModelDto dto = new TaskModelDto();
TaskMessageDto taskMessageDto = new TaskMessageDto();
BeanUtil.copyProperties(jgUseRegistration, taskMessageDto);
taskMessageDto.setEquipId(String.valueOf(map.get("equipId")));
// 数据参数
dto.setModel(taskMessageDto);
// 摘要
dto.setTaskContent("来自" + "电梯" + "【" + (ObjectUtils.isEmpty(jgUseRegistration.getSupervisoryCode()) ? "无" : jgUseRegistration.getSupervisoryCode()) + "】的业务办理," + "【申请单号：" + jgUseRegistration.getApplyNo() + "】");
// 申请单号
dto.setTaskCode(jgUseRegistration.getApplyNo());
// 业务类型
dto.setTaskType(String.valueOf(BusinessTypeEnum.JG_USAGE_REGISTRATION.getCode()));
// 业务主键
dto.setRelationId(String.valueOf(jgUseRegistration.getSequenceNbr()));
dto.setNextExecuteUser("");
list.add(dto);
commonServiceImpl.buildTaskModel(list);
}
}
......@@ -297,6 +318,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
taskModelDto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
if (WorkFlowStatusEnum.USE_SUBMIT.getCode().equals(taskCode) && "1".equals(operate)) {
taskModelDto.setPageType("edit");
}
commonServiceImpl.buildTaskModel(Collections.singletonList(taskModelDto));
} else {
workflowResultDto.setInstanceId(jgUseRegistration.getInstanceId());
......@@ -438,6 +462,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
jsonObject.put("nextExecuteUser", data.getNextExecuteIds());
jsonObject.put("taskType", BusinessTypeEnum.JG_USAGE_REGISTRATION.getCode());
jsonObject.put("equipId", jgUseRegistrationEq.getEquId());
if (!WorkFlowStatusEnum.USE_SUBMIT.getCode().equals(taskCode)) {
jsonObject.put("pageType", "look");
}
// 撤回删除代办
commonServiceImpl.rollbackTask(instanceId, jsonObject);
}
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/urlInfo.json
View file @ a60e9f7d
[
{
"type": "101",
"pageType": "draft",
"name": "设备移交",
"url": "/mixuap?appId=1742358052905971713&id=1737399017643470849&formType=edit&roleIds={roleIds}&userId={userId}"
},
{
"type": "101",
"pageType": "look",
"name": "设备移交",
"url": "/mixuap?appId=1742358052905971713&id=1737399017643470849&formType=detail&roleIds={roleIds}&userId={userId}"
},
{
"type": "102",
"pageType": "draft",
"name": "安装告知",
"url": "/mixuap?appId=1742358052905971713&id=1735246137364869121&roleIds={roleIds}&userId={userId}&formType=edit"
},
{
"type": "102",
"pageType": "look",
"name": "安装告知",
"url": "/mixuap?appId=1742358052905971713&id=1735246137364869121&roleIds={roleIds}&userId={userId}&formType=detail"
......@@ -15,11 +27,11 @@
"type": "102",
"pageType": "edit",
"name": "安装告知",
"url": ""
"url": "/mixuap?appId=1742358052905971713&id=1735246137364869121&roleIds={roleIds}&userId={userId}&formType=edit"
},
{
"type": "103",
"pageType": "edit",
"pageType": "draft",
"name": "改造告知",
"url": "/mixuap?appId=1742358052905971713&id=1737116607995473921&handle=true&formType=edit&roleIds={roleIds}&userId={userId}"
},
......@@ -30,6 +42,18 @@
"url": "/mixuap?appId=1742358052905971713&id=1737116607995473921&handle=true&roleIds={roleIds}&userId={userId}&formType=detail"
},
{
"type": "103",
"pageType": "edit",
"name": "改造告知",
"url": "/mixuap?appId=1742358052905971713&id=1737116607995473921&handle=true&formType=edit&roleIds={roleIds}&userId={userId}"
},
{
"type": "104",
"pageType": "draft",
"name": "维修告知",
"url": "/mixuap?appId=1742358052905971713&id=1736722439125102594&roleIds={roleIds}&userId={userId}&formType=edit"
},
{
"type": "104",
"pageType": "look",
"name": "维修告知",
......@@ -60,10 +84,10 @@
"url": "/mixuap?appId=1742358052905971713&id=1736722525146083329&formType=edit&roleIds={roleIds}&userId={userId}"
},
{
"type": "106",
"pageType": "draft",
"name": "维保备案",
"url": "/mixuap?appId=1742358052905971713&id=1737347718667333633&roleIds={roleIds}&userId={userId}&pageType=edit"
"type": "106",
"pageType": "draft",
"name": "维保备案",
"url": "/mixuap?appId=1742358052905971713&id=1737347718667333633&roleIds={roleIds}&userId={userId}&pageType=edit"
},
{
"type": "106",
......@@ -91,21 +115,28 @@
},
{
"type": "108",
"pageType": "draft",
"name": "更名变更登记-暂存打开",
"url": "/mixuap?appId=1742358052905971713&id=1739168596900212738&roleIds={roleIds}&userId={userId}&formType=edit"
},
{
"type": "108",
"pageType": "look",
"name": "更名变更登记",
"name": "更名变更登记-查看",
"url": "/mixuap?appId=1742358052905971713&id=1739186702624256001&roleIds={roleIds}&userId={userId}&formType=detail"
},
{
"type": "108",
"pageType": "edit",
"name": "更名变更登记",
"url": "/mixuap?appId=1742358052905971713&id=1739186702624256001&roleIds={roleIds}&userId={userId}&formType=detail"
"url": "/mixuap?appId=1742358052905971713&id=1739186702624256001&roleIds={roleIds}&userId={userId}&formType=edit"
},
{
"type": "109",
"pageType": "draft",
"name": "单位变更登记",
"url": "/mixuap?appId=1742358052905971713&id=1738018156141637633&roleIds={roleIds}&userId={userId}&pageType=edit" },
"url": "/mixuap?appId=1742358052905971713&id=1738018156141637633&roleIds={roleIds}&userId={userId}&pageType=edit"
},
{
"type": "109",
"pageType": "look",
......@@ -120,6 +151,12 @@
},
{
"type": "110",
"pageType": "draft",
"name": "移装变更登记",
"url": "/mixuap?appId=1742358052905971713&id=1737388347548004354&roleIds={roleIds}&userId={userId}&pageType=edit"
},
{
"type": "110",
"pageType": "look",
"name": "移装变更登记",
"url": "/mixuap?appId=1742358052905971713&id=1737388393685348353&roleIds={roleIds}&userId={userId}&pageType=look"
......@@ -128,25 +165,31 @@
"type": "110",
"pageType": "edit",
"name": "移装变更登记",
"url": "/mixuap?appId=1742358052905971713&id=1737388347548004354&roleIds={roleIds}&userId={userId}&pageType=edit"
"url": "/mixuap?appId=1742358052905971713&id=1737388393685348353&roleIds={roleIds}&userId={userId}&pageType=edit"
},
{
"type": "111",
"name": "改造变更登记",
"pageType": "draft",
"url": "/mixuap?appId=1742358052905971713&id=1737415693835464705&roleIds={roleIds}&userId={userId}&pageType=look"
"url": "/mixuap?appId=1742358052905971713&id=1737029146837544962&roleIds={roleIds}&userId={userId}&pageType=look"
},
{
"type": "111",
"name": "改造变更登记",
"pageType": "look",
"url": "/mixuap?appId=1742358052905971713&id=1737415710281330690&roleIds={roleIds}&userId={userId}&pageType=look"
"url": "/mixuap?appId=1742358052905971713&id=1737415693835464705&roleIds={roleIds}&userId={userId}&pageType=look"
},
{
"type": "111",
"pageType": "edit",
"name": "改造变更登记",
"url": "/mixuap?appId=1742358052905971713&id=1737415710281330690&roleIds={roleIds}&userId={userId}&pageType=edit"
"url": "/mixuap?appId=1742358052905971713&id=1737415693835464705&roleIds={roleIds}&userId={userId}&pageType=edit"
},
{
"type": "112-1",
"pageType": "draft",
"name": "设备启用",
"url": "mixuap?appId=1742358052905971713&id=1737383754143395841&roleIds={roleIds}&userId={userId}&formType=edit"
},
{
"type": "112-1",
......@@ -162,6 +205,12 @@
},
{
"type": "112-2",
"pageType": "draft",
"name": "设备停用",
"url": "mixuap?appId=1742358052905971713&id=1737383754143395841&roleIds={roleIds}&userId={userId}&formType=edit"
},
{
"type": "112-2",
"pageType": "look",
"name": "设备停用",
"url": "mixuap?appId=1742358052905971713&id=1737383754143395841&roleIds={roleIds}&userId={userId}&formType=look"
......@@ -174,6 +223,12 @@
},
{
"type": "113-1",
"pageType": "draft",
"name": "移装报废",
"url": "/mixuap?appId=1742358052905971713&id=1737357808040439809&roleIds={roleIds}&userId={userId}&pageType=edit"
},
{
"type": "113-1",
"pageType": "look",
"name": "移装报废",
"url": "/mixuap?appId=1742358052905971713&id=1737357871097606146&roleIds={roleIds}&userId={userId}&pageType=look"
......@@ -186,6 +241,12 @@
},
{
"type": "113-2",
"pageType": "draft",
"name": "注销报废",
"url": "/mixuap?appId=1742358052905971713&id=1737357808040439809&roleIds={roleIds}&userId={userId}&pageType=edit"
},
{
"type": "113-2",
"pageType": "look",
"name": "注销报废",
"url": "/mixuap?appId=1742358052905971713&id=1737357871097606146&roleIds={roleIds}&userId={userId}&pageType=look"
......
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/SupervisoryCodeInfoMapper.java
View file @ a60e9f7d
......@@ -15,4 +15,6 @@ import java.util.List;
public interface SupervisoryCodeInfoMapper extends BaseMapper<SupervisoryCodeInfo> {
void updateStatus(@Param("superviseCodeList") List<String> superviseCodeList);
void updateStatusBySuperviseCode(String superviseCode);
}
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/SupervisoryCodeInfoMapper.xml
View file @ a60e9f7d
......@@ -8,4 +8,8 @@
#{superviseCode}
</foreach>
</update>
<update id="updateStatusBySuperviseCode">
update biz_jg_supervisory_code set status = '1' where supervisory_code = #{superviseCode}
</update>
</mapper>
\ No newline at end of file
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