|
|
@@ -445,6 +445,9 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
|
|
|
admin.setChannelNewCount(user.getChannelNewCount());
|
|
|
admin.setReceiveCount(user.getReceiveCount());
|
|
|
admin.setTransferCount(user.getTransferCount());
|
|
|
+ admin.setIntentionCount(user.getIntentionCount());
|
|
|
+ admin.setKeynoteCount(user.getKeynoteCount());
|
|
|
+ admin.setGeneralCount(user.getGeneralCount());
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
@@ -471,6 +474,9 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
|
|
|
if (admin.getCompleteCount()==null) admin.setCompleteCount(0);
|
|
|
if (admin.getChannelCompleteCount()==null) admin.setChannelCompleteCount(0);
|
|
|
if (admin.getTransferCount()==null)admin.setTransferCount(0);
|
|
|
+ if (admin.getIntentionCount()==null)admin.setIntentionCount(0);
|
|
|
+ if (admin.getKeynoteCount()==null)admin.setKeynoteCount(0);
|
|
|
+ if (admin.getGeneralCount()==null)admin.setGeneralCount(0);
|
|
|
}
|
|
|
|
|
|
//迭代获取所有部门与部门员工并计算出部门数量
|
|
|
@@ -493,7 +499,8 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
|
|
|
* @param ab
|
|
|
*/
|
|
|
public void sumCount(DepCountBo ab) {
|
|
|
- int completeCount=0,receiveCount=0,userCount=0,signCount=0,channelCount=0,newCount=0,channelNewCount=0,channelCompleteCount=0,transferCount=0;
|
|
|
+ int completeCount=0,receiveCount=0,userCount=0,signCount=0,channelCount=0,newCount=0,channelNewCount=0,
|
|
|
+ channelCompleteCount=0,transferCount=0,intentionCount=0,keynoteCount=0,generalCount=0;
|
|
|
if (ab.getList()!=null&&!ab.getList().isEmpty()) {
|
|
|
for (DepCountBo a : ab.getList()) {
|
|
|
if (a.getCompleteCount()!=null&& a.getCompleteCount()!=0) completeCount+=a.getCompleteCount();
|
|
|
@@ -505,6 +512,9 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
|
|
|
if (a.getChannelNewCount()!=null&& a.getChannelNewCount()!=0) channelNewCount+=a.getChannelNewCount();
|
|
|
if (a.getChannelCompleteCount()!=null&& a.getChannelCompleteCount()!=0) channelCompleteCount+=a.getChannelCompleteCount();
|
|
|
if (a.getTransferCount()!=null&& a.getTransferCount()!=0)transferCount+=a.getTransferCount();
|
|
|
+ if (a.getIntentionCount()!=null&& a.getIntentionCount()!=0) intentionCount+=a.getIntentionCount();
|
|
|
+ if (a.getKeynoteCount()!=null&& a.getKeynoteCount()!=0) keynoteCount+=a.getKeynoteCount();
|
|
|
+ if (a.getGeneralCount()!=null&& a.getGeneralCount()!=0) generalCount=a.getGeneralCount();
|
|
|
}
|
|
|
}
|
|
|
if (ab.getaList()!=null&&!ab.getaList().isEmpty()) {
|
|
|
@@ -518,6 +528,9 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
|
|
|
if (a.getChannelNewCount()!=null&& a.getChannelNewCount()!=0) channelNewCount+=a.getChannelNewCount();
|
|
|
if (a.getChannelCompleteCount()!=null&& a.getChannelCompleteCount()!=0) channelCompleteCount+=a.getChannelCompleteCount();
|
|
|
if (a.getTransferCount()!=null&& a.getTransferCount()!=0)transferCount+=a.getTransferCount();
|
|
|
+ if (a.getIntentionCount()!=null&& a.getIntentionCount()!=0) intentionCount+=a.getIntentionCount();
|
|
|
+ if (a.getKeynoteCount()!=null&& a.getKeynoteCount()!=0) keynoteCount+=a.getKeynoteCount();
|
|
|
+ if (a.getGeneralCount()!=null&& a.getGeneralCount()!=0) generalCount=a.getGeneralCount();
|
|
|
}
|
|
|
}
|
|
|
ab.setCompleteCount(completeCount);
|
|
|
@@ -529,6 +542,9 @@ public class AdminServiceImpl extends BaseMybatisDao<AdminMapper> implements Adm
|
|
|
ab.setChannelNewCount(channelNewCount);
|
|
|
ab.setChannelCompleteCount(channelCompleteCount);
|
|
|
ab.setTransferCount(transferCount);
|
|
|
+ ab.setIntentionCount(intentionCount);
|
|
|
+ ab.setKeynoteCount(keynoteCount);
|
|
|
+ ab.setGeneralCount(generalCount);
|
|
|
|
|
|
}
|
|
|
|