队员列表：加入队列时间格式 显示年月日时分 最近登陆时间 若为同年不显示 年，值显示月日时分

Administrator

2018-11-26 8948eb44b8a84a9a2b96f06f8c10924075e05835

队员列表：加入队列时间格式 显示年月日时分    最近登陆时间 若为同年不显示 年，值显示月日时分  

 fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java

@@ -432,16 +432,11 @@
            // 邀请id

            object.put("inviteId", threeSale.getId());

            

            // 加入队列时间

            Long createTime = threeSale.getCreateTime();

            Date inviteTime = new Date(createTime);

            object.put("inviteTime", format.format(inviteTime) + " 加入");

            

            if (formatYears.format(todayTime).equals(formatYears.format(inviteTime))) {

                // 本年

                object.put("inviteTime", sdf.format(inviteTime) + " 加入");

            } else {

                // 往年

                object.put("inviteTime", format.format(inviteTime) + " 加入");

            }

            

            String memoName = "";

            ThreeSaleExtraInfo threeSaleExtraInfo = threeSale.getThreeSaleExtraInfo();

@@ -465,7 +460,6 @@
                nickName = worker.getNickName();

            }

            object.put("nickName", nickName);

            object.put("workerId", workerId);

            object.put("portrait", portrait);

            

            int type = 0;

@@ -481,7 +475,14 @@
                

                JSONArray array1 = new JSONArray();

                array1.add(fontColor1);

                array1.add("最近登陆 " + sdf.format(lastLoginTime));

				
                if (formatYears.format(todayTime).equals(formatYears.format(lastLoginTime))) {

                    // 本年

                    array1.add("最近登陆 " + sdf.format(lastLoginTime));

                } else {

                    // 往年

                    array1.add("最近登陆 " + format.format(lastLoginTime));

                }

                

                array.add(array1);

                

@@ -532,8 +533,6 @@
        result.put("result_list", resultArray);

        

        return result;

		
    }

	
    

}