修改审核重新提交节点
This commit is contained in:
parent
28be0a9332
commit
716676d42f
|
|
@ -489,4 +489,11 @@ public interface BusinessMapper {
|
|||
* @return
|
||||
*/
|
||||
Integer getAuditRemark(RequestEntity params);
|
||||
|
||||
/**
|
||||
*
|
||||
* 删除审核的驳回的数据
|
||||
* @param taskId
|
||||
*/
|
||||
void deleteCheckRemark(String taskId);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -543,6 +543,7 @@ public class BusinessServiceImpl implements BusinessService {
|
|||
}
|
||||
//添加审核人员树信息
|
||||
mapper.insertCheckPerson(finaList);
|
||||
mapper.deleteCheckRemark(auditTask.getTaskId());
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -563,8 +564,6 @@ public class BusinessServiceImpl implements BusinessService {
|
|||
String processType, String finalCheck, String examineId, String sort,
|
||||
String processKey, boolean iaAdd, String enterStatus,String version) {
|
||||
Map<String, Object> map = new HashMap<>();
|
||||
|
||||
|
||||
//审核人员列表
|
||||
map.put(ProcessConstants.USER_LIST, list);
|
||||
//审核类型 人员入场、机具入场等
|
||||
|
|
|
|||
|
|
@ -183,6 +183,9 @@
|
|||
<delete id="delectCheckPerson">
|
||||
delete from nxdt_ii.pt_check_person where task_id = #{taskId}
|
||||
</delete>
|
||||
<delete id="deleteCheckRemark">
|
||||
delete from nxdt_ii.pt_check_person_remark where task_id = #{taskId} and audit_status=2
|
||||
</delete>
|
||||
|
||||
<insert id="insertCheckPerson" parameterType="java.util.List">
|
||||
insert into nxdt_ii.pt_check_person(task_id, user_id,exam_type,type,sort,version)
|
||||
|
|
|
|||
|
|
@ -52,20 +52,56 @@ public class EquipServiceImpl implements EquipService {
|
|||
private FlowTaskService flowTaskService;
|
||||
@Override
|
||||
public List<Equipment> selectEquipList(Equipment bean) {
|
||||
List<Equipment> list = mapper.selectEquipList(bean);
|
||||
RequestEntity entity = new RequestEntity();
|
||||
entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
|
||||
// 创建一个 GenericProcessor 实例 对审批流程数据进行处理
|
||||
GenericProcessor processor = new GenericProcessor();
|
||||
processor.processEntities(list, entity, flowTaskService);
|
||||
if (!StringUtils.isEmpty(bean.getStatus()) && ("1".equals(bean.getStatus()) || "2".equals(bean.getStatus()))) {
|
||||
list = list.stream()
|
||||
.filter(equipment -> bean.getStatus().equals(equipment.getIntoStatus()))
|
||||
.collect(Collectors.toList());
|
||||
//数据查询
|
||||
Map<String, String> checkMaps= Maps.newHashMap();
|
||||
if("1".equals(bean.getStatus()) || "2".equals(bean.getStatus())){
|
||||
entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
|
||||
AjaxResult ajaxResult = flowTaskService.getStayFlow(entity);
|
||||
if (ajaxResult.isSuccess()) {
|
||||
List<Map<String, Object>> data = (List<Map<String, Object>>) ajaxResult.get("data");
|
||||
List<String> proInsId=new ArrayList<>();
|
||||
data.forEach(map->{
|
||||
proInsId.add((String)map.get("proInsId"));
|
||||
checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck"));
|
||||
});
|
||||
if(StringUtils.isNotEmpty(data)){
|
||||
bean.setDataType(1);
|
||||
bean.setProInsId(proInsId);
|
||||
}
|
||||
}
|
||||
}
|
||||
PageUtils.startPage();
|
||||
List<Equipment> list = mapper.selectEquipList(bean);
|
||||
list.forEach(data->{
|
||||
if ("2".equals(data.getIntoStatus())) {
|
||||
data.setIntoStatus("1");
|
||||
}
|
||||
if("1".equals(data.getStatus()) && bean.getDataType()==1){
|
||||
data.setFinalCheck(checkMaps.get(data.getProcInsId()));
|
||||
}
|
||||
});
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
// @Override
|
||||
// public List<Equipment> selectEquipList(Equipment bean) {
|
||||
// List<Equipment> list = mapper.selectEquipList(bean);
|
||||
// RequestEntity entity = new RequestEntity();
|
||||
// entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid()));
|
||||
// // 创建一个 GenericProcessor 实例 对审批流程数据进行处理
|
||||
// GenericProcessor processor = new GenericProcessor();
|
||||
// processor.processEntities(list, entity, flowTaskService);
|
||||
// if (!StringUtils.isEmpty(bean.getStatus()) && ("1".equals(bean.getStatus()) || "2".equals(bean.getStatus()))) {
|
||||
// list = list.stream()
|
||||
// .filter(equipment -> bean.getStatus().equals(equipment.getIntoStatus()))
|
||||
// .collect(Collectors.toList());
|
||||
// }
|
||||
// return list;
|
||||
// }
|
||||
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public int addEquip(MultipartFile[] instrumentDocumentFiles, Map<String, String> allRequestParams){
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@
|
|||
ppt.admission_date as admissionDate,
|
||||
ppt.departure_date as departureDate,
|
||||
ppt.status as intoStatus,
|
||||
'0' as status,
|
||||
#{dataType} as status,
|
||||
group_concat(pci.information_path) as filePath
|
||||
from pt_pro_tools ppt
|
||||
left join sys_dict_data sdd1 on sdd1.dict_value = ppt.tools_type and sdd1.dict_type = 'sys_tools_type' and
|
||||
|
|
@ -82,6 +82,16 @@
|
|||
<if test="status != null and status != '' and status != 1 and status != '1' and status != '2' and status != 2 ">
|
||||
and ppt.status = #{status}
|
||||
</if>
|
||||
<if test='dataType==1'>
|
||||
AND ppt.proc_inst_id IN (
|
||||
<foreach collection="proInsId" item="item" separator=",">
|
||||
#{item}
|
||||
</foreach>
|
||||
)
|
||||
</if>
|
||||
<if test="status==2 or status=='2'">
|
||||
and ppt.status = #{status}
|
||||
</if>
|
||||
group by ppt.tools_id
|
||||
</select>
|
||||
<select id="getInfo" resultType="com.bonus.project.domain.Equipment">
|
||||
|
|
|
|||
Loading…
Reference in New Issue