fzzy-igdss.git - Gitblit

			@@ -4,6 +4,7 @@
			import com.bstek.dorado.annotation.DataResolver;
			import com.bstek.dorado.annotation.Expose;
			import com.bstek.dorado.data.provider.Page;
			import com.fzzy.common.constant.BizTypeEnum;
			import com.fzzy.igds.data.BaseResp;
			import com.fzzy.igds.data.IgdsBaseParam;
			import com.fzzy.igds.data.PatrolSuperData;
			@@ -11,6 +12,8 @@
			import com.fzzy.igds.service.CoreDeptService;
			import com.fzzy.igds.service.PatrolService;
			import com.fzzy.igds.utils.DateUtil;
			import com.ruoyi.common.annotation.Log;
			import com.ruoyi.common.enums.BusinessType;
			import org.apache.commons.lang3.StringUtils;
			import org.springframework.stereotype.Component;
			import org.springframework.transaction.annotation.Transactional;
			@@ -49,7 +52,7 @@
			//库区转换
			Map<String, PatrolSuperData> map = new HashMap<>();
			for (Dept dept : deptList) {
			map.put(dept.getId(), new PatrolSuperData(dept.getCompanyId(), dept.getId()));
			map.put(dept.getId(), new PatrolSuperData(dept.getId().substring(0,(dept.getId().length()-3)), dept.getId()));
			}

			List<Patrol> weekList = patrolService.getWeekList();
			@@ -77,7 +80,14 @@
			}
			}

			return new ArrayList<>(map.values());
			ArrayList<PatrolSuperData> list = new ArrayList<>(map.values());
			Collections.sort(list, new Comparator<PatrolSuperData>() {
			@Override
			public int compare(PatrolSuperData o1, PatrolSuperData o2) {
			return o1.getDeptId().compareTo(o2.getDeptId());
			}
			});
			return list;
			}

			/-------------------电子巡更记录主表信息--------------------/
			@@ -140,6 +150,7 @@
			* @return
			*/
			@Expose
			@Log(title = "巡检配置", businessType = BusinessType.DELETE,bizType = BizTypeEnum.SECURITY)
			public BaseResp deletePatrolConf(PatrolConf bank){
			if(StringUtils.isNotEmpty(bank.getId())) return patrolService.deletePatrolConf(bank);
			return BaseResp.success();