shiyj1101 5 år sedan
förälder
incheckning
99e417537a

+ 9 - 0
java110-bean/src/main/java/com/java110/dto/reportInfoSettingTitleValue/ReportInfoSettingTitleValueDto.java

@@ -18,6 +18,7 @@ public class ReportInfoSettingTitleValueDto extends PageDto implements Serializa
 private String titleId;
 private String communityId;
 private String qaValue;
+private String userCount;
 private String seq;
     private String[] titleIds;
 
@@ -81,4 +82,12 @@ public void setSeq(String seq) {
     public void setTitleIds(String[] titleIds) {
         this.titleIds = titleIds;
     }
+
+    public String getUserCount() {
+        return userCount;
+    }
+
+    public void setUserCount(String userCount) {
+        this.userCount = userCount;
+    }
 }

+ 43 - 3
java110-db/src/main/resources/mapper/report/ReportInfoSettingTitleValueServiceDaoImplMapper.xml

@@ -21,9 +21,9 @@ value_id,title_id,community_id,qa_value,seq
 
     <!-- 查询批量操作日志详情信息 add by wuxw 2018-07-03 -->
     <select id="getReportInfoSettingTitleValueInfo" parameterType="Map" resultType="Map">
-        select  t.value_id,t.value_id valueId,t.create_time,t.create_time createTime,t.title_id,t.title_id titleId,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.qa_value,t.qa_value qaValue,t.seq 
-from report_info_setting_title_value t 
-where 1 =1 
+        select  t.value_id,t.value_id valueId,t.create_time,t.create_time createTime,t.title_id,t.title_id titleId,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.qa_value,t.qa_value qaValue,t.seq
+from report_info_setting_title_value t
+where 1 =1
 <if test="valueId !=null and valueId != ''">
    and t.value_id= #{valueId}
 </if> 
@@ -59,6 +59,46 @@ order by t.create_time desc
     </select>
 
 
+    <!-- 查询批量操作日志详情信息 add by wuxw 2018-07-03 -->
+    <select id="getReportInfoSettingTitleValueInfoResult" parameterType="Map" resultType="Map">
+        select t.value_id valueId,t.qa_value qaValue,count(t2.person_id) userCount
+        from report_info_setting_title_value t
+        LEFT JOIN report_info_answer_value uqav on t.value_id = uqav.value_id and t.title_id=uqav.title_id and uqav.status_cd = '0'
+        left join report_info_answer t2 on uqav.user_an_id = t2.user_an_id and t2.setting_id=uqav.setting_id and t2.status_cd = '0'
+        where 1 =1
+        <if test="valueId !=null and valueId != ''">
+            and t.value_id= #{valueId}
+        </if>
+        <if test="createTime !=null and createTime != ''">
+            and t.create_time= #{createTime}
+        </if>
+        <if test="titleId !=null and titleId != ''">
+            and t.title_id= #{titleId}
+        </if>
+        <if test="titleIds !=null">
+            and t.title_id in
+            <foreach collection="titleIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="qaValue !=null and qaValue != ''">
+            and t.qa_value= #{qaValue}
+        </if>
+        <if test="seq !=null and seq != ''">
+            and t.seq= #{seq}
+        </if>
+        GROUP BY t.value_id,t.qa_value
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
+
+    </select>
 
 
     <!-- 修改批量操作日志详情信息 add by wuxw 2018-07-03 -->

+ 9 - 0
java110-interface/src/main/java/com/java110/intf/report/IReportInfoSettingTitleValueInnerServiceSMO.java

@@ -41,6 +41,15 @@ public interface IReportInfoSettingTitleValueInnerServiceSMO {
      */
     @RequestMapping(value = "/queryReportInfoSettingTitleValues", method = RequestMethod.POST)
     List<ReportInfoSettingTitleValueDto> queryReportInfoSettingTitleValues(@RequestBody ReportInfoSettingTitleValueDto reportInfoSettingTitleValueDto);
+    /**
+     * <p>查询小区楼信息</p>
+     *
+     *
+     * @param reportInfoSettingTitleValueDto 数据对象分享
+     * @return ReportInfoSettingTitleValueDto 对象数据
+     */
+    @RequestMapping(value = "/getReportInfoSettingTitleValueInfoResult", method = RequestMethod.POST)
+    List<ReportInfoSettingTitleValueDto> getReportInfoSettingTitleValueInfoResult(@RequestBody ReportInfoSettingTitleValueDto reportInfoSettingTitleValueDto);
 
     /**
      * 查询<p>小区楼</p>总记录数

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

@@ -106,4 +106,23 @@ public class ReportInfoSettingTitleValueApi {
         reportInfoSettingTitleValueDto.setCommunityId(communityId);
         return getReportInfoSettingTitleValueBMOImpl.get(reportInfoSettingTitleValueDto);
     }
+    /**
+     * 微信删除消息模板
+     * @serviceCode /reportInfoSettingTitleValue/queryTitleValueInfoResult
+     * @path /app/reportInfoSettingTitleValue/queryReportInfoSettingTitleValue
+     * @param communityId 小区ID
+     * @return
+     */
+    @RequestMapping(value = "/queryTitleValueInfoResult", method = RequestMethod.GET)
+    public ResponseEntity<String> getReportInfoSettingTitleValueInfoResult(@RequestParam(value = "communityId") String communityId,
+                                                                   @RequestParam(value = "titleId") String titleId,
+                                                      @RequestParam(value = "page") int page,
+                                                      @RequestParam(value = "row") int row) {
+        ReportInfoSettingTitleValueDto reportInfoSettingTitleValueDto = new ReportInfoSettingTitleValueDto();
+        reportInfoSettingTitleValueDto.setPage(page);
+        reportInfoSettingTitleValueDto.setRow(row);
+        reportInfoSettingTitleValueDto.setTitleId(titleId);
+        reportInfoSettingTitleValueDto.setCommunityId(communityId);
+        return getReportInfoSettingTitleValueBMOImpl.getReportInfoSettingTitleValueInfoResult(reportInfoSettingTitleValueDto);
+    }
 }

+ 7 - 0
service-report/src/main/java/com/java110/report/bmo/reportInfoSettingTitleValue/IGetReportInfoSettingTitleValueBMO.java

@@ -11,6 +11,13 @@ public interface IGetReportInfoSettingTitleValueBMO {
      * @return
      */
     ResponseEntity<String> get(ReportInfoSettingTitleValueDto reportInfoSettingTitleValueDto);
+    /**
+     * 查询批量操作日志详情
+     * add by wuxw
+     * @param  reportInfoSettingTitleValueDto
+     * @return
+     */
+    ResponseEntity<String> getReportInfoSettingTitleValueInfoResult(ReportInfoSettingTitleValueDto reportInfoSettingTitleValueDto);
 
 
 }

+ 13 - 0
service-report/src/main/java/com/java110/report/bmo/reportInfoSettingTitleValue/impl/GetReportInfoSettingTitleValueBMOImpl.java

@@ -43,4 +43,17 @@ public class GetReportInfoSettingTitleValueBMOImpl implements IGetReportInfoSett
         return responseEntity;
     }
 
+    /**
+     *
+     *
+     * @param  reportInfoSettingTitleValueDto
+     * @return 订单服务能够接受的报文
+     */
+    public ResponseEntity<String> getReportInfoSettingTitleValueInfoResult(ReportInfoSettingTitleValueDto reportInfoSettingTitleValueDto) {
+
+
+        List<ReportInfoSettingTitleValueDto> reportInfoSettingTitleValueDtos =  reportInfoSettingTitleValueDtos = reportInfoSettingTitleValueInnerServiceSMOImpl.getReportInfoSettingTitleValueInfoResult(reportInfoSettingTitleValueDto);
+        return ResultVo.createResponseEntity(reportInfoSettingTitleValueDtos);
+    }
+
 }

+ 8 - 0
service-report/src/main/java/com/java110/report/dao/IReportInfoSettingTitleValueServiceDao.java

@@ -36,6 +36,14 @@ public interface IReportInfoSettingTitleValueServiceDao {
      * @throws DAOException DAO异常
      */
     List<Map> getReportInfoSettingTitleValueInfo(Map info) throws DAOException;
+    /**
+     * 查询批量操作日志详情信息(instance过程)
+     * 根据bId 查询批量操作日志详情信息
+     * @param info bId 信息
+     * @return 批量操作日志详情信息
+     * @throws DAOException DAO异常
+     */
+    List<Map> getReportInfoSettingTitleValueInfoResult(Map info) throws DAOException;
 
 
 

+ 14 - 0
service-report/src/main/java/com/java110/report/dao/impl/ReportInfoSettingTitleValueServiceDaoImpl.java

@@ -59,6 +59,20 @@ public class ReportInfoSettingTitleValueServiceDaoImpl extends BaseServiceDao im
 
         return businessReportInfoSettingTitleValueInfos;
     }
+    /**
+     * 查询批量操作日志详情信息(instance)
+     * @param info bId 信息
+     * @return List<Map>
+     * @throws DAOException DAO异常
+     */
+    @Override
+    public List<Map> getReportInfoSettingTitleValueInfoResult(Map info) throws DAOException {
+        logger.debug("查询批量操作日志详情信息 入参 info : {}",info);
+
+        List<Map> businessReportInfoSettingTitleValueInfos = sqlSessionTemplate.selectList("reportInfoSettingTitleValueServiceDaoImpl.getReportInfoSettingTitleValueInfoResult",info);
+
+        return businessReportInfoSettingTitleValueInfos;
+    }
 
 
     /**

+ 15 - 0
service-report/src/main/java/com/java110/report/smo/impl/ReportInfoSettingTitleValueInnerServiceSMOImpl.java

@@ -68,6 +68,21 @@ public class ReportInfoSettingTitleValueInnerServiceSMOImpl extends BaseServiceS
 
         return reportInfoSettingTitleValues;
     }
+    @Override
+    public List<ReportInfoSettingTitleValueDto> getReportInfoSettingTitleValueInfoResult(@RequestBody  ReportInfoSettingTitleValueDto reportInfoSettingTitleValueDto) {
+
+        //校验是否传了 分页信息
+
+        int page = reportInfoSettingTitleValueDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            reportInfoSettingTitleValueDto.setPage((page - 1) * reportInfoSettingTitleValueDto.getRow());
+        }
+
+        List<ReportInfoSettingTitleValueDto> reportInfoSettingTitleValues = BeanConvertUtil.covertBeanList(reportInfoSettingTitleValueServiceDaoImpl.getReportInfoSettingTitleValueInfoResult(BeanConvertUtil.beanCovertMap(reportInfoSettingTitleValueDto)), ReportInfoSettingTitleValueDto.class);
+
+        return reportInfoSettingTitleValues;
+    }
 
 
     @Override