Merge remote-tracking branch 'origin/jtdev' into jtdev

guoshilong

2023-05-31 8bd367d113a32601c72dd7cf0f8208f59e109160

Merge remote-tracking branch 'origin/jtdev' into jtdev

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.java

@@ -33,6 +33,7 @@
     */
    List<AttResBaseUserDTO> getAttResBaseUserPage(IPage<AttResBaseUserDTO> page,
                                                  @Param("ad_code") String ad_code,
                                                  @Param("p_ad_code") String p_ad_code,
                                                  @Param("params") Map<String, Object> params);

    /**

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml

@@ -97,8 +97,11 @@
                )
            )
        </if>
        <if test="p_ad_code != null and p_ad_code !='' ">
            and aab."p_ad_code" like CONCAT(#{p_ad_code},'%')
        </if>
        <if test="ad_code != null and ad_code !='' ">
            and aab."ad_code" like CONCAT(#{ad_code},'%')
            and aab."ad_code" = #{ad_code}
        </if>
    </select>


 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java

@@ -57,22 +57,26 @@
    public Object getAttResBaseUserPage(IPage<AttResBaseUserDTO> page,Map<String, Object> params) {

        Object adCode = params.get("adCode");
        Object adGrad = params.get("adGrad");
        String ad_code = "";
        String p_ad_code = "";
        String code = adCode.toString();
        if (code.substring(0,4).indexOf("00") > -1) {
            ad_code = adCode.toString().substring(0,2);
        } else if (code.substring(0,6).indexOf("00") > -1) {
            ad_code = adCode.toString().substring(0,4);
        if (adGrad.toString().equals("1")) {
            p_ad_code = code.substring(0,2);
        } else if (adGrad.toString().equals("2")) {
            p_ad_code = code.substring(0,4);
        } else if (adGrad.toString().equals("3")) {
            p_ad_code = code.substring(0,7);
        } else {
            ad_code = adCode.toString().substring(0,6);
            ad_code = code;
        }
        Object isExport = params.get("isExport");

        Object isExport = params.get("isExport");
        // 判断是否导出，导出不分页
        if (null != isExport && !isExport.equals("")) {
            return baseMapper.getAttResBaseUserPage(null,ad_code,params);
            return baseMapper.getAttResBaseUserPage(null,ad_code,p_ad_code,params);
        }
        List<AttResBaseUserDTO> attResBaseUserDTOList = baseMapper.getAttResBaseUserPage(page,ad_code,params);
        List<AttResBaseUserDTO> attResBaseUserDTOList = baseMapper.getAttResBaseUserPage(page,ad_code,p_ad_code,params);
        // 返回数据
        return page.setRecords(attResBaseUserDTOList);
    }