|
|
@@ -85,23 +85,30 @@ public class TaskScoreServiceImpl extends BaseMybatisDao<TaskScoreMapper> implem
|
|
|
List<TOrderTaskBo> tOrderTaskBos = tOrderTaskMapper.selectAdminTaskByTid(tid);
|
|
|
String aid=null;
|
|
|
//项目数量
|
|
|
- int htSatCount = 0,htSatScoreCount = 0,memberCount=0,memberScoreCount = 0;
|
|
|
+ int htSatCount = 0,htSatScoreCount = 0,htSatNotScoreCount = 0,
|
|
|
+ memberCount=0,memberScoreCount = 0,memberNotScoreCount = 0;
|
|
|
BigDecimal ht_satSum=new BigDecimal(0);
|
|
|
BigDecimal hySum=new BigDecimal(0);
|
|
|
for (TOrderTaskBo tOrderTaskBo : tOrderTaskBos) {
|
|
|
if (aid==null)aid=tOrderTaskBo.getTaskReceiver();
|
|
|
if (tOrderTaskBo.getcSort()==3||tOrderTaskBo.getcSort()==9){
|
|
|
htSatCount++;
|
|
|
- if (tOrderTaskBo.getScoreStatus()==2){
|
|
|
+ if (tOrderTaskBo.getScoreStatus()==1){
|
|
|
+ htSatNotScoreCount++;
|
|
|
+ }else if (tOrderTaskBo.getScoreStatus()==2){
|
|
|
htSatScoreCount++;
|
|
|
ht_satSum=ht_satSum.add(new BigDecimal(tOrderTaskBo.getScoreNumber()));
|
|
|
}
|
|
|
+
|
|
|
}else if (tOrderTaskBo.getcSort()==6) {
|
|
|
memberCount++;
|
|
|
- if (tOrderTaskBo.getScoreStatus()==2){
|
|
|
+ if (tOrderTaskBo.getScoreStatus()==1){
|
|
|
+ memberNotScoreCount++;
|
|
|
+ }else if (tOrderTaskBo.getScoreStatus()==2){
|
|
|
memberScoreCount++;
|
|
|
hySum=hySum.add(new BigDecimal(tOrderTaskBo.getScoreNumber()));
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
BigDecimal htSatScoreAverage = BigDecimal.ZERO;
|