wuxw лет назад: 2
Родитель
Сommit
a7ab180711

+ 0 - 162
java110-db/src/main/resources/mapper/community/ComplaintV1ServiceDaoImplMapper.xml

@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="complaintV1ServiceDaoImpl">
-
-
-    <!-- 保存投诉建议信息 add by wuxw 2018-07-03 -->
-    <insert id="saveComplaintInfo" parameterType="Map">
-        insert into complaint(
-        start_user_id,complaint_id,type_cd,context,complaint_name,tel,state,store_id,community_id,room_id
-        ) values (
-        #{startUserId},#{complaintId},#{typeCd},#{context},#{complaintName},#{tel},#{state},#{storeId},#{communityId},#{roomId}
-        )
-    </insert>
-
-
-    <!-- 查询投诉建议信息 add by wuxw 2018-07-03 -->
-    <select id="getComplaintInfo" parameterType="Map" resultType="Map">
-        select t.start_user_id,t.start_user_id startUserId,t.complaint_id,t.complaint_id complaintId,t.type_cd,t.type_cd
-        typeCd,t.context,t.complaint_name,t.complaint_name complaintName,t.tel,t.status_cd,t.status_cd
-        statusCd,t.state,t.store_id,t.store_id storeId,t.community_id,t.community_id communityId,t.room_id,t.room_id
-        roomId
-        from complaint t
-        where 1 =1
-        <if test="startUserId !=null and startUserId != ''">
-            and t.start_user_id= #{startUserId}
-        </if>
-        <if test="complaintId !=null and complaintId != ''">
-            and t.complaint_id= #{complaintId}
-        </if>
-        <if test="typeCd !=null and typeCd != ''">
-            and t.type_cd= #{typeCd}
-        </if>
-        <if test="context !=null and context != ''">
-            and t.context= #{context}
-        </if>
-        <if test="complaintName !=null and complaintName != ''">
-            and t.complaint_name= #{complaintName}
-        </if>
-        <if test="tel !=null and tel != ''">
-            and t.tel= #{tel}
-        </if>
-        <if test="statusCd !=null and statusCd != ''">
-            and t.status_cd= #{statusCd}
-        </if>
-        <if test="state !=null and state != ''">
-            and t.state= #{state}
-        </if>
-        <if test="storeId !=null and storeId != ''">
-            and t.store_id= #{storeId}
-        </if>
-        <if test="communityId !=null and communityId != ''">
-            and t.community_id= #{communityId}
-        </if>
-        <if test="roomId !=null and roomId != ''">
-            and t.room_id= #{roomId}
-        </if>
-        order by t.create_time desc
-        <if test="page != -1 and page != null ">
-            limit #{page}, #{row}
-        </if>
-
-    </select>
-
-
-    <!-- 修改投诉建议信息 add by wuxw 2018-07-03 -->
-    <update id="updateComplaintInfo" parameterType="Map">
-        update complaint t set t.status_cd = #{statusCd}
-        <if test="newBId != null and newBId != ''">
-            ,t.b_id = #{newBId}
-        </if>
-        <if test="startUserId !=null and startUserId != ''">
-            , t.start_user_id= #{startUserId}
-        </if>
-        <if test="typeCd !=null and typeCd != ''">
-            , t.type_cd= #{typeCd}
-        </if>
-        <if test="context !=null and context != ''">
-            , t.context= #{context}
-        </if>
-        <if test="complaintName !=null and complaintName != ''">
-            , t.complaint_name= #{complaintName}
-        </if>
-        <if test="tel !=null and tel != ''">
-            , t.tel= #{tel}
-        </if>
-        <if test="state !=null and state != ''">
-            , t.state= #{state}
-        </if>
-        <if test="storeId !=null and storeId != ''">
-            , t.store_id= #{storeId}
-        </if>
-        <if test="communityId !=null and communityId != ''">
-            , t.community_id= #{communityId}
-        </if>
-        <if test="roomId !=null and roomId != ''">
-            , t.room_id= #{roomId}
-        </if>
-        where 1=1
-        <if test="complaintId !=null and complaintId != ''">
-            and t.complaint_id= #{complaintId}
-        </if>
-
-    </update>
-
-    <!-- 查询投诉建议数量 add by wuxw 2018-07-03 -->
-    <select id="queryComplaintsCount" parameterType="Map" resultType="Map">
-        select count(1) count
-        from complaint t
-        where 1 =1
-        <if test="startUserId !=null and startUserId != ''">
-            and t.start_user_id= #{startUserId}
-        </if>
-        <if test="complaintId !=null and complaintId != ''">
-            and t.complaint_id= #{complaintId}
-        </if>
-        <if test="typeCd !=null and typeCd != ''">
-            and t.type_cd= #{typeCd}
-        </if>
-        <if test="context !=null and context != ''">
-            and t.context= #{context}
-        </if>
-        <if test="complaintName !=null and complaintName != ''">
-            and t.complaint_name= #{complaintName}
-        </if>
-        <if test="tel !=null and tel != ''">
-            and t.tel= #{tel}
-        </if>
-        <if test="statusCd !=null and statusCd != ''">
-            and t.status_cd= #{statusCd}
-        </if>
-        <if test="state !=null and state != ''">
-            and t.state= #{state}
-        </if>
-        <if test="storeId !=null and storeId != ''">
-            and t.store_id= #{storeId}
-        </if>
-        <if test="communityId !=null and communityId != ''">
-            and t.community_id= #{communityId}
-        </if>
-        <if test="roomId !=null and roomId != ''">
-            and t.room_id= #{roomId}
-        </if>
-
-
-    </select>
-
-    <select id="queryComplaintCountByOwnerTels" parameterType="Map" resultType="Map">
-        select t.tel ownerTel,count(1) complaintCount
-        from
-        complaint t
-        where t.status_cd = '0'
-        and t.community_id = #{communityId}
-        and t.tel in
-        <foreach collection="ownerTels" item="item" open="(" close=")" separator=",">
-            #{item}
-        </foreach>
-        group by t.tel
-    </select>
-
-</mapper>

+ 163 - 149
java110-db/src/main/resources/mapper/store/ComplaintV1ServiceDaoImplMapper.xml

@@ -5,174 +5,188 @@
 <mapper namespace="complaintV1ServiceDaoImpl">
 
 
-
-
-
     <!-- 保存投诉信息 add by wuxw 2018-07-03 -->
     <insert id="saveComplaintInfo" parameterType="Map">
         insert into complaint(
-store_id,owner_id,room_id,room_name,start_user_id,complaint_id,type_cd,owner_name,context,complaint_name,tel,state,community_id
-) values (
-#{storeId},#{ownerId},#{roomId},#{roomName},#{startUserId},#{complaintId},#{typeCd},#{ownerName},#{context},#{complaintName},#{tel},#{state},#{communityId}
-)
+        store_id,owner_id,room_id,room_name,start_user_id,complaint_id,type_cd,owner_name,context,complaint_name,tel,state,community_id
+        ) values (
+        #{storeId},#{ownerId},#{roomId},#{roomName},#{startUserId},#{complaintId},#{typeCd},#{ownerName},#{context},#{complaintName},#{tel},#{state},#{communityId}
+        )
     </insert>
 
 
-
     <!-- 查询投诉信息 add by wuxw 2018-07-03 -->
     <select id="getComplaintInfo" parameterType="Map" resultType="Map">
-        select  t.status_cd,t.status_cd statusCd,t.store_id,t.store_id storeId,t.owner_id,t.owner_id ownerId,t.room_id,t.room_id roomId,t.room_name,t.room_name roomName,t.start_user_id,t.start_user_id startUserId,t.complaint_id,t.complaint_id complaintId,t.type_cd,t.type_cd typeCd,t.owner_name,t.owner_name ownerName,t.context,t.complaint_name,t.complaint_name complaintName,t.tel,t.state,t.community_id,t.community_id communityId 
-from complaint t 
-where 1 =1 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="storeId !=null and storeId != ''">
-   and t.store_id= #{storeId}
-</if> 
-<if test="ownerId !=null and ownerId != ''">
-   and t.owner_id= #{ownerId}
-</if> 
-<if test="roomId !=null and roomId != ''">
-   and t.room_id= #{roomId}
-</if> 
-<if test="roomName !=null and roomName != ''">
-   and t.room_name= #{roomName}
-</if> 
-<if test="startUserId !=null and startUserId != ''">
-   and t.start_user_id= #{startUserId}
-</if> 
-<if test="complaintId !=null and complaintId != ''">
-   and t.complaint_id= #{complaintId}
-</if> 
-<if test="typeCd !=null and typeCd != ''">
-   and t.type_cd= #{typeCd}
-</if> 
-<if test="ownerName !=null and ownerName != ''">
-   and t.owner_name= #{ownerName}
-</if> 
-<if test="context !=null and context != ''">
-   and t.context= #{context}
-</if> 
-<if test="complaintName !=null and complaintName != ''">
-   and t.complaint_name= #{complaintName}
-</if> 
-<if test="tel !=null and tel != ''">
-   and t.tel= #{tel}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.status_cd,t.status_cd statusCd,t.store_id,t.store_id storeId,t.owner_id,t.owner_id
+        ownerId,t.room_id,t.room_id roomId,t.room_name,t.room_name roomName,t.start_user_id,t.start_user_id
+        startUserId,t.complaint_id,t.complaint_id complaintId,t.type_cd,t.type_cd typeCd,t.owner_name,t.owner_name
+        ownerName,t.context,t.complaint_name,t.complaint_name complaintName,t.tel,t.state,t.community_id,t.community_id
+        communityId
+        from complaint t
+        where 1 =1
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="ownerId !=null and ownerId != ''">
+            and t.owner_id= #{ownerId}
+        </if>
+        <if test="roomId !=null and roomId != ''">
+            and t.room_id= #{roomId}
+        </if>
+        <if test="roomName !=null and roomName != ''">
+            and t.room_name= #{roomName}
+        </if>
+        <if test="startUserId !=null and startUserId != ''">
+            and t.start_user_id= #{startUserId}
+        </if>
+        <if test="complaintId !=null and complaintId != ''">
+            and t.complaint_id= #{complaintId}
+        </if>
+        <if test="typeCd !=null and typeCd != ''">
+            and t.type_cd= #{typeCd}
+        </if>
+        <if test="ownerName !=null and ownerName != ''">
+            and t.owner_name= #{ownerName}
+        </if>
+        <if test="context !=null and context != ''">
+            and t.context= #{context}
+        </if>
+        <if test="complaintName !=null and complaintName != ''">
+            and t.complaint_name= #{complaintName}
+        </if>
+        <if test="tel !=null and tel != ''">
+            and t.tel= #{tel}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 修改投诉信息 add by wuxw 2018-07-03 -->
     <update id="updateComplaintInfo" parameterType="Map">
-        update  complaint t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="storeId !=null and storeId != ''">
-, t.store_id= #{storeId}
-</if> 
-<if test="ownerId !=null and ownerId != ''">
-, t.owner_id= #{ownerId}
-</if> 
-<if test="roomId !=null and roomId != ''">
-, t.room_id= #{roomId}
-</if> 
-<if test="roomName !=null and roomName != ''">
-, t.room_name= #{roomName}
-</if> 
-<if test="startUserId !=null and startUserId != ''">
-, t.start_user_id= #{startUserId}
-</if> 
-<if test="typeCd !=null and typeCd != ''">
-, t.type_cd= #{typeCd}
-</if> 
-<if test="ownerName !=null and ownerName != ''">
-, t.owner_name= #{ownerName}
-</if> 
-<if test="context !=null and context != ''">
-, t.context= #{context}
-</if> 
-<if test="complaintName !=null and complaintName != ''">
-, t.complaint_name= #{complaintName}
-</if> 
-<if test="tel !=null and tel != ''">
-, t.tel= #{tel}
-</if> 
-<if test="state !=null and state != ''">
-, t.state= #{state}
-</if> 
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if> 
- where 1=1 <if test="complaintId !=null and complaintId != ''">
-and t.complaint_id= #{complaintId}
-</if> 
+        update complaint t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+
+        <if test="ownerId !=null and ownerId != ''">
+            , t.owner_id= #{ownerId}
+        </if>
+        <if test="roomId !=null and roomId != ''">
+            , t.room_id= #{roomId}
+        </if>
+        <if test="roomName !=null and roomName != ''">
+            , t.room_name= #{roomName}
+        </if>
+        <if test="startUserId !=null and startUserId != ''">
+            , t.start_user_id= #{startUserId}
+        </if>
+        <if test="typeCd !=null and typeCd != ''">
+            , t.type_cd= #{typeCd}
+        </if>
+        <if test="ownerName !=null and ownerName != ''">
+            , t.owner_name= #{ownerName}
+        </if>
+        <if test="context !=null and context != ''">
+            , t.context= #{context}
+        </if>
+        <if test="complaintName !=null and complaintName != ''">
+            , t.complaint_name= #{complaintName}
+        </if>
+        <if test="tel !=null and tel != ''">
+            , t.tel= #{tel}
+        </if>
+        <if test="state !=null and state != ''">
+            , t.state= #{state}
+        </if>
+
+        where 1=1
+        <if test="complaintId !=null and complaintId != ''">
+            and t.complaint_id= #{complaintId}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
 
     </update>
 
     <!-- 查询投诉数量 add by wuxw 2018-07-03 -->
-     <select id="queryComplaintsCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from complaint t 
-where 1 =1 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="storeId !=null and storeId != ''">
-   and t.store_id= #{storeId}
-</if> 
-<if test="ownerId !=null and ownerId != ''">
-   and t.owner_id= #{ownerId}
-</if> 
-<if test="roomId !=null and roomId != ''">
-   and t.room_id= #{roomId}
-</if> 
-<if test="roomName !=null and roomName != ''">
-   and t.room_name= #{roomName}
-</if> 
-<if test="startUserId !=null and startUserId != ''">
-   and t.start_user_id= #{startUserId}
-</if> 
-<if test="complaintId !=null and complaintId != ''">
-   and t.complaint_id= #{complaintId}
-</if> 
-<if test="typeCd !=null and typeCd != ''">
-   and t.type_cd= #{typeCd}
-</if> 
-<if test="ownerName !=null and ownerName != ''">
-   and t.owner_name= #{ownerName}
-</if> 
-<if test="context !=null and context != ''">
-   and t.context= #{context}
-</if> 
-<if test="complaintName !=null and complaintName != ''">
-   and t.complaint_name= #{complaintName}
-</if> 
-<if test="tel !=null and tel != ''">
-   and t.tel= #{tel}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
+    <select id="queryComplaintsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from complaint t
+        where 1 =1
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="ownerId !=null and ownerId != ''">
+            and t.owner_id= #{ownerId}
+        </if>
+        <if test="roomId !=null and roomId != ''">
+            and t.room_id= #{roomId}
+        </if>
+        <if test="roomName !=null and roomName != ''">
+            and t.room_name= #{roomName}
+        </if>
+        <if test="startUserId !=null and startUserId != ''">
+            and t.start_user_id= #{startUserId}
+        </if>
+        <if test="complaintId !=null and complaintId != ''">
+            and t.complaint_id= #{complaintId}
+        </if>
+        <if test="typeCd !=null and typeCd != ''">
+            and t.type_cd= #{typeCd}
+        </if>
+        <if test="ownerName !=null and ownerName != ''">
+            and t.owner_name= #{ownerName}
+        </if>
+        <if test="context !=null and context != ''">
+            and t.context= #{context}
+        </if>
+        <if test="complaintName !=null and complaintName != ''">
+            and t.complaint_name= #{complaintName}
+        </if>
+        <if test="tel !=null and tel != ''">
+            and t.tel= #{tel}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+
 
+    </select>
 
-     </select>
+    <select id="queryComplaintCountByOwnerTels" parameterType="Map" resultType="Map">
+        select t.tel ownerTel,count(1) complaintCount
+        from
+        complaint t
+        where t.status_cd = '0'
+        and t.community_id = #{communityId}
+        and t.tel in
+        <foreach collection="ownerTels" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        group by t.tel
+    </select>
 
 </mapper>

+ 0 - 72
java110-interface/src/main/java/com/java110/intf/community/IComplaintV1InnerServiceSMO.java

@@ -1,72 +0,0 @@
-/*
- * Copyright 2017-2020 吴学文 and java110 team.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.java110.intf.community;
-
-import com.java110.config.feign.FeignConfiguration;
-import com.java110.dto.complaint.ComplaintDto;
-import com.java110.po.complaint.ComplaintPo;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 类表述: 服务之前调用的接口类,不对外提供接口能力 只用于接口建调用
- * add by 吴学文 at 2022-07-17 00:29:44 mail: 928255095@qq.com
- * open source address: https://gitee.com/wuxw7/MicroCommunity
- * 官网:http://www.homecommunity.cn
- * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
- * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
- */
-@FeignClient(name = "community-service", configuration = {FeignConfiguration.class})
-@RequestMapping("/complaintV1Api")
-public interface IComplaintV1InnerServiceSMO {
-
-
-    @RequestMapping(value = "/saveComplaint", method = RequestMethod.POST)
-    public int saveComplaint(@RequestBody ComplaintPo complaintPo);
-
-    @RequestMapping(value = "/updateComplaint", method = RequestMethod.POST)
-    public int updateComplaint(@RequestBody ComplaintPo complaintPo);
-
-    @RequestMapping(value = "/deleteComplaint", method = RequestMethod.POST)
-    public int deleteComplaint(@RequestBody ComplaintPo complaintPo);
-
-    /**
-     * <p>查询小区楼信息</p>
-     *
-     *
-     * @param complaintDto 数据对象分享
-     * @return ComplaintDto 对象数据
-     */
-    @RequestMapping(value = "/queryComplaints", method = RequestMethod.POST)
-    List<ComplaintDto> queryComplaints(@RequestBody ComplaintDto complaintDto);
-
-    /**
-     * 查询<p>小区楼</p>总记录数
-     *
-     * @param complaintDto 数据对象分享
-     * @return 小区下的小区楼记录数
-     */
-    @RequestMapping(value = "/queryComplaintsCount", method = RequestMethod.POST)
-    int queryComplaintsCount(@RequestBody ComplaintDto complaintDto);
-
-    @RequestMapping(value = "/queryComplaintCountByOwnerTels", method = RequestMethod.POST)
-    List<Map> queryComplaintCountByOwnerTels(@RequestBody Map ownerTels);
-}

+ 4 - 0
java110-interface/src/main/java/com/java110/intf/store/IComplaintV1InnerServiceSMO.java

@@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 类表述: 服务之前调用的接口类,不对外提供接口能力 只用于接口建调用
@@ -65,4 +66,7 @@ public interface IComplaintV1InnerServiceSMO {
      */
     @RequestMapping(value = "/queryComplaintsCount", method = RequestMethod.POST)
     int queryComplaintsCount(@RequestBody ComplaintDto complaintDto);
+
+    @RequestMapping(value = "/queryComplaintsCount", method = RequestMethod.POST)
+    List<Map> queryComplaintCountByOwnerTels(@RequestBody Map info);
 }

+ 1 - 1
service-community/src/main/java/com/java110/community/bmo/room/impl/QueryRoomStatisticsBMOImpl.java

@@ -2,7 +2,7 @@ package com.java110.community.bmo.room.impl;
 
 import com.java110.community.bmo.room.IQueryRoomStatisticsBMO;
 import com.java110.dto.room.RoomDto;
-import com.java110.intf.community.IComplaintV1InnerServiceSMO;
+import com.java110.intf.store.IComplaintV1InnerServiceSMO;
 import com.java110.intf.community.IRepairPoolV1InnerServiceSMO;
 import com.java110.intf.report.IReportOweFeeInnerServiceSMO;
 import com.java110.intf.store.IContractRoomInnerServiceSMO;

+ 0 - 74
service-community/src/main/java/com/java110/community/dao/IComplaintV1ServiceDao.java

@@ -1,74 +0,0 @@
-/*
- * Copyright 2017-2020 吴学文 and java110 team.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.java110.community.dao;
-
-
-import com.java110.utils.exception.DAOException;
-
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 类表述:
- * add by 吴学文 at 2022-07-17 00:29:44 mail: 928255095@qq.com
- * open source address: https://gitee.com/wuxw7/MicroCommunity
- * 官网:http://www.homecommunity.cn
- * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
- * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
- */
-public interface IComplaintV1ServiceDao {
-
-
-    /**
-     * 保存 投诉建议信息
-     * @param info
-     * @throws DAOException DAO异常
-     */
-    int saveComplaintInfo(Map info) throws DAOException;
-
-
-
-
-    /**
-     * 查询投诉建议信息(instance过程)
-     * 根据bId 查询投诉建议信息
-     * @param info bId 信息
-     * @return 投诉建议信息
-     * @throws DAOException DAO异常
-     */
-    List<Map> getComplaintInfo(Map info) throws DAOException;
-
-
-
-    /**
-     * 修改投诉建议信息
-     * @param info 修改信息
-     * @throws DAOException DAO异常
-     */
-    int updateComplaintInfo(Map info) throws DAOException;
-
-
-    /**
-     * 查询投诉建议总数
-     *
-     * @param info 投诉建议信息
-     * @return 投诉建议数量
-     */
-    int queryComplaintsCount(Map info);
-
-    List<Map> queryComplaintCountByOwnerTels(Map info);
-}

+ 0 - 120
service-community/src/main/java/com/java110/community/dao/impl/ComplaintV1ServiceDaoImpl.java

@@ -1,120 +0,0 @@
-/*
- * Copyright 2017-2020 吴学文 and java110 team.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.java110.community.dao.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.java110.utils.constant.ResponseConstant;
-import com.java110.utils.exception.DAOException;
-import com.java110.utils.util.DateUtil;
-import com.java110.core.base.dao.BaseServiceDao;
-import com.java110.community.dao.IComplaintV1ServiceDao;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 类表述:
- * add by 吴学文 at 2022-07-17 00:29:44 mail: 928255095@qq.com
- * open source address: https://gitee.com/wuxw7/MicroCommunity
- * 官网:http://www.homecommunity.cn
- * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
- * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
- */
-@Service("complaintV1ServiceDaoImpl")
-public class ComplaintV1ServiceDaoImpl extends BaseServiceDao implements IComplaintV1ServiceDao {
-
-    private static Logger logger = LoggerFactory.getLogger(ComplaintV1ServiceDaoImpl.class);
-
-
-
-
-
-    /**
-     * 保存投诉建议信息 到 instance
-     * @param info   bId 信息
-     * @throws DAOException DAO异常
-     */
-    @Override
-    public int saveComplaintInfo(Map info) throws DAOException {
-        logger.debug("保存 saveComplaintInfo 入参 info : {}",info);
-
-        int saveFlag = sqlSessionTemplate.insert("complaintV1ServiceDaoImpl.saveComplaintInfo",info);
-
-        return saveFlag;
-    }
-
-
-    /**
-     * 查询投诉建议信息(instance)
-     * @param info bId 信息
-     * @return List<Map>
-     * @throws DAOException DAO异常
-     */
-    @Override
-    public List<Map> getComplaintInfo(Map info) throws DAOException {
-        logger.debug("查询 getComplaintInfo 入参 info : {}",info);
-
-        List<Map> businessComplaintInfos = sqlSessionTemplate.selectList("complaintV1ServiceDaoImpl.getComplaintInfo",info);
-
-        return businessComplaintInfos;
-    }
-
-
-    /**
-     * 修改投诉建议信息
-     * @param info 修改信息
-     * @throws DAOException DAO异常
-     */
-    @Override
-    public int updateComplaintInfo(Map info) throws DAOException {
-        logger.debug("修改 updateComplaintInfo 入参 info : {}",info);
-
-        int saveFlag = sqlSessionTemplate.update("complaintV1ServiceDaoImpl.updateComplaintInfo",info);
-
-        return saveFlag;
-    }
-
-     /**
-     * 查询投诉建议数量
-     * @param info 投诉建议信息
-     * @return 投诉建议数量
-     */
-    @Override
-    public int queryComplaintsCount(Map info) {
-        logger.debug("查询 queryComplaintsCount 入参 info : {}",info);
-
-        List<Map> businessComplaintInfos = sqlSessionTemplate.selectList("complaintV1ServiceDaoImpl.queryComplaintsCount", info);
-        if (businessComplaintInfos.size() < 1) {
-            return 0;
-        }
-
-        return Integer.parseInt(businessComplaintInfos.get(0).get("count").toString());
-    }
-
-    @Override
-    public List<Map> queryComplaintCountByOwnerTels(Map info) {
-        logger.debug("查询 queryComplaintCountByOwnerTels 入参 info : {}",info);
-
-        List<Map> result = sqlSessionTemplate.selectList("complaintV1ServiceDaoImpl.queryComplaintCountByOwnerTels", info);
-        return result;
-    }
-
-
-}

+ 0 - 98
service-community/src/main/java/com/java110/community/smo/impl/ComplaintV1InnerServiceSMOImpl.java

@@ -1,98 +0,0 @@
-/*
- * Copyright 2017-2020 吴学文 and java110 team.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.java110.community.smo.impl;
-
-
-import com.java110.community.dao.IComplaintV1ServiceDao;
-import com.java110.intf.community.IComplaintV1InnerServiceSMO;
-import com.java110.dto.complaint.ComplaintDto;
-import com.java110.po.complaint.ComplaintPo;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.dto.user.UserDto;
-import com.java110.dto.PageDto;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 类表述: 服务之前调用的接口实现类,不对外提供接口能力 只用于接口建调用
- * add by 吴学文 at 2022-07-17 00:29:44 mail: 928255095@qq.com
- * open source address: https://gitee.com/wuxw7/MicroCommunity
- * 官网:http://www.homecommunity.cn
- * 温馨提示:如果您对此文件进行修改 请不要删除原有作者及注释信息,请补充您的 修改的原因以及联系邮箱如下
- * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复,注释10至20行 加入 20行至30行
- */
-@RestController
-public class ComplaintV1InnerServiceSMOImpl extends BaseServiceSMO implements IComplaintV1InnerServiceSMO {
-
-    @Autowired
-    private IComplaintV1ServiceDao complaintV1ServiceDaoImpl;
-
-
-    @Override
-    public int saveComplaint(@RequestBody  ComplaintPo complaintPo) {
-        int saveFlag = complaintV1ServiceDaoImpl.saveComplaintInfo(BeanConvertUtil.beanCovertMap(complaintPo));
-        return saveFlag;
-    }
-
-     @Override
-    public int updateComplaint(@RequestBody  ComplaintPo complaintPo) {
-        int saveFlag = complaintV1ServiceDaoImpl.updateComplaintInfo(BeanConvertUtil.beanCovertMap(complaintPo));
-        return saveFlag;
-    }
-
-     @Override
-    public int deleteComplaint(@RequestBody  ComplaintPo complaintPo) {
-       complaintPo.setStatusCd("1");
-       int saveFlag = complaintV1ServiceDaoImpl.updateComplaintInfo(BeanConvertUtil.beanCovertMap(complaintPo));
-       return saveFlag;
-    }
-
-    @Override
-    public List<ComplaintDto> queryComplaints(@RequestBody  ComplaintDto complaintDto) {
-
-        //校验是否传了 分页信息
-
-        int page = complaintDto.getPage();
-
-        if (page != PageDto.DEFAULT_PAGE) {
-            complaintDto.setPage((page - 1) * complaintDto.getRow());
-        }
-
-        List<ComplaintDto> complaints = BeanConvertUtil.covertBeanList(complaintV1ServiceDaoImpl.getComplaintInfo(BeanConvertUtil.beanCovertMap(complaintDto)), ComplaintDto.class);
-
-        return complaints;
-    }
-
-
-    @Override
-    public int queryComplaintsCount(@RequestBody ComplaintDto complaintDto) {
-        return complaintV1ServiceDaoImpl.queryComplaintsCount(BeanConvertUtil.beanCovertMap(complaintDto));    }
-
-    @Override
-    public List<Map> queryComplaintCountByOwnerTels(@RequestBody Map ownerTels) {
-
-        List<Map> result = complaintV1ServiceDaoImpl.queryComplaintCountByOwnerTels(ownerTels);
-        return result;
-    }
-
-}

+ 1 - 1
service-store/src/main/java/com/java110/store/cmd/complaint/AuditComplaintCmd.java

@@ -7,7 +7,7 @@ import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.dto.complaint.ComplaintDto;
 import com.java110.intf.common.IComplaintUserInnerServiceSMO;
-import com.java110.intf.community.IComplaintV1InnerServiceSMO;
+import com.java110.intf.store.IComplaintV1InnerServiceSMO;
 import com.java110.intf.store.IComplaintInnerServiceSMO;
 import com.java110.po.complaint.ComplaintPo;
 import com.java110.utils.constant.BusinessTypeConstant;

+ 1 - 0
service-store/src/main/java/com/java110/store/dao/IComplaintV1ServiceDao.java

@@ -70,4 +70,5 @@ public interface IComplaintV1ServiceDao {
      */
     int queryComplaintsCount(Map info);
 
+    List<Map> queryComplaintCountByOwnerTels(Map info);
 }

+ 8 - 0
service-store/src/main/java/com/java110/store/dao/impl/ComplaintV1ServiceDaoImpl.java

@@ -108,5 +108,13 @@ public class ComplaintV1ServiceDaoImpl extends BaseServiceDao implements ICompla
         return Integer.parseInt(businessComplaintInfos.get(0).get("count").toString());
     }
 
+    @Override
+    public List<Map> queryComplaintCountByOwnerTels(Map info) {
+        logger.debug("查询 queryComplaintCountByOwnerTels 入参 info : {}",info);
+
+        List<Map> result = sqlSessionTemplate.selectList("complaintV1ServiceDaoImpl.queryComplaintCountByOwnerTels", info);
+        return result;
+    }
+
 
 }

+ 6 - 0
service-store/src/main/java/com/java110/store/smo/impl/ComplaintV1InnerServiceSMOImpl.java

@@ -30,6 +30,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 类表述: 服务之前调用的接口实现类,不对外提供接口能力 只用于接口建调用
@@ -86,4 +87,9 @@ public class ComplaintV1InnerServiceSMOImpl extends BaseServiceSMO implements IC
     public int queryComplaintsCount(@RequestBody ComplaintDto complaintDto) {
         return complaintV1ServiceDaoImpl.queryComplaintsCount(BeanConvertUtil.beanCovertMap(complaintDto));    }
 
+    @Override
+    public List<Map> queryComplaintCountByOwnerTels(@RequestBody Map info) {
+        return complaintV1ServiceDaoImpl.queryComplaintCountByOwnerTels(info);
+    }
+
 }

+ 1 - 1
service-user/src/main/java/com/java110/user/bmo/owner/impl/QueryOwnerStatisticsBMOImpl.java

@@ -1,7 +1,7 @@
 package com.java110.user.bmo.owner.impl;
 
 import com.java110.dto.owner.OwnerDto;
-import com.java110.intf.community.IComplaintV1InnerServiceSMO;
+import com.java110.intf.store.IComplaintV1InnerServiceSMO;
 import com.java110.intf.community.IRepairPoolV1InnerServiceSMO;
 import com.java110.intf.report.IReportOweFeeInnerServiceSMO;
 import com.java110.intf.store.IContractInnerServiceSMO;