ss

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/CheckOtherServiceImpl.java

@@ -242,6 +242,11 @@ public class CheckOtherServiceImpl  extends BaseService implements CheckOtherSer
             if(checktype==2){id = 22L;}
 	        //获取考核办法对应的考核项
            List<String> itemname =  checkOtherDao.getcheckitemnames(id);
+            for (CheckOther c :checkOthers){
+                if(!itemname.contains(c.getPcheckname())){
+                    itemname.add(c.getPcheckname());
+                }
+            }
 
             for (FeeStation station:liststation
                  ) {
@@ -259,7 +264,16 @@ public class CheckOtherServiceImpl  extends BaseService implements CheckOtherSer
                     if((c.getDept_id()+"").equals(station.getDeptid())){
                         Integer i = s.get(c.getPcheckname());
                         if(i==null){i=0;}
-                        s.put(c.getPcheckname(), Integer.valueOf((int) (i+c.getCheck_score())));
+                        if(checktype==2){
+                            s.put(c.getPcheckname(), Integer.valueOf((int) (i+c.getCheck_score())));
+                        }else{
+                            if(c.getUsername() == null || "".equals(c.getUsername())){
+                                s.put(c.getPcheckname(), Integer.valueOf((int) (i+c.getCheck_score())));
+                            }else {
+                                s.put(c.getPcheckname(), i);
+                            }
+                        }
+
                     }
                 }
                 otherCheckStatistics1.setScoremap(s);