Authored by linlong

update

... ... @@ -215,6 +215,7 @@ public class ChannelGroupServiceImpl implements ChannelGroupService {
channelGroup.setGroupNumber(total);
channelGroup.setContent(content);
channelGroup.setSendUser(sendUserId);
channelGroup.setSmsNumber(groupBatchId);
Profile profile = profileDAO.selectByPrimaryKey(sendUserId);
channelGroup.setSendUserName(profile!=null?profile.getAccount():"");
channelGroupDAO.updateByPrimaryKeySelective(channelGroup);
... ...
... ... @@ -148,11 +148,11 @@
width: 170,
align: "center",
formatter: function (value, rowData, rowIndex) {
if(rowData.content !=''){
return "-"
}else{
if(rowData.content == null || rowData.content ==''){
var str = "<a role='send' dataId='" + rowData.id + "' style='margin-left:10px'>发送短信</a>";
return str;
}else{
return "-"
}
}
}
... ... @@ -298,12 +298,12 @@
for ( var i = 0; i < data1.rows.length; i++) {
ids.push(data1.rows[i].id);
}
$.post(contextPath + "/channel/getCondition", {ids:"2,3"},function (data) {
var groupIds = ids.join(",");
console.info(groupIds);
$.post(contextPath + "/channel/getCondition", {ids:groupIds},function (data) {
var content = data.data;
for ( var i = 0; i < data1.rows.length; i++) {
var id = data1.rows[i].id;
console.info(content[id]);
addTooltip(content[id],'condition-' + i);
}
});
... ...