1
0
Просмотр исходного кода

列表查询日志增加测试

chenendian 1 день назад
Родитель
Сommit
bf4c7080ee

+ 3 - 0
siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/ProjectController.java

@@ -10,6 +10,8 @@ import com.siwei.apply.domain.vo.*;
 import com.siwei.apply.service.ProjectService;
 import com.siwei.apply.service.ProjectService;
 import com.siwei.common.core.domain.R;
 import com.siwei.common.core.domain.R;
 import com.siwei.common.core.web.controller.BaseController;
 import com.siwei.common.core.web.controller.BaseController;
+import com.siwei.common.log.annotation.Log;
+import com.siwei.common.log.enums.BusinessType;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.usermodel.*;
@@ -81,6 +83,7 @@ public class ProjectController extends BaseController {
      *
      *
      * @return
      * @return
      */
      */
+    @Log(title = "项目列表查询", businessType = BusinessType.OTHER)
     @PostMapping("/list")
     @PostMapping("/list")
     public R<Map<String, Object>> GetList(@RequestBody ProjectFilterVo projectFilterVo) {
     public R<Map<String, Object>> GetList(@RequestBody ProjectFilterVo projectFilterVo) {
         try {
         try {

+ 1 - 1
siwei-modules/siwei-apply/src/main/resources/mapper/YdbpDataMapper.xml

@@ -246,7 +246,7 @@
         '' AS node_id,
         '' AS node_id,
         ''  AS  id,
         ''  AS  id,
         '2' AS batch_type,
         '2' AS batch_type,
-        ST_AsEWKT( ST_Difference(bp.union_geom, gy.union_geom)) AS rest_geom,
+        ST_AsEWKT( ST_Difference(bp.union_geom, gy.union_geom)) AS geom,
         COALESCE (ST_Area( ST_Difference(bp.union_geom, COALESCE(gy.union_geom, ST_GeomFromText('POLYGON EMPTY',4326)))::geography ),0) / 666.6666667 AS rest_area
         COALESCE (ST_Area( ST_Difference(bp.union_geom, COALESCE(gy.union_geom, ST_GeomFromText('POLYGON EMPTY',4326)))::geography ),0) / 666.6666667 AS rest_area
         FROM geom_ydbp_data bp
         FROM geom_ydbp_data bp
         LEFT JOIN  geom_gy_data gy ON bp.nf = gy.nf
         LEFT JOIN  geom_gy_data gy ON bp.nf = gy.nf