bug修改

src/main/java/com/lqkj/info/controller/OrganizationInfoController.java

@@ -24,7 +24,7 @@ import com.github.pagehelper.PageInfo;
 
 /**
  * 主体信息Controller
- * 
+ *
  * @author lqkj
  * @date 2024-11-13
  */
@@ -50,6 +50,20 @@ public class OrganizationInfoController extends BaseController
     }
 
     /**
+     * 查询主体信息列表
+     */
+    @ApiOperation("查询主体信息列表")
+    @PreAuthorize("@ss.hasPermi('info:organizationInfo:list')")
+    @GetMapping("/list1")
+    public ResultUtil list1(OrganizationInfo organizationInfo)
+    {
+        startPage( organizationInfo);
+        PageInfo<OrganizationInfo> pageInfo = new PageInfo<>(organizationInfoService.selectOrganizationInfoList1(organizationInfo));
+        return ResultUtil.success(pageInfo);
+    }
+
+
+    /**
      * 导出主体信息列表
      */
     @ApiOperation("导出主体信息列表")
@@ -109,4 +123,4 @@ public class OrganizationInfoController extends BaseController
     {
         return resultByRows(organizationInfoService.deleteOrganizationInfoByOrganizationIds(organizationIds));
     }
-}
+}

src/main/java/com/lqkj/info/mapper/OrganizationInfoMapper.java

@@ -6,16 +6,16 @@ import com.lqkj.info.entity.OrganizationInfo;
 
 /**
  * 主体信息Mapper接口
- * 
+ *
  * @author lqkj
  * @date 2024-11-13
  */
 @Mapper
-public interface OrganizationInfoMapper 
+public interface OrganizationInfoMapper
 {
     /**
      * 查询主体信息
-     * 
+     *
      * @param organizationId 主体信息主键
      * @return 主体信息
      */
@@ -23,15 +23,17 @@ public interface OrganizationInfoMapper
 
     /**
      * 查询主体信息列表
-     * 
+     *
      * @param organizationInfo 主体信息
      * @return 主体信息集合
      */
     public List<OrganizationInfo> selectOrganizationInfoList(OrganizationInfo organizationInfo);
 
+    public List<OrganizationInfo> selectOrganizationInfoList1(OrganizationInfo organizationInfo);
+
     /**
      * 新增主体信息
-     * 
+     *
      * @param organizationInfo 主体信息
      * @return 结果
      */
@@ -39,7 +41,7 @@ public interface OrganizationInfoMapper
 
     /**
      * 修改主体信息
-     * 
+     *
      * @param organizationInfo 主体信息
      * @return 结果
      */
@@ -47,7 +49,7 @@ public interface OrganizationInfoMapper
 
     /**
      * 删除主体信息
-     * 
+     *
      * @param organizationId 主体信息主键
      * @return 结果
      */
@@ -55,9 +57,9 @@ public interface OrganizationInfoMapper
 
     /**
      * 批量删除主体信息
-     * 
+     *
      * @param organizationIds 需要删除的数据主键集合
      * @return 结果
      */
     public int deleteOrganizationInfoByOrganizationIds(Integer[] organizationIds);
-}
+}

src/main/java/com/lqkj/info/service/OrganizationInfoService.java

@@ -40,6 +40,15 @@ public class OrganizationInfoService {
     public List<OrganizationInfo> selectOrganizationInfoList(OrganizationInfo organizationInfo) {
         return organizationInfoMapper.selectOrganizationInfoList(organizationInfo);
     }
+    /**
+     * 查询主体信息列表
+     *
+     * @param organizationInfo 主体信息
+     * @return 主体信息
+     */
+    public List<OrganizationInfo> selectOrganizationInfoList1(OrganizationInfo organizationInfo) {
+        return organizationInfoMapper.selectOrganizationInfoList1(organizationInfo);
+    }
 
     /**
      * 新增主体信息

src/main/java/com/lqkj/ioc/mapper/SmartParkMapper.java

@@ -11,28 +11,7 @@ import java.util.Map;
 @Mapper
 public interface SmartParkMapper {
 
-    @Select("WITH months AS ( " +
-            "    SELECT generate_series( " +
-            "        date_trunc('year', CURRENT_DATE) - INTERVAL '1 year',  " +
-            "        date_trunc('month', CURRENT_DATE),  " +
-            "        '1 month' :: INTERVAL " +
-            "    ) AS MONTH " +
-            ") " +
-            "SELECT  " +
-            "    CASE  " +
-            "        WHEN EXTRACT(YEAR FROM M.MONTH) = EXTRACT(YEAR FROM CURRENT_DATE) THEN '今年' " +
-            "        WHEN EXTRACT(YEAR FROM M.MONTH) = EXTRACT(YEAR FROM CURRENT_DATE) - 1 THEN '去年' " +
-            "        ELSE EXTRACT(YEAR FROM M.MONTH)::TEXT " +
-            "    END AS YEAR, " +
-            "    EXTRACT(MONTH FROM M.MONTH) AS MONTH, " +
-            "    COALESCE(COUNT(C.organization_id), 0) AS join_count " +
-            "FROM months M " +
-            "LEFT JOIN organization_info C  " +
-            "    ON EXTRACT(YEAR FROM C.enter_time) = EXTRACT(YEAR FROM M.MONTH) " +
-            "    AND EXTRACT(MONTH FROM C.enter_time) = EXTRACT(MONTH FROM M.MONTH) " +
-            "    AND C.park_id = #{parkId} " +
-            "GROUP BY YEAR, MONTH " +
-            "ORDER BY YEAR DESC, MONTH;")
+    @Select("SELECT * FROM qyrzqk WHERE park_id = #{parkId} ")
     List<Map<String, Object>> addParkNewTenant(@Param("parkId") Integer parkId);
 
 

src/main/java/com/lqkj/supporting/service/ResourcesInfoService.java

@@ -102,10 +102,10 @@ public class ResourcesInfoService {
      */
 
     public int updateResourcesInfo(ResourcesInfo resourcesInfo) {
-//        String location = resourcesInfo.getLocation();
-//        Point point = GeoUtils.createPoint(location);
-//        JSONObject jsonObject = GeoUtils.readFromGeometry(point);
-//        resourcesInfo.setLocation(jsonObject.toJSONString());
+        String location = (String) resourcesInfo.getLocation();
+        Point point = GeoUtils.createPoint(location);
+        JSONObject jsonObject = GeoUtils.readFromGeometry(point);
+        resourcesInfo.setLocation(jsonObject);
         return resourcesInfoMapper.updateResourcesInfo(resourcesInfo);
     }
 

src/main/resources/mapper/info/OrganizationInfoMapper.xml

@@ -51,6 +51,24 @@
 
 	</select>
 
+	<select id="selectOrganizationInfoList1" parameterType="OrganizationInfo" resultMap="OrganizationInfoResult">
+		<include refid="selectOrganizationInfoVo"/>
+		<where>
+			<if test="typeId != null "> and type_id = #{typeId}</if>
+			<if test="roomId != null "> and room_id = #{roomId}</if>
+			<if test="buildingId != null "> and building_id = #{buildingId}</if>
+			<if test="areaId != null "> and area_id = #{areaId}</if>
+			<if test="organizationName != null  and organizationName != ''"> and organization_name like concat('%', #{organizationName}, '%')</if>
+			<if test="important != null "> and important = #{important}</if>
+			and industry_type is not null
+			<if test="floor != null "> and floor = #{floor}</if>
+			<if test="houseTypeId != null "> and house_type_id = #{houseTypeId}</if>
+			<if test="parkId != null"> and park_id = #{parkId}</if>
+		</where>
+		order by organization_id
+
+	</select>
+
 	<select id="selectOrganizationInfoByOrganizationId" parameterType="Integer" resultMap="OrganizationInfoResult">
 		<include refid="selectOrganizationInfoVo"/>
 		where organization_id = #{organizationId}