Skip to content

A
amos-boot-zx-biz
Commit 79d851fa authored by hezhuozhi's avatar hezhuozhi
Browse files
Options

注释掉taskV2工作台信息

parent b53cc336
Hide whitespace changes
Inline Side-by-side
Showing with 470 additions and 417 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/AcceptanceCheckServiceImpl.java
View file @ 79d851fa
...@@ -173,8 +173,8 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A ...@@ -173,8 +173,8 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
up.eq(PeasantHousehold::getSequenceNbr, idsk); up.eq(PeasantHousehold::getSequenceNbr, idsk);
peasantHouseholdMapper.update(null, up); peasantHouseholdMapper.update(null, up);
//发起待办 //发起待办
workflowResultDto.setInstanceId(basicGridRecord.getInstanceId()); // workflowResultDto.setInstanceId(basicGridRecord.getInstanceId());
commonService.buildTaskModel(commonService.buildTaskModelDto(basicGridRecord, workflowResultDto, BusinessTypeEnum.HYGF_YSLC)); // commonService.buildTaskModel(commonService.buildTaskModelDto(basicGridRecord, workflowResultDto, BusinessTypeEnum.HYGF_YSLC));
} }
//防止重复提交 //防止重复提交
...@@ -233,8 +233,8 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A ...@@ -233,8 +233,8 @@ public class AcceptanceCheckServiceImpl extends BaseService<AcceptanceCheckDto,A
} }
acceptanceCheckAuditingService.createWithModel(basicGridAuditingDto); acceptanceCheckAuditingService.createWithModel(basicGridAuditingDto);
//更新待办 //更新待办
workflowResultDto.setInstanceId(basicGridAuditingDto.getInstanceId()); // workflowResultDto.setInstanceId(basicGridAuditingDto.getInstanceId());
commonService.updateTaskModelAndAddTask(basicGridAuditingDto,workflowResultDto,BusinessTypeEnum.HYGF_YSLC); // commonService.updateTaskModelAndAddTask(basicGridAuditingDto,workflowResultDto,BusinessTypeEnum.HYGF_YSLC);
} }
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/AcceptanceRectificationOrderServiceImpl.java
View file @ 79d851fa
...@@ -153,9 +153,9 @@ public class AcceptanceRectificationOrderServiceImpl extends BaseService<Accepta ...@@ -153,9 +153,9 @@ public class AcceptanceRectificationOrderServiceImpl extends BaseService<Accepta
taskResultDTO.setTaskId(basicGridAcceptance.getNextTaskId()); taskResultDTO.setTaskId(basicGridAcceptance.getNextTaskId());
ProcessTaskDTO processTaskDTO = workFlowService.standard(basicGridAcceptance, taskResultDTO, userId); ProcessTaskDTO processTaskDTO = workFlowService.standard(basicGridAcceptance, taskResultDTO, userId);
//更新待办 //更新待办
WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)).get(0); // WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)).get(0);
workflowResultDto.setInstanceId(basicGridAcceptance.getInstanceId()); // workflowResultDto.setInstanceId(basicGridAcceptance.getInstanceId());
commonService.updateTaskModelAndAddTask(basicGridAcceptance, workflowResultDto,BusinessTypeEnum.HYGF_BWYS); // commonService.updateTaskModelAndAddTask(basicGridAcceptance, workflowResultDto,BusinessTypeEnum.HYGF_BWYS);
basicGridAcceptanceMapper.updateById(basicGridAcceptance); basicGridAcceptanceMapper.updateById(basicGridAcceptance);
} }
} finally { } finally {
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/AcceptanceServiceImpl.java
View file @ 79d851fa
...@@ -149,9 +149,9 @@ public class AcceptanceServiceImpl implements IAcceptanceService { ...@@ -149,9 +149,9 @@ public class AcceptanceServiceImpl implements IAcceptanceService {
taskResultDTO.setTaskId(basicGridAcceptanc.getNextTaskId()); taskResultDTO.setTaskId(basicGridAcceptanc.getNextTaskId());
ProcessTaskDTO processTaskDTO = workFlowService.standard(basicGridAcceptanc, taskResultDTO, userId); ProcessTaskDTO processTaskDTO = workFlowService.standard(basicGridAcceptanc, taskResultDTO, userId);
//发起待办 //发起待办
WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)).get(0); // WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)).get(0);
workflowResultDto.setInstanceId(basicGridAcceptanc.getInstanceId()); // workflowResultDto.setInstanceId(basicGridAcceptanc.getInstanceId());
commonService.updateTaskModelAndAddTask(basicGridAcceptanc, workflowResultDto,BusinessTypeEnum.HYGF_BWYS); // commonService.updateTaskModelAndAddTask(basicGridAcceptanc, workflowResultDto,BusinessTypeEnum.HYGF_BWYS);
basicGridAcceptanceMapper.updateById(basicGridAcceptanc); basicGridAcceptanceMapper.updateById(basicGridAcceptanc);
//线上验收 //线上验收
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/BasicGridAcceptanceServiceImpl.java
View file @ 79d851fa
...@@ -252,8 +252,8 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta ...@@ -252,8 +252,8 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
up.eq(PeasantHousehold::getSequenceNbr, idsk); up.eq(PeasantHousehold::getSequenceNbr, idsk);
peasantHouseholdMapper.update(null, up); peasantHouseholdMapper.update(null, up);
//发起待办 //发起待办
workflowResultDto.setInstanceId(basicGridRecord.getInstanceId()); // workflowResultDto.setInstanceId(basicGridRecord.getInstanceId());
commonService.buildTaskModel(commonService.buildTaskModelDto(basicGridRecord, workflowResultDto, BusinessTypeEnum.HYGF_BWLC)); // commonService.buildTaskModel(commonService.buildTaskModelDto(basicGridRecord, workflowResultDto, BusinessTypeEnum.HYGF_BWLC));
} }
// 防止重复提交 // 防止重复提交
...@@ -450,9 +450,9 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta ...@@ -450,9 +450,9 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
basicGridAcceptanceMapper.updateById(basicGridAcceptanc); basicGridAcceptanceMapper.updateById(basicGridAcceptanc);
//更新待办 //更新待办
WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)).get(0); // WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)).get(0);
workflowResultDto.setInstanceId(basicGridAcceptanc.getInstanceId()); // workflowResultDto.setInstanceId(basicGridAcceptanc.getInstanceId());
commonService.updateTaskModelAndAddTask(basicGridAcceptanc,workflowResultDto,BusinessTypeEnum.HYGF_BWYS); // commonService.updateTaskModelAndAddTask(basicGridAcceptanc,workflowResultDto,BusinessTypeEnum.HYGF_BWYS);
} finally { } finally {
redisLockUtil.releaseLock(lockName); redisLockUtil.releaseLock(lockName);
} }
...@@ -493,8 +493,8 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta ...@@ -493,8 +493,8 @@ public class BasicGridAcceptanceServiceImpl extends BaseService<BasicGridAccepta
} }
basicGridAuditingService.createWithModel(basicGridAuditingDto); basicGridAuditingService.createWithModel(basicGridAuditingDto);
//更新待办 //更新待办
workflowResultDto.setInstanceId(basicGridAuditingDto.getInstanceId()); // workflowResultDto.setInstanceId(basicGridAuditingDto.getInstanceId());
commonService.updateTaskModelAndAddTask(basicGridAuditingDto,workflowResultDto,BusinessTypeEnum.HYGF_BWYS); // commonService.updateTaskModelAndAddTask(basicGridAuditingDto,workflowResultDto,BusinessTypeEnum.HYGF_BWYS);
} }
public void completeAdminAudit(Map<String, String> kv) { public void completeAdminAudit(Map<String, String> kv) {
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/CommonServiceImpl.java
View file @ 79d851fa
...@@ -64,8 +64,8 @@ import java.util.zip.ZipOutputStream; ...@@ -64,8 +64,8 @@ import java.util.zip.ZipOutputStream;
@Service @Service
@Slf4j @Slf4j
public class CommonServiceImpl { public class CommonServiceImpl {
@Autowired // @Autowired
private TaskV2FeignService taskV2FeignService; // private TaskV2FeignService taskV2FeignService;
@Autowired @Autowired
private RedisUtils redisUtils; private RedisUtils redisUtils;
@Value("classpath:/json/urlInfo.json") @Value("classpath:/json/urlInfo.json")
...@@ -83,348 +83,348 @@ public class CommonServiceImpl { ...@@ -83,348 +83,348 @@ public class CommonServiceImpl {
private static final String TEMP_DIR_NAME = "temp"; private static final String TEMP_DIR_NAME = "temp";
private static final String TEMPLATE_FILE_PATH = "F:\\work\\amos-boot-zx-biz\\amos-boot-system-jxiop\\amos-boot-module-hygf-biz\\src\\main\\resources\\templates\\test.xlsx"; // 模版文件路径 private static final String TEMPLATE_FILE_PATH = "F:\\work\\amos-boot-zx-biz\\amos-boot-system-jxiop\\amos-boot-module-hygf-biz\\src\\main\\resources\\templates\\test.xlsx"; // 模版文件路径
private static String toQueryParams2(JSONObject jsonObject) { // private static String toQueryParams2(JSONObject jsonObject) {
StringBuilder sb = new StringBuilder(); // StringBuilder sb = new StringBuilder();
Set<String> keys = jsonObject.keySet(); // Set<String> keys = jsonObject.keySet();
keys.forEach(key -> { // keys.forEach(key -> {
Object value = jsonObject.get(key); // Object value = jsonObject.get(key);
if (sb.length() > 0) { // if (sb.length() > 0) {
sb.append('&'); // sb.append('&');
} // }
try { // try {
if (value != null && !"".equals(value)) { // if (value != null && !"".equals(value)) {
sb.append(URLEncoder.encode(key, "UTF-8")).append('=').append(URLEncoder.encode(value.toString(), "UTF-8")); // sb.append(URLEncoder.encode(key, "UTF-8")).append('=').append(URLEncoder.encode(value.toString(), "UTF-8"));
} // }
} catch (UnsupportedEncodingException e) { // } catch (UnsupportedEncodingException e) {
e.printStackTrace(); // e.printStackTrace();
} // }
}); // });
return sb.toString(); // return sb.toString();
} // }
public List<TaskModelDto> buildTaskModelDto(Object model, WorkflowResultDto workflowResultDto, BusinessTypeEnum businessType) { // public List<TaskModelDto> buildTaskModelDto(Object model, WorkflowResultDto workflowResultDto, BusinessTypeEnum businessType) {
List<TaskModelDto> taskModelDtoList = new ArrayList<>(); // List<TaskModelDto> taskModelDtoList = new ArrayList<>();
TaskModelDto taskModelDto = new TaskModelDto(); // TaskModelDto taskModelDto = new TaskModelDto();
FlowKeyTodoEnum flowKeyTodoEnum = FlowKeyTodoEnum.getEumByFlowNodeKey(workflowResultDto.getNextNodeKey()); // FlowKeyTodoEnum flowKeyTodoEnum = FlowKeyTodoEnum.getEumByFlowNodeKey(workflowResultDto.getNextNodeKey());
if (!Objects.isNull(flowKeyTodoEnum)) { // if (!Objects.isNull(flowKeyTodoEnum)) {
taskModelDto.setFlowStatus(flowKeyTodoEnum.getCode()); // taskModelDto.setFlowStatus(flowKeyTodoEnum.getCode());
taskModelDto.setFlowStatusLabel(flowKeyTodoEnum.getDealName()); // taskModelDto.setFlowStatusLabel(flowKeyTodoEnum.getDealName());
} // }
taskModelDto.setRoutePath(null); // taskModelDto.setRoutePath(null);
taskModelDto.setFlowCode(workflowResultDto.getNextTaskId()); // taskModelDto.setFlowCode(workflowResultDto.getNextTaskId());
taskModelDto.setFlowCreateDate(new Date()); // taskModelDto.setFlowCreateDate(new Date());
taskModelDto.setPageType(null); // taskModelDto.setPageType(null);
taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecuteUserIds()); // taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecuteUserIds());
taskModelDto.setModel(model); // taskModelDto.setModel(model);
taskModelDto.setRelationId(workflowResultDto.getInstanceId()); // taskModelDto.setRelationId(workflowResultDto.getInstanceId());
taskModelDto.setStartUserId(workflowResultDto.getStartUserId()); // taskModelDto.setStartUserId(workflowResultDto.getStartUserId());
taskModelDto.setStartUser(workflowResultDto.getStartUser()); // taskModelDto.setStartUser(workflowResultDto.getStartUser());
taskModelDto.setStartDate(workflowResultDto.getStartDate()); // taskModelDto.setStartDate(workflowResultDto.getStartDate());
taskModelDto.setStartUserCompanyName(workflowResultDto.getStartUserCompanyName()); // taskModelDto.setStartUserCompanyName(workflowResultDto.getStartUserCompanyName());
taskModelDto.setTaskName(workflowResultDto.getNextNodeName()); // taskModelDto.setTaskName(workflowResultDto.getNextNodeName());
taskModelDto.setTaskCode(workflowResultDto.getNextNodeKey()); // taskModelDto.setTaskCode(workflowResultDto.getNextNodeKey());
taskModelDto.setTaskType(businessType.getCode()); // taskModelDto.setTaskType(businessType.getCode());
taskModelDto.setTaskTypeLabel(businessType.getName()); // taskModelDto.setTaskTypeLabel(businessType.getName());
taskModelDto.setTaskStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode()); // taskModelDto.setTaskStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
taskModelDto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName()); // taskModelDto.setTaskStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
// taskModelDto.setTaskDesc(); //// taskModelDto.setTaskDesc();
// taskModelDto.setTaskContent(); //// taskModelDto.setTaskContent();
taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorIds()); // taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorIds());
taskModelDtoList.add(taskModelDto); // taskModelDtoList.add(taskModelDto);
return taskModelDtoList; // return taskModelDtoList;
} // }
public void deleteTaskModel(String id) { // public void deleteTaskModel(String id) {
try { // try {
List<TaskV2Model> result = taskV2FeignService.selectListByRelationId(id).getResult(); // List<TaskV2Model> result = taskV2FeignService.selectListByRelationId(id).getResult();
if (!result.isEmpty()) { // if (!result.isEmpty()) {
List<Long> idList = result.stream().map(TaskV2Model::getSequenceNbr).collect(Collectors.toList()); // List<Long> idList = result.stream().map(TaskV2Model::getSequenceNbr).collect(Collectors.toList());
String ids = idList.stream().map(Object::toString).collect(Collectors.joining(",")); // String ids = idList.stream().map(Object::toString).collect(Collectors.joining(","));
taskV2FeignService.delete(ids); // taskV2FeignService.delete(ids);
} // }
}catch (Exception e){ // }catch (Exception e){
log.error(e.getMessage(),e); // log.error(e.getMessage(),e);
} // }
} // }
/** // /**
* 待办新增接口 // * 待办新增接口
**/ // **/
public void buildTaskModel(List<TaskModelDto> list) { // public void buildTaskModel(List<TaskModelDto> list) {
try { // try {
//执行人为空使用系统机器人账号 // //执行人为空使用系统机器人账号
if (StrUtil.isEmpty(RequestContext.getExeUserId())) { // if (StrUtil.isEmpty(RequestContext.getExeUserId())) {
RequestContext.setExeUserId(amosRequestContext.getUserId()); // RequestContext.setExeUserId(amosRequestContext.getUserId());
RequestContext.setToken(amosRequestContext.getToken()); // RequestContext.setToken(amosRequestContext.getToken());
RequestContext.setAgencyCode("JXIOP"); // RequestContext.setAgencyCode("JXIOP");
} // }
List<TaskV2Model> taskV2Models = new ArrayList<>(); // List<TaskV2Model> taskV2Models = new ArrayList<>();
for (TaskModelDto obj : list) { // for (TaskModelDto obj : list) {
// 判断是否是暂存 新增若无下一节点执行人即为暂存 // // 判断是否是暂存 新增若无下一节点执行人即为暂存
boolean flag = StringUtils.isEmpty(obj.getNextExecuteUser()); // boolean flag = StringUtils.isEmpty(obj.getNextExecuteUser());
if (flag) { // if (flag) {
List<TaskV2Model> result = taskV2FeignService.selectListByRelationId(obj.getRelationId()).getResult(); // List<TaskV2Model> result = taskV2FeignService.selectListByRelationId(obj.getRelationId()).getResult();
if (CollectionUtil.isNotEmpty(result)) { // if (CollectionUtil.isNotEmpty(result)) {
break; // break;
} // }
} // }
//处理开始流程人员为空的问题 // //处理开始流程人员为空的问题
dealStartUser(obj); // dealStartUser(obj);
TaskV2Model model = new TaskV2Model(); // TaskV2Model model = new TaskV2Model();
BeanUtil.copyProperties(obj, model); // BeanUtil.copyProperties(obj, model);
String urlParams = "&formType=edit"; // String urlParams = "&formType=edit";
try { // try {
urlParams = "&" + toQueryParams(obj.getModel()); // urlParams = "&" + toQueryParams(obj.getModel());
} catch (UnsupportedEncodingException e) { // } catch (UnsupportedEncodingException e) {
e.printStackTrace(); // e.printStackTrace();
} // }
List<Map> urlList = JsonUtils.getResourceList(urlInfo); // List<Map> urlList = JsonUtils.getResourceList(urlInfo);
for (Map map : urlList) { // for (Map map : urlList) {
if (map.get("type").equals(obj.getTaskCode())) { // if (map.get("type").equals(obj.getTaskCode())) {
model.setRoutePath(map.get("url").toString() + urlParams); // model.setRoutePath(map.get("url").toString() + urlParams);
break; // break;
} // }
} // }
// 是true则为暂存 除公共部分统一处理 // // 是true则为暂存 除公共部分统一处理
if (flag) { // if (flag) {
Object redisUserInfo = redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())); // Object redisUserInfo = redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()));
if (Objects.isNull(redisUserInfo)) { // if (Objects.isNull(redisUserInfo)) {
break; // break;
} // }
ReginParams reginParams = JSONObject.parseObject(redisUserInfo.toString(), ReginParams.class); // ReginParams reginParams = JSONObject.parseObject(redisUserInfo.toString(), ReginParams.class);
model.setFlowStatus(FlowStatusEnum.TO_BE_SUBMITTED.getCode()); // model.setFlowStatus(FlowStatusEnum.TO_BE_SUBMITTED.getCode());
model.setFlowStatusLabel(FlowStatusEnum.TO_BE_SUBMITTED.getName()); // model.setFlowStatusLabel(FlowStatusEnum.TO_BE_SUBMITTED.getName());
model.setStartUserId(RequestContext.getExeUserId()); // model.setStartUserId(RequestContext.getExeUserId());
model.setStartUser(reginParams.getUserModel().getRealName()); // model.setStartUser(reginParams.getUserModel().getRealName());
model.setStartUserCompanyName(reginParams.getCompany().getCompanyName()); // model.setStartUserCompanyName(reginParams.getCompany().getCompanyName());
model.setStartDate(new Date()); // model.setStartDate(new Date());
model.setExecuteUserIds(RequestContext.getExeUserId()); // model.setExecuteUserIds(RequestContext.getExeUserId());
model.setFlowCreateDate(new Date()); // model.setFlowCreateDate(new Date());
model.setTaskStatus(FlowStatusEnum.TO_BE_SUBMITTED.getCode()); // model.setTaskStatus(FlowStatusEnum.TO_BE_SUBMITTED.getCode());
model.setTaskTitle("有一条待提交的草稿"); // model.setTaskTitle("有一条待提交的草稿");
model.setTaskName(BusinessTypeEnum.getNameByType(obj.getTaskType())); // model.setTaskName(BusinessTypeEnum.getNameByType(obj.getTaskType()));
model.setTaskTypeLabel(BusinessTypeEnum.getNameByType(obj.getTaskType())); // model.setTaskTypeLabel(BusinessTypeEnum.getNameByType(obj.getTaskType()));
// model.setTaskContent("【申请单号:"+obj.getTaskCode()+"】待提交"); // // model.setTaskContent("【申请单号:"+obj.getTaskCode()+"】待提交");
} else { // } else {
model.setTaskStatus(0); // model.setTaskStatus(0);
model.setTaskTitle(obj.getStartUser() + "发起了" + obj.getTaskName()); // model.setTaskTitle(obj.getStartUser() + "发起了" + obj.getTaskName());
} // }
model.setFlowInstanceId(model.getRelationId()); // model.setFlowInstanceId(model.getRelationId());
model.setTaskSource("workFlow"); // model.setTaskSource("workFlow");
model.setExtras(JSON.toJSONString(obj.getModel())); // model.setExtras(JSON.toJSONString(obj.getModel()));
// model.setTerminal(params.getOrDefault("terminal","WEB").toString()); // // model.setTerminal(params.getOrDefault("terminal","WEB").toString());
model.setCreateDate(new Date()); // model.setCreateDate(new Date());
model.setRecUserId(RequestContext.getExeUserId()); // model.setRecUserId(RequestContext.getExeUserId());
model.setAgencyCode(RequestContext.getAgencyCode()); // model.setAgencyCode(RequestContext.getAgencyCode());
taskV2Models.add(model); // taskV2Models.add(model);
//
} // }
//如果使用的是机器人则使用机器人的token、appkey、product进行调用 // //如果使用的是机器人则使用机器人的token、appkey、product进行调用
if (amosRequestContext.getUserId().equals(RequestContext.getExeUserId())) { // if (amosRequestContext.getUserId().equals(RequestContext.getExeUserId())) {
taskV2FeignService.batchAddStringNew(amosRequestContext.getAppKey(), amosRequestContext.getProduct(), amosRequestContext.getToken(), JSONArray.toJSONString(taskV2Models)); // taskV2FeignService.batchAddStringNew(amosRequestContext.getAppKey(), amosRequestContext.getProduct(), amosRequestContext.getToken(), JSONArray.toJSONString(taskV2Models));
} else { // } else {
taskV2FeignService.batchAddString(JSONArray.toJSONString(taskV2Models)); // taskV2FeignService.batchAddString(JSONArray.toJSONString(taskV2Models));
} // }
}catch (Exception e){ // }catch (Exception e){
log.error(e.getMessage(),e); // log.error(e.getMessage(),e);
} // }
} // }
private void dealStartUser(TaskModelDto obj) { // private void dealStartUser(TaskModelDto obj) {
if (StrUtil.isEmpty(obj.getStartUser())) { // if (StrUtil.isEmpty(obj.getStartUser())) {
List<TaskV2Model> result = taskV2FeignService.selectListByRelationId(obj.getRelationId()).getResult(); // List<TaskV2Model> result = taskV2FeignService.selectListByRelationId(obj.getRelationId()).getResult();
if (CollectionUtil.isNotEmpty(result)) { // if (CollectionUtil.isNotEmpty(result)) {
List<TaskV2Model> collect = result.stream().filter(item -> item.getStartUser() != null).collect(Collectors.toList()); // List<TaskV2Model> collect = result.stream().filter(item -> item.getStartUser() != null).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(collect)) { // if (CollectionUtil.isNotEmpty(collect)) {
TaskV2Model taskV2Model = collect.get(0); // TaskV2Model taskV2Model = collect.get(0);
obj.setStartUserId(taskV2Model.getStartUserId()); // obj.setStartUserId(taskV2Model.getStartUserId());
obj.setStartUser(taskV2Model.getStartUser()); // obj.setStartUser(taskV2Model.getStartUser());
obj.setStartDate(taskV2Model.getStartDate()); // obj.setStartDate(taskV2Model.getStartDate());
obj.setStartUserCompanyName(taskV2Model.getStartUserCompanyName()); // obj.setStartUserCompanyName(taskV2Model.getStartUserCompanyName());
} // }
} // }
} // }
} // }
/** // /**
* 待办编辑接口 // * 待办编辑接口
* 参数 // * 参数
* taskStatus // * taskStatus
* taskStatusLabel 操作名称 6614驳回 6616已完成 6612待受理 // * taskStatusLabel 操作名称 6614驳回 6616已完成 6612待受理
* flowStatusLabel 任务状态枚举code // * flowStatusLabel 任务状态枚举code
* 流程实例id instanceId // * 流程实例id instanceId
* flowCode 任务id // * flowCode 任务id
**/ // **/
public TaskV2Model updateTaskModel(Map<String, Object> params) { // public TaskV2Model updateTaskModel(Map<String, Object> params) {
try { // try {
String exeUserId = RequestContext.getExeUserId(); // String exeUserId = RequestContext.getExeUserId();
List<TaskV2Model> result = taskV2FeignService.selectListByRelationId(params.get("relationId").toString()).getResult(); // List<TaskV2Model> result = taskV2FeignService.selectListByRelationId(params.get("relationId").toString()).getResult();
List<TaskV2Model> collect = result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())).collect(Collectors.toList()); // List<TaskV2Model> collect = result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())).collect(Collectors.toList());
//
if (collect.isEmpty()) { // if (collect.isEmpty()) {
return null; // return null;
} // }
collect.get(0).setFlowStatus(Integer.valueOf(params.get("flowStatus").toString())); // collect.get(0).setFlowStatus(Integer.valueOf(params.get("flowStatus").toString()));
collect.get(0).setFlowStatusLabel(params.get("flowStatusLabel").toString()); // collect.get(0).setFlowStatusLabel(params.get("flowStatusLabel").toString());
collect.get(0).setTaskStatus(Integer.valueOf(params.get("taskStatus").toString())); // collect.get(0).setTaskStatus(Integer.valueOf(params.get("taskStatus").toString()));
collect.get(0).setTaskStatusLabel(params.get("taskStatusLabel").toString()); // collect.get(0).setTaskStatusLabel(params.get("taskStatusLabel").toString());
collect.get(0).setEndUserId(exeUserId); // collect.get(0).setEndUserId(exeUserId);
collect.get(0).setEndDate(new Date()); // collect.get(0).setEndDate(new Date());
// 当流程完成时将所有待办状态统一修改为已完成 // // 当流程完成时将所有待办状态统一修改为已完成
String urlParams = "&formType=detail"; // String urlParams = "&formType=detail";
if (collect.get(0).getFlowStatusLabel().equals(FlowStatusEnum.TO_BE_FINISHED.getName())) { // if (collect.get(0).getFlowStatusLabel().equals(FlowStatusEnum.TO_BE_FINISHED.getName())) {
try { // try {
urlParams = "&" + toQueryParams(params.get("model")); // urlParams = "&" + toQueryParams(params.get("model"));
} catch (UnsupportedEncodingException e) { // } catch (UnsupportedEncodingException e) {
e.printStackTrace(); // e.printStackTrace();
} // }
List<Map> urlList = JsonUtils.getResourceList(urlInfo); // List<Map> urlList = JsonUtils.getResourceList(urlInfo);
for (Map map : urlList) { // for (Map map : urlList) {
//此处单独处理经销商审核 审核完成后跳转列表页面 // //此处单独处理经销商审核 审核完成后跳转列表页面
if("jxs_03".equals(collect.get(0).getTaskCode())){ // if("jxs_03".equals(collect.get(0).getTaskCode())){
urlParams = "/mixuap?appId=1678340647909617665&id=1678365817248444417"+ urlParams; // urlParams = "/mixuap?appId=1678340647909617665&id=1678365817248444417"+ urlParams;
break; // break;
} // }
if (map.get("type").equals(collect.get(0).getTaskCode())) { // if (map.get("type").equals(collect.get(0).getTaskCode())) {
urlParams = map.get("url").toString() + urlParams; // urlParams = map.get("url").toString() + urlParams;
break; // break;
} // }
} // }
collect.get(0).setRoutePath(urlParams); // collect.get(0).setRoutePath(urlParams);
for (TaskV2Model taskV2Model : collect) { // for (TaskV2Model taskV2Model : collect) {
taskV2Model.setTaskStatusLabel((FlowStatusEnum.TO_BE_FINISHED.getName())); // taskV2Model.setTaskStatusLabel((FlowStatusEnum.TO_BE_FINISHED.getName()));
taskV2Model.setTaskStatus(FlowStatusEnum.TO_BE_FINISHED.getCode()); // taskV2Model.setTaskStatus(FlowStatusEnum.TO_BE_FINISHED.getCode());
taskV2Model.setFlowStatusLabel((FlowStatusEnum.TO_BE_FINISHED.getName())); // taskV2Model.setFlowStatusLabel((FlowStatusEnum.TO_BE_FINISHED.getName()));
taskV2Model.setFlowStatus(FlowStatusEnum.TO_BE_FINISHED.getCode()); // taskV2Model.setFlowStatus(FlowStatusEnum.TO_BE_FINISHED.getCode());
} // }
taskV2FeignService.batchUpdateString(JSONArray.toJSONString(collect)); // taskV2FeignService.batchUpdateString(JSONArray.toJSONString(collect));
} else { // } else {
collect.get(0).setRoutePath(collect.get(0).getRoutePath().replace("roleIds=", "roleIds=55555&fq=")); // collect.get(0).setRoutePath(collect.get(0).getRoutePath().replace("roleIds=", "roleIds=55555&fq="));
taskV2FeignService.update(collect.get(0), collect.get(0).getSequenceNbr()); // taskV2FeignService.update(collect.get(0), collect.get(0).getSequenceNbr());
} // }
// 修改model并返回 用于组装新待办 // // 修改model并返回 用于组装新待办
collect.get(0).setEndUserId(null); // collect.get(0).setEndUserId(null);
collect.get(0).setTaskStatus(null); // collect.get(0).setTaskStatus(null);
collect.get(0).setEndDate(null); // collect.get(0).setEndDate(null);
collect.get(0).setSequenceNbr(null); // collect.get(0).setSequenceNbr(null);
collect.get(0).setCreateDate(new Date()); // collect.get(0).setCreateDate(new Date());
collect.get(0).setStartDate(new Date()); // collect.get(0).setStartDate(new Date());
return collect.get(0); // return collect.get(0);
}catch (Exception e){ // }catch (Exception e){
log.error(e.getMessage(),e); // log.error(e.getMessage(),e);
} // }
return null; // return null;
} // }
/** // /**
* 待办 撤回 // * 待办 撤回
* // *
* @param id 工作流实例id // * @param id 工作流实例id
* @param obj 自己的实体：taskType为BusinessTypeEnum code；nextExecuteUser // * @param obj 自己的实体：taskType为BusinessTypeEnum code；nextExecuteUser
*/ // */
public void rollbackTask(String id, JSONObject obj) { // public void rollbackTask(String id, JSONObject obj) {
//
List<TaskV2Model> result = taskV2FeignService.selectListByRelationId(id).getResult(); // List<TaskV2Model> result = taskV2FeignService.selectListByRelationId(id).getResult();
List<TaskV2Model> list = result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())).collect(Collectors.toList()); // List<TaskV2Model> list = result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())).collect(Collectors.toList());
TaskV2Model model = list.get(0); // TaskV2Model model = list.get(0);
taskV2FeignService.delete(String.valueOf(model.getSequenceNbr())); // taskV2FeignService.delete(String.valueOf(model.getSequenceNbr()));
//
String urlParams = ""; // String urlParams = "";
urlParams = "&" + toQueryParams2(obj); // urlParams = "&" + toQueryParams2(obj);
List<Map> urlList = JsonUtils.getResourceList(urlInfo); // List<Map> urlList = JsonUtils.getResourceList(urlInfo);
//
if (list.size() > 1) { // if (list.size() > 1) {
TaskV2Model lastTaskModel = list.get(1); // TaskV2Model lastTaskModel = list.get(1);
lastTaskModel.setEndUserId(null); // lastTaskModel.setEndUserId(null);
lastTaskModel.setEndDate(null); // lastTaskModel.setEndDate(null);
lastTaskModel.setTaskStatus(FlowStatusEnum.TO_SUBMITTED.getCode()); // lastTaskModel.setTaskStatus(FlowStatusEnum.TO_SUBMITTED.getCode());
lastTaskModel.setTaskStatusLabel("重新提交"); // lastTaskModel.setTaskStatusLabel("重新提交");
lastTaskModel.setFlowCode(obj.get("nextTaskId").toString()); // lastTaskModel.setFlowCode(obj.get("nextTaskId").toString());
if (obj.get("flowStatus") != null) { // if (obj.get("flowStatus") != null) {
lastTaskModel.setFlowStatus(Integer.valueOf(obj.get("flowStatus").toString())); // lastTaskModel.setFlowStatus(Integer.valueOf(obj.get("flowStatus").toString()));
} // }
if (obj.get("flowStatusLabel") != null) { // if (obj.get("flowStatusLabel") != null) {
lastTaskModel.setFlowStatusLabel(obj.get("flowStatusLabel").toString()); // lastTaskModel.setFlowStatusLabel(obj.get("flowStatusLabel").toString());
} // }
//
for (Map map : urlList) { // for (Map map : urlList) {
if (map.get("type").equals(obj.get("taskType")) && map.get("pageType").equals(obj.getOrDefault("pageType", "edit"))) { // 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); // lastTaskModel.setRoutePath(map.get("url").toString().replace("{roleIds}", obj.get("nextExecuteUser").toString()) + urlParams);
break; // break;
} // }
} // }
taskV2FeignService.update(lastTaskModel, lastTaskModel.getSequenceNbr()); // taskV2FeignService.update(lastTaskModel, lastTaskModel.getSequenceNbr());
} else if (list.size() == 1) { // } else if (list.size() == 1) {
model.setExecuteUserIds(model.getStartUserId()); // model.setExecuteUserIds(model.getStartUserId());
model.setTaskStatusLabel("重新提交"); // model.setTaskStatusLabel("重新提交");
model.setTaskStatus(FlowStatusEnum.TO_SUBMITTED.getCode()); // model.setTaskStatus(FlowStatusEnum.TO_SUBMITTED.getCode());
model.setSequenceNbr(null); // model.setSequenceNbr(null);
if (obj.get("flowStatus") != null) { // if (obj.get("flowStatus") != null) {
model.setFlowStatus(Integer.valueOf(obj.get("flowStatus").toString())); // model.setFlowStatus(Integer.valueOf(obj.get("flowStatus").toString()));
} // }
if (obj.get("flowStatusLabel") != null) { // if (obj.get("flowStatusLabel") != null) {
model.setFlowStatusLabel(obj.get("flowStatusLabel").toString()); // model.setFlowStatusLabel(obj.get("flowStatusLabel").toString());
} // }
for (Map map : urlList) { // for (Map map : urlList) {
if (map.get("type").equals(obj.get("taskType")) && map.get("pageType").equals("edit")) { // if (map.get("type").equals(obj.get("taskType")) && map.get("pageType").equals("edit")) {
model.setRoutePath(map.get("url").toString().replace("{roleIds}", obj.get("nextExecuteUser").toString()) + urlParams); // model.setRoutePath(map.get("url").toString().replace("{roleIds}", obj.get("nextExecuteUser").toString()) + urlParams);
break; // break;
} // }
} // }
taskV2FeignService.create(model); // taskV2FeignService.create(model);
} // }
} // }
public <T> String toQueryParams(T obj) throws UnsupportedEncodingException { // public <T> String toQueryParams(T obj) throws UnsupportedEncodingException {
StringBuilder sb = new StringBuilder(); // StringBuilder sb = new StringBuilder();
//
for (Class<?> clazz = obj.getClass(); !clazz.equals(Object.class); clazz = clazz.getSuperclass()) { // for (Class<?> clazz = obj.getClass(); !clazz.equals(Object.class); clazz = clazz.getSuperclass()) {
Field[] fields = clazz.getDeclaredFields(); // Field[] fields = clazz.getDeclaredFields();
//
for (Field field : fields) { // for (Field field : fields) {
if (!Modifier.isStatic(field.getModifiers())) { // if (!Modifier.isStatic(field.getModifiers())) {
field.setAccessible(true); // field.setAccessible(true);
//
try { // try {
Object value = field.get(obj); // Object value = field.get(obj);
//
if (value != null && !"".equals(value)) { // if (value != null && !"".equals(value)) {
String encodedValue = URLEncoder.encode(value.toString(), "UTF-8"); // String encodedValue = URLEncoder.encode(value.toString(), "UTF-8");
sb.append(field.getName()).append('=').append(encodedValue).append('&'); // sb.append(field.getName()).append('=').append(encodedValue).append('&');
} // }
} catch (IllegalAccessException e) { // } catch (IllegalAccessException e) {
throw new RuntimeException(e); // throw new RuntimeException(e);
} // }
} // }
} // }
} // }
//
return sb.length() > 0 ? sb.substring(0, sb.length() - 1) : ""; // return sb.length() > 0 ? sb.substring(0, sb.length() - 1) : "";
} // }
/** // /**
* 更新并完成 // * 更新并完成
* @param object // * @param object
* @param workflowResultDto // * @param workflowResultDto
* @param businessTypeEnum // * @param businessTypeEnum
*/ // */
public void updateTaskModelAndAddTask(Object object, WorkflowResultDto workflowResultDto, BusinessTypeEnum businessTypeEnum) { // public void updateTaskModelAndAddTask(Object object, WorkflowResultDto workflowResultDto, BusinessTypeEnum businessTypeEnum) {
try { // try {
Map<String, Object> updateTaskParam = new HashMap<>(); // Map<String, Object> updateTaskParam = new HashMap<>();
updateTaskParam.put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode()); // updateTaskParam.put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
updateTaskParam.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName()); // updateTaskParam.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
updateTaskParam.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode()); // updateTaskParam.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
updateTaskParam.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName()); // updateTaskParam.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
updateTaskParam.put("model", object); // updateTaskParam.put("model", object);
updateTaskParam.put("relationId", workflowResultDto.getInstanceId()); // updateTaskParam.put("relationId", workflowResultDto.getInstanceId());
updateTaskModel(updateTaskParam); // updateTaskModel(updateTaskParam);
buildTaskModel((buildTaskModelDto(object, workflowResultDto, businessTypeEnum))); // buildTaskModel((buildTaskModelDto(object, workflowResultDto, businessTypeEnum)));
}catch (Exception e){ // }catch (Exception e){
log.error(e.getMessage(),e); // log.error(e.getMessage(),e);
} // }
//
} // }
public JSONArray getRegionName() { public JSONArray getRegionName() {
JSONArray jsonArray = new JSONArray(); JSONArray jsonArray = new JSONArray();
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/FinancingInfoServiceImpl.java
View file @ 79d851fa
...@@ -208,10 +208,10 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina ...@@ -208,10 +208,10 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
financingAuditingDto.setPromoter(RequestContext.getExeUserId()); financingAuditingDto.setPromoter(RequestContext.getExeUserId());
financingAuditingService.createWithModel(financingAuditingDto); financingAuditingService.createWithModel(financingAuditingDto);
//发起待办 //发起待办
FinancingInfo newFinancingInfo = new FinancingInfo(); // FinancingInfo newFinancingInfo = new FinancingInfo();
BeanUtils.copyProperties(model, newFinancingInfo); // BeanUtils.copyProperties(model, newFinancingInfo);
newFinancingInfo.setStatus(FinancingAuditEnum.待融资审核.getName()); // newFinancingInfo.setStatus(FinancingAuditEnum.待融资审核.getName());
commonService.buildTaskModel(commonService.buildTaskModelDto(newFinancingInfo, workflowResultDto, BusinessTypeEnum.HYGF_DZTRRZ)); // commonService.buildTaskModel(commonService.buildTaskModelDto(newFinancingInfo, workflowResultDto, BusinessTypeEnum.HYGF_DZTRRZ));
} }
//批量 兼容审核不通过及整改待推送 //批量 兼容审核不通过及整改待推送
else if (financingInfos.getStatus().equals(FinancingAuditEnum.审核不通过.getName()) || financingInfos.getStatus().equals("待推送") ){ else if (financingInfos.getStatus().equals(FinancingAuditEnum.审核不通过.getName()) || financingInfos.getStatus().equals("待推送") ){
...@@ -262,7 +262,7 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina ...@@ -262,7 +262,7 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
this.deleteBySeq(financingInfo.getSequenceNbr()); this.deleteBySeq(financingInfo.getSequenceNbr());
} }
//停止流程 //停止流程
commonService.deleteTaskModel(processId); // commonService.deleteTaskModel(processId);
} }
@Override @Override
...@@ -340,8 +340,8 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina ...@@ -340,8 +340,8 @@ public class FinancingInfoServiceImpl extends BaseService<FinancingInfoDto, Fina
this.updateById(financingInfo); this.updateById(financingInfo);
//更新待办 //更新待办
workflowResultDto.setInstanceId(financingAuditing.getInstanceId()); // workflowResultDto.setInstanceId(financingAuditing.getInstanceId());
commonService.updateTaskModelAndAddTask(financingInfo,workflowResultDto,BusinessTypeEnum.HYGF_DZTRRZ); // commonService.updateTaskModelAndAddTask(financingInfo,workflowResultDto,BusinessTypeEnum.HYGF_DZTRRZ);
//节点为待整改时生成整改单 //节点为待整改时生成整改单
if (params.containsKey("isFlag") && params.get("isFlag").equals("1") && workflowResultDto.getNextNodeKey().equals(FinancingAuditEnum.待整改.getCode())) { if (params.containsKey("isFlag") && params.get("isFlag").equals("1") && workflowResultDto.getNextNodeKey().equals(FinancingAuditEnum.待整改.getCode())) {
if (params.containsKey("isHistory")){ if (params.containsKey("isHistory")){
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PowerStationServiceImpl.java
View file @ 79d851fa
...@@ -424,9 +424,9 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS ...@@ -424,9 +424,9 @@ public class PowerStationServiceImpl extends BaseService<PowerStationDto, PowerS
powerStationService.savePowerStation(powerStation, flag, powerStation.getOwnersName(), meg); powerStationService.savePowerStation(powerStation, flag, powerStation.getOwnersName(), meg);
//更新待办 //更新待办
WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)).get(0); // WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)).get(0);
workflowResultDto.setInstanceId(powerStation.getProcessInstanceId()); // workflowResultDto.setInstanceId(powerStation.getProcessInstanceId());
commonService.updateTaskModelAndAddTask(powerStation, workflowResultDto,BusinessTypeEnum.HYGF_DZ_SH); // commonService.updateTaskModelAndAddTask(powerStation, workflowResultDto,BusinessTypeEnum.HYGF_DZ_SH);
if (!flag) { if (!flag) {
// 更新农户状态 // 更新农户状态
String peasantHouseholdId = powerStation.getPeasantHouseholdId(); String peasantHouseholdId = powerStation.getPeasantHouseholdId();
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PreparationMoneyServiceImpl.java
View file @ 79d851fa
...@@ -667,7 +667,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto ...@@ -667,7 +667,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
List<ProcessTaskDTO> processTaskDTOS = workFlowService.startBatch(actWorkflowBatchDTO); List<ProcessTaskDTO> processTaskDTOS = workFlowService.startBatch(actWorkflowBatchDTO);
List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfo(processTaskDTOS); List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfo(processTaskDTOS);
//发起待办 //发起待办
commonService.buildTaskModel(commonService.buildTaskModelDto(model, workflowResultDtos.get(0), BusinessTypeEnum.HYGF_FHGL)); // commonService.buildTaskModel(commonService.buildTaskModelDto(model, workflowResultDtos.get(0), BusinessTypeEnum.HYGF_FHGL));
WorkflowResultDto workflowResultDto = workflowResultDtos.get(0); WorkflowResultDto workflowResultDto = workflowResultDtos.get(0);
HygfPreparationMoneyAuditingDto hygfPreparationMoneyAuditingDto = new HygfPreparationMoneyAuditingDto(); HygfPreparationMoneyAuditingDto hygfPreparationMoneyAuditingDto = new HygfPreparationMoneyAuditingDto();
BeanUtils.copyProperties(workflowResultDto, hygfPreparationMoneyAuditingDto); BeanUtils.copyProperties(workflowResultDto, hygfPreparationMoneyAuditingDto);
...@@ -762,7 +762,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto ...@@ -762,7 +762,7 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
List<ProcessTaskDTO> processTaskDTOS = workFlowService.startBatch(actWorkflowBatchDTO); List<ProcessTaskDTO> processTaskDTOS = workFlowService.startBatch(actWorkflowBatchDTO);
List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfo(processTaskDTOS); List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfo(processTaskDTOS);
//发起待办 //发起待办
commonService.buildTaskModel(commonService.buildTaskModelDto(model, workflowResultDtos.get(0), BusinessTypeEnum.HYGF_FHGL)); // commonService.buildTaskModel(commonService.buildTaskModelDto(model, workflowResultDtos.get(0), BusinessTypeEnum.HYGF_FHGL));
WorkflowResultDto workflowResultDto = workflowResultDtos.get(0); WorkflowResultDto workflowResultDto = workflowResultDtos.get(0);
HygfPreparationMoneyAuditingDto hygfPreparationMoneyAuditingDto = new HygfPreparationMoneyAuditingDto(); HygfPreparationMoneyAuditingDto hygfPreparationMoneyAuditingDto = new HygfPreparationMoneyAuditingDto();
BeanUtils.copyProperties(workflowResultDto, hygfPreparationMoneyAuditingDto); BeanUtils.copyProperties(workflowResultDto, hygfPreparationMoneyAuditingDto);
...@@ -1040,8 +1040,8 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto ...@@ -1040,8 +1040,8 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)); List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO));
WorkflowResultDto workflowResultDto = workflowResultDtos.get(0); WorkflowResultDto workflowResultDto = workflowResultDtos.get(0);
//更新待办 //更新待办
workflowResultDto.setInstanceId(instanceId); // workflowResultDto.setInstanceId(instanceId);
commonService.updateTaskModelAndAddTask(model,workflowResultDto,BusinessTypeEnum.HYGF_FHGL); // commonService.updateTaskModelAndAddTask(model,workflowResultDto,BusinessTypeEnum.HYGF_FHGL);
BeanUtils.copyProperties(workflowResultDto, preparationMoneyAuditpDto); BeanUtils.copyProperties(workflowResultDto, preparationMoneyAuditpDto);
preparationMoneyAuditpDto.setPreparationMoneyId(hygfPreparationMoneyAuditing.getPreparationMoneyId()); preparationMoneyAuditpDto.setPreparationMoneyId(hygfPreparationMoneyAuditing.getPreparationMoneyId());
preparationMoneyAuditpDto.setPromoter(hygfPreparationMoneyAuditing.getPromoter()); preparationMoneyAuditpDto.setPromoter(hygfPreparationMoneyAuditing.getPromoter());
...@@ -1086,8 +1086,8 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto ...@@ -1086,8 +1086,8 @@ public class PreparationMoneyServiceImpl extends BaseService<PreparationMoneyDto
WorkflowResultDto workflowResultDto = workflowResultDtos.get(0); WorkflowResultDto workflowResultDto = workflowResultDtos.get(0);
workflowResultDto.setInstanceId(hygfPreparationMoneyAuditing.getInstanceId()); workflowResultDto.setInstanceId(hygfPreparationMoneyAuditing.getInstanceId());
//更新待办 //更新待办
workflowResultDto.setInstanceId(preparationMoney.getInstanceId()); // workflowResultDto.setInstanceId(preparationMoney.getInstanceId());
commonService.updateTaskModelAndAddTask(preparationMoney,workflowResultDto,BusinessTypeEnum.HYGF_FHGL); // commonService.updateTaskModelAndAddTask(preparationMoney,workflowResultDto,BusinessTypeEnum.HYGF_FHGL);
HygfPreparationMoneyAuditingDto preparationMoneyAuditpDto = new HygfPreparationMoneyAuditingDto(); HygfPreparationMoneyAuditingDto preparationMoneyAuditpDto = new HygfPreparationMoneyAuditingDto();
BeanUtils.copyProperties(workflowResultDto, preparationMoneyAuditpDto); BeanUtils.copyProperties(workflowResultDto, preparationMoneyAuditpDto);
preparationMoneyAuditpDto.setPreparationMoneyId(sequenceNbr); preparationMoneyAuditpDto.setPreparationMoneyId(sequenceNbr);
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/RectificationOrderAuditingServiceImpl.java
View file @ 79d851fa
...@@ -94,7 +94,7 @@ public class RectificationOrderAuditingServiceImpl extends BaseService<Rectifica ...@@ -94,7 +94,7 @@ public class RectificationOrderAuditingServiceImpl extends BaseService<Rectifica
rectificationOrderAuditingDto.setPromoter(RequestContext.getExeUserId()); rectificationOrderAuditingDto.setPromoter(RequestContext.getExeUserId());
this.createWithModel(rectificationOrderAuditingDto); this.createWithModel(rectificationOrderAuditingDto);
//发起待办 //发起待办
commonService.buildTaskModel(commonService.buildTaskModelDto(rectificationOrderAuditingDto, workflowResultDto, BusinessTypeEnum.HYGF_ZGDSHLC)); // commonService.buildTaskModel(commonService.buildTaskModelDto(rectificationOrderAuditingDto, workflowResultDto, BusinessTypeEnum.HYGF_ZGDSHLC));
} }
} }
...@@ -130,8 +130,8 @@ public class RectificationOrderAuditingServiceImpl extends BaseService<Rectifica ...@@ -130,8 +130,8 @@ public class RectificationOrderAuditingServiceImpl extends BaseService<Rectifica
} }
this.createWithModel(rectificationOrderAuditingDto); this.createWithModel(rectificationOrderAuditingDto);
//更新待办 //更新待办
workflowResultDto.setInstanceId(rectificationOrderAuditing.getInstanceId()); // workflowResultDto.setInstanceId(rectificationOrderAuditing.getInstanceId());
commonService.updateTaskModelAndAddTask(rectificationOrderAuditing,workflowResultDto,BusinessTypeEnum.HYGF_ZGDSHLC); // commonService.updateTaskModelAndAddTask(rectificationOrderAuditing,workflowResultDto,BusinessTypeEnum.HYGF_ZGDSHLC);
} }
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/RepaymentServiceImpl.java
View file @ 79d851fa
...@@ -36,6 +36,8 @@ import java.time.LocalDate; ...@@ -36,6 +36,8 @@ import java.time.LocalDate;
import java.time.ZoneId; import java.time.ZoneId;
import java.time.temporal.ChronoUnit; import java.time.temporal.ChronoUnit;
import java.util.*; import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
/** /**
* 还款实现层 * 还款实现层
...@@ -122,7 +124,7 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R ...@@ -122,7 +124,7 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R
updateTaskParam.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName()); updateTaskParam.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
updateTaskParam.put("model", sequenceNbr); updateTaskParam.put("model", sequenceNbr);
updateTaskParam.put("relationId", sequenceNbr); updateTaskParam.put("relationId", sequenceNbr);
commonService.updateTaskModel(updateTaskParam); // commonService.updateTaskModel(updateTaskParam);
} }
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
...@@ -153,9 +155,9 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R ...@@ -153,9 +155,9 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R
Boolean dateSend = betweenDay == 15 || betweenDay == 5 || betweenDay == 0; Boolean dateSend = betweenDay == 15 || betweenDay == 5 || betweenDay == 0;
if (dateSend && repayment.getCronSendState() == RepaymentCronSendStateEnum.SEND.getCode()) { if (dateSend && repayment.getCronSendState() == RepaymentCronSendStateEnum.SEND.getCode()) {
//生成待办 //生成待办
WorkflowResultDto workflowResultDto = new WorkflowResultDto(); // WorkflowResultDto workflowResultDto = new WorkflowResultDto();
workflowResultDto.setInstanceId(String.valueOf(repayment.getSequenceNbr())); // workflowResultDto.setInstanceId(String.valueOf(repayment.getSequenceNbr()));
commonService.buildTaskModel(commonService.buildTaskModelDto(repayment, workflowResultDto, BusinessTypeEnum.HYGF_REPAY)); // commonService.buildTaskModel(commonService.buildTaskModelDto(repayment, workflowResultDto, BusinessTypeEnum.HYGF_REPAY));
} }
if (repayment.getCronSendState() < 0) { if (repayment.getCronSendState() < 0) {
//关闭定时任务 //关闭定时任务
...@@ -180,13 +182,11 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R ...@@ -180,13 +182,11 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R
List<List<Object>> read = reader.read(1); List<List<Object>> read = reader.read(1);
List<Repayment> repaymentList = new ArrayList<>(); List<Repayment> repaymentList = new ArrayList<>();
for (List<Object> objects : read) { for (List<Object> objects : read) {
if (objects.size() != 7) { checkExcel(objects);
throw new BadRequest("模板列不是7个");
}
Repayment repayment = new Repayment(); Repayment repayment = new Repayment();
String companyName = (String) objects.get(0); String companyName = String.valueOf(objects.get(0));
for (DropDown dropDown : region) { for (DropDown dropDown : region) {
if (dropDown.getName().equals(companyName)) { if (companyName.equals(dropDown.getName())) {
PrivilegeCompany privilegeCompany = repaymentMapper.getPrivilegeCompanyByOrgCode(dropDown.getOrgCode()); PrivilegeCompany privilegeCompany = repaymentMapper.getPrivilegeCompanyByOrgCode(dropDown.getOrgCode());
if (Objects.nonNull(privilegeCompany)) { if (Objects.nonNull(privilegeCompany)) {
repayment.setRegionalCompaniesCode(dropDown.getOrgCode()); repayment.setRegionalCompaniesCode(dropDown.getOrgCode());
...@@ -198,7 +198,6 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R ...@@ -198,7 +198,6 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R
if (StrUtil.isEmpty(repayment.getCompanyName())) { if (StrUtil.isEmpty(repayment.getCompanyName())) {
throw new BadRequest(companyName + ",该用户没有权限"); throw new BadRequest(companyName + ",该用户没有权限");
} }
String period = String.valueOf(objects.get(1)); String period = String.valueOf(objects.get(1));
String repayDate = String.valueOf(objects.get(2)); String repayDate = String.valueOf(objects.get(2));
String rent = String.valueOf(objects.get(3)); String rent = String.valueOf(objects.get(3));
...@@ -209,11 +208,7 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R ...@@ -209,11 +208,7 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R
repayment.setCronSendState(RepaymentCronSendStateEnum.SEND.getCode()); repayment.setCronSendState(RepaymentCronSendStateEnum.SEND.getCode());
repayment.setRepayState(RepaymentRepayStateEnum.UN_REPAY.getCode()); repayment.setRepayState(RepaymentRepayStateEnum.UN_REPAY.getCode());
repayment.setPeriod(period); repayment.setPeriod(period);
Date date = DateUtils.dateParse(repayDate); repayment.setRepayDate(DateUtils.dateParse(repayDate).toInstant()
if (Objects.isNull(date)){
throw new BadRequest("还款日期格式不对");
}
repayment.setRepayDate(date.toInstant()
.atZone(ZoneId.systemDefault()) .atZone(ZoneId.systemDefault())
.toLocalDate()); .toLocalDate());
repayment.setRent(Double.valueOf(rent)); repayment.setRent(Double.valueOf(rent));
...@@ -233,6 +228,64 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R ...@@ -233,6 +228,64 @@ public class RepaymentServiceImpl extends BaseService<RepaymentDto, Repayment, R
} }
} }
private void checkExcel(List<Object> objects) {
if (objects.size() != 7) {
throw new BadRequest("模板列不是7个");
}
String companyName = String.valueOf(objects.get(0));
if(StrUtil.isEmpty(companyName)){
throw new BadRequest("区域公司不能为空");
}
String period = String.valueOf(objects.get(1));
if(StrUtil.isEmpty(period)){
throw new BadRequest("期次不能为空");
}
String repayDate = String.valueOf(objects.get(2));
if(StrUtil.isEmpty(repayDate)){
throw new BadRequest("还款日期不能为空");
}
Date date = DateUtils.dateParse(repayDate);
if (Objects.isNull(date)){
throw new BadRequest("还款日期格式不对");
}
String rent = String.valueOf(objects.get(3));
if(StrUtil.isEmpty(rent)){
throw new BadRequest("租金不能为空");
}
String interest = String.valueOf(objects.get(4));
if(StrUtil.isEmpty(interest)){
throw new BadRequest("利息不能为空");
}
String principal = String.valueOf(objects.get(5));
if(StrUtil.isEmpty(principal)){
throw new BadRequest("本金不能为空");
}
checkMoney(rent,interest,principal);
String loanPeriod = String.valueOf(objects.get(6));
if(StrUtil.isEmpty(loanPeriod)){
throw new BadRequest("放款批次不能为空");
}
}
private void checkMoney(String rent, String interest, String principal) {
// 定义要匹配的正则表达式
String regex = "^([1-9]\\d{0,9}|0)([.]?|(\\.\\d{1,2})?)$";
Pattern pattern = Pattern.compile(regex);
Matcher rentMatcher = pattern.matcher(rent);
if(!rentMatcher.find()){
throw new BadRequest("租金金额格式不对");
}
Matcher interestMatcher = pattern.matcher(interest);
if(!interestMatcher.find()){
throw new BadRequest("利息金额格式不对");
}
Matcher principalMatcher = pattern.matcher(principal);
if(!principalMatcher.find()){
throw new BadRequest("本金金额格式不对");
}
}
public void exportRepaymentExcel(List<String> sequenceNbrList, HttpServletResponse response) { public void exportRepaymentExcel(List<String> sequenceNbrList, HttpServletResponse response) {
LambdaQueryWrapper<Repayment> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<Repayment> wrapper = new LambdaQueryWrapper<>();
//如果是空值导出全部 //如果是空值导出全部
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/SurveyInformationServiceImpl.java
View file @ 79d851fa
...@@ -352,16 +352,16 @@ public class SurveyInformationServiceImpl ...@@ -352,16 +352,16 @@ public class SurveyInformationServiceImpl
return code; return code;
} }
private void updateSurveyInformationTask(PowerStation powerStation, String instanceId) { // private void updateSurveyInformationTask(PowerStation powerStation, String instanceId) {
Map<String, Object> updateTaskParam = new HashMap<>(); // Map<String, Object> updateTaskParam = new HashMap<>();
updateTaskParam.put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode()); // updateTaskParam.put("flowStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
updateTaskParam.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName()); // updateTaskParam.put("flowStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
updateTaskParam.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode()); // updateTaskParam.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
updateTaskParam.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName()); // updateTaskParam.put("taskStatusLabel", FlowStatusEnum.TO_BE_FINISHED.getName());
updateTaskParam.put("model", powerStation); // updateTaskParam.put("model", powerStation);
updateTaskParam.put("relationId", instanceId); // updateTaskParam.put("relationId", instanceId);
commonService.updateTaskModel(updateTaskParam); // commonService.updateTaskModel(updateTaskParam);
} // }
private void submitExamine(PeasantHousehold peasantHousehold) { private void submitExamine(PeasantHousehold peasantHousehold) {
...@@ -397,7 +397,7 @@ public class SurveyInformationServiceImpl ...@@ -397,7 +397,7 @@ public class SurveyInformationServiceImpl
ProcessTaskDTO processTaskDTO = workFlowService.standard(basicGridAcceptance, taskResultDTO, requestContext.getUserId()); ProcessTaskDTO processTaskDTO = workFlowService.standard(basicGridAcceptance, taskResultDTO, requestContext.getUserId());
basicGridAcceptance.setInstanceId(powerStation.getProcessInstanceId()); basicGridAcceptance.setInstanceId(powerStation.getProcessInstanceId());
updateSurveyInformationTask(powerStation, powerStation.getProcessInstanceId()); // updateSurveyInformationTask(powerStation, powerStation.getProcessInstanceId());
processTaskDTOS.add(processTaskDTO); processTaskDTOS.add(processTaskDTO);
} else { } else {
// 第一步启动工作流 // 第一步启动工作流
...@@ -458,9 +458,9 @@ public class SurveyInformationServiceImpl ...@@ -458,9 +458,9 @@ public class SurveyInformationServiceImpl
up.eq(PeasantHousehold::getSequenceNbr, idsk); up.eq(PeasantHousehold::getSequenceNbr, idsk);
peasantHouseholdMapper.update(null, up); peasantHouseholdMapper.update(null, up);
//添加待办 //添加待办
WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(processTaskDTOS).get(0); // WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(processTaskDTOS).get(0);
workflowResultDto.setInstanceId(powerStation.getProcessInstanceId()); // workflowResultDto.setInstanceId(powerStation.getProcessInstanceId());
commonService.buildTaskModel(commonService.buildTaskModelDto(powerStation, workflowResultDto, BusinessTypeEnum.HYGF_DZ_SH)); // commonService.buildTaskModel(commonService.buildTaskModelDto(powerStation, workflowResultDto, BusinessTypeEnum.HYGF_DZ_SH));
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
log.error("submitExamine error:", e); log.error("submitExamine error:", e);
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/UnitInfoServiceImpl.java
View file @ 79d851fa
...@@ -536,8 +536,8 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn ...@@ -536,8 +536,8 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
dealerReview.setNextProcessNode(DealerReviewEnum.经销商管理员审核.getCode()); dealerReview.setNextProcessNode(DealerReviewEnum.经销商管理员审核.getCode());
dealerReviewService.saveDealerReview(dealerReview, true, false, regUnitInfo.getName(), "任务明细：经销商已上传信息"); dealerReviewService.saveDealerReview(dealerReview, true, false, regUnitInfo.getName(), "任务明细：经销商已上传信息");
//添加待办 //添加待办
List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfo(processTaskDTOS); // List<WorkflowResultDto> workflowResultDtos = workFlowService.buildWorkFlowInfo(processTaskDTOS);
commonService.buildTaskModel(commonService.buildTaskModelDto(dealerReview, workflowResultDtos.get(0), BusinessTypeEnum.HYGF_JXS_SH)); // commonService.buildTaskModel(commonService.buildTaskModelDto(dealerReview, workflowResultDtos.get(0), BusinessTypeEnum.HYGF_JXS_SH));
} catch (Exception e){ } catch (Exception e){
throw new BaseException("获取工作流节点失败！","400","获取工作流节点失败！"); throw new BaseException("获取工作流节点失败！","400","获取工作流节点失败！");
...@@ -702,9 +702,9 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn ...@@ -702,9 +702,9 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
this.saveOrUpdate(unitInfo); this.saveOrUpdate(unitInfo);
//更新待办 //更新待办
WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)).get(0); // WorkflowResultDto workflowResultDto = workFlowService.buildWorkFlowInfo(CollectionUtil.newArrayList(processTaskDTO)).get(0);
workflowResultDto.setInstanceId(dealerReview.getProcessInstanceId()); // workflowResultDto.setInstanceId(dealerReview.getProcessInstanceId());
commonService.updateTaskModelAndAddTask(unitInfo, workflowResultDto,BusinessTypeEnum.HYGF_JXS_SH); // commonService.updateTaskModelAndAddTask(unitInfo, workflowResultDto,BusinessTypeEnum.HYGF_JXS_SH);
}catch (Exception e){ }catch (Exception e){
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/WorkOrderServiceImpl.java
View file @ 79d851fa
...@@ -381,7 +381,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W ...@@ -381,7 +381,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
hygfWorkOrderStationAuditingDto.setPromoter(RequestContext.getExeUserId()); hygfWorkOrderStationAuditingDto.setPromoter(RequestContext.getExeUserId());
hygfWorkOrderStationAuditingService.createWithModel(hygfWorkOrderStationAuditingDto); hygfWorkOrderStationAuditingService.createWithModel(hygfWorkOrderStationAuditingDto);
//发起待办 //发起待办
commonService.buildTaskModel(commonService.buildTaskModelDto(hygfWorkOrderStationAuditingDto, workflowResultDto, BusinessTypeEnum.HYGF_SGLCSH)); // commonService.buildTaskModel(commonService.buildTaskModelDto(hygfWorkOrderStationAuditingDto, workflowResultDto, BusinessTypeEnum.HYGF_SGLCSH));
}else { }else {
this.wofkflowExcute(workOrderStationAuditing.getInstanceId(),"0","通过",BusinessWorkflowKey.施工完成提交.getCode()); this.wofkflowExcute(workOrderStationAuditing.getInstanceId(),"0","通过",BusinessWorkflowKey.施工完成提交.getCode());
} }
...@@ -517,8 +517,8 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W ...@@ -517,8 +517,8 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
} }
hygfWorkOrderStationAuditingService.createWithModel(workOrderStationAuditingDto); hygfWorkOrderStationAuditingService.createWithModel(workOrderStationAuditingDto);
//更新待办 //更新待办
workflowResultDto.setInstanceId(hygfWorkOrderStationAuditing.getInstanceId()); // workflowResultDto.setInstanceId(hygfWorkOrderStationAuditing.getInstanceId());
commonService.updateTaskModelAndAddTask(hygfWorkOrderStationAuditing,workflowResultDto,BusinessTypeEnum.HYGF_SGLCSH); // commonService.updateTaskModelAndAddTask(hygfWorkOrderStationAuditing,workflowResultDto,BusinessTypeEnum.HYGF_SGLCSH);
} }
public Page<WorkOrder> selectPage(int pageNum, int pageSize, WorkOrder workOrder) { public Page<WorkOrder> selectPage(int pageNum, int pageSize, WorkOrder workOrder) {
......
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