翻译状态

StoreService/src/main/java/com/java110/store/smo/impl/ComplaintInnerServiceSMOImpl.java

@@ -72,7 +72,10 @@ public class ComplaintInnerServiceSMOImpl extends BaseServiceSMO implements ICom
     private void refreshRoomInfo(ComplaintDto complainDto, List<RoomDto> roomDtos) {
         for (RoomDto room : roomDtos) {
             if (room.getRoomId().equals(complainDto.getRoomId())) {
-                BeanConvertUtil.covertBean(room, complainDto);
+                //BeanConvertUtil.covertBean(room, complainDto);
+                complainDto.setFloorNum(room.getFloorNum());
+                complainDto.setRoomNum(room.getRoomNum());
+                complainDto.setUnitNum(room.getUnitNum());
             }
         }
     }

WebService/src/main/resources/components/complaintPackage/complaint-manage/complaintManage.html

@@ -97,13 +97,13 @@
                         <tbody>
                         <tr v-for="complaint in complaintManageInfo.complaints">
                             <td class="text-center">{{complaint.complaintId}}</td>
-                            <td class="text-center">{{complaint.typeCd}}</td>
+                            <td class="text-center">{{complaint.typeCdName}}</td>
                             <td class="text-center">
                                 {{complaint.floorNum}}号楼{{complaint.unitNum}}单元{{complaint.roomNum}}室
                             </td>
                             <td class="text-center">{{complaint.complaintName}}</td>
                             <td class="text-center">{{complaint.tel}}</td>
-                            <td class="text-center">{{complaint.state}}</td>
+                            <td class="text-center">{{complaint.stateName}}</td>
                             <td class="text-center">
                                 <div class="btn-group">
                                     <button class="btn-white btn btn-xs"

java110-bean/src/main/java/com/java110/dto/complaint/ComplaintDto.java

@@ -17,10 +17,12 @@ public class ComplaintDto extends PageDto implements Serializable {
 
     private String complaintId;
     private String typeCd;
+    private String typeCdName;
     private String context;
     private String complaintName;
     private String tel;
     private String state;
+    private String stateName;
     private String storeId;
     private String roomId;
     private String roomNum;
@@ -127,6 +129,14 @@ public class ComplaintDto extends PageDto implements Serializable {
         return floorNum;
     }
 
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
+
     public void setFloorNum(String floorNum) {
         this.floorNum = floorNum;
     }
@@ -146,4 +156,12 @@ public class ComplaintDto extends PageDto implements Serializable {
     public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
+
+    public String getTypeCdName() {
+        return typeCdName;
+    }
+
+    public void setTypeCdName(String typeCdName) {
+        this.typeCdName = typeCdName;
+    }
 }

java110-bean/src/main/java/com/java110/vo/api/complaint/ApiComplaintDataVo.java

@@ -8,10 +8,12 @@ public class ApiComplaintDataVo implements Serializable {
     private String complaintId;
     private String storeId;
     private String typeCd;
+    private String typeCdName;
     private String roomId;
     private String complaintName;
     private String tel;
     private String state;
+    private String stateName;
     private String context;
     private String roomNum;
     private String unitNum;
@@ -114,4 +116,20 @@ public class ApiComplaintDataVo implements Serializable {
     public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
+
+    public String getTypeCdName() {
+        return typeCdName;
+    }
+
+    public void setTypeCdName(String typeCdName) {
+        this.typeCdName = typeCdName;
+    }
 }

java110-db/src/main/resources/mapper/store/ComplaintServiceDaoImplMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="complaintServiceDaoImpl">
 
     <!-- 保存投诉建议信息 add by wuxw 2018-07-03 -->
-       <insert id="saveBusinessComplaintInfo" parameterType="Map">
+    <insert id="saveBusinessComplaintInfo" parameterType="Map">
            insert into business_complaint(
 operate,complaint_id,type_cd,context,complaint_name,tel,state,store_id,b_id,room_id
 ) values (
@@ -14,203 +14,209 @@ operate,complaint_id,type_cd,context,complaint_name,tel,state,store_id,b_id,room
        </insert>
 
 
-       <!-- 查询投诉建议信息（Business） add by wuxw 2018-07-03 -->
-       <select id="getBusinessComplaintInfo" parameterType="Map" resultType="Map">
-           select  t.operate,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.state,t.store_id,t.store_id storeId,t.b_id,t.b_id bId,t.room_id,t.room_id roomId 
-from business_complaint t 
-where 1 =1 
-<if test="operate !=null and operate != ''">
-   and t.operate= #{operate}
-</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="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="storeId !=null and storeId != ''">
-   and t.store_id= #{storeId}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="roomId !=null and roomId != ''">
-   and t.room_id= #{roomId}
-</if> 
-
-       </select>
-
-
+    <!-- 查询投诉建议信息（Business） add by wuxw 2018-07-03 -->
+    <select id="getBusinessComplaintInfo" parameterType="Map" resultType="Map">
+        select t.operate,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.state,t.store_id,t.store_id
+        storeId,t.b_id,t.b_id bId,t.room_id,t.room_id roomId
+        from business_complaint t
+        where 1 =1
+        <if test="operate !=null and operate != ''">
+            and t.operate= #{operate}
+        </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="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="roomId !=null and roomId != ''">
+            and t.room_id= #{roomId}
+        </if>
 
+    </select>
 
 
     <!-- 保存投诉建议信息至 instance表中 add by wuxw 2018-07-03 -->
     <insert id="saveComplaintInfoInstance" parameterType="Map">
         insert into complaint(
-complaint_id,type_cd,context,complaint_name,tel,status_cd,state,store_id,b_id,room_id
-) select t.complaint_id,t.type_cd,t.context,t.complaint_name,t.tel,'0',t.state,t.store_id,t.b_id,t.room_id from business_complaint t where 1=1
-   and t.operate= 'ADD'
-<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="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="storeId !=null and storeId != ''">
-   and t.store_id= #{storeId}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="roomId !=null and roomId != ''">
-   and t.room_id= #{roomId}
-</if> 
+        complaint_id,type_cd,context,complaint_name,tel,status_cd,state,store_id,b_id,room_id
+        ) select t.complaint_id,t.type_cd,t.context,t.complaint_name,t.tel,'0',t.state,t.store_id,t.b_id,t.room_id from
+        business_complaint t where 1=1
+        and t.operate= 'ADD'
+        <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="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="roomId !=null and roomId != ''">
+            and t.room_id= #{roomId}
+        </if>
 
     </insert>
 
 
-
     <!-- 查询投诉建议信息 add by wuxw 2018-07-03 -->
     <select id="getComplaintInfo" parameterType="Map" resultType="Map">
-        select  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.b_id,t.b_id bId,t.room_id,t.room_id roomId 
-from complaint t 
-where 1 =1 
-<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="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="roomId !=null and roomId != ''">
-   and t.room_id= #{roomId}
-</if> 
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.complaint_id,t.complaint_id complaintId,t.type_cd,t.type_cd
+        typeCd,td2.name typeCdName,t.context,t.complaint_name,t.complaint_name complaintName,t.tel,t.status_cd,t.status_cd
+        statusCd,t.state,td.name stateName,t.store_id,t.store_id storeId,t.b_id,t.b_id bId,t.room_id,t.room_id roomId
+        from complaint t,t_dict td,t_dict td2
+        where 1 =1
+        and t.state = td.status_cd
+        and td.table_name = 'complaint'
+        and td.table_columns = 'state'
+        and t.type_cd = td.status_cd
+        and td.table_name = 'complaint'
+        and td.table_columns = 'type_cd'
+        <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="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="roomId !=null and roomId != ''">
+            and t.room_id= #{roomId}
+        </if>
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 修改投诉建议信息 add by wuxw 2018-07-03 -->
     <update id="updateComplaintInfoInstance" parameterType="Map">
-        update  complaint t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</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="roomId !=null and roomId != ''">
-, t.room_id= #{roomId}
-</if> 
- where 1=1 <if test="complaintId !=null and complaintId != ''">
-and t.complaint_id= #{complaintId}
-</if> 
-<if test="bId !=null and bId != ''">
-and t.b_id= #{bId}
-</if> 
+        update complaint t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </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="roomId !=null and roomId != ''">
+            , t.room_id= #{roomId}
+        </if>
+        where 1=1
+        <if test="complaintId !=null and complaintId != ''">
+            and t.complaint_id= #{complaintId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </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="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="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="roomId !=null and roomId != ''">
-   and t.room_id= #{roomId}
-</if> 
-
-
-     </select>
+    <select id="queryComplaintsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from complaint t
+        where 1 =1
+        <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="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="roomId !=null and roomId != ''">
+            and t.room_id= #{roomId}
+        </if>
+
+
+    </select>
 
 </mapper>