|
@@ -9,6 +9,7 @@ import com.example.utils.PageMap;
|
|
import com.example.utils.PageUtils;
|
|
import com.example.utils.PageUtils;
|
|
import com.example.utils.Query;
|
|
import com.example.utils.Query;
|
|
import com.example.utils.R;
|
|
import com.example.utils.R;
|
|
|
|
+import lombok.extern.slf4j.Slf4j;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
@@ -20,6 +21,7 @@ import java.util.HashMap;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
|
|
|
|
|
|
+@Slf4j
|
|
@RestController
|
|
@RestController
|
|
@RequestMapping("/house-car/house/dist/api/WzBuildmanageAvagearea")
|
|
@RequestMapping("/house-car/house/dist/api/WzBuildmanageAvagearea")
|
|
public class WzBuildmanageAvageareaController {
|
|
public class WzBuildmanageAvageareaController {
|
|
@@ -45,7 +47,12 @@ public class WzBuildmanageAvageareaController {
|
|
List<WzBuildmanageAvageareaVo> appointmentRecordList = wzBuildmanageAvageareaService.queryVoList(query);
|
|
List<WzBuildmanageAvageareaVo> appointmentRecordList = wzBuildmanageAvageareaService.queryVoList(query);
|
|
Map<String, List<WzBuildmanageAvageareaVo>> map = new HashMap<>();
|
|
Map<String, List<WzBuildmanageAvageareaVo>> map = new HashMap<>();
|
|
for (WzBuildmanageAvageareaVo wzBuildmanageAvageareaVo : appointmentRecordList) {
|
|
for (WzBuildmanageAvageareaVo wzBuildmanageAvageareaVo : appointmentRecordList) {
|
|
- double avera = wzBuildmanageAvageareaVo.getOfficeArea() / wzBuildmanageAvageareaVo.getEmployees();
|
|
|
|
|
|
+ double avera = 0;
|
|
|
|
+ if (wzBuildmanageAvageareaVo.getOfficeArea() != null
|
|
|
|
+ && wzBuildmanageAvageareaVo.getEmployees() != null
|
|
|
|
+ && !wzBuildmanageAvageareaVo.getEmployees().equals(0d)) {
|
|
|
|
+ avera = wzBuildmanageAvageareaVo.getOfficeArea() / wzBuildmanageAvageareaVo.getEmployees();
|
|
|
|
+ }
|
|
avera = formatDouble(avera);
|
|
avera = formatDouble(avera);
|
|
wzBuildmanageAvageareaVo.setAverage(avera);
|
|
wzBuildmanageAvageareaVo.setAverage(avera);
|
|
List<WzBuildmanageAvageareaVo> list;
|
|
List<WzBuildmanageAvageareaVo> list;
|
|
@@ -107,7 +114,11 @@ public class WzBuildmanageAvageareaController {
|
|
allEmp += wzBuildmanageAvageareaVo.getEmployees();
|
|
allEmp += wzBuildmanageAvageareaVo.getEmployees();
|
|
}
|
|
}
|
|
WzBuildmanageAvageareaVo countyObject = new WzBuildmanageAvageareaVo();
|
|
WzBuildmanageAvageareaVo countyObject = new WzBuildmanageAvageareaVo();
|
|
- double avera = formatDouble(areaNum / emp);
|
|
|
|
|
|
+ double avera = 0;
|
|
|
|
+ if (emp != 0) {
|
|
|
|
+ avera = areaNum / emp;
|
|
|
|
+ }
|
|
|
|
+ avera = formatDouble(avera);
|
|
countyObject.setOfficeArea(formatDouble(areaNum));
|
|
countyObject.setOfficeArea(formatDouble(areaNum));
|
|
countyObject.setEmployees(emp);
|
|
countyObject.setEmployees(emp);
|
|
countyObject.setCity(countyEntry.getValue().get(0).getCounty());
|
|
countyObject.setCity(countyEntry.getValue().get(0).getCounty());
|