人员批量入场时系统报错修改
This commit is contained in:
parent
d77643a3fb
commit
a353302d1e
|
|
@ -51,11 +51,14 @@ public class BusinessServiceImpl implements BusinessService {
|
|||
|
||||
@Override
|
||||
public AjaxResult submitApproval(AuditTask auditTask) {
|
||||
//任务id
|
||||
String taskId = auditTask.getTaskId();
|
||||
String taskId = null;
|
||||
if (StringUtils.isBlank(auditTask.getTaskId())) {
|
||||
//任务id
|
||||
taskId = auditTask.getTaskId();
|
||||
}
|
||||
//任务类型
|
||||
String taskType = auditTask.getTaskType();
|
||||
if(StringUtils.isEmpty(taskType)){
|
||||
if (StringUtils.isEmpty(taskType)) {
|
||||
return AjaxResult.error("请选择审核类型");
|
||||
}
|
||||
//驳回id
|
||||
|
|
@ -66,13 +69,13 @@ public class BusinessServiceImpl implements BusinessService {
|
|||
//审核流 默认为2 通用审核流
|
||||
String examineType = "2";
|
||||
//提交至上一个审核人，暂不启用
|
||||
if( StringUtils.isNotEmpty(taskId)){
|
||||
List<ConfigurationVo> list = mapper.getRestartChechMessage(taskId,taskType);
|
||||
if (StringUtils.isNotEmpty(taskId)) {
|
||||
List<ConfigurationVo> list = mapper.getRestartChechMessage(taskId, taskType);
|
||||
//表示第一次审批或没被驳回，不做处理
|
||||
if(list ==null || list.size() == 0 ){
|
||||
if (list == null || list.size() == 0) {
|
||||
|
||||
//有驳回信息，查询相关人员，再次提交至驳回人员
|
||||
}else if(list !=null && list.size() == 1){
|
||||
//有驳回信息，查询相关人员，再次提交至驳回人员
|
||||
} else if (list != null && list.size() == 1) {
|
||||
// //审核流程最后的id
|
||||
// int lastId = mapper.getLastCheckId(taskId);
|
||||
// //驳回id
|
||||
|
|
@ -82,12 +85,12 @@ public class BusinessServiceImpl implements BusinessService {
|
|||
// }
|
||||
rejectId = list.get(0).getUserId();
|
||||
rejectSort = list.get(0).getSort();
|
||||
rejectVersion = list.get(0).getVersion();
|
||||
rejectVersion = list.get(0).getVersion();
|
||||
repeatedSubmit = list.get(0).getRepeatedSubmit();
|
||||
}else if(list !=null && list.size() >1){
|
||||
} else if (list != null && list.size() > 1) {
|
||||
//特殊审核流修改，重新提交
|
||||
// return AjaxResult.error("驳回信息异常，请联系管理员处理！");
|
||||
}else{
|
||||
// return AjaxResult.error("驳回信息异常，请联系管理员处理！");
|
||||
} else {
|
||||
return AjaxResult.error("发生未知错误！");
|
||||
}
|
||||
|
||||
|
|
@ -98,18 +101,18 @@ public class BusinessServiceImpl implements BusinessService {
|
|||
String screenExamineId = getExamineIdByProAndCheckType(auditTask.getProId(), auditTask.getTaskType());
|
||||
//为null代表此审核走通用审核流
|
||||
if (screenExamineId == null) {
|
||||
cd = getCongifDetailsByTypeAndSort(auditTask.getTaskType(), 1,null,examineType);
|
||||
cd = getCongifDetailsByTypeAndSort(auditTask.getTaskType(), 1, null, examineType);
|
||||
} else {
|
||||
examineType = "1";
|
||||
cd = getCongifDetailsByExamineIdAndSort(auditTask.getTaskType(),screenExamineId, 1,null,examineType);
|
||||
cd = getCongifDetailsByExamineIdAndSort(auditTask.getTaskType(), screenExamineId, 1, null, examineType);
|
||||
}
|
||||
if(cd == null){
|
||||
if (cd == null) {
|
||||
return AjaxResult.success("此审核类型未配置相对应的审核流，请联系管理员配置后再次提交");
|
||||
}
|
||||
//版本号
|
||||
String version = cd.getVersion();
|
||||
if(version !=null){
|
||||
if(!version.equals(rejectVersion)){
|
||||
if (version != null) {
|
||||
if (!version.equals(rejectVersion)) {
|
||||
//版本更迭，重头开始
|
||||
rejectId = null;
|
||||
}
|
||||
|
|
@ -141,17 +144,17 @@ public class BusinessServiceImpl implements BusinessService {
|
|||
Map<String, Object> map = new HashMap<>();
|
||||
switch (auditTask.getUserType()) {
|
||||
case "01":
|
||||
if(rejectId == null){
|
||||
if (rejectId == null) {
|
||||
//查询特殊审核流
|
||||
String specialExamineId = mapper.getExamineIdByProAndCheckType(auditTask.getProId(), auditTask.getTaskType());
|
||||
ConfigurationVo configDetails = new ConfigurationVo();
|
||||
ConfigurationVo configDetails = new ConfigurationVo();
|
||||
//无特殊审核流
|
||||
if(specialExamineId == null){
|
||||
if (specialExamineId == null) {
|
||||
//监理提交 直接进入业主审核流程
|
||||
configDetails = getCongifDetailsByTypeAndSort(auditTask.getTaskType(), 1,null,examineType);
|
||||
}else{
|
||||
configDetails = getCongifDetailsByTypeAndSort(auditTask.getTaskType(), 1, null, examineType);
|
||||
} else {
|
||||
examineType = "1";
|
||||
configDetails = mapper.getCongifDetailsByExamineIdAndSort(auditTask.getTaskType(),screenExamineId, 1,null,examineType);
|
||||
configDetails = mapper.getCongifDetailsByExamineIdAndSort(auditTask.getTaskType(), screenExamineId, 1, null, examineType);
|
||||
}
|
||||
//configDetails = getCongifDetailsByTypeAndSort(auditTask.getTaskType(), 1,null);
|
||||
System.out.println("configDetails: " + configDetails);
|
||||
|
|
@ -180,18 +183,18 @@ public class BusinessServiceImpl implements BusinessService {
|
|||
}
|
||||
auditTask.setExamineId(newExamineId);
|
||||
auditTask.setExamineType(examineType);
|
||||
addCheckPerson(auditTask,null);
|
||||
addCheckPerson(auditTask, null);
|
||||
return startFlowAble(auditTask, userList, userId, taskId, ProcessConstants.BASE, newFinalJudgment
|
||||
, newExamineId, newSort, newProcessKey, iaAdd,"1",version);
|
||||
, newExamineId, newSort, newProcessKey, iaAdd, "1", version);
|
||||
}
|
||||
}else{
|
||||
} else {
|
||||
//重新提交至驳回之人
|
||||
return rejectSubmit( auditTask, screenExamineId, rejectSort, rejectVersion,rejectId,userId,taskId,iaAdd,version,repeatedSubmit,null,null,examineType);
|
||||
return rejectSubmit(auditTask, screenExamineId, rejectSort, rejectVersion, rejectId, userId, taskId, iaAdd, version, repeatedSubmit, null, null, examineType);
|
||||
}
|
||||
|
||||
break;
|
||||
case "02":
|
||||
if(rejectId == null){
|
||||
if (rejectId == null) {
|
||||
//承包商提交 下一步进入监理审核流程
|
||||
uuidMap = mapper.getContMessageByUser(auditTask.getProId(), auditTask.getParentUuid());
|
||||
if (uuidMap.containsKey("supUuid")) {
|
||||
|
|
@ -201,26 +204,26 @@ public class BusinessServiceImpl implements BusinessService {
|
|||
list.add(supUserId);
|
||||
}
|
||||
String exId = cd.getExamineId();
|
||||
System.err.println("exId=="+exId);
|
||||
System.err.println("exId==" + exId);
|
||||
auditTask.setExamineType(examineType);
|
||||
auditTask.setExamineId(cd.getExamineId());
|
||||
addCheckPerson(auditTask,list);
|
||||
addCheckPerson(auditTask, list);
|
||||
return startFlowAble(auditTask, list, userId, taskId, ProcessConstants.BASE,
|
||||
ProcessConstants.FINAL_CHECK_FALSE, exId, "0", "0", iaAdd,"1",version);
|
||||
ProcessConstants.FINAL_CHECK_FALSE, exId, "0", "0", iaAdd, "1", version);
|
||||
} else {
|
||||
//监理提交 直接进入业主审核流程
|
||||
// ConfigurationVo configDetails1 = getCongifDetailsByTypeAndSort(auditTask.getTaskType(), 1,null);
|
||||
|
||||
//查询特殊审核流
|
||||
String specialExamineId1 = mapper.getExamineIdByProAndCheckType(auditTask.getProId(), auditTask.getTaskType());
|
||||
ConfigurationVo configDetails1 = new ConfigurationVo();
|
||||
ConfigurationVo configDetails1 = new ConfigurationVo();
|
||||
//无特殊审核流
|
||||
if(specialExamineId1 == null){
|
||||
if (specialExamineId1 == null) {
|
||||
//监理提交 直接进入业主审核流程
|
||||
configDetails1 = getCongifDetailsByTypeAndSort(auditTask.getTaskType(), 1,null,examineType);
|
||||
}else{
|
||||
configDetails1 = getCongifDetailsByTypeAndSort(auditTask.getTaskType(), 1, null, examineType);
|
||||
} else {
|
||||
examineType = "1";
|
||||
configDetails1 = mapper.getCongifDetailsByExamineIdAndSort(auditTask.getTaskType(),screenExamineId, 1,null,examineType);
|
||||
configDetails1 = mapper.getCongifDetailsByExamineIdAndSort(auditTask.getTaskType(), screenExamineId, 1, null, examineType);
|
||||
}
|
||||
|
||||
System.out.println("configDetails: " + configDetails1);
|
||||
|
|
@ -249,14 +252,14 @@ public class BusinessServiceImpl implements BusinessService {
|
|||
}
|
||||
auditTask.setExamineId(newExamineId);
|
||||
auditTask.setExamineType(examineType);
|
||||
addCheckPerson(auditTask,null);
|
||||
addCheckPerson(auditTask, null);
|
||||
//addCheckPerson(auditTask,userList);
|
||||
return startFlowAble(auditTask, userList, userId, taskId, ProcessConstants.BASE,
|
||||
newFinalJudgment, newExamineId, newSort, newProcessKey, iaAdd,"1",version);
|
||||
newFinalJudgment, newExamineId, newSort, newProcessKey, iaAdd, "1", version);
|
||||
}
|
||||
|
||||
}
|
||||
}else{
|
||||
} else {
|
||||
//重新提交至驳回之人
|
||||
uuidMap = mapper.getContMessageByUser(auditTask.getProId(), auditTask.getParentUuid());
|
||||
if (uuidMap.containsKey("supUuid")) {
|
||||
|
|
@ -264,13 +267,13 @@ public class BusinessServiceImpl implements BusinessService {
|
|||
}
|
||||
|
||||
|
||||
return rejectSubmit( auditTask, screenExamineId, rejectSort, rejectVersion,rejectId, userId,taskId,iaAdd,version,repeatedSubmit,supUserId,null,examineType);
|
||||
return rejectSubmit(auditTask, screenExamineId, rejectSort, rejectVersion, rejectId, userId, taskId, iaAdd, version, repeatedSubmit, supUserId, null, examineType);
|
||||
}
|
||||
|
||||
case "03":
|
||||
String exId = cd.getExamineId();
|
||||
System.err.println("exId=="+exId);
|
||||
if(rejectId == null){
|
||||
String exId = cd.getExamineId();
|
||||
System.err.println("exId==" + exId);
|
||||
if (rejectId == null) {
|
||||
uuidMap = mapper.getSubMessageByUser(auditTask.getProId(), auditTask.getParentUuid());
|
||||
//分包商提交 下一步进入承包商审核流程
|
||||
contUserId = String.valueOf(StringUtils.isNotEmpty(uuidMap.get("contUserId") + "") ? uuidMap.get("contUserId") : null);
|
||||
|
|
@ -285,29 +288,29 @@ public class BusinessServiceImpl implements BusinessService {
|
|||
System.err.println("taskId==" + taskId);
|
||||
auditTask.setExamineType(examineType);
|
||||
auditTask.setExamineId(cd.getExamineId());
|
||||
addCheckPerson(auditTask,list);
|
||||
addCheckPerson(auditTask, list);
|
||||
return startFlowAble(auditTask, list, userId, taskId, ProcessConstants.BASE,
|
||||
ProcessConstants.FINAL_CHECK_FALSE, exId, "0", "0", iaAdd,"1",version);
|
||||
}else{
|
||||
ProcessConstants.FINAL_CHECK_FALSE, exId, "0", "0", iaAdd, "1", version);
|
||||
} else {
|
||||
uuidMap = mapper.getSubMessageByUser(auditTask.getProId(), auditTask.getParentUuid());
|
||||
//分包商提交 下一步进入承包商审核流程
|
||||
contUserId = String.valueOf(StringUtils.isNotEmpty(uuidMap.get("contUserId") + "") ? uuidMap.get("contUserId") : null);
|
||||
supUserId = String.valueOf(StringUtils.isNotEmpty(uuidMap.get("supUserId") + "") ? uuidMap.get("supUserId") : null);
|
||||
return rejectSubmit( auditTask, exId, rejectSort, rejectVersion,rejectId,userId,taskId,iaAdd,version,repeatedSubmit,supUserId,contUserId,examineType);
|
||||
return rejectSubmit(auditTask, exId, rejectSort, rejectVersion, rejectId, userId, taskId, iaAdd, version, repeatedSubmit, supUserId, contUserId, examineType);
|
||||
}
|
||||
|
||||
case "00":
|
||||
if(rejectId == null){
|
||||
case "00":
|
||||
if (rejectId == null) {
|
||||
//查询特殊审核流
|
||||
String specialExamineId = mapper.getExamineIdByProAndCheckType(auditTask.getProId(), auditTask.getTaskType());
|
||||
ConfigurationVo configDetails = new ConfigurationVo();
|
||||
ConfigurationVo configDetails = new ConfigurationVo();
|
||||
//无特殊审核流
|
||||
if(specialExamineId == null){
|
||||
if (specialExamineId == null) {
|
||||
//监理提交 直接进入业主审核流程
|
||||
configDetails = getCongifDetailsByTypeAndSort(auditTask.getTaskType(), 1,null,examineType);
|
||||
}else{
|
||||
configDetails = getCongifDetailsByTypeAndSort(auditTask.getTaskType(), 1, null, examineType);
|
||||
} else {
|
||||
examineType = "1";
|
||||
configDetails = mapper.getCongifDetailsByExamineIdAndSort(auditTask.getTaskType(),screenExamineId, 1,null,examineType);
|
||||
configDetails = mapper.getCongifDetailsByExamineIdAndSort(auditTask.getTaskType(), screenExamineId, 1, null, examineType);
|
||||
}
|
||||
//configDetails = getCongifDetailsByTypeAndSort(auditTask.getTaskType(), 1,null);
|
||||
System.out.println("configDetails: " + configDetails);
|
||||
|
|
@ -337,13 +340,13 @@ public class BusinessServiceImpl implements BusinessService {
|
|||
}
|
||||
auditTask.setExamineId(newExamineId);
|
||||
auditTask.setExamineType(examineType);
|
||||
addCheckPerson(auditTask,null);
|
||||
addCheckPerson(auditTask, null);
|
||||
return startFlowAble(auditTask, userList, userId, taskId, ProcessConstants.BASE, newFinalJudgment
|
||||
, newExamineId, newSort, newProcessKey, iaAdd,"1",version);
|
||||
, newExamineId, newSort, newProcessKey, iaAdd, "1", version);
|
||||
}
|
||||
}else{
|
||||
} else {
|
||||
//重新提交至驳回之人
|
||||
return rejectSubmit( auditTask, screenExamineId, rejectSort, rejectVersion,rejectId,userId,taskId,iaAdd,version,repeatedSubmit,null,null,examineType);
|
||||
return rejectSubmit(auditTask, screenExamineId, rejectSort, rejectVersion, rejectId, userId, taskId, iaAdd, version, repeatedSubmit, null, null, examineType);
|
||||
}
|
||||
default:
|
||||
return AjaxResult.error("审核提交失败");
|
||||
|
|
@ -352,22 +355,22 @@ public class BusinessServiceImpl implements BusinessService {
|
|||
}
|
||||
|
||||
|
||||
private AjaxResult rejectSubmit(AuditTask auditTask,String screenExamineId,String rejectSort,String rejectVersion,
|
||||
String rejectId,String userId,String taskId,boolean iaAdd,String version,String repeatedSubmit,String supUserId,String contUserId,String examineType){
|
||||
private AjaxResult rejectSubmit(AuditTask auditTask, String screenExamineId, String rejectSort, String rejectVersion,
|
||||
String rejectId, String userId, String taskId, boolean iaAdd, String version, String repeatedSubmit, String supUserId, String contUserId, String examineType) {
|
||||
|
||||
//还未到业主审核
|
||||
if("0".equals(rejectSort)){
|
||||
if ("0".equals(rejectSort)) {
|
||||
List<String> finalList = new ArrayList<>();
|
||||
List<String> userList = new ArrayList<>();
|
||||
if(contUserId !=null){
|
||||
if (contUserId != null) {
|
||||
userList.add(contUserId);
|
||||
}
|
||||
if(supUserId !=null){
|
||||
userList.add(supUserId);
|
||||
}
|
||||
List<String> alreadyList = mapper.getAlreadyCheckPerson(auditTask.getTaskId(),rejectVersion,repeatedSubmit,rejectSort);
|
||||
if (supUserId != null) {
|
||||
userList.add(supUserId);
|
||||
}
|
||||
List<String> alreadyList = mapper.getAlreadyCheckPerson(auditTask.getTaskId(), rejectVersion, repeatedSubmit, rejectSort);
|
||||
//userList 本节点应有人员 ；userList本节点审核通过人员
|
||||
if(userList !=null && alreadyList != null && alreadyList.size()>0 && userList.size()>0){
|
||||
if (userList != null && alreadyList != null && alreadyList.size() > 0 && userList.size() > 0) {
|
||||
// 合并并去重
|
||||
List<String> mergedList = new ArrayList<>(userList);
|
||||
mergedList.addAll(alreadyList);
|
||||
|
|
@ -375,24 +378,24 @@ public class BusinessServiceImpl implements BusinessService {
|
|||
mergedList.removeAll(alreadyList);
|
||||
finalList = mergedList;
|
||||
//alreadyList =null 说明第一个审核的人就未通过，所有的人均需重新审核
|
||||
} else if (userList !=null && (alreadyList == null || alreadyList.size() == 0)) {
|
||||
} else if (userList != null && (alreadyList == null || alreadyList.size() == 0)) {
|
||||
finalList = userList;
|
||||
}else{
|
||||
} else {
|
||||
return AjaxResult.error("审核节点数据查询失败");
|
||||
}
|
||||
auditTask.setExamineType(examineType);
|
||||
return startFlowAble(auditTask, finalList, userId, taskId, ProcessConstants.BASE,
|
||||
ProcessConstants.FINAL_CHECK_FALSE, "0", "0", "0", iaAdd,"1",version);
|
||||
}else{
|
||||
ProcessConstants.FINAL_CHECK_FALSE, "0", "0", "0", iaAdd, "1", version);
|
||||
} else {
|
||||
//查询特殊审核流
|
||||
String specialExamineId = mapper.getExamineIdByProAndCheckType(auditTask.getProId(), auditTask.getTaskType());
|
||||
ConfigurationVo configDetails = new ConfigurationVo();
|
||||
ConfigurationVo configDetails = new ConfigurationVo();
|
||||
//无特殊审核流
|
||||
if(specialExamineId == null){
|
||||
if (specialExamineId == null) {
|
||||
//监理提交 直接进入业主审核流程
|
||||
configDetails = getCongifDetailsByTypeAndSort(auditTask.getTaskType(), Integer.parseInt(rejectSort),rejectVersion,examineType);
|
||||
}else{
|
||||
configDetails = mapper.getCongifDetailsByExamineIdAndSort(auditTask.getTaskType(),specialExamineId, Integer.parseInt(rejectSort),rejectVersion,examineType);
|
||||
configDetails = getCongifDetailsByTypeAndSort(auditTask.getTaskType(), Integer.parseInt(rejectSort), rejectVersion, examineType);
|
||||
} else {
|
||||
configDetails = mapper.getCongifDetailsByExamineIdAndSort(auditTask.getTaskType(), specialExamineId, Integer.parseInt(rejectSort), rejectVersion, examineType);
|
||||
}
|
||||
//configDetails = getCongifDetailsByTypeAndSort(auditTask.getTaskType(), 1,null);
|
||||
System.out.println("configDetails: " + configDetails);
|
||||
|
|
@ -406,7 +409,7 @@ public class BusinessServiceImpl implements BusinessService {
|
|||
String newFinalJudgment = configDetails.getFinalJudgment();
|
||||
List<String> finalList = new ArrayList<>();
|
||||
//依次审批0
|
||||
if("0".equals(newProcessKey)){
|
||||
if ("0".equals(newProcessKey)) {
|
||||
// 将数组转换为 List
|
||||
// 将字符串按逗号拆分并转换为 List<Integer>
|
||||
List<String> userList = Arrays.asList(newUser.split(","));
|
||||
|
|
@ -417,21 +420,21 @@ public class BusinessServiceImpl implements BusinessService {
|
|||
? userList.subList(index, userList.size())
|
||||
: Arrays.asList(newUser.split(","));
|
||||
//去除空白字符
|
||||
filteredList = filteredList.stream()
|
||||
filteredList = filteredList.stream()
|
||||
.filter(s -> s != null && !s.trim().isEmpty())
|
||||
.collect(Collectors.toList());
|
||||
|
||||
finalList = filteredList;
|
||||
finalList = filteredList;
|
||||
//会签审批1
|
||||
}else if("1".equals(newProcessKey)){
|
||||
} else if ("1".equals(newProcessKey)) {
|
||||
List<String> userList = new ArrayList<>(Arrays.asList(newUser.split(",")));
|
||||
//获取驳回列表人员下标
|
||||
// userList.remove(rejectId);
|
||||
// finalList = userList;
|
||||
//获取改节点审批通过人员id
|
||||
List<String> alreadyList = mapper.getAlreadyCheckPerson(auditTask.getTaskId(),rejectVersion,repeatedSubmit,rejectSort);
|
||||
List<String> alreadyList = mapper.getAlreadyCheckPerson(auditTask.getTaskId(), rejectVersion, repeatedSubmit, rejectSort);
|
||||
//userList 本节点应有人员 ；userList本节点审核通过人员
|
||||
if(userList !=null && alreadyList != null && alreadyList.size()>0 && userList.size()>0){
|
||||
if (userList != null && alreadyList != null && alreadyList.size() > 0 && userList.size() > 0) {
|
||||
// 合并并去重
|
||||
List<String> mergedList = new ArrayList<>(userList);
|
||||
mergedList.addAll(alreadyList);
|
||||
|
|
@ -439,13 +442,13 @@ public class BusinessServiceImpl implements BusinessService {
|
|||
mergedList.removeAll(alreadyList);
|
||||
finalList = mergedList;
|
||||
//alreadyList =null 说明第一个审核的人就未通过，所有的人均需重新审核
|
||||
} else if (userList !=null && (alreadyList == null || alreadyList.size() == 0)) {
|
||||
} else if (userList != null && (alreadyList == null || alreadyList.size() == 0)) {
|
||||
finalList = userList;
|
||||
}else{
|
||||
} else {
|
||||
return AjaxResult.error("审核节点数据查询失败");
|
||||
}
|
||||
|
||||
}else{
|
||||
} else {
|
||||
finalList = Arrays.asList(newUser.split(","));
|
||||
}
|
||||
|
||||
|
|
@ -455,20 +458,20 @@ public class BusinessServiceImpl implements BusinessService {
|
|||
if (StringUtils.isNotEmpty(auditTask.getSubUuid())) {
|
||||
auditTask.setSubUuid(auditTask.getSubUuid());
|
||||
}
|
||||
List<String> userList=new ArrayList<>();
|
||||
List<String> userList = new ArrayList<>();
|
||||
if (StringUtils.isNotEmpty(auditTask.getSupUuid())) {
|
||||
auditTask.setSupUuid(auditTask.getSupUuid());
|
||||
List<String> jlList=mapper.getJlUserList(auditTask.getSupUuid());
|
||||
if(jlList!=null && !jlList.isEmpty()){
|
||||
List<String> jlList = mapper.getJlUserList(auditTask.getSupUuid());
|
||||
if (jlList != null && !jlList.isEmpty()) {
|
||||
userList.addAll(jlList);
|
||||
}
|
||||
}
|
||||
auditTask.setExamineId(newExamineId);
|
||||
auditTask.setExamineType(examineType);
|
||||
addCheckPerson(auditTask,userList);
|
||||
addCheckPerson(auditTask, userList);
|
||||
return startFlowAble(auditTask, finalList, userId, taskId, ProcessConstants.OWNER, newFinalJudgment
|
||||
, newExamineId, newSort, newProcessKey, iaAdd,"1",version);
|
||||
}else{
|
||||
, newExamineId, newSort, newProcessKey, iaAdd, "1", version);
|
||||
} else {
|
||||
return AjaxResult.error("审核提交失败");
|
||||
}
|
||||
}
|
||||
|
|
@ -476,17 +479,17 @@ public class BusinessServiceImpl implements BusinessService {
|
|||
}
|
||||
|
||||
@Override
|
||||
public void addCheckPerson(AuditTask auditTask,List<String> stringList) {
|
||||
public void addCheckPerson(AuditTask auditTask, List<String> stringList) {
|
||||
mapper.delectCheckPerson(auditTask.getTaskId());
|
||||
List<ConfigurationVo> finaList = new ArrayList<>();
|
||||
//审批流程配置信息
|
||||
List<ConfigurationVo> checkDetailsList = mapper.getCongifDetailsListByTypeAndSort(auditTask.getTaskType(),auditTask.getExamineType(),auditTask.getExamineId());
|
||||
List<ConfigurationVo> checkDetailsList = mapper.getCongifDetailsListByTypeAndSort(auditTask.getTaskType(), auditTask.getExamineType(), auditTask.getExamineId());
|
||||
List<ConfigurationVo> allList = new ArrayList();
|
||||
// if(stringList !=null && stringList.size()>0){
|
||||
// allList.addAll(stringList);
|
||||
// }
|
||||
if(stringList !=null && stringList.size()>0){
|
||||
for (String s:stringList) {
|
||||
if (stringList != null && stringList.size() > 0) {
|
||||
for (String s : stringList) {
|
||||
ConfigurationVo configurationVo = new ConfigurationVo();
|
||||
configurationVo.setCheckPerson(s);
|
||||
configurationVo.setExamineType("0");
|
||||
|
|
@ -515,8 +518,8 @@ public class BusinessServiceImpl implements BusinessService {
|
|||
// }
|
||||
// }
|
||||
List<ConfigurationVo> configDetailsList = new ArrayList<>();
|
||||
for (ConfigurationVo bean:finaList) {
|
||||
if(StringUtils.isBlank(bean.getCheckPerson())){
|
||||
for (ConfigurationVo bean : finaList) {
|
||||
if (StringUtils.isBlank(bean.getCheckPerson())) {
|
||||
continue;
|
||||
}
|
||||
String newUser = bean.getCheckPerson();
|
||||
|
|
@ -524,7 +527,7 @@ public class BusinessServiceImpl implements BusinessService {
|
|||
String version = bean.getVersion();
|
||||
String rejectSort = bean.getSort();
|
||||
List<String> userList = Arrays.asList(newUser.split(","));
|
||||
for (String s:userList) {
|
||||
for (String s : userList) {
|
||||
ConfigurationVo configurationVo = new ConfigurationVo();
|
||||
configurationVo.setCheckPerson(s);
|
||||
configurationVo.setExamineType(examineType);
|
||||
|
|
@ -533,12 +536,12 @@ public class BusinessServiceImpl implements BusinessService {
|
|||
configurationVo.setIsActive("1");
|
||||
configurationVo.setTaskId(auditTask.getTaskId());
|
||||
configDetailsList.add(configurationVo);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//添加审核人员信息
|
||||
mapper.insertCheckPerson(configDetailsList);
|
||||
for (ConfigurationVo bean:checkDetailsList) {
|
||||
for (ConfigurationVo bean : checkDetailsList) {
|
||||
bean.setIsActive("2");
|
||||
bean.setTaskId(auditTask.getTaskId());
|
||||
}
|
||||
|
|
@ -563,7 +566,7 @@ public class BusinessServiceImpl implements BusinessService {
|
|||
@Override
|
||||
public AjaxResult startFlowAble(AuditTask auditTask, List<String> list, String userId, String taskId,
|
||||
String processType, String finalCheck, String examineId, String sort,
|
||||
String processKey, boolean iaAdd, String enterStatus,String version) {
|
||||
String processKey, boolean iaAdd, String enterStatus, String version) {
|
||||
Map<String, Object> map = new HashMap<>();
|
||||
//审核人员列表
|
||||
map.put(ProcessConstants.USER_LIST, list);
|
||||
|
|
@ -584,9 +587,9 @@ public class BusinessServiceImpl implements BusinessService {
|
|||
//主要审核信息id 对应lk——表中唯一标识
|
||||
map.put(ProcessConstants.CHECK_MAIN_ID, auditTask.getUuid());
|
||||
//审核流类型1特殊审核流 2基础审核流
|
||||
map.put(ProcessConstants.EXAMINE_TYPE, StringUtils.isEmpty(auditTask.getExamineType())?"2":auditTask.getExamineType());
|
||||
map.put(ProcessConstants.EXAMINE_TYPE, StringUtils.isEmpty(auditTask.getExamineType()) ? "2" : auditTask.getExamineType());
|
||||
//版本号
|
||||
map.put(ProcessConstants.VERSION,version);
|
||||
map.put(ProcessConstants.VERSION, version);
|
||||
|
||||
map.put(ProcessConstants.PROJECT_ID, auditTask.getProId());
|
||||
if (StringUtils.isNotEmpty(auditTask.getContUuid())) {
|
||||
|
|
@ -622,9 +625,9 @@ public class BusinessServiceImpl implements BusinessService {
|
|||
String processInstanceId = service.startFlow(userId, checkUuid, map);
|
||||
if (StringUtils.isNotEmpty(processInstanceId)) {
|
||||
int num = addTask(auditTask.getProId(), taskId, userId, auditTask.getTaskType(),
|
||||
auditTask.getParentUuid(), processInstanceId, auditTask.getUuid(), "1", sort, iaAdd,enterStatus,version,examineId);
|
||||
auditTask.getParentUuid(), processInstanceId, auditTask.getUuid(), "1", sort, iaAdd, enterStatus, version, examineId);
|
||||
if (num > 0) {
|
||||
// sedPhoneMsg(auditTask,list);
|
||||
// sedPhoneMsg(auditTask,list);
|
||||
return AjaxResult.success("审核提交成功");
|
||||
} else {
|
||||
return AjaxResult.error("审核提交失败");
|
||||
|
|
@ -639,7 +642,7 @@ public class BusinessServiceImpl implements BusinessService {
|
|||
@Override
|
||||
public int addTask(String proId, String taskId, String userId, String taskType, String parentUuid,
|
||||
String processInstanceId, String uuid, String type, String sort, boolean iaAdd,
|
||||
String enterStatus,String version,String examineId) {
|
||||
String enterStatus, String version, String examineId) {
|
||||
|
||||
CheckTaskVo checkTaskVo = new CheckTaskVo();
|
||||
checkTaskVo.setTaskId(taskId);
|
||||
|
|
@ -663,7 +666,7 @@ public class BusinessServiceImpl implements BusinessService {
|
|||
num = mapper.upDateAuditTask(checkTaskVo);
|
||||
}
|
||||
if (num > 0) {
|
||||
Integer mapper1 = updateTaskIdProcessInstanceId(taskId, taskType, processInstanceId, uuid,enterStatus,sort,version);
|
||||
Integer mapper1 = updateTaskIdProcessInstanceId(taskId, taskType, processInstanceId, uuid, enterStatus, sort, version);
|
||||
if (mapper1 != null) {
|
||||
return mapper1;
|
||||
} else {
|
||||
|
|
@ -675,7 +678,7 @@ public class BusinessServiceImpl implements BusinessService {
|
|||
} else {
|
||||
checkTaskVo.setVersion(version);
|
||||
mapper.upDateAuditTask(checkTaskVo);
|
||||
Integer mapper1 = updateTaskIdProcessInstanceId(taskId, taskType, processInstanceId, uuid,enterStatus,sort,version);
|
||||
Integer mapper1 = updateTaskIdProcessInstanceId(taskId, taskType, processInstanceId, uuid, enterStatus, sort, version);
|
||||
if (mapper1 != null) {
|
||||
return mapper1;
|
||||
} else {
|
||||
|
|
@ -686,18 +689,18 @@ public class BusinessServiceImpl implements BusinessService {
|
|||
|
||||
@Nullable
|
||||
private Integer updateTaskIdProcessInstanceId(String taskId, String taskType, String processInstanceId,
|
||||
String uuid,String enterStatus,String sort,String version) {
|
||||
String uuid, String enterStatus, String sort, String version) {
|
||||
TaskDetails taskDetails = new TaskDetails();
|
||||
taskDetails.setProcessInstanceId(processInstanceId);
|
||||
taskDetails.setTaskId(taskId);
|
||||
taskDetails.setVersion(version);
|
||||
int repeatedSubmit = 0;
|
||||
try{
|
||||
try {
|
||||
repeatedSubmit = mapper.getRepeatedSubmit(taskId);
|
||||
}catch (Exception e){
|
||||
repeatedSubmit = 1 ;
|
||||
} catch (Exception e) {
|
||||
repeatedSubmit = 1;
|
||||
}
|
||||
taskDetails.setRepeatedSubmit(repeatedSubmit+"");
|
||||
taskDetails.setRepeatedSubmit(repeatedSubmit + "");
|
||||
taskDetails.setSort(sort);
|
||||
//添加任务详情
|
||||
int times = mapper.addTaskDetails(taskDetails);
|
||||
|
|
@ -706,55 +709,55 @@ public class BusinessServiceImpl implements BusinessService {
|
|||
switch (taskType) {
|
||||
case "1":
|
||||
//监理入场资质---修改任务ID和流程实例ID
|
||||
return mapper.updateSupervisorStatus(uuid, taskId, processInstanceId,enterStatus);
|
||||
return mapper.updateSupervisorStatus(uuid, taskId, processInstanceId, enterStatus);
|
||||
case "2":
|
||||
//承包商入场资质---修改任务ID和流程实例ID
|
||||
return mapper.updateConsStatus(uuid, taskId, processInstanceId,enterStatus);
|
||||
return mapper.updateConsStatus(uuid, taskId, processInstanceId, enterStatus);
|
||||
case "3":
|
||||
//分包商入场资质---修改任务ID和流程实例ID
|
||||
return mapper.updateSubStatus(uuid, taskId, processInstanceId,enterStatus);
|
||||
return mapper.updateSubStatus(uuid, taskId, processInstanceId, enterStatus);
|
||||
case "4":
|
||||
//承包商开工申请---修改任务ID和流程实例ID
|
||||
return mapper.updateStartWorkStatus(uuid, taskId, processInstanceId,enterStatus);
|
||||
return mapper.updateStartWorkStatus(uuid, taskId, processInstanceId, enterStatus);
|
||||
case "5":
|
||||
//承包商人员入场---修改任务ID和流程实例ID
|
||||
return mapper.updatePersonStatus(uuid, taskId, processInstanceId,enterStatus);
|
||||
return mapper.updatePersonStatus(uuid, taskId, processInstanceId, enterStatus);
|
||||
case "6":
|
||||
//承包商人员出场---修改任务ID和流程实例ID
|
||||
return mapper.updatePersonOutStatus(uuid, taskId, processInstanceId,enterStatus);
|
||||
return mapper.updatePersonOutStatus(uuid, taskId, processInstanceId, enterStatus);
|
||||
case "7":
|
||||
//承包商施工材料入场---修改任务ID和流程实例ID
|
||||
return mapper.updateConsMaterialStatus(uuid, taskId, processInstanceId,enterStatus);
|
||||
return mapper.updateConsMaterialStatus(uuid, taskId, processInstanceId, enterStatus);
|
||||
case "8":
|
||||
//工器具入场---修改任务ID和流程实例ID
|
||||
return mapper.updateToolsStatus(uuid, taskId, processInstanceId,enterStatus);
|
||||
return mapper.updateToolsStatus(uuid, taskId, processInstanceId, enterStatus);
|
||||
case "9":
|
||||
//承包商完工---修改任务ID和流程实例ID
|
||||
return mapper.updateConsFinishStatus(uuid, taskId, processInstanceId,enterStatus);
|
||||
return mapper.updateConsFinishStatus(uuid, taskId, processInstanceId, enterStatus);
|
||||
case "10":
|
||||
//分包包商人员入场---修改任务ID和流程实例ID
|
||||
return mapper.updatePersonStatus(uuid, taskId, processInstanceId,enterStatus);
|
||||
return mapper.updatePersonStatus(uuid, taskId, processInstanceId, enterStatus);
|
||||
case "11":
|
||||
//分包包商人员出场---修改任务ID和流程实例ID
|
||||
return mapper.updatePersonOutStatus(uuid, taskId, processInstanceId,enterStatus);
|
||||
return mapper.updatePersonOutStatus(uuid, taskId, processInstanceId, enterStatus);
|
||||
case "12":
|
||||
//分包商出场---修改任务ID和流程实例ID
|
||||
return mapper.updateSubOutStatus(uuid, taskId, processInstanceId,enterStatus);
|
||||
return mapper.updateSubOutStatus(uuid, taskId, processInstanceId, enterStatus);
|
||||
case "13":
|
||||
//违章回传---修改任务ID和流程实例ID、punish_status
|
||||
return mapper.updateViolationPunishStatus(uuid, taskId, processInstanceId,enterStatus);
|
||||
return mapper.updateViolationPunishStatus(uuid, taskId, processInstanceId, enterStatus);
|
||||
case "14":
|
||||
//一般隐患验收---修改任务ID和流程实例ID
|
||||
return mapper.updateHiddenDangerAcceptanceStatus(uuid, taskId, processInstanceId,enterStatus);
|
||||
return mapper.updateHiddenDangerAcceptanceStatus(uuid, taskId, processInstanceId, enterStatus);
|
||||
case "15":
|
||||
//较大隐患验收---修改任务ID和流程实例ID
|
||||
return mapper.updateHiddenDangerAcceptanceStatus(uuid, taskId, processInstanceId,enterStatus);
|
||||
return mapper.updateHiddenDangerAcceptanceStatus(uuid, taskId, processInstanceId, enterStatus);
|
||||
case "16":
|
||||
//重大隐患验收---修改任务ID和流程实例ID
|
||||
return mapper.updateHiddenDangerAcceptanceStatus(uuid, taskId, processInstanceId,enterStatus);
|
||||
return mapper.updateHiddenDangerAcceptanceStatus(uuid, taskId, processInstanceId, enterStatus);
|
||||
case "17":
|
||||
//延期申请---修改任务ID和流程实例ID
|
||||
return mapper.updateExtensionApplicationStatus(uuid, taskId, processInstanceId,enterStatus);
|
||||
return mapper.updateExtensionApplicationStatus(uuid, taskId, processInstanceId, enterStatus);
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
|
@ -766,14 +769,14 @@ public class BusinessServiceImpl implements BusinessService {
|
|||
|
||||
|
||||
@Override
|
||||
public ConfigurationVo getCongifDetailsByTypeAndSort(String businessType, int sort,@Param("version")String version,String examineType) {
|
||||
return mapper.getCongifDetailsByTypeAndSort(businessType, sort,version,examineType);
|
||||
public ConfigurationVo getCongifDetailsByTypeAndSort(String businessType, int sort, @Param("version") String version, String examineType) {
|
||||
return mapper.getCongifDetailsByTypeAndSort(businessType, sort, version, examineType);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public ConfigurationVo getCongifDetailsByExamineIdAndSort(String businessType,String examineId, int sort,@Param("version")String version,String examineType) {
|
||||
return mapper.getCongifDetailsByExamineIdAndSort(businessType,examineId, sort,version,examineType);
|
||||
public ConfigurationVo getCongifDetailsByExamineIdAndSort(String businessType, String examineId, int sort, @Param("version") String version, String examineType) {
|
||||
return mapper.getCongifDetailsByExamineIdAndSort(businessType, examineId, sort, version, examineType);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -800,8 +803,8 @@ public class BusinessServiceImpl implements BusinessService {
|
|||
}
|
||||
|
||||
@Override
|
||||
public List<String> getProcessInstanceIdListByTaskId(String taskId,String checkType) {
|
||||
return mapper.getProcessInstanceIdListByTaskId(taskId,checkType);
|
||||
public List<String> getProcessInstanceIdListByTaskId(String taskId, String checkType) {
|
||||
return mapper.getProcessInstanceIdListByTaskId(taskId, checkType);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -810,17 +813,17 @@ public class BusinessServiceImpl implements BusinessService {
|
|||
}
|
||||
|
||||
@Override
|
||||
public List<ConfigurationVo> approvalHistoryUser(String taskId) {
|
||||
public List<ConfigurationVo> approvalHistoryUser(String taskId) {
|
||||
List<ConfigurationVo> list = mapper.approvalHistoryUser(taskId);
|
||||
List<ConfigurationVo> finalList = new ArrayList<>();
|
||||
ConfigurationVo bbb= new ConfigurationVo();
|
||||
ConfigurationVo bbb = new ConfigurationVo();
|
||||
for (ConfigurationVo bean : list) {
|
||||
List<String> ss = Arrays.asList(bean.getUserId().split(","));
|
||||
List<String> ss = Arrays.asList(bean.getUserId().split(","));
|
||||
List<String> userName = mapper.getNickNameById(ss);
|
||||
String examineType = bean.getExamineType();
|
||||
String[] stringArray = userName.toArray(new String[0]);
|
||||
if ("0".equals(examineType)) {
|
||||
for(int i=0;i<stringArray.length;i++){
|
||||
for (int i = 0; i < stringArray.length; i++) {
|
||||
ConfigurationVo newBean = new ConfigurationVo();
|
||||
newBean.setId(bean.getId());
|
||||
newBean.setExamineId(bean.getExamineId());
|
||||
|
|
@ -860,22 +863,22 @@ public class BusinessServiceImpl implements BusinessService {
|
|||
|
||||
}
|
||||
String userId = mapper.getThisCheckUser(taskId);
|
||||
if(userId != null){
|
||||
for (ConfigurationVo bb:finalList) {
|
||||
if (userId != null) {
|
||||
for (ConfigurationVo bb : finalList) {
|
||||
String users = bb.getUserId();
|
||||
if(users !=null && Arrays.asList(users.split(",")).contains(userId)){
|
||||
if (users != null && Arrays.asList(users.split(",")).contains(userId)) {
|
||||
bb.setIsActive("1");
|
||||
}
|
||||
}
|
||||
}else{
|
||||
} else {
|
||||
List<String> types = mapper.getThisCheckUserStatus(taskId);
|
||||
if(StringUtils.isNotEmpty(types)){
|
||||
if (StringUtils.isNotEmpty(types)) {
|
||||
finalList.get(0).setType(types.get(0));
|
||||
}
|
||||
finalList.get(0).setIsActive("10");
|
||||
}
|
||||
for (ConfigurationVo configurationVo : finalList) {
|
||||
if (configurationVo.getAuditStatus() == null){
|
||||
if (configurationVo.getAuditStatus() == null) {
|
||||
configurationVo.setAuditStatus(4);
|
||||
break;
|
||||
}
|
||||
|
|
@ -884,14 +887,14 @@ public class BusinessServiceImpl implements BusinessService {
|
|||
}
|
||||
|
||||
@Override
|
||||
public void updateViolationPunishByUuid(String id, String statusType,String rejectReason) {
|
||||
mapper.updateViolationPunishByUuid(id, statusType,rejectReason);
|
||||
public void updateViolationPunishByUuid(String id, String statusType, String rejectReason) {
|
||||
mapper.updateViolationPunishByUuid(id, statusType, rejectReason);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateHiddenDangerAcceptanceByUuid(String id, String statusType,String rejectReason) {
|
||||
mapper.updateHiddenDangerAcceptanceByUuid(id, statusType,rejectReason);
|
||||
if ("4".equals(statusType) || "5".equals(statusType)){
|
||||
public void updateHiddenDangerAcceptanceByUuid(String id, String statusType, String rejectReason) {
|
||||
mapper.updateHiddenDangerAcceptanceByUuid(id, statusType, rejectReason);
|
||||
if ("4".equals(statusType) || "5".equals(statusType)) {
|
||||
SecurityCheckDto checkDto = new SecurityCheckDto();
|
||||
checkDto.setId(id);
|
||||
NewHiddenDangerDto newDto = mapper.getHiddenDangerRectificationForm(checkDto);
|
||||
|
|
@ -908,17 +911,18 @@ public class BusinessServiceImpl implements BusinessService {
|
|||
|
||||
// 设置 dto 的 checkStatus
|
||||
if (checkStatus != null) {
|
||||
mapper.updateHiddenDangerStatus(checkStatus,id);
|
||||
mapper.updateHiddenDangerStatus(checkStatus, id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据当前日期、整改时间和延期时间计算检查状态
|
||||
* @param date 当前日期
|
||||
* @param correctionTime 整改时间
|
||||
* @param delayTime 延期时间
|
||||
* @param isCheck 是否整改
|
||||
*
|
||||
* @param date 当前日期
|
||||
* @param correctionTime 整改时间
|
||||
* @param delayTime 延期时间
|
||||
* @param isCheck 是否整改
|
||||
* @param delayCheckState 延期检查状态
|
||||
* @return 返回一个计算出来的checkStatus字符串
|
||||
*/
|
||||
|
|
@ -950,8 +954,8 @@ public class BusinessServiceImpl implements BusinessService {
|
|||
}
|
||||
|
||||
@Override
|
||||
public void updateExtensionApplicationByUuid(String uuid, String statusType,String rejectReason) {
|
||||
mapper.updateExtensionApplicationByUuid(uuid, statusType,rejectReason);
|
||||
public void updateExtensionApplicationByUuid(String uuid, String statusType, String rejectReason) {
|
||||
mapper.updateExtensionApplicationByUuid(uuid, statusType, rejectReason);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -1142,7 +1146,7 @@ public class BusinessServiceImpl implements BusinessService {
|
|||
code = 1;
|
||||
}
|
||||
//查询当前工程下所以承包商是否都已完工
|
||||
if (mapper.getConsFinishCount(baseBean.getProId()) == 0){
|
||||
if (mapper.getConsFinishCount(baseBean.getProId()) == 0) {
|
||||
code = mapper.updateProStatus(baseBean.getProId());
|
||||
if (code == 0) {
|
||||
throw new Exception("修改工程状态失败");
|
||||
|
|
@ -1185,17 +1189,17 @@ public class BusinessServiceImpl implements BusinessService {
|
|||
}
|
||||
|
||||
|
||||
public void sedPhoneMsg(AuditTask auditTask,List<String> userList){
|
||||
try{
|
||||
public void sedPhoneMsg(AuditTask auditTask, List<String> userList) {
|
||||
try {
|
||||
|
||||
String proName=mapper.getProject(auditTask);
|
||||
String userName=mapper.getUserName(auditTask);
|
||||
String typeName=mapper.getTypeName(auditTask);
|
||||
String msg="您有新的审核数据进行审核,工程名称为:"+proName+"发起人:"+userName+"发起了->"+typeName+"审核流程,请您及时审批";
|
||||
List<String> list=mapper.getUserPhone(userList);
|
||||
MsgBean bean=new MsgBean();
|
||||
String proName = mapper.getProject(auditTask);
|
||||
String userName = mapper.getUserName(auditTask);
|
||||
String typeName = mapper.getTypeName(auditTask);
|
||||
String msg = "您有新的审核数据进行审核,工程名称为:" + proName + "发起人:" + userName + "发起了->" + typeName + "审核流程,请您及时审批";
|
||||
List<String> list = mapper.getUserPhone(userList);
|
||||
MsgBean bean = new MsgBean();
|
||||
bean.setMsg(msg);
|
||||
for (String phone:list){
|
||||
for (String phone : list) {
|
||||
// bean.setPhone("15755022653");
|
||||
// bean.setMsg(msg);
|
||||
// remoteUserService.setPhoneMsg(bean);
|
||||
|
|
@ -1203,25 +1207,23 @@ public class BusinessServiceImpl implements BusinessService {
|
|||
// bean.setMsg("恭喜您已中奖,请您携带信息到宁夏办理处领取奖品,谢谢配合!");
|
||||
// bean.setPhone("18855456507");
|
||||
// remoteUserService.setPhoneMsg(bean);
|
||||
// bean.setPhone(phone);
|
||||
// sedPhoneMsg(bean);
|
||||
// bean.setPhone(phone);
|
||||
// sedPhoneMsg(bean);
|
||||
}
|
||||
}catch (Exception e){
|
||||
log.error(e.toString(),e);
|
||||
} catch (Exception e) {
|
||||
log.error(e.toString(), e);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
public void sedPhoneMsg(MsgBean bean){
|
||||
public void sedPhoneMsg(MsgBean bean) {
|
||||
try {
|
||||
remoteUserService.setPhoneMsg(bean);
|
||||
}catch (Exception e){
|
||||
log.error(e.toString(),e);
|
||||
} catch (Exception e) {
|
||||
log.error(e.toString(), e);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue