|
|
@@ -392,7 +392,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
List<Map<String, Object>> taskList = res.getTaskList();
|
|
|
String serviceYear = null;
|
|
|
if (taskList!=null){
|
|
|
- StringBuffer sb = new StringBuffer();
|
|
|
+ StringBuilder sb = new StringBuilder();
|
|
|
for (Map<String, Object> map : taskList) {
|
|
|
sb.append(map.get("taskName")).append("-").append(map.get("serviceYear")).append(",");
|
|
|
if (serviceYear==null)serviceYear = (String) map.get("serviceYear");
|
|
|
@@ -427,7 +427,7 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
|
|
|
@Override
|
|
|
public Object logList(Integer id, Integer pageNo, Integer pageSize) {
|
|
|
- Map<String,Object> param=new HashMap<String, Object>();
|
|
|
+ Map<String,Object> param= new HashMap<>();
|
|
|
param.put("tdid",id);
|
|
|
if (pageNo ==null)pageNo=1;
|
|
|
if (pageSize ==null)pageSize=10;
|
|
|
@@ -442,10 +442,10 @@ public class TaskDetailsServiceImpl extends BaseMybatisDao<TaskDetailsMapper> im
|
|
|
TaskDetailsBo res = new TaskDetailsBo();
|
|
|
TOrderNew tOrderNew = tOrderNewMapper.selectByTid(tid);
|
|
|
TOrderMid mid = tOrderMidMapper.selectByOrderNo(tOrderNew.getOrderNo());
|
|
|
- List<Map<String,Object >> list=new ArrayList<>();
|
|
|
+ List<Map<String,Object >> list;
|
|
|
List<TOrderTaskBo> tOrderTaskBos = tOrderTaskMapper.selectOrderTaskAll(tOrderNew.getOrderNo(), 4);
|
|
|
//如果是会员
|
|
|
- TOrderTaskBo thisTask = null;
|
|
|
+ TOrderTaskBo thisTask = new TOrderTaskBo();
|
|
|
for (TOrderTaskBo e : tOrderTaskBos) {
|
|
|
if (e.getId().equals(tid)){
|
|
|
thisTask=e;
|