moral.git - Gitblit

			@@ -11,6 +11,7 @@
			import com.moral.api.pojo.ext.allocation.AllocationExcelExt;
			import com.moral.api.pojo.ext.allocation.AllocationExt;
			import com.moral.api.pojo.ext.allocation.AllocationPageExt;
			import com.moral.api.pojo.query.ResponsibilityUnitQuery;
			import com.moral.api.pojo.query.allocation.*;
			import com.moral.api.pojo.query.allocationextension.AllocationExtensionAddCond;
			import com.moral.api.pojo.vo.allocation.AllocationListExcelVo;
			@@ -18,6 +19,7 @@
			import com.moral.api.pojo.vo.allocation.AllocationVo;
			import com.moral.api.pojo.vo.file.FileAddressVo;
			import com.moral.api.service.AllocationService;
			import com.moral.api.service.ResponsibilityUnitService;
			import com.moral.api.utils.*;
			import com.moral.constant.Constants;
			import com.moral.constant.PageResult;
			@@ -53,6 +55,8 @@
			private String basePath;
			@Autowired
			private AllocationService allocationService;
			@Autowired
			private ResponsibilityUnitService responsibilityUnitService;


			@ApiOperation(value = "污染类型", notes = "污染类型")
			@@ -173,7 +177,6 @@
			return ResultMessage.ok(ObjectUtils.isEmpty(map1)? "0":map1);
			}


			@GetMapping("unitExel")
			public void unitExel(HttpServletResponse response,HttpServletRequest request){
			Map<String, Object> params = WebUtils.getParametersStartingWith(request, null);
			@@ -244,6 +247,8 @@
			for(int i = 0;i<list.size();i++){
			AllocationExcelExt excelExt = list.get(i);
			AllocationListExcelVo item = AllocationListExcelVo.convert(excelExt);
			String stateStr = Objects.nonNull(excelExt.getState())?AllocationApproveEnum.getByValue(excelExt.getState()).getName():"未找到状态";
			item.setStateStr(stateStr);
			List<String> urls = new ArrayList<>();
			for(FileAddressVo z : excelExt.getFileBaseList()){
			urls.add(handleFileRealPath(z.getFileAddress()));
			@@ -275,4 +280,12 @@
			return basePath.replaceAll(StringUtils.BACKSLASH.concat(StringUtils.BACKSLASH), StringUtils.SLASH).concat(StringUtils.SLASH).concat(path);
			}


			@GetMapping("unitQuery")
			@ApiOperation("显示责任主体")
			public ResultMessage unitQuery(){
			List<ResponsibilityUnitQuery> responsibilityUnitQueries = responsibilityUnitService.unitQuery();
			return ResultMessage.ok(responsibilityUnitQueries);
			}

			}