feat: 复审流程增加判断是否显示第一个节点的新接口

This commit is contained in:
2023-11-29 10:34:44 +08:00
parent 6a796e036a
commit 21f2331f62
5 changed files with 41 additions and 1 deletions
@@ -45,6 +45,18 @@ public class ESRecheckController {
return Result.OK();
}
/**
* 企标复审流程查询是否显示标准化工程师选择联络人节点
*
* @param id
*/
@AutoLog(value = "企标复审流程-是否显示标准化工程师选择联络人节点")
@ApiOperation(value="企标复审流程-是否显示标准化工程师选择联络人节点", notes="企标复审流程-是否显示标准化工程师选择联络人节点")
@GetMapping("/isShowFirstNode")
public Result<?> isShowFirstNode(@RequestParam("id") String id) {
return Result.OK(recheckService.isShowFirstNode(id));
}
/**
* 保存到待办
* @param recheckData
@@ -131,6 +131,12 @@ public class ProcessEsRecheck implements Serializable {
@ApiModelProperty(value = "复审计划Id")
private String recheckPlanId;
/**
* 是否显示
*/
@ApiModelProperty(value = "0不显示 1显示")
private Integer ShowFirstNode;
@TableField(exist = false)
private static final long serialVersionUID = 1L;
}
@@ -22,4 +22,6 @@ public interface ProcessEsRecheckService extends IService<ProcessEsRecheck> {
void approval(ESRecheckDataVO recheckData, boolean pass);
ESRecheckDataVO getDraftData(String draftId, String projectId);
boolean isShowFirstNode(String id);
}
@@ -56,6 +56,8 @@ public class ProcessEsRecheckServiceImpl extends ServiceImpl<ProcessEsRecheckMap
String userId = UserUtils.getUserId();
// 业务数据
ProcessEsRecheck esRecheck = recheckData.getData();
// 手动发起不显示第一个节点
esRecheck.setShowFirstNode(YesOrNoEnum.NO.getInteger());
// 通用数据
CommonVO common = recheckData.getCommon();
// 人员数据
@@ -213,6 +215,17 @@ public class ProcessEsRecheckServiceImpl extends ServiceImpl<ProcessEsRecheckMap
return recheckDataVO;
}
}
@Override
public boolean isShowFirstNode(String id) {
ProcessEsRecheck es = this.getById(id);
if (es == null) {
throw new JeroBootException(ResultCommon.NO_CORRESPONDING_DATA_FOUND);
} else {
Integer showFirstNode = es.getShowFirstNode();
return Objects.equals(showFirstNode, YesOrNoEnum.YES.getInteger());
}
}
}
@@ -9,6 +9,7 @@ import com.jero.modules.activiti.process.esRecheck.entity.vo.ESRecheckDataVO;
import com.jero.modules.activiti.process.esRecheck.service.ProcessEsRecheckService;
import com.jero.modules.laws.enterprise.entity.EnterpriseStandardRecheckPlan;
import com.jero.modules.laws.enterprise.service.EnterpriseStandardRecheckPlanService;
import com.jero.modules.laws.enterprise.util.BeanCopyUtils;
import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
import com.jero.modules.laws.system.service.ILawsContactManageService;
@@ -108,8 +109,14 @@ public class ESRecheckPlanJob implements Job {
private ESRecheckDataVO getEsRecheckDataVO(LawsEnterpriseStandard es, String standardizationUser, String standardEngineer) {
ESRecheckDataVO esRecheckDataVO = new ESRecheckDataVO();
ProcessEsRecheck recheck = new ProcessEsRecheck();
ProcessEsRecheck recheck = BeanCopyUtils.copyBean(es, ProcessEsRecheck.class);
recheck.setId(null);
recheck.setStandardId(es.getId());
if (standardizationUser == null) {
recheck.setShowFirstNode(YesOrNoEnum.YES.getInteger());
} else {
recheck.setShowFirstNode(YesOrNoEnum.NO.getInteger());
}
CommonVO commonVO = new CommonVO();
commonVO.setPrcName(es.getStandardNumber() + "-" + es.getStandardName() + "-复审");
Map<String, Object> map = new HashMap<>();