guoshilong
2024-01-26 a725657bb6f9fd7693441732985fb4e233363a50
质量查询明细
5 files modified
89 ■■■■ changed files
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/controller/QualityManageDetailController.java 4 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/QualityManageDetailMapper.xml 75 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/IQualityManageDetailService.java 2 ●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/impl/QualityManageDetailServiceImpl.java 6 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/vo/QualityManageDetailVO.java 2 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/controller/QualityManageDetailController.java
@@ -35,8 +35,8 @@
     */
    @ApiOperation(value = "数据规则校验-分页列表查询", notes = "数据规则校验-分页列表查询")
    @GetMapping(value = "/list")
    public R<IPage<QualityManageDetailVO>> queryPageList(Query query, QualityManageDetailVO qualityManageDetailVO) {
        IPage<QualityManageDetailVO> pageList = qualityManageDetailService.selectCustomizePage(Condition.getPage(query), qualityManageDetailVO);
    public R queryPageList(Query query, QualityManageDetailVO qualityManageDetailVO) {
        Object pageList = qualityManageDetailService.selectCustomizePage(Condition.getPage(query), qualityManageDetailVO);
        return R.data(pageList);
    }
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/mapper/QualityManageDetailMapper.xml
@@ -77,34 +77,36 @@
    <select id="selectCustomizePage" resultType="cn.gistack.sm.resDataCheck.vo.QualityManageDetailVO">
        SELECT
            MAX(id) id,
            RES_ID,
            is_gate,
            eng_scal,
            is_danger,
            town_code,
            town_name,
            county_code,
            county_name,
            city_code,
            city_name,
            res_reg_code,
            res_name,
            rz,
            tb_weir_top_elevation,
            tb_norm_pool_stag,
            tb_control_z,
            tb_des_fl_stag,
            tb_dam_top_elevation,
            tb_dead_stag,
            replace(wm_concat(remark),',',';') as remark
            MAX(is_gate) is_gate,
            MAX(eng_scal) eng_scal,
            MAX(is_danger) is_danger,
            MAX(town_code) town_code,
            MAX(town_name) town_name,
            MAX(county_code)county_code,
            MAX(county_name)county_name,
            MAX(city_code) city_code,
            MAX(city_name) city_name,
            MAX(res_reg_code) res_reg_code,
            MAX(res_name) res_name,
            MAX(rz) rz,
            MAX(tb_weir_top_elevation) tb_weir_top_elevation,
            MAX(tb_norm_pool_stag) tb_norm_pool_stag,
            MAX(tb_control_z) tb_control_z,
            MAX(tb_des_fl_stag) tb_des_fl_stag,
            MAX(tb_dam_top_elevation) tb_dam_top_elevation,
            MAX(tb_dead_stag) tb_dead_stag,
            replace(wm_concat(remark),',',';') as remark,
            MAX(create_time) create_time
        from YWXT.SM_RES_DATA_QUALITY_MANAGE_DETAIL
        where
            1=1
        <if test="vo.resId != null and vo.resId != ''">
            res_id = #{vo.resId}
            AND res_id = #{vo.resId}
        </if>
        <if test="vo.resName != null and vo.resName != ''">
            res_name LIKE CONCAT('%', #{vo.resName},'%')
            AND res_name LIKE CONCAT('%', #{vo.resName},'%')
        </if>
        <if test="vo.startTime != null and vo.startTime != ''">
            AND DATE_FORMAT(create_time,'%Y-%m-%d')  &gt;= #{vo.startTime}
@@ -113,36 +115,21 @@
            AND DATE_FORMAT(create_time,'%Y-%m-%d') &lt;= #{vo.endTime}
        </if>
        <if test="vo.engScal != null and vo.engScal != ''">
            eng_scal = #{vo.engScal}
            and eng_scal = #{vo.engScal}
        </if>
        <if test="vo.isDanger != null and vo.isDanger != ''">
            and is_danger = #{vo.isDanger}
        </if>
        <if test="vo.cityCode != null and vo.cityCode != ''">
            city_code = #{vo.cityCode}
            and city_code = #{vo.cityCode}
        </if>
        <if test="vo.countyCode != null and vo.countyCode != ''">
           county_code = #{vo.countyCode}
           and county_code = #{vo.countyCode}
        </if>
        <if test="vo.townCode != null and vo.townCode != ''">
            town_code= #{vo.townCode}
            and town_code= #{vo.townCode}
        </if>
        GROUP BY
            RES_ID,
            is_gate,
            eng_scal,
            is_danger,
            town_code,
            town_name,
            county_code,
            county_name,
            city_code,
            city_name,
            res_reg_code,
            res_name,
            rz,
            tb_weir_top_elevation,
            tb_norm_pool_stag,
            tb_control_z,
            tb_des_fl_stag,
            tb_dam_top_elevation,
            tb_dead_stag
            RES_ID
    </select>
</mapper>
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/IQualityManageDetailService.java
@@ -8,7 +8,7 @@
import org.springblade.core.mp.base.BaseService;
public interface IQualityManageDetailService extends BaseService<QualityManageDetail> {
    IPage<QualityManageDetailVO> selectCustomizePage(IPage<QualityManageDetailVO> page, QualityManageDetailVO qualityManageDetailVO);
    Object selectCustomizePage(IPage<QualityManageDetailVO> page, QualityManageDetailVO qualityManageDetailVO);
    Integer saveQualityManageDetail(Long ruleId, String varStr, String whereStr);
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/service/impl/QualityManageDetailServiceImpl.java
@@ -19,7 +19,11 @@
    private final IRulesService rulesService;
    @Override
    public IPage<QualityManageDetailVO> selectCustomizePage(IPage<QualityManageDetailVO> page, QualityManageDetailVO qualityManageDetailVO) {
    public Object selectCustomizePage(IPage<QualityManageDetailVO> page, QualityManageDetailVO qualityManageDetailVO) {
        if (qualityManageDetailVO.getIsExport() != null && qualityManageDetailVO.getIsExport().equals("1")){
            return baseMapper.selectCustomizePage(null,qualityManageDetailVO);
        }
        return page.setRecords(baseMapper.selectCustomizePage(page, qualityManageDetailVO));
    }
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/resDataCheck/vo/QualityManageDetailVO.java
@@ -10,4 +10,6 @@
    private String startTime;
    private String endTime;
    private String isExport;
}