Commit 01baaae8 authored by chenzhao's avatar chenzhao

修改返回值

parent 58fa48e6
...@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams; ...@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationUnitDto; import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationUnitDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationUnit; import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationUnit;
import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
...@@ -58,6 +59,6 @@ public interface IJgChangeRegistrationUnitService { ...@@ -58,6 +59,6 @@ public interface IJgChangeRegistrationUnitService {
* @param model 数据 * @param model 数据
* @param submitType 保存类型 * @param submitType 保存类型
*/ */
void saveNotice(String submitType, JSONObject model, ReginParams reginParams); List<JgChangeRegistrationUnit> saveNotice(String submitType, JSONObject model, ReginParams reginParams);
} }
...@@ -372,7 +372,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg ...@@ -372,7 +372,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
@Override @Override
@SuppressWarnings({"Duplicates", "rawtypes"}) @SuppressWarnings({"Duplicates", "rawtypes"})
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void saveNotice(String submitType, JSONObject map, ReginParams reginParams) { public List<JgChangeRegistrationUnit> saveNotice(String submitType, JSONObject map, ReginParams reginParams) {
JgChangeRegistrationUnitDto model = BeanUtil.toBeanIgnoreError(map.get("changeRegisInfo"), JgChangeRegistrationUnitDto.class); JgChangeRegistrationUnitDto model = BeanUtil.toBeanIgnoreError(map.get("changeRegisInfo"), JgChangeRegistrationUnitDto.class);
String[] taskName = new String[]{"流程结束"}; String[] taskName = new String[]{"流程结束"};
...@@ -382,7 +382,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg ...@@ -382,7 +382,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
// 获取单位变更设备列表 // 获取单位变更设备列表
List<Map<String, Object>> deviceList = model.getDeviceList(); List<Map<String, Object>> deviceList = model.getDeviceList();
if (CollectionUtils.isEmpty(deviceList)) { if (CollectionUtils.isEmpty(deviceList)) {
return; return new ArrayList<>();
} }
// 获取单位变更单号 // 获取单位变更单号
...@@ -390,7 +390,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg ...@@ -390,7 +390,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
List<String> applyNoList = listResponseModel.getResult(); List<String> applyNoList = listResponseModel.getResult();
if (CollectionUtils.isEmpty(applyNoList)) { if (CollectionUtils.isEmpty(applyNoList)) {
log.error("生成申请变更单位编失败"); log.error("生成申请变更单位编失败");
return; return new ArrayList<>();
} }
ArrayList<String> roleListFirst = new ArrayList<>(); ArrayList<String> roleListFirst = new ArrayList<>();
...@@ -588,7 +588,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg ...@@ -588,7 +588,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
}).collect(Collectors.toList()); }).collect(Collectors.toList());
JgChangeRegistrationUnitEqMapper.insertBatchSomeColumn(jgRelationEquipList); JgChangeRegistrationUnitEqMapper.insertBatchSomeColumn(jgRelationEquipList);
return list;
} }
void getNext(ArrayList<String> roleListFirst, String instanceId, String[] taskName) { void getNext(ArrayList<String> roleListFirst, String instanceId, String[] taskName) {
......
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