Merge remote-tracking branch 'origin/V0.0.4' into V0.0.4

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/utils/html/HTMLFilter.java

@@ -281,12 +281,18 @@ public final class HTMLFilter
         // these get tallied in processTag
         // (remember to reset before subsequent calls to filter method)
         final StringBuilder sBuilder = new StringBuilder(buf.toString());
-        for (String key : vTagCounts.keySet())
+        /*for (String key : vTagCounts.keySet())
         {
             for (int ii = 0; ii < vTagCounts.get(key); ii++)
             {
                 sBuilder.append("</").append(key).append(">");
             }
+        }*/
+        for(Map.Entry<String,Integer> entry:vTagCounts.entrySet()){
+            for (int ii = 0; ii < entry.getValue(); ii++)
+            {
+                sBuilder.append("</").append(entry.getKey()).append(">");
+            }
         }
         s = sBuilder.toString();
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/panel/service/impl/PanelServiceImpl.java

@@ -126,7 +126,16 @@ public class PanelServiceImpl implements PanelService {
                 .sorted(Comparator.comparing(PanelListVo::getType))
                 .collect(Collectors.groupingBy(PanelListVo::getType));
         List<PanelResultVo> list = new ArrayList<PanelResultVo>();
-        for (Integer type : listMap.keySet()) {
+        for(Map.Entry<Integer, List<PanelListVo>> map:listMap.entrySet()){
+            PanelResultVo vo = new PanelResultVo();
+            vo.setTaskType(map.getKey());
+            List<PanelListVo> data = map.getValue();
+            vo.setNums(data.size());
+            vo.setTaskTypeText(PanelTypeEnums.getName(map.getKey()));
+            vo.setDataList(data);
+            list.add(vo);
+        }
+        /*for (Integer type : listMap.keySet()) {
             PanelResultVo vo = new PanelResultVo();
             vo.setTaskType(type);
             List<PanelListVo> data = listMap.get(type);
@@ -134,7 +143,7 @@ public class PanelServiceImpl implements PanelService {
             vo.setTaskTypeText(PanelTypeEnums.getName(type));
             vo.setDataList(data);
             list.add(vo);
-        }
+        }*/
 
         return list;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/ResumptionBusiness.java

@@ -472,18 +472,19 @@ public class ResumptionBusiness {
         });
         //将数据按区域分组
         Map<Long, List<ResumptionPointVo>> pointListMap = pointList.stream().collect(Collectors.groupingBy(r -> r.getAreaid()));
-        for (Long key : pointListMap.keySet()) {
-            List<ResumptionPointVo> pointsList = pointListMap.get(key);
+       // for (Long key : pointListMap.keySet()) {
+        for(Map.Entry<Long, List<ResumptionPointVo>> map:pointListMap.entrySet()){
+            List<ResumptionPointVo> pointsList =map.getValue(); //pointListMap.get(key);
             if (CollectionUtil.isEmpty(pointsList)) {
                 continue;
             }
 
 
             ResumptionRegisterAreaVo area = new ResumptionRegisterAreaVo();
-            area.setAreaid(key);
+            area.setAreaid(map.getKey());
             area.setAreaname(pointsList.get(0).getAreaname());
 
-            List<ResumptionNfcVo> areanfclist = nfclist.stream().filter(r -> r.getAreaId().equals(key)).collect(Collectors.toList());
+            List<ResumptionNfcVo> areanfclist = nfclist.stream().filter(r -> r.getAreaId().equals(map.getKey())).collect(Collectors.toList());
             if ("0".equals(0)) {
                 if (CollectionUtil.isEmpty(areanfclist)) {
                     continue;
@@ -493,8 +494,9 @@ public class ResumptionBusiness {
             //将区域内的要点按检查项分组
             Map<Long, List<ResumptionPointVo>> pointsListMapItem = pointsList.stream().collect(Collectors.groupingBy(r -> r.getItemid()));
             List<ResumptionRegisterItemVo> checklist = new ArrayList<>();
-            for (Long keya : pointsListMapItem.keySet()) {
-                List<ResumptionPointVo> checkitemlist = pointsListMapItem.get(keya);
+            //for (Long keya : pointsListMapItem.keySet()) {
+            for(Map.Entry<Long, List<ResumptionPointVo>> mapa:pointsListMapItem.entrySet()){
+                List<ResumptionPointVo> checkitemlist = mapa.getValue();//pointsListMapItem.get(keya);
                 if (CollectionUtil.isEmpty(checkitemlist)) {
                     continue;
                 } else {
@@ -516,7 +518,7 @@ public class ResumptionBusiness {
                     }
                 }
                 ResumptionRegisterItemVo item = new ResumptionRegisterItemVo();
-                item.setItemid(keya);
+                item.setItemid(mapa.getKey());
                 item.setItemname(checkitemlist.get(0).getItemname());
                 item.setCheckitemlist(checkitemlist);
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/AppPlanServiceImpl.java

@@ -871,13 +871,13 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
 
     public List<ResumptionPdf> getResult(Map<Long, List<AppResumptionDataInfoVo>> bef) {
         List<ResumptionPdf> befs = new ArrayList<>();
-        for (Long l :
-                bef.keySet()) {
+       // for (Long l :bef.keySet()) {
+        for(Map.Entry<Long, List<AppResumptionDataInfoVo>> map: bef.entrySet()){
             String pointName = "";
             StringBuilder submitName = new StringBuilder();
             int result = 0;
-            for (AppResumptionDataInfoVo vo :
-                    bef.get(l)) {
+           // for (AppResumptionDataInfoVo vo :bef.get(l)) {
+            for (AppResumptionDataInfoVo vo :map.getValue()) {
                 pointName = vo.getPointName();
                 result += vo.getResValue();
                 submitName.append(vo.getSubmitName());

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/SafetyCheckRegisterSericeImpl.java

@@ -203,8 +203,9 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
         TaskRegisterVo<AppTaskRegisterItemVo> vo = new TaskRegisterVo<AppTaskRegisterItemVo>();
         BeanUtils.copyProperties(baseData, vo);
         List<AppTaskRegisterItemVo> itemVos = new ArrayList<>();
-        for (Long itemId : groupByItem.keySet()) {
-            List<AppTaskRegisterPointVo> pointVos = groupByItem.get(itemId);
+        //for (Long itemId : groupByItem.keySet()) {
+        for(Map.Entry<Long, List<AppTaskRegisterPointVo>> map:groupByItem.entrySet()){
+            List<AppTaskRegisterPointVo> pointVos = map.getValue();//groupByItem.get(itemId);
             AppTaskRegisterItemVo itemVo = new AppTaskRegisterItemVo();
             itemVo.setItemId(pointVos.get(0).getItemId());
             itemVo.setItemName(pointVos.get(0).getItemName());

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyindex/service/impl/CoreSafeMonthScoreServiceImpl.java

@@ -136,11 +136,11 @@ public class CoreSafeMonthScoreServiceImpl extends ServiceImpl<CoreSafeMonthScor
         Map<String, List<MonthScoreDetailDictDetailTempVo>> listMap = tempVoList.stream().collect(Collectors.groupingBy(MonthScoreDetailDictDetailTempVo::getTypeCode));
         List<MonthScoreDetailDictVo> dataList = new ArrayList<MonthScoreDetailDictVo>();
         detailVo.setDataList(dataList);
-        for (String typeCode : listMap.keySet()) {
-
-            List<MonthScoreDetailDictDetailTempVo> voList = listMap.get(typeCode);
+        //for (String typeCode : listMap.keySet()) {
+        for(Map.Entry<String, List<MonthScoreDetailDictDetailTempVo>> map:listMap.entrySet()){
+            List<MonthScoreDetailDictDetailTempVo> voList =map.getValue(); //listMap.get(typeCode);
             MonthScoreDetailDictVo dictVo = new MonthScoreDetailDictVo();
-            dictVo.setTypeCode(typeCode);
+            dictVo.setTypeCode(map.getKey());
             dictVo.setTypeName(voList.get(0).getTypeName());
 
             List<MonthScoreDetailDictDetailVo> detailVoList = BeanHelper.copyProperties(voList, MonthScoreDetailDictDetailVo.class);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyindex/service/impl/CoreSafetyExceptionDataServiceImpl.java

@@ -222,10 +222,11 @@ public class CoreSafetyExceptionDataServiceImpl extends ServiceImpl<CoreSafetyEx
         Map<Long, List<CoreSafetyDeductData>> safetyDeDuctDataMap = list.stream().collect(Collectors.groupingBy(CoreSafetyDeductData::getOrgId));
         Map<Long, List<CoreSafeMonthScore>> monthScoreMap = monthScores.stream().collect(Collectors.groupingBy(CoreSafeMonthScore::getOrgId));
         //遍历safeSourceDataMap
-        for (Long key : safetyDeDuctDataMap.keySet()) {
+        //for (Long key : safetyDeDuctDataMap.keySet()) {
+        for(Map.Entry<Long, List<CoreSafetyDeductData>>smap:safetyDeDuctDataMap.entrySet()){
             CoreSafeMonthScore monthScore = null;
-            List<CoreSafeMonthScore> monthScoreOneList = monthScoreMap.get(key);
-            List<CoreSafetyDeductData> listOneList = safetyDeDuctDataMap.get(key);
+            List<CoreSafeMonthScore> monthScoreOneList = monthScoreMap.get(smap.getKey());
+            List<CoreSafetyDeductData> listOneList = smap.getValue();//safetyDeDuctDataMap.get(key);
             if (ObjectUtil.hasEmpty(monthScoreOneList, listOneList)) {
                 continue;
             }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysWorkTimeServiceImpl.java

@@ -142,8 +142,9 @@ public class SysWorkTimeServiceImpl extends ServiceImpl<SysWorkTimeMapper, SysWo
             Map<Long, List<SysWorkTimeSet>> orgMap = list.stream().collect(Collectors.groupingBy(SysWorkTimeSet::getOrgId));
             //遍历orgMap
             StringBuffer sbf = new StringBuffer();
-            for (Long key : orgMap.keySet()) {
-                List<SysWorkTimeSet> wo = orgMap.get(key);
+          //  for (Long key : orgMap.keySet()) {
+            for(Map.Entry<Long, List<SysWorkTimeSet>> setMap:orgMap.entrySet()){
+                List<SysWorkTimeSet> wo = setMap.getValue();//orgMap.get(key);
                 //遍历wo
                 List<Date> dateList = new ArrayList<>();
                 dateList.add(sysWorkTime.getEffectiveDate());

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysWorkTimeSetServiceImpl.java

@@ -603,8 +603,9 @@ public class SysWorkTimeSetServiceImpl extends ServiceImpl<SysWorkTimeSetMapper,
         for (DateTime time : dateTimeList) {
             Date date1 = time.toJdkDate();
             System.out.println("date1:"+date1);
-            for(Long orgId:group.keySet()) {
-                Optional<SysWorkTimeSet> ws=   group.get(orgId).stream().filter(w->date1.after(w.getEffectiveDate())||DateUtil.isSameDay(date1,w.getEffectiveDate())).findFirst();
+            //for(Long orgId:group.keySet()) {
+            for(Map.Entry<Long,List<SysWorkTimeSet>> setMap:group.entrySet()){
+                Optional<SysWorkTimeSet> ws=   setMap.getValue().stream().filter(w->date1.after(w.getEffectiveDate())||DateUtil.isSameDay(date1,w.getEffectiveDate())).findFirst();
                 if(!ws.isPresent()){
                     continue;
                 }
@@ -616,7 +617,7 @@ public class SysWorkTimeSetServiceImpl extends ServiceImpl<SysWorkTimeSetMapper,
                 boolean isEnable = ObjectUtil.isNotNull(dayOfWeekSet) && dayOfWeekSet.getIsWorkday()>0;
                 SysWorkTime dto = new SysWorkTime();
                 dto.setDate(time);
-                dto.setOrgId(orgId);
+                dto.setOrgId(setMap.getKey());
                 dto.setIsEnable(isEnable?1L:0L);
                 if (ObjectUtil.isNull(dayOfWeekSet) || !(dayOfWeekSet.getIsWorkday()>0)) {
                     Optional<SysWorkTimeSetDayofweek> firstWorkDay = set.getDayOfWeeks().stream().filter(f -> f.getIsWorkday()>0).findFirst();
@@ -640,9 +641,10 @@ public class SysWorkTimeSetServiceImpl extends ServiceImpl<SysWorkTimeSetMapper,
         //获取所有机构下个月的按日配置的作息
         List<SysWorkTime> list = new ArrayList<>();
         list = this.sysWorkTimeMapper.selectList(new LambdaQueryWrapper<SysWorkTime>().eq(SysWorkTime::getIsManual,1L).likeRight(SysWorkTime::getYmdDate,DateUtil.format(start, "yyyy-MM")));
-        for(Long orgId:groupDay.keySet()){
-            List<SysWorkTime> workTimeEditDtos = groupDay.get(orgId);
-            List<SysWorkTime> workTimeNewVos = list.stream().filter(w -> w.getOrgId().equals(orgId)).collect(Collectors.toList());
+        /*for(Long orgId:groupDay.keySet()){*/
+        for(Map.Entry<Long,List<SysWorkTime>> dayMap:groupDay.entrySet()){
+            List<SysWorkTime> workTimeEditDtos = dayMap.getValue();//groupDay.get(orgId);
+            List<SysWorkTime> workTimeNewVos = list.stream().filter(w -> w.getOrgId().equals(dayMap.getKey())).collect(Collectors.toList());
             //去掉workTimeEditDtos中机构与日期在workTimeNewVos中存在的数据
             List<SysWorkTime> list1 = null;
             if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(workTimeNewVos)){
@@ -653,7 +655,7 @@ public class SysWorkTimeSetServiceImpl extends ServiceImpl<SysWorkTimeSetMapper,
                 list1 = workTimeEditDtos;
             }
 
-            batch(orgId, date, list1);
+            batch(dayMap.getKey(), date, list1);
         }
 
     }