优化修改

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabRiskPlanAbnormalGroupController.java

@@ -72,49 +72,6 @@ public class LabRiskPlanAbnormalGroupController extends BaseController {
         return ResultData.fail();
     }
 
-    /**
-     * 东北大学，数据大屏， 预案执行统计
-     * @param
-     * @return
-     */
-    /*@GetMapping("/riskRecordCount")
-    @ApiOperation(value = "查询预案执行记录")
-    public TableDataInfo riskRecordCount(LabRiskPlanAbnormalGroup group) {
-        //结束时间
-        Date endTime =DateUtils.dateTime("yyyy-MM-dd",DateUtils.getDate()) ;
-        //开始时间 本年第一天
-        Calendar calendar = Calendar.getInstance();
-        int year = calendar.get(Calendar.YEAR);
-        calendar.clear();
-        calendar.set(Calendar.YEAR, year);
-        Date startTime = calendar.getTime();
-
-        group.setStartTime(startTime);
-        group.setEndTime(endTime);
-        group.setStatus(0L);
-        //集合查询
-        List<LabRiskPlanAbnormalGroup> list = labRiskPlanAbnormalGroupService.queryRiskExeRecordList(group);
-        //list.sort(Comparator.comparing(LabRiskPlanAbnormalGroup::getCreateTime));
-
-        //数据封装
-        List<WarningNoticeLogVO> backList= new ArrayList<>();
-        if(list!=null && list.size()>0){
-            for (int i=1;i<13;i++){
-                WarningNoticeLogVO pag = new WarningNoticeLogVO();
-                pag.setYearMonth(i+"月");
-                int num =0;
-                for (LabRiskPlanAbnormalGroup gp:list) {
-                    String strdate = DateUtils.parseDateToStr("MM",gp.getCreateTime());
-                    if(Integer.valueOf(strdate).equals(i)){
-                        num++;
-                    }
-                }
-                pag.setTotalNum(num);
-                backList.add(pag);
-            }
-        }
-        return getDataTable(backList);
-    }*/
 
     public static void main(String[] args) {
         // 获取当前年第一天

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabCheckRecordDetailsServiceImpl.java

@@ -453,26 +453,6 @@ public class LabCheckRecordDetailsServiceImpl implements ILabCheckRecordDetailsS
      */
     @Override
     public List<LabCheckRecordDetailsVO> selectLabCheckRecordListVoIndex(LabCheckRecordDetailsVO labCheckRecordDetailsVo) {
-        /*//查询发布批次表 并获取最新一次的发布批次
-        List<LabCheckRecordRelease> rrlist = labCheckRecordReleaseMapper.selectLabCheckRecordReleaseList(new LabCheckRecordRelease());
-        List<LabCheckRecordDetailsVO> list = new ArrayList<>();
-        List<LabCheckRecordDetailsVO> listCount = new ArrayList<>();
-        if(rrlist.size()>0){
-          String[] strids=  rrlist.get(0).getCheckId().split(",");
-          //Long[] ids = new Long[strids.length];
-            List<Long> ids= new ArrayList<>();
-          for (int i=0;i<strids.length;i++){
-              ids.add(Long.valueOf(strids[i]));
-          }
-          labCheckRecordDetailsVo.setIds(ids);
-          list=labCheckRecordDetailsMapper.selectLabCheckRecordListVoIndex(labCheckRecordDetailsVo);
-          //查询隐患总数、已整改、未整改数据
-          listCount= labCheckRecordDetailsMapper.selectLabCheckRecordCountIndex(labCheckRecordDetailsVo);
-          list.get(0).setListVo(listCount);
-          SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日");
-          String remarkDate = sdf.format(rrlist.get(0).getCreateTime());
-          list.get(0).setRemark(remarkDate);//检查时间
-        }*/
         return labCheckRecordDetailsMapper.selectLabCheckRecordListVoIndex(labCheckRecordDetailsVo);
     }
 
@@ -484,19 +464,6 @@ public class LabCheckRecordDetailsServiceImpl implements ILabCheckRecordDetailsS
      */
     @Override
     public LabCheckRecordDetailsVO selectLabCheckRecordCountIndex(LabCheckRecordDetailsVO labCheckRecordDetailsVo) {
-        /*//查询发布批次表 并获取最新一次的发布批次
-        List<LabCheckRecordRelease> rrlist = labCheckRecordReleaseMapper.selectLabCheckRecordReleaseList(new LabCheckRecordRelease());
-        List<LabCheckRecordDetailsVO> list = new ArrayList<>();
-        if(rrlist.size()>0){
-            String[] strids=  rrlist.get(0).getCheckId().split(",");
-            //Long[] ids = new Long[strids.length];
-            List<Long> ids= new ArrayList<>();
-            for (int i=0;i<strids.length;i++){
-                ids.add(Long.valueOf(strids[i]));
-            }
-            labCheckRecordDetailsVo.setIds(ids);
-            list=labCheckRecordDetailsMapper.selectLabCheckRecordCountIndex(labCheckRecordDetailsVo);
-        }*/
         return labCheckRecordDetailsMapper.selectLabCheckRecordCountIndex(labCheckRecordDetailsVo);
     }
 
@@ -507,11 +474,6 @@ public class LabCheckRecordDetailsServiceImpl implements ILabCheckRecordDetailsS
      */
     @Override
     public List<LabCheckRecordDetailsVO> selectLabCheckRecordIndexDetals(LabCheckRecordDetailsVO labCheckRecordDetailsVo) {
-        //查询发布批次表 并获取最新一次的发布批次
-        //List<LabCheckRecordRelease> rrlist = labCheckRecordReleaseMapper.selectLabCheckRecordReleaseList(null);
-        /*List<LabCheckRecordDetailsVO> list = new ArrayList<>();
-        list=labCheckRecordDetailsMapper.selectLabCheckRecordIndexDetals(labCheckRecordDetailsVo);*/
-
         return labCheckRecordDetailsMapper.selectLabCheckRecordIndexDetals(labCheckRecordDetailsVo);
     }
 

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabContainerServiceImpl.java

@@ -109,7 +109,7 @@ public class LabContainerServiceImpl implements ILabContainerService {
         List<LabHazardSubjectRelation> labHazardSubjectRelationList = labContainer.getLabHazardSubjectRelationList();
         Long id = labContainer.getId();
         if (StringUtils.isNotNull(labHazardSubjectRelationList)) {
-            List<LabHazardSubjectRelation> list = new ArrayList<LabHazardSubjectRelation>();
+            List<LabHazardSubjectRelation> list = new ArrayList<>();
             for (LabHazardSubjectRelation labHazardSubjectRelation : labHazardSubjectRelationList) {
                 labHazardSubjectRelation.setHazardId(id);
                 list.add(labHazardSubjectRelation);

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabHazardServiceImpl.java

@@ -184,7 +184,7 @@ public class LabHazardServiceImpl implements ILabHazardService {
         // 先删除
         labHazardMapper.deleteLabHazardSubjectRelationBy(labHazard.getId());
         if (StringUtils.isNotNull(labHazardSubjectRelationList)) {
-            List<LabHazardSubjectRelation> list = new ArrayList<LabHazardSubjectRelation>();
+            List<LabHazardSubjectRelation> list = new ArrayList<>();
             for (LabHazardSubjectRelation labHazardSubjectRelation : labHazardSubjectRelationList) {
                 labHazardSubjectRelation.setHazardId(id);
                 list.add(labHazardSubjectRelation);

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabNotifyplanServiceImpl.java

@@ -99,21 +99,6 @@ public class LabNotifyplanServiceImpl implements ILabNotifyplanService
                 //e.printStackTrace();
                 throw new ServiceException("文件解析异常！");
             }
-            /*//组装文件名
-            String[] filename= labNotifyplanVO.getContentName().split(";");
-            List<String> listFilename= new ArrayList<>();
-              for (int i=0;i<filename.length;i++){
-                  listFilename.add(filename[i]);
-              }
-            labNotifyplanVO.setListFilename(listFilename);
-
-            //组装附件
-            String[] fileurl= labNotifyplanVO.getContentUrl().split(";");
-            List<String> listFileurl= new ArrayList<>();
-            for (int i=0;i<fileurl.length;i++){
-                listFileurl.add(fileurl[i]);
-            }
-            labNotifyplanVO.setListFileurl(listFileurl);*/
         }
         return labNotifyplanVO;
     }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabViolationServiceImpl.java

@@ -328,34 +328,6 @@ public class LabViolationServiceImpl implements ILabViolationService {
             }
             returnAllList.add(changeList);
         });
-
-
-//        for(Long key:collect.keySet()){
-//            List<LabViolationColumnarVO> allList = new ArrayList<>();
-//            List<SysDictData> dictList = DictUtils.getDictCache("lab_violation_rules");
-//            List<LabViolationColumnarVO> columnarList = collect.get(key);
-//            for(SysDictData sysDictData:dictList){
-//                LabViolationColumnarVO labViolationColumnarVO = new LabViolationColumnarVO();
-//                labViolationColumnarVO.setType(sysDictData.getDictValue());
-//                labViolationColumnarVO.setContent(sysDictData.getDictLabel());
-//                labViolationColumnarVO.setNum(0L);
-//                allList.add(labViolationColumnarVO);
-//            }
-//            String currencyName = "";
-//            for(LabViolationColumnarVO columnarVO:columnarList){
-//                for(LabViolationColumnarVO allColumnar:allList){
-//                    if(columnarVO.getType()!=null && columnarVO.getType().equals(allColumnar.getType())){
-//                        allColumnar.setNum(columnarVO.getNum());
-//                        allColumnar.setCurrencyid(columnarVO.getCurrencyid());
-//                        allColumnar.setCurrencyName(columnarVO.getCurrencyName());
-//                    }
-//                    if(columnarVO.getCurrencyName()!=null){
-//                        currencyName = columnarVO.getCurrencyName();
-//                    }
-//                }
-//            }
-//            allMap.put(currencyName,allList);
-//        }
         return returnAllList;
     }