优化代码

java110-bean/src/main/java/com/java110/dto/reportInfoAnswerValue/ReportInfoAnswerValueDto.java

@@ -23,6 +23,15 @@ private String communityId;
 private String settingId;
 
 
+private String userName;
+private String repName;
+private String repTitle;
+private String repValue;
+private String reType;
+private String repTypeName;
+
+
+
     private Date createTime;
 
     private String statusCd = "0";
@@ -87,4 +96,52 @@ public void setSettingId(String settingId) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getRepName() {
+        return repName;
+    }
+
+    public void setRepName(String repName) {
+        this.repName = repName;
+    }
+
+    public String getRepTitle() {
+        return repTitle;
+    }
+
+    public void setRepTitle(String repTitle) {
+        this.repTitle = repTitle;
+    }
+
+    public String getRepValue() {
+        return repValue;
+    }
+
+    public void setRepValue(String repValue) {
+        this.repValue = repValue;
+    }
+
+    public String getReType() {
+        return reType;
+    }
+
+    public void setReType(String reType) {
+        this.reType = reType;
+    }
+
+    public String getRepTypeName() {
+        return repTypeName;
+    }
+
+    public void setRepTypeName(String repTypeName) {
+        this.repTypeName = repTypeName;
+    }
 }

java110-db/src/main/resources/mapper/report/ReportInfoAnswerValueServiceDaoImplMapper.xml

@@ -21,9 +21,15 @@ value_id,user_an_id,title_id,an_value_id,value_content,community_id,setting_id
 
     <!-- 查询批量操作日志详情信息 add by wuxw 2018-07-03 -->
     <select id="getReportInfoAnswerValueInfo" parameterType="Map" resultType="Map">
-        select  t.value_id,t.value_id valueId,t.create_time,t.create_time createTime,t.user_an_id,t.user_an_id userAnId,t.title_id,t.title_id titleId,t.an_value_id,t.an_value_id anValueId,t.value_content,t.value_content valueContent,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.setting_id,t.setting_id settingId 
-from report_info_answer_value t 
-where 1 =1 
+        select ra.person_name userName,st.name repName,tt.title repTitle,tv.qa_value repValue,av.value_content valueContent,
+        av.create_time createTime,st.report_type reType,td.`name` repTypeName from
+        report_info_answer_value av
+        LEFT JOIN report_info_answer ra on av.user_an_id = ra.user_an_id and ra.status_cd=0
+        LEFT JOIN report_info_setting_title_value tv on av.value_id = tv.value_id  and tv.status_cd=0
+        LEFT JOIN report_info_setting_title tt on av.title_id = av.title_id and tt.status_cd=0
+        LEFT JOIN report_info_setting st on av.setting_id = st.setting_id and st.status_cd=0
+        LEFT JOIN t_dict td on st.report_type = td.status_cd and td.table_name = 'report_info_setting' and td.table_columns = 'report_type'
+        where 1=1
 <if test="valueId !=null and valueId != ''">
    and t.value_id= #{valueId}
 </if> 
@@ -96,9 +102,14 @@ and t.an_value_id= #{anValueId}
 
     <!-- 查询批量操作日志详情数量 add by wuxw 2018-07-03 -->
      <select id="queryReportInfoAnswerValuesCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from report_info_answer_value t 
-where 1 =1 
+         select count(1) count  from
+         report_info_answer_value av
+         LEFT JOIN report_info_answer ra on av.user_an_id = ra.user_an_id and ra.status_cd=0
+         LEFT JOIN report_info_setting_title_value tv on av.value_id = tv.value_id  and tv.status_cd=0
+         LEFT JOIN report_info_setting_title tt on av.title_id = av.title_id and tt.status_cd=0
+         LEFT JOIN report_info_setting st on av.setting_id = st.setting_id and st.status_cd=0
+         LEFT JOIN t_dict td on st.report_type = td.status_cd and td.table_name = 'report_info_setting' and td.table_columns = 'report_type'
+         where 1=1
 <if test="valueId !=null and valueId != ''">
    and t.value_id= #{valueId}
 </if> 

service-report/src/main/java/com/java110/report/api/ReportInfoAnswerValueApi.java

@@ -101,12 +101,14 @@ public class ReportInfoAnswerValueApi {
      */
     @RequestMapping(value = "/queryReportInfoAnswerValue", method = RequestMethod.GET)
     public ResponseEntity<String> queryReportInfoAnswerValue(@RequestParam(value = "communityId") String communityId,
+                                                             @RequestParam(value = "titleId") String titleId,
                                                       @RequestParam(value = "page") int page,
                                                       @RequestParam(value = "row") int row) {
         ReportInfoAnswerValueDto reportInfoAnswerValueDto = new ReportInfoAnswerValueDto();
         reportInfoAnswerValueDto.setPage(page);
         reportInfoAnswerValueDto.setRow(row);
         reportInfoAnswerValueDto.setCommunityId(communityId);
+        reportInfoAnswerValueDto.setTitleId(titleId);
         return getReportInfoAnswerValueBMOImpl.get(reportInfoAnswerValueDto);
     }
 }

service-report/src/main/java/com/java110/report/api/ReportInfoSettingTitleValueApi.java

@@ -108,12 +108,12 @@ public class ReportInfoSettingTitleValueApi {
     }
     /**
      * 微信删除消息模板
-     * @serviceCode /reportInfoSettingTitleValue/queryTitleValueInfoResult
+     * @serviceCode /reportInfoSettingTitleValue/queryTitleValueResult
      * @path /app/reportInfoSettingTitleValue/queryReportInfoSettingTitleValue
      * @param communityId 小区ID
      * @return
      */
-    @RequestMapping(value = "/queryTitleValueInfoResult", method = RequestMethod.GET)
+    @RequestMapping(value = "/queryTitleValueResult", method = RequestMethod.GET)
     public ResponseEntity<String> getReportInfoSettingTitleValueInfoResult(@RequestParam(value = "communityId") String communityId,
                                                                    @RequestParam(value = "titleId") String titleId,
                                                       @RequestParam(value = "page") int page,