Skip to content

X
xzxt-app-report
Commit e0adcf91 by 段惠斌
Options

mysql改造

parent fe4f2131
Showing with 470 additions and 302 deletions
src/main/java/org/springblade/common/config/BladeConfiguration.java
......@@ -19,6 +19,7 @@ package org.springblade.common.config;
import org.springblade.core.secure.registry.SecureRegistry;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.CorsRegistry;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
......@@ -30,6 +31,14 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@Configuration
public class BladeConfiguration implements WebMvcConfigurer {
public void addCorsMappings(CorsRegistry corsRegistry){
corsRegistry.addMapping("/**")
.allowedOriginPatterns("*")
.allowCredentials(true)
.allowedMethods("GET","POST")
.allowedHeaders("*");
}
@Bean
public SecureRegistry secureRegistry() {
SecureRegistry secureRegistry = new SecureRegistry();
......@@ -46,8 +55,8 @@ public class BladeConfiguration implements WebMvcConfigurer {
secureRegistry.excludePathPatterns("/flwsFj/tbstasjflwsCj/flwsComp");
secureRegistry.excludePathPatterns("/js/**");
secureRegistry.excludePathPatterns("/webjars/**");
// secureRegistry.excludePathPatterns("/swagger-resources/**");
// secureRegistry.excludePathPatterns("/matj/**");
secureRegistry.excludePathPatterns("/swagger-resources/**");
secureRegistry.excludePathPatterns("/matj/**");
secureRegistry.excludePathPatterns("/ajzljc/**");
secureRegistry.excludePathPatterns("/refreshCodeCache");
secureRegistry.excludePathPatterns("/reloadSysDict");
......@@ -59,7 +68,7 @@ public class BladeConfiguration implements WebMvcConfigurer {
secureRegistry.excludePathPatterns("/bbgx/**");
secureRegistry.excludePathPatterns("/bjhc/ktsj/**");
secureRegistry.excludePathPatterns("/**");
/*secureRegistry.excludePathPatterns("/**");
secureRegistry.excludePathPatterns("/**");
secureRegistry.excludePathPatterns("/ajDetail/**");
secureRegistry.excludePathPatterns("/tbstAsj/stasj*");
secureRegistry.excludePathPatterns("/matj*");
......@@ -70,7 +79,7 @@ public class BladeConfiguration implements WebMvcConfigurer {
secureRegistry.excludePathPatterns("/getFlwsCountForAutoCheck");
secureRegistry.excludePathPatterns("/getFlwsForAutoSwCheck");
secureRegistry.excludePathPatterns("/ajxq*");
secureRegistry.excludePathPatterns("/ajsp*");*/
secureRegistry.excludePathPatterns("/ajsp*");
return secureRegistry;
}
......@@ -83,4 +92,6 @@ public class BladeConfiguration implements WebMvcConfigurer {
.addResourceLocations("classpath:/META-INF/resources/webjars/");
}
}
src/main/java/org/springblade/founder/ajda/service/IAjdaService.java
......@@ -49,7 +49,6 @@ public interface IAjdaService {
List<TbXwCh> queryChListByAsjbh(String asjbh);
// 获取采比反消息
@DS("db1")
List<TbXxfwXxdl> queryXxdlListByasjbhAndXxlx(String asjbh, String s);
//根据参数查询分页侦查日志
......
src/main/java/org/springblade/founder/asj/mapper/HnJbAsjXsMapper.xml
......@@ -8,7 +8,9 @@
and xxsc_pdbz = '0'
</select>
<select id="getAsjListByParam" resultType="org.springblade.founder.asj.entity.JbAsjXs">
select * from (select rownum r,t.* from (
select a.* from (
select * from (
select @rownum := @rownum + 1 AS rownum,t.* from (
select asj.asjbh as asjbh,
asj.ajmc as ajmc,
asj.ASJFSSJ_ASJFSKSSJ as afsj,
......@@ -27,20 +29,24 @@
#{item}
</foreach>
order by asj.djsj desc
) t where rownum <![CDATA[ <= ]]> #{end} ) where r <![CDATA[ > ]]> #{begin}
) t,(SELECT @rownum:=0) r
)b where rownum <![CDATA[ <= ]]> #{end})a where rownum <![CDATA[ > ]]> #{begin}
</select>
<select id="getRyxbByZjhm" resultType="org.springblade.founder.asj.entity.JbAsjXs">
select * from (
select zhrq as zhrq,
ZHFZXYR_JZRYBH as jzxyrbh,
(select name from sys_dictitem where GROUPID = 'CODE_DAZT' and code = ZHFZXYR_FZXYRDAZTDM) as rydazt
(select name from sys_dictitem where GROUPID = 'CODE_DAZT' and code = ZHFZXYR_FZXYRDAZTDM) as rydazt,
@rownum := @rownum + 1 AS rownum
from tb_xw_zbfzxyr
where asjbh = #{asjbh,jdbcType=VARCHAR}
and zhfzxyr_cyzj_zjhm = #{zjhm,jdbcType=VARCHAR} and xxsc_pdbz = '0' and rownum = 1 order by gxsj desc
and zhfzxyr_cyzj_zjhm = #{zjhm,jdbcType=VARCHAR} and xxsc_pdbz = '0' order by gxsj desc ) t,(SELECT @rownum:=0) r
where rownum = 1
</select>
<select id="getAsjbhListBsh" resultType="java.lang.String">
select ASJBH
from tb_st_asj
where XXSC_PDBZ = '0'
and JYAQ like '%' || #{bsh,jdbcType=VARCHAR} || '%'
and JYAQ like concat('%',#{bsh, jdbcType=VARCHAR},'%')
</select>
</mapper>
src/main/java/org/springblade/founder/asj/mapper/QgJbAsjXsMapper.xml
......@@ -14,7 +14,8 @@
</if>
</select>
<select id="getAsjListByParam" resultType="org.springblade.founder.asj.entity.JbAsjXs">
select * from (select rownum r,t.* from (
select a.* from (
select * from (select @rownum := @rownum + 1 AS rownum,t.* from (
select asj.asjbh as asjbh,
asj.ajmc as ajmc,
asj.ASJFSSJ_ASJFSKSSJ as afsj,
......@@ -29,13 +30,14 @@
#{item}
</foreach>
order by asj.djsj desc
) t where rownum <![CDATA[ <= ]]> #{end} ) where r <![CDATA[ > ]]> #{begin}
) t,(SELECT @rownum:=0) r
)b where rownum <![CDATA[ <= ]]> #{end} )a where rownum <![CDATA[ > ]]> #{begin}
</select>
<select id="getAsjbhListBsh" resultType="java.lang.String">
select ASJBH
from tb_st_asj
where XXSC_PDBZ = '0'
and JYAQ like '%' || #{bsh,jdbcType=VARCHAR} || '%'
and JYAQ like concat('%',#{bsh, jdbcType=VARCHAR },'%')
<if test="qsAsjbhList != null and qsAsjbhList.size() > 0">
and not exists (select asjbh from tb_xw_zbfzxyr where asjbh in
<foreach collection="qsAsjbhList" item="item" open="(" separator=", " close=")">
......
src/main/java/org/springblade/founder/asj/mapper/TbStAsjMapper.xml
......@@ -407,7 +407,10 @@
<!--查询指定行数据-->
<select id="queryAll" resultMap="TbStAsjMap">
select * from(select
select a.* from (
select * from(
select @rownum := @rownum + 1 AS rownum,t.* from (
select
ASJBH, JJBH, XCKYBH, ASJLYDM, XSJQLBDM, ZCJDDM, XSAJLASCJGDM, AJLBDM, ZATZ_JYQK, TSSDDM, ZATZZDFL_JYQK,
ZATZBCMS_JYQK, ZATZ_AJZATZJHBD, AJMC, FXASJSJ, FXASJDD_XZQHDM, FXASJDD_DZMC, ASJFSSJ_ASJFSKSSJ,
ASJFSSJ_ASJFSJSSJ, ASJFSSJ_RSDDM, ASJFSSJ_ZASJ_ZASJLBDM, ASJFSSJ_ZASJ_DMBCMS, ASJFSDD_XZQHDM, ASJFSDD_DZMC,
......@@ -434,21 +437,22 @@
ZZDWFZR_LXDH, ZUZDW_ZBR_XM, ZUZDW_ZBR_LXDH, ZUZDW_ZBR_GMSFHM, ZUZDW_XBR_XM1, ZUZDW_XBR_GMSFHM1, ZUZDW_XBR_LXDH1,
ZUZDW_XBR_XM2, ZUZDW_XBR_GMSFHM2, ZUZDW_XBR_LXDH2, ZBR_XM, ZBR_LXDH, ZBR_GMSFHM, JZAJBH, JYAQ,
XXRBK_PDBZ, XXRSK_PDBZ, XXRBKSJ, XXRSKSJ, ZADJDM, AJSFXCKY_PDBZ, ASJ_XC_QRR_GMSFHM, ASJ_XC_QRR_XM, ASJ_XC_QRSJ,
SFWWFZ_PDBZ, SFLSJA_PDBZ, PART, AJYWZTDM,ROWNUM rn
SFWWFZ_PDBZ, SFLSJA_PDBZ, PART, AJYWZTDM
from tb_st_asj
<where>
XXSC_PDBZ = '0'
<if test="asjbh != null and asjbh != ''">
and ASJBH like '%' || #{asjbh} || '%'
and ASJBH like concat('%',#{asjbh},'%')
</if>
<if test="ajmc != null and ajmc != ''">
and ajmc like '%' || #{ajmc} || '%'
and ajmc like concat('%',#{ajmc},'%')
</if>
and ROWNUM <![CDATA[ <= ]]> #{limit}
</where>
)where rn <![CDATA[ > ]]> #{page}
) t,(SELECT @rownum:=0) r
)b where rownum <![CDATA[ <= ]]> #{limit}
)a where rownum <![CDATA[ > ]]> #{page}
</select>
<!--统计总行数-->
......@@ -458,7 +462,7 @@
<where>
xxsc_pdbz = '0'
<if test="asjbh != null and asjbh != ''">
and ASJBH like '%' || #{asjbh} || '%'
and ASJBH like concat('%',#{asjbh},'%')
</if>
<if test="jjbh != null and jjbh != ''">
and JJBH = #{jjbh}
......@@ -497,7 +501,7 @@
and ZATZ_AJZATZJHBD = #{zatzAjzatzjhbd}
</if>
<if test="ajmc != null and ajmc != ''">
and AJMC like '%' || #{ajmc} || '%'
and AJMC like concat('%',#{ajmc},'%')
</if>
<if test="fxasjsj != null">
......
src/main/java/org/springblade/founder/asj/service/impl/HnJbAsjXsServiceImpl.java
......@@ -11,7 +11,6 @@ import org.springframework.stereotype.Service;
import java.util.List;
@Service
@DS("xzxt_hn")
public class HnJbAsjXsServiceImpl implements HnJbAsjXsService {
@Autowired
private HnJbAsjXsMapper hnJbAsjXsMapper;
......
src/main/java/org/springblade/founder/asj/service/impl/KyxsServiceImpl.java
......@@ -37,7 +37,6 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.FutureTask;
@Service
@DS("xzxt_hn")
public class KyxsServiceImpl implements KyxsService {
@Autowired
......
src/main/java/org/springblade/founder/bbgx/entity/AppBbgx.java
......@@ -8,8 +8,8 @@ import lombok.Data;
import java.util.Date;
@Data
@TableName("TB_ST_APP_BBGX")
public class AppBbgx {
@TableName("tb_st_app_bbgx")
public class AppBbgx{
@TableId(type = IdType.INPUT)
private String appVersion;//版本号
private String appGxbz;//更新备注
......
src/main/java/org/springblade/founder/bbgx/mapper/AppBbgxMapper.java
......@@ -2,6 +2,7 @@ package org.springblade.founder.bbgx.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springblade.founder.bbgx.entity.AppBbgx;
import org.springframework.stereotype.Repository;
......@@ -11,4 +12,8 @@ import java.util.List;
@Repository
public interface AppBbgxMapper extends BaseMapper<AppBbgx> {
List<AppBbgx> selectBbgxList(@Param("version") String version, @Param("page")Integer page, @Param("limit")Integer limit);
int selectBbgxListCount(@Param("version") String version, @Param("page")Integer page, @Param("limit")Integer limit);
}
src/main/java/org/springblade/founder/bbgx/mapper/AppBbgxMapper.xml
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="org.springblade.founder.bbgx.mapper.AppBbgxMapper">
<select id="selectBbgxList" resultType="org.springblade.founder.bbgx.entity.AppBbgx">
select APP_VERSION appVersion,APP_GXBZ appGxbz,APP_GXWJWZ appGxwjwz,rksj,XXSC_PDBZ xxscPdbz,filename
from tb_st_app_bbgx
where xxsc_pdbz = 0
<if test="version != null and version != ''">and app_version = #{version}</if>
order by rksj desc
limit #{page}, #{limit}
</select>
<select id="selectBbgxListCount" resultType="int">
select count(*)
from tb_st_app_bbgx
where xxsc_pdbz = 0
<if test="version != null and version != ''">and app_version = #{version}</if>
order by rksj desc
</select>
</mapper>
src/main/java/org/springblade/founder/bbgx/service/impl/AppBbgxServiceImpl.java
......@@ -37,25 +37,14 @@ public class AppBbgxServiceImpl extends ServiceImpl<AppBbgxMapper, AppBbgx> impl
@Override
public Map<String, Object> getBbgxList(String version, Integer page, Integer limit) {
HashMap<String, Object> resultMap = new HashMap<>();
LambdaQueryWrapper<AppBbgx> queryWrapper = Wrappers.lambdaQuery(AppBbgx.class);
queryWrapper.eq(AppBbgx::getXxscPdbz, "0");
queryWrapper.orderByDesc(AppBbgx::getRksj);
queryWrapper.select(AppBbgx::getAppVersion
, AppBbgx::getAppGxbz
, AppBbgx::getRksj
, AppBbgx::getXxscPdbz);
Page<AppBbgx> bbgxPage = super.page(new Page<>(page, limit), queryWrapper);
long total = bbgxPage.getTotal();
List<AppBbgx> rows = bbgxPage.getRecords();
List<AppBbgx> appBbgxes = appBbgxMapper.selectBbgxList(version, page, limit);
int i = appBbgxMapper.selectBbgxListCount(version, page, limit);
resultMap.put("sfksj", "1");
if (rows != null && !rows.isEmpty()) {
AppBbgx bbgx = rows.get(0);
if (version != null && version.equals(bbgx.getAppVersion())) {
if (i>0) {
resultMap.put("sfksj", "0");
}
}
resultMap.put("total", total);
resultMap.put("rows", rows);
resultMap.put("total", appBbgxes);
resultMap.put("rows", i);
return resultMap;
}
......
src/main/java/org/springblade/founder/dzbl/mapper/TbStAppDzblMapper.xml
......@@ -3,16 +3,17 @@
<mapper namespace="org.springblade.founder.dzbl.mapper.TbStAppDzblMapper">
<select id="selectListByParam" resultType="org.springblade.founder.dzbl.entity.TbStAppDzbl">
select * from (select rownum r, t.* from (
select a.* from (
select * from (select @rownum := @rownum + 1 AS rownum, t.* from (
SELECT
<include refid="dzblField"/>
FROM tb_st_app_dzbl dzbl
where dzbl.XXSC_PDBZ = '0'
<include refid="dzblParam"/>
order by dzbl.DJSJ desc
) t
where rownum <![CDATA[ <= ]]> #{end})
where r <![CDATA[ > ]]> #{begin}
) t,(SELECT @rownum:=0) r
)b where rownum <![CDATA[ <= ]]> #{end})a
where rownum <![CDATA[ > ]]> #{begin}
</select>
<select id="selectCountByParam" resultType="java.lang.Integer">
select count(1)
......@@ -39,10 +40,13 @@
unitcode like CONCAT(#{dwdm,jdbcType=VARCHAR}, '%')
</if>
<if test="dwList != null and dwList.size() > 0">
and unitcode in
<foreach collection="dwList" item="dw" open="(" close=")" separator=",">
and
<foreach collection="dwList" item="dws" open="(" close=")" separator=" or ">
unitcode in
<foreach collection="dws" item="dw" separator="," open="(" close=")">
#{dw,jdbcType=VARCHAR}
</foreach>
</foreach>
</if>
<if test="xm != null and xm != ''">
and true_name like CONCAT('%', #{xm,jdbcType=VARCHAR}, '%')
......@@ -65,10 +69,13 @@
unitcode like CONCAT(#{dwdm,jdbcType=VARCHAR}, '%')
</if>
<if test="dwList != null and dwList.size() > 0">
and unitcode in
<foreach collection="dwList" item="dw" open="(" close=")" separator=",">
and
<foreach collection="dwList" item="dws" open="(" close=")" separator=" or ">
unitcode in
<foreach collection="dws" item="dw" separator="," open="(" close=")">
#{dw,jdbcType=VARCHAR}
</foreach>
</foreach>
</if>
<if test="xm != null and xm != ''">
and true_name like CONCAT('%', #{xm,jdbcType=VARCHAR}, '%')
......@@ -137,10 +144,10 @@
<sql id="dzblParam">
<if test="xxzjbh != null and xxzjbh != ''">
AND dzbl.XXZJBH like '%' || #{xxzjbh , jdbcType=VARCHAR } || '%'
AND dzbl.XXZJBH like concat('%',#{xxzjbh, jdbcType=VARCHAR},'%')
</if>
<if test="asjbh != null and asjbh != ''">
AND dzbl.ASJBH like #{asjbh , jdbcType=VARCHAR } || '%'
AND dzbl.ASJBH like concat(#{asjbh, jdbcType=VARCHAR},'%')
</if>
<if test="sfdxzpPdbz != null and sfdxzpPdbz != ''">
AND dzbl.SFDXZP_PDBZ = #{sfdxzpPdbz , jdbcType=VARCHAR }
......@@ -182,7 +189,7 @@
AND dzbl.DJSJ = #{djsj , jdbcType=TIMESTAMP }
</if>
<if test="xxdjdwGajgjgdm != null and xxdjdwGajgjgdm != ''">
AND dzbl.XXDJDW_GAJGJGDM like #{xxdjdwGajgjgdm , jdbcType=VARCHAR } || '%'
AND dzbl.XXDJDW_GAJGJGDM like concat(#{xxdjdwGajgjgdm, jdbcType=VARCHAR},'%')
</if>
<if test="xxdjdwGajgmc != null and xxdjdwGajgmc != ''">
AND dzbl.XXDJDW_GAJGMC = #{xxdjdwGajgmc , jdbcType=VARCHAR }
......@@ -227,7 +234,7 @@
AND dzbl.XXRBK_PDBZ = #{xxrbkPdbz , jdbcType=VARCHAR }
</if>
<if test="xm != null and xm != ''">
AND xm like '%' || #{xm , jdbcType=VARCHAR } || '%'
AND xm like concat('%',#{xm, jdbcType=VARCHAR},'%')
</if>
<if test="sfzh != null and sfzh != ''">
AND sfzh = #{sfzh , jdbcType=VARCHAR }
......
src/main/java/org/springblade/founder/dzbl/service/impl/TbStAppDzblServiceImpl.java
......@@ -18,12 +18,12 @@ import org.springblade.modules.system.entity.XzxtUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Service
@DS("xzxt_hn")
public class TbStAppDzblServiceImpl implements TbStAppDzblService {
@Autowired
......@@ -88,8 +88,14 @@ public class TbStAppDzblServiceImpl implements TbStAppDzblService {
@Override
public TbStAppDzbl getDzblByXxzjbh(String xxzjbh) {
TbStAppDzbl dzbl = tbStAppDzblMapper.selectByxxzjbh(xxzjbh);
List<String> hnAsjbhList = hnJbAsjXsService.getAsjbhListZjhm(dzbl.getSfzh());
List<String> qgAsjbhList = qgJbAsjXsService.getAsjbhListZjhm(dzbl.getSfzh(), hnAsjbhList);
List<String> hnAsjbhList = new ArrayList<>();
if (StringUtils.isNotEmpty(dzbl.getSfzh())) {
hnAsjbhList = hnJbAsjXsService.getAsjbhListZjhm(dzbl.getSfzh());
}
List<String> qgAsjbhList = new ArrayList<>();
if (StringUtils.isNotEmpty(dzbl.getSfzh()) && hnAsjbhList.size() > 0) {
qgAsjbhList = qgJbAsjXsService.getAsjbhListZjhm(dzbl.getSfzh(), hnAsjbhList);
}
dzbl.setQsAjList(hnAsjbhList);
dzbl.setQsAjCount(hnAsjbhList.size());
dzbl.setQgAjList(qgAsjbhList);
......@@ -120,10 +126,8 @@ public class TbStAppDzblServiceImpl implements TbStAppDzblService {
}
@Override
@DS("db1")
public Map<String, Object> queryAllZcy(ZcyEntity zcy) {
HashMap<String, Object> resultMap = new HashMap<>();
// Utils.setPageParams(zcy);
zcy.setEnd(zcy.getRows());
zcy.setBegin((zcy.getPage() - 1 ) * zcy.getRows());
unitcodeUnitService.setDwParam(zcy);
......
src/main/java/org/springblade/founder/log/service/impl/LogMysqlServiceImpl.java
......@@ -10,7 +10,6 @@ import org.springframework.stereotype.Service;
@Slf4j
@Service
@DS("db1")
public class LogMysqlServiceImpl implements LogMysqlService {
@Autowired
private LogDao logDao;
......
src/main/java/org/springblade/founder/qgccj/mapper/TbGlAsjRyMapper.java
......@@ -74,12 +74,6 @@ public interface TbGlAsjRyMapper {
*/
int update(TbGlAsjRyQgccj tbGlAsjRy);
/**
* 通过主键删除数据
*
* @param xxzjbh 主键
* @return 影响行数
*/
int delete(TbGlAsjRyQgccj tbGlAsjRyQgccj);
TbGlAsjRyQgccj query(String asjxgrybh, String asjbh);
......
src/main/java/org/springblade/founder/qgccj/mapper/TbStQtsawpWpMapper.xml
......@@ -53,17 +53,29 @@
</resultMap>
<select id="queryAll" resultMap="TbStQtsawpWpMap">
select * from(select
SAWPBH, SAWP_SAWPDM, SAWP_DMBCMS, QTSAWP_WPMC, QTSAWP_PPXH, QTSAWP_WPGG, QTSAWP_WPBZH_WPBZHLBDM, QTSAWP_WPBZH_DMBCMS, QTSAWP_WPBZH_WPBZH, QTSAWP_WPYS_WPYSDM, QTSAWP_WPYS_DMBCMS, QTSAWP_WPJZRMBY, QTSAWP_WPSL, QTSAWP_WPZL, QTSAWP_JLDLDW, QTSAWP_WPTZMS, QTSAWP_WPZW_PDBZ, QTSAWP_WPLYMS, QTSAWP_WPGZRQ, XXSC_PDBZ, XXDJDW_GAJGJGDM, XXDJDW_GAJGMC, XXDJRY_XM, XXDJRY_GMSFHM, XXDJRY_LXDH, DJSJ, XXCZDW_GAJGJGDM, XXCZDW_GAJGMC, XXCZRY_XM, XXCZRY_GMSFHM, GXSJ, XXLYMS, XXRSKSJ, XXRBKSJ, XXRSK_PDBZ, XXRBK_PDBZ, GABXF, JZWPBH, JZAJBH, JZGXBH, ASJBH,
select a.* from (
select * from(
select @rownum := @rownum + 1 AS rownum, t1.* from (
select
SAWPBH, SAWP_SAWPDM, SAWP_DMBCMS, QTSAWP_WPMC, QTSAWP_PPXH, QTSAWP_WPGG, QTSAWP_WPBZH_WPBZHLBDM,
QTSAWP_WPBZH_DMBCMS, QTSAWP_WPBZH_WPBZH, QTSAWP_WPYS_WPYSDM, QTSAWP_WPYS_DMBCMS, QTSAWP_WPJZRMBY, QTSAWP_WPSL,
QTSAWP_WPZL, QTSAWP_JLDLDW, QTSAWP_WPTZMS, QTSAWP_WPZW_PDBZ, QTSAWP_WPLYMS, QTSAWP_WPGZRQ, XXSC_PDBZ,
XXDJDW_GAJGJGDM, XXDJDW_GAJGMC, XXDJRY_XM, XXDJRY_GMSFHM, XXDJRY_LXDH, DJSJ, XXCZDW_GAJGJGDM, XXCZDW_GAJGMC,
XXCZRY_XM, XXCZRY_GMSFHM, GXSJ, XXLYMS, XXRSKSJ, XXRBKSJ, XXRSK_PDBZ, XXRBK_PDBZ, GABXF, JZWPBH, JZAJBH, JZGXBH,
ASJBH,
(select name from sys_dictitem where groupid = 'CODE_SAWPFL' and code = t.SAWP_SAWPDM ) as SAWP_SAWPDMStr,
(select name from sys_dictitem where groupid = 'CODE_WPBSH' and code = t.QTSAWP_WPBZH_WPBZHLBDM ) as QTSAWP_WPBZH_WPBZHLBDMStr,
(select name from sys_dictitem where groupid = 'CODE_YS' and code = t.QTSAWP_WPYS_WPYSDM ) as QTSAWP_WPYS_WPYSDMStr,
rownum rn
(select name from sys_dictitem where groupid = 'CODE_WPBSH' and code = t.QTSAWP_WPBZH_WPBZHLBDM ) as
QTSAWP_WPBZH_WPBZHLBDMStr,
(select name from sys_dictitem where groupid = 'CODE_YS' and code = t.QTSAWP_WPYS_WPYSDM ) as
QTSAWP_WPYS_WPYSDMStr
from tb_st_qtsawp_wp t
where xxsc_pdbz = '0' and rownum <![CDATA[ <= ]]> #{limit}
where xxsc_pdbz = '0'
<if test="asjbh != null and asjbh != '' ">
and asjbh = #{asjbh}
</if>)where rn <![CDATA[ > ]]> #{page}
</if>
)t1,(SELECT @rownum:=0) r
)b where rownum <![CDATA[ <= ]]> #{limit}
)a where rownum <![CDATA[ > ]]> #{page}
</select>
<!--查询单个-->
......
src/main/java/org/springblade/founder/qgccj/mapper/TbStRySyfwbzhMapper.xml
......@@ -275,16 +275,20 @@
</select>
<select id="queryAll" resultType="org.springblade.founder.qgccj.entity.TbStRySyfwbzh">
select * from(select
select a.* from (
select * from(
select @rownum := @rownum + 1 AS rownum, t1.* from (
select
xxzjbh, asjxgrybh, syfwbzh_wqlbdm, syfwbzh_fwbzh_xxzjbh, syfwbzh_fwbzh_fwbzhlbdm, syfwbzh_fwbzh_dmbcms, syfwbzh_fwbzh_fwbzh, syfwbzh_fwbzh_djsj, syfwbzh_fwzcd_gjhdqdm, syfwbzh_fwzcd_xzqhdm, syfwbzh_fwzcd_dzmc, syfwbzh_fwdw_dwmc, syfwbzh_yxqksrq, syfwbzh_yxqjzrq, xxsc_pdbz, xxdjdw_gajgjgdm, xxdjdw_gajgmc, xxdjry_xm, xxdjry_gmsfhm, xxdjry_lxdh, djsj, xxczdw_gajgjgdm, xxczdw_gajgmc, xxczry_xm, xxczry_gmsfhm, gxsj, ysxxbh, xxlyms, xxrsksj, xxrbksj, xxrsk_pdbz, xxrbk_pdbz, gabxf,
(select name from sys_dictitem where code = t.syfwbzh_wqlbdm and groupid = 'CODE_WQLB') as syfwbzh_wqlbdmStr,
(select name from sys_dictitem where code = t.syfwbzh_fwbzh_fwbzhlbdm and groupid = 'CODE_FWBSHLB') as syfwbzh_fwbzh_fwbzhlbdmStr,
(select name from sys_dictitem where code = t.syfwbzh_fwzcd_gjhdqdm and groupid = 'CODE_GJ') as syfwbzh_fwzcd_gjhdqdmStr,
(select name from sys_dictitem where code = t.syfwbzh_fwzcd_xzqhdm and groupid = 'CODE_XZQH') as syfwbzh_fwzcd_xzqhdmStr,
rownum rn
(select name from sys_dictitem where code = t.syfwbzh_fwzcd_xzqhdm and groupid = 'CODE_XZQH') as syfwbzh_fwzcd_xzqhdmStr
from tb_st_ry_syfwbzh t
where asjxgrybh = #{asjxgrybh} and xxsc_pdbz = '0' and rownum <![CDATA[ > ]]>#{page})
where rn <![CDATA[ <= ]]> #{limit}
where asjxgrybh = #{asjxgrybh} and xxsc_pdbz = '0'
)t1,(SELECT @rownum:=0) r
)b where rownum <![CDATA[ > ]]>#{page})a
where rownum <![CDATA[ <= ]]> #{limit}
</select>
<select id="queryByRybhAndFwbzh" resultMap="TbStRySyfwbzhMap">
select
......
src/main/java/org/springblade/founder/qgccj/mapper/TbStXcylwpWpMapper.xml
......@@ -64,17 +64,22 @@
</select>
<select id="queryAll" resultMap="TbStXcylwpWpMap">
select * from(select
select a.* from (
select * from(
select @rownum := @rownum + 1 AS rownum, t1.* from (
select
SAWPBH, SAWP_SAWPDM, SAWP_DMBCMS, ASJBH, XCYLWP_WPMC, XCYLWP_PPXH, XCYLWP_WPGG, XCYLWP_WPBZH_WPBZHLBDM, XCYLWP_WPBZH_DMBCMS, XCYLWP_WPBZH_WPBZH, XCYLWP_WPYS_WPYSDM, XCYLWP_WPYS_DMBCMS, XCYLWP_WPJZRMBY, XCYLWP_WPSL, XCYLWP_WPZL, XCYLWP_JLDLDW, XCYLWP_WPTZMS, XCYLWP_WPZW_PDBZ, XCYLWP_WPLYMS, XCYLWP_WPGZRQ, XXSC_PDBZ, XXDJDW_GAJGJGDM, XXDJDW_GAJGMC, XXDJRY_XM, XXDJRY_GMSFHM, XXDJRY_LXDH, DJSJ, XXCZDW_GAJGJGDM, XXCZDW_GAJGMC, XXCZRY_XM, XXCZRY_GMSFHM, GXSJ, XXLYMS, XXRSKSJ, XXRBKSJ, XXRSK_PDBZ, XXRBK_PDBZ, GABXF, JZWPBH, JZAJBH, JZGXBH,
(select name from sys_dictitem where groupid = 'CODE_SAWPFL' and code = t.SAWP_SAWPDM ) as SAWP_SAWPDMStr,
(select name from sys_dictitem where groupid = 'CODE_WPBSH' and code = t.XCYLWP_WPBZH_WPBZHLBDM ) as XCYLWP_WPBZH_WPBZHLBDMStr,
(select name from sys_dictitem where groupid = 'CODE_YS' and code = t.XCYLWP_WPYS_WPYSDM ) as XCYLWP_WPYS_WPYSDMStr,
rownum rn
(select name from sys_dictitem where groupid = 'CODE_YS' and code = t.XCYLWP_WPYS_WPYSDM ) as XCYLWP_WPYS_WPYSDMStr
from tb_st_xcylwp_wp t
where xxsc_pdbz = '0' and rownum <![CDATA[ <= ]]> #{limit}
where xxsc_pdbz = '0'
<if test="asjbh != null and asjbh != '' ">
and asjbh = #{asjbh}
</if>)where rn <![CDATA[ > ]]> #{page}
</if>
)t1,(SELECT @rownum:=0) r
)b where rownum <![CDATA[ <= ]]> #{limit})a
where rn <![CDATA[ > ]]> #{page}
</select>
<!--查询指定行数据-->
......
src/main/java/org/springblade/founder/qgccj/mapper/TbXwBaMapper.java
......@@ -80,7 +80,6 @@ public interface TbXwBaMapper {
/**
* 通过主键删除数据
*
* @param xxzjbh 主键
* @return 影响行数
*/
int delete(TbXwBaQgccj tbXwBaQgccj);
......
src/main/java/org/springblade/founder/qgccj/mapper/TbXwBaMapper.xml
......@@ -196,13 +196,23 @@
</select>
<select id="queryAll" resultMap="TbXwBaMap">
select * from(select
xxzjbh, asjbh, ba_jyqk, basj, badd_xzqhdm, badd_dzmc, bar_asjxgrybh, bar_xm, bar_cyzj_cyzjdm, bar_cyzj_dmbcms, bar_cyzj_zjhm, bar_csrq, bar_xbdm, bar_gjdm, bar_jgdm, bar_mzdm, bar_xzz_xzqhdm, bar_xzz_dzmc, bar_gzdw, bar_lxdh, bar_bz, glxx_xxzjbh, xxsc_pdbz, xxdjdw_gajgjgdm, xxdjdw_gajgmc, xxdjry_xm, xxdjry_gmsfhm, xxdjry_lxdh, djsj, xxczdw_gajgjgdm, xxczdw_gajgmc, xxczry_xm, xxczry_gmsfhm, gxsj, xxlyms, xxrsksj, xxrbksj, xxrsk_pdbz, xxrbk_pdbz, bar_jzrybh, jzajbh, gabxf, if_collect,rownum rn
select a.* from (
select * from(
select t.* , @rownum := @rownum + 1 AS rownum from (
select
xxzjbh, asjbh, ba_jyqk, basj, badd_xzqhdm, badd_dzmc, bar_asjxgrybh, bar_xm, bar_cyzj_cyzjdm, bar_cyzj_dmbcms,
bar_cyzj_zjhm, bar_csrq, bar_xbdm, bar_gjdm, bar_jgdm, bar_mzdm, bar_xzz_xzqhdm, bar_xzz_dzmc, bar_gzdw,
bar_lxdh, bar_bz, glxx_xxzjbh, xxsc_pdbz, xxdjdw_gajgjgdm, xxdjdw_gajgmc, xxdjry_xm, xxdjry_gmsfhm, xxdjry_lxdh,
djsj, xxczdw_gajgjgdm, xxczdw_gajgmc, xxczry_xm, xxczry_gmsfhm, gxsj, xxlyms, xxrsksj, xxrbksj, xxrsk_pdbz,
xxrbk_pdbz, bar_jzrybh, jzajbh, gabxf, if_collect
from tb_xw_ba
where xxsc_pdbz = '0' and rownum <![CDATA[ <= ]]> #{limit}
where xxsc_pdbz = '0'
<if test="asjbh != null and asjbh != '' ">
and asjbh = #{asjbh}
</if>)where rn <![CDATA[ > ]]> #{page}
</if>
)t,(SELECT @rownum:=0) r
)b where rownum <![CDATA[ <= ]]> #{limit}
)a where rownum <![CDATA[ > ]]> #{page}
</select>
<!--统计总行数-->
......
src/main/java/org/springblade/founder/qgccj/mapper/TbXwFxkyddfjdcxsMapper.xml
......@@ -336,17 +336,22 @@
</select>
<select id="queryAll" resultType="org.springblade.founder.qgccj.entity.TbXwFxkyddfjdcxs">
select * from (select
select a.* from (
select * from (
select @rownum := @rownum + 1 AS rownum, t1.* from (
select
XXZJBH, ASJBH, KEYYJ_JYQK, KEYDDFJDC_SAWPBH, KEYDDFJDC_SAWPDM, KEYDDFJDC_PPXH, KEYDDFJDC_DDFJDCDJH_WPBZH, KEYDDFJDC_DDFJDCCJH_WPBZH, KEYDDFJDC_DDFJDCPZH_WPBZH, KEYDDFJDC_DDFJDCGYH_WPBZH, KEYDDFJDC_WPYS_WPYSDM, KEYDDFJDC_WPYS_DMBCMS, KEYDDFJDC_WPTZMS, KEYDDFJDC_WPJZRMBY, BLDW_GAJGJGDM, BLDW_GAJGMC, ZBR_XM, ZBR_GMSFHM, ZBR_LXDH, XBR_XM, XBR_GMSFHM, XBR_LXDH, BLSJ, XXSC_PDBZ, XXDJDW_GAJGJGDM, XXDJDW_GAJGMC, XXDJRY_XM, XXDJRY_GMSFHM, XXDJRY_LXDH, DJSJ, XXCZDW_GAJGJGDM, XXCZDW_GAJGMC, XXCZRY_XM, XXCZRY_GMSFHM, GXSJ, XXLYMS, XXRSKSJ, XXRBKSJ, XXRSK_PDBZ, XXRBK_PDBZ, GABXF, KEYDDFJDC_JZWPBH,
(select name from sys_dictitem where groupid = 'CODE_SAWPFL' and code = t.KEYDDFJDC_SAWPDM ) as KEYDDFJDC_SAWPDMStr,
(select name from sys_dictitem where groupid = 'CODE_YS' and code = t.KEYDDFJDC_WPYS_WPYSDM ) as KEYDDFJDC_WPYS_WPYSDMStr,
(select name from sys_dictitem where groupid = 'ODE_UNIT' and code = t.BLDW_GAJGJGDM ) as BLDW_GAJGJGDMStr,
rownum rn
(select name from sys_dictitem where groupid = 'ODE_UNIT' and code = t.BLDW_GAJGJGDM ) as BLDW_GAJGJGDMStr
from tb_xw_fxkyddfjdcxs t
where xxsc_pdbz = '0' and rownum <![CDATA[ <= ]]> #{limit}
where xxsc_pdbz = '0'
<if test="asjbh != null and asjbh != '' ">
and asjbh = #{asjbh}
</if>)where rn <![CDATA[ > ]]> #{page}
</if>
)t1,(SELECT @rownum:=0) r
)b where rownum <![CDATA[ <= ]]> #{limit})a
where rownum <![CDATA[ > ]]> #{page}
</select>
<!--新增所有列-->
......
src/main/java/org/springblade/founder/qgccj/mapper/TbXwFxkydyMapper.xml
......@@ -346,18 +346,23 @@
</select>
<select id="queryAll" resultMap="TbXwFxkydyMap">
select * from ( select
select a.* from (
select * from (
select @rownum := @rownum + 1 AS rownum, t1.* from (
select
XXZJBH, ASJBH, KYDY_SAWPBH, KYDY_DYLXDM, KYDY_DYXHDM, KYDY_WPSL, KYDY_WPTZMS, KYDY_WPLYMS, KYDY_WPQX_JYQK, KYDY_CNFS_JYQK, KYDY_JYFS_JYQK, KYDY_JYDD_XZQHDM, KYDY_JYDD_DZMC, KYDY_YSFS_JYQK, KYDY_YSLX_JYQK, BLDW_GAJGJGDM, BLDW_GAJGMC, ZBR_XM, ZBR_GMSFHM, ZBR_LXDH, XBR_XM, XBR_GMSFHM, XBR_LXDH, BLSJ, XXSC_PDBZ, XXDJDW_GAJGJGDM, XXDJDW_GAJGMC, XXDJRY_XM, XXDJRY_GMSFHM, XXDJRY_LXDH, DJSJ, XXCZDW_GAJGJGDM, XXCZDW_GAJGMC, XXCZRY_XM, XXCZRY_GMSFHM, GXSJ, XXLYMS, XXRSKSJ, XXRBKSJ, XXRSK_PDBZ, XXRBK_PDBZ, GABXF, KYDY_JZWPBH,
(select name from sys_dictitem where groupid = 'CODE_DYLX' and code = t.KYDY_DYLXDM ) as KYDY_DYLXDMStr,
(select name from sys_dictitem where groupid = 'CODE_DYXH' and code = t.KYDY_DYXHDM ) as KYDY_DYXHDMStr,
(select name from sys_dictitem where groupid = 'CODE_XZQH' and code = t.KYDY_JYDD_XZQHDM ) as KYDY_JYDD_XZQHDMStr,
(select name from sys_dictitem where groupid = 'CODE_UNIT' and code = t.BLDW_GAJGJGDM ) as BLDW_GAJGJGDMStr,
rownum rn
(select name from sys_dictitem where groupid = 'CODE_UNIT' and code = t.BLDW_GAJGJGDM ) as BLDW_GAJGJGDMStr
from tb_xw_fxkydy t
where xxsc_pdbz = '0' and rownum <![CDATA[ <= ]]> #{limit}
where xxsc_pdbz = '0'
<if test="asjbh != null and asjbh != '' ">
and asjbh = #{asjbh}
</if>)where rn <![CDATA[ > ]]> #{page}
</if>
)t1,(SELECT @rownum:=0) r
)b where rownum <![CDATA[ <= ]]> #{limit})a
where rownum <![CDATA[ > ]]> #{page}
</select>
<!--新增所有列-->
......
src/main/java/org/springblade/founder/qgccj/mapper/TbXwFxkyjdcxsMapper.xml
......@@ -377,19 +377,24 @@
</select>
<select id="queryAll" resultMap="TbXwFxkyjdcxsMap">
select * from(select
select a.* from (
select * from(
select @rownum := @rownum + 1 AS rownum, t1.* from (
select
XXZJBH, ASJBH, KEYYJ_JYQK, KEYJDC_SAWPBH, KEYJDC_JDCSYXZDM, KEYJDC_FFYY_PDBZ, KEYJDC_SAWPDM, KEYJDC_PPXH, KEYJDC_JDCHPZLDM, KEYJDC_JDCHPHM, KEYJDC_JDCHPHMZW_PDBZ, KEYJDC_CLSBDH, KEYJDC_SFXGCLSBDH_PDBZ, KEYJDC_JDCFDJDDJXH, KEYJDC_SFXGJDCFDJDDJH_PDBZ, KEYJDC_JDCCSYS_JDCCSYSDM, KEYJDC_JDCCSYS_DMBCMS, KEYJDC_WPTZMS, KEYJDC_WPJZRMBY, BLDW_GAJGJGDM, BLDW_GAJGMC, ZBR_XM, ZBR_GMSFHM, ZBR_LXDH, XBR_XM, XBR_GMSFHM, XBR_LXDH, BLSJ, XXSC_PDBZ, XXDJDW_GAJGJGDM, XXDJDW_GAJGMC, XXDJRY_XM, XXDJRY_GMSFHM, XXDJRY_LXDH, DJSJ, XXCZDW_GAJGJGDM, XXCZDW_GAJGMC, XXCZRY_XM, XXCZRY_GMSFHM, GXSJ, XXLYMS, XXRSKSJ, XXRBKSJ, XXRSK_PDBZ, XXRBK_PDBZ, GABXF, KEYJDC_JZWPBH,
(select name from sys_dictitem where groupid = 'CODE_CLSYXZ' and code = t.KEYJDC_JDCSYXZDM ) as KEYJDC_JDCSYXZDMStr,
(select name from sys_dictitem where groupid = 'CODE_SAWPFL' and code = t.KEYJDC_SAWPDM ) as KEYJDC_SAWPDMStr,
(select name from sys_dictitem where groupid = 'CODE_HPZL' and code = t.KEYJDC_JDCHPZLDM ) as KEYJDC_JDCHPZLDMStr,
(select name from sys_dictitem where groupid = 'CODE_YS' and code = t.KEYJDC_JDCCSYS_JDCCSYSDM ) as KEYJDC_JDCCSYS_JDCCSYSDMStr,
(select name from sys_dictitem where groupid = 'CODE_UNIT' and code = t.BLDW_GAJGJGDM ) as BLDW_GAJGJGDMStr,
rownum rn
(select name from sys_dictitem where groupid = 'CODE_UNIT' and code = t.BLDW_GAJGJGDM ) as BLDW_GAJGJGDMStr
from tb_xw_fxkyjdcxs t
where xxsc_pdbz = '0' and rownum <![CDATA[ <= ]]> #{limit}
where xxsc_pdbz = '0'
<if test="asjbh != null and asjbh != '' ">
and asjbh = #{asjbh}
</if>)where rn <![CDATA[ > ]]> #{page}
</if>
)t1,(SELECT @rownum:=0) r
)b where rownum <![CDATA[ <= ]]> #{limit})a
where rownum <![CDATA[ > ]]> #{page}
</select>
<!--新增所有列-->
......
src/main/java/org/springblade/founder/qgccj/mapper/TbXwFxkyqzMapper.xml
......@@ -395,18 +395,23 @@
</select>
<select id="queryAll" resultMap="TbXwFxkyqzMap">
select * from(select
select a.* from (
select * from(
select @rownum := @rownum + 1 AS rownum, t1.* from (
select
XXZJBH, ASJBH, KYQZ_SAWPBH, KYQZ_QZLXDM, KYQZ_QZXHDM, KYQZ_QZKJ, KYQZ_SFZSQZ_PDBZ, KYQZ_QH_WPBZH, KYQZ_QZSFWZ_PDBZ, KYQZ_QZSFWZ_JYQK, KYQZ_WPTZMS, KYQZ_WPLYMS, KYQZ_WPQX_JYQK, KYQZ_CNFS_JYQK, KYQZ_JYFS_JYQK, KYQZ_JYDD_XZQHDM, KYQZ_JYDD_DZMC, KYQZ_YSFS_JYQK, KYQZ_YSLX_JYQK, KYQZ_GZJG_ZCXWYJMS, KYQZ_GZJG_ZCXWJGMS, KYQZ_GZJG_ZXSJ01, BLDW_GAJGJGDM, BLDW_GAJGMC, ZBR_XM, ZBR_GMSFHM, ZBR_LXDH, XBR_XM, XBR_GMSFHM, XBR_LXDH, BLSJ, XXSC_PDBZ, XXDJDW_GAJGJGDM, XXDJDW_GAJGMC, XXDJRY_XM, XXDJRY_GMSFHM, XXDJRY_LXDH, DJSJ, XXCZDW_GAJGJGDM, XXCZDW_GAJGMC, XXCZRY_XM, XXCZRY_GMSFHM, GXSJ, XXLYMS, XXRSKSJ, XXRBKSJ, XXRSK_PDBZ, XXRBK_PDBZ, GABXF, KYQZ_JZWPBH,
(select name from sys_dictitem where groupid = 'CODE_QZLB' and code = t.KYQZ_QZLXDM ) as KYQZ_QZLXDMStr,
(select name from sys_dictitem where groupid = 'CODE_QZLXDM' and code = t.KYQZ_QZXHDM ) as KYQZ_QZXHDMStr,
(select name from sys_dictitem where groupid = 'CODE_XZQH' and code = t.KYQZ_JYDD_XZQHDM ) as KYQZ_JYDD_XZQHDMStr,
(select name from sys_dictitem where groupid = 'CODE_UNIT' and code = t.BLDW_GAJGJGDM ) as BLDW_GAJGJGDMStr,
rownum rn
(select name from sys_dictitem where groupid = 'CODE_UNIT' and code = t.BLDW_GAJGJGDM ) as BLDW_GAJGJGDMStr
from tb_xw_fxkyqz t
where xxsc_pdbz = '0' and rownum <![CDATA[ <= ]]> #{limit}
where xxsc_pdbz = '0'
<if test="asjbh != null and asjbh != '' ">
and asjbh = #{asjbh}
</if>)where rn <![CDATA[ > ]]> #{page}
</if>
)t1,(SELECT @rownum:=0) r
)b where rownum <![CDATA[ <= ]]> #{limit})a
where rownum <![CDATA[ > ]]> #{page}
</select>
<!--新增所有列-->
......
src/main/java/org/springblade/founder/qgccj/mapper/TbXwFxkywwxsMapper.xml
......@@ -45,15 +45,20 @@
</resultMap>
<select id="queryAll" resultMap="TbXwFxkywwxsMap">
select * from(select
select a.* from (
select * from(
select @rownum := @rownum + 1 AS rownum, t1.* from (
select
XXZJBH, ASJBH, KEYYJ_JYQK, KEYWW_SAWPBH, KEYWW_WWDJMS, KEYWW_WWZXSCLT_PDBZ, KEYWW_WWZXCJ_PDBZ, KEYWW_WPTZMS, KEYWW_WPJZRMBY, KEYWW_WPZW_PDBZ, BLDW_GAJGJGDM, BLDW_GAJGMC, ZBR_XM, ZBR_GMSFHM, ZBR_LXDH, XBR_XM, XBR_GMSFHM, XBR_LXDH, BLSJ, XXSC_PDBZ, XXDJDW_GAJGJGDM, XXDJDW_GAJGMC, XXDJRY_XM, XXDJRY_GMSFHM, XXDJRY_LXDH, DJSJ, XXCZDW_GAJGJGDM, XXCZDW_GAJGMC, XXCZRY_XM, XXCZRY_GMSFHM, GXSJ, XXLYMS, XXRSKSJ, XXRBKSJ, XXRSK_PDBZ, XXRBK_PDBZ, GABXF, KEYWW_JZWPBH,
(select name from sys_dictitem where groupid = 'CODE_UNIT' and code = t.BLDW_GAJGJGDM ) as BLDW_GAJGJGDMStr,
rownum rn
(select name from sys_dictitem where groupid = 'CODE_UNIT' and code = t.BLDW_GAJGJGDM ) as BLDW_GAJGJGDMStr
from tb_xw_fxkywwxs t
where xxsc_pdbz = '0' and rownum <![CDATA[ <= ]]> #{limit}
where xxsc_pdbz = '0'
<if test="asjbh != null and asjbh != '' ">
and asjbh = #{asjbh}
</if>)where rn <![CDATA[ > ]]> #{page}
</if>
)t1,(SELECT @rownum:=0) r
)b where rownum <![CDATA[ <= ]]> #{limit})a
where rownum <![CDATA[ > ]]> #{page}
</select>
<!--查询单个-->
......@@ -71,6 +76,7 @@
XXZJBH, ASJBH, KEYYJ_JYQK, KEYWW_SAWPBH, KEYWW_WWDJMS, KEYWW_WWZXSCLT_PDBZ, KEYWW_WWZXCJ_PDBZ, KEYWW_WPTZMS, KEYWW_WPJZRMBY, KEYWW_WPZW_PDBZ, BLDW_GAJGJGDM, BLDW_GAJGMC, ZBR_XM, ZBR_GMSFHM, ZBR_LXDH, XBR_XM, XBR_GMSFHM, XBR_LXDH, BLSJ, XXSC_PDBZ, XXDJDW_GAJGJGDM, XXDJDW_GAJGMC, XXDJRY_XM, XXDJRY_GMSFHM, XXDJRY_LXDH, DJSJ, XXCZDW_GAJGJGDM, XXCZDW_GAJGMC, XXCZRY_XM, XXCZRY_GMSFHM, GXSJ, XXLYMS, XXRSKSJ, XXRBKSJ, XXRSK_PDBZ, XXRBK_PDBZ, GABXF, KEYWW_JZWPBH
from tb_xw_fxkywwxs
<where>
1=1
<if test="xxzjbh != null and xxzjbh != ''">
and XXZJBH = #{xxzjbh}
</if>
......
src/main/java/org/springblade/founder/qgccj/mapper/TbXwFxkyydtxsbxsMapper.xml
......@@ -64,17 +64,22 @@
</select>
<select id="queryAll" resultMap="TbXwFxkyydtxsbxsMap">
select * from(select
select a.* from (
select * from(
select @rownum := @rownum + 1 AS rownum, t1.* from (
select
XXZJBH, ASJBH, KEYYJ_JYQK, KEYYDTXSB_SAWPBH, KEYYDTXSB_PPXH, KEYYDTXSB_ICCID_WPBZH, KEYYDTXSB_IMEI_WPBZH, KEYYDTXSB_IMSI_FWBZH, KEYYDTXSB_YDDH, KEYYDTXSB_WPYSDM, KEYYDTXSB_WPTZMS, KEYYDTXSB_WPJZRMBY, BLDW_GAJGJGDM, BLDW_GAJGMC, ZBR_XM, ZBR_GMSFHM, ZBR_LXDH, XBR_XM, XBR_GMSFHM, XBR_LXDH, BLSJ, XXSC_PDBZ, XXDJDW_GAJGJGDM, XXDJDW_GAJGMC, XXDJRY_XM, XXDJRY_GMSFHM, XXDJRY_LXDH, DJSJ, XXCZDW_GAJGJGDM, XXCZDW_GAJGMC, XXCZRY_XM, XXCZRY_GMSFHM, GXSJ, XXLYMS, XXRSKSJ, XXRBKSJ, XXRSK_PDBZ, XXRBK_PDBZ, GABXF, KEYYDTXSB_JZWPBH, SJSYZT, KEYYDTXSB_PPXHDM,
(select name from sys_dictitem where groupid = 'CODE_YS' and code = t.KEYYDTXSB_WPYSDM ) as KEYYDTXSB_WPYSDMStr,
(select name from sys_dictitem where groupid = 'CODE_SJPP' and code = t.KEYYDTXSB_PPXHDM ) as KEYYDTXSB_PPXHDMStr,
(select name from sys_dictitem where groupid = 'CODE_UNIT' and code = t.BLDW_GAJGJGDM ) as BLDW_GAJGJGDMStr,
rownum rn
(select name from sys_dictitem where groupid = 'CODE_UNIT' and code = t.BLDW_GAJGJGDM ) as BLDW_GAJGJGDMStr
from tb_xw_fxkyydtxsbxs t
where xxsc_pdbz = '0' and rownum <![CDATA[ <= ]]> #{limit}
where xxsc_pdbz = '0'
<if test="asjbh != null and asjbh != '' ">
and asjbh = #{asjbh}
</if>)where rn <![CDATA[ > ]]> #{page}
</if>
)t1,(SELECT @rownum:=0) r
)b where rownum <![CDATA[ <= ]]> #{limit})a
where rownum <![CDATA[ > ]]> #{page}
</select>
<!--查询指定行数据-->
......@@ -83,6 +88,7 @@
XXZJBH, ASJBH, KEYYJ_JYQK, KEYYDTXSB_SAWPBH, KEYYDTXSB_PPXH, KEYYDTXSB_ICCID_WPBZH, KEYYDTXSB_IMEI_WPBZH, KEYYDTXSB_IMSI_FWBZH, KEYYDTXSB_YDDH, KEYYDTXSB_WPYSDM, KEYYDTXSB_WPTZMS, KEYYDTXSB_WPJZRMBY, BLDW_GAJGJGDM, BLDW_GAJGMC, ZBR_XM, ZBR_GMSFHM, ZBR_LXDH, XBR_XM, XBR_GMSFHM, XBR_LXDH, BLSJ, XXSC_PDBZ, XXDJDW_GAJGJGDM, XXDJDW_GAJGMC, XXDJRY_XM, XXDJRY_GMSFHM, XXDJRY_LXDH, DJSJ, XXCZDW_GAJGJGDM, XXCZDW_GAJGMC, XXCZRY_XM, XXCZRY_GMSFHM, GXSJ, XXLYMS, XXRSKSJ, XXRBKSJ, XXRSK_PDBZ, XXRBK_PDBZ, GABXF, KEYYDTXSB_JZWPBH, SJSYZT, KEYYDTXSB_PPXHDM
from tb_xw_fxkyydtxsbxs
<where>
1=1
<if test="xxzjbh != null and xxzjbh != ''">
and XXZJBH = #{xxzjbh}
</if>
......
src/main/java/org/springblade/founder/qgccj/mapper/TbXwFxqtgzwpMapper.xml
......@@ -84,19 +84,24 @@
</select>
<select id="queryAll" resultMap="TbXwFxqtgzwpMap">
select * from(select
select a.* from (
select * from(
select @rownum := @rownum + 1 AS rownum, t1.* from (
select
XXZJBH, ASJBH, QTGZWP_SAWPBH, QTGZWP_SAWP_SAWPDM, QTGZWP_SAWP_DMBCMS, QTGZWP_WPMC, QTGZWP_PPXH, QTGZWP_WPGG, QTGZWP_WPBZH_WPBZHLBDM, QTGZWP_WPBZH_DMBCMS, QTGZWP_WPBZH_WPBZH, QTGZWP_WPYS_WPYSDM, QTGZWP_WPYS_DMBCMS, QTGZWP_WPJZRMBY, QTGZWP_WPSL, QTGZWP_WPZL, QTGZWP_JLDLDW, QTGZWP_WPZW_PDBZ, QTGZWP_WPTZMS, QTGZWP_WPLYMS, QTGZWP_WPQX_JYQK, QTGZWP_CNFS_JYQK, QTGZWP_JYFS_JYQK, QTGZWP_JYDD_XZQHDM, QTGZWP_JYDD_DZMC, QTGZWP_YSFS_JYQK, QTGZWP_YSLX_JYQK, BLDW_GAJGJGDM, BLDW_GAJGMC, ZBR_XM, ZBR_GMSFHM, ZBR_LXDH, XBR_XM, XBR_GMSFHM, XBR_LXDH, BLSJ, XXSC_PDBZ, XXDJDW_GAJGJGDM, XXDJDW_GAJGMC, XXDJRY_XM, XXDJRY_GMSFHM, XXDJRY_LXDH, DJSJ, XXCZDW_GAJGJGDM, XXCZDW_GAJGMC, XXCZRY_XM, XXCZRY_GMSFHM, GXSJ, XXLYMS, XXRSKSJ, XXRBKSJ, XXRSK_PDBZ, XXRBK_PDBZ, GABXF, QTGZWP_JZWPBH,
(select name from sys_dictitem where groupid = 'CODE_SAWPFL' and code = t.QTGZWP_SAWP_SAWPDM ) as QTGZWP_SAWP_SAWPDMStr,
(select name from sys_dictitem where groupid = 'CODE_WPBSH' and code = t.QTGZWP_WPBZH_WPBZHLBDM ) as QTGZWP_WPBZH_WPBZHLBDMStr,
(select name from sys_dictitem where groupid = 'CODE_YS' and code = t.QTGZWP_WPYS_WPYSDM ) as QTGZWP_WPYS_WPYSDMStr,
(select name from sys_dictitem where groupid = 'CODE_XZQH' and code = t.QTGZWP_JYDD_XZQHDM ) as QTGZWP_JYDD_XZQHDMStr,
(select name from sys_dictitem where groupid = 'CODE_UNIT' and code = t.BLDW_GAJGJGDM ) as BLDW_GAJGJGDMStr,
rownum rn
(select name from sys_dictitem where groupid = 'CODE_UNIT' and code = t.BLDW_GAJGJGDM ) as BLDW_GAJGJGDMStr
from tb_xw_fxqtgzwp t
where xxsc_pdbz = '0' and rownum <![CDATA[ <= ]]> #{limit}
where xxsc_pdbz = '0'
<if test="asjbh != null and asjbh != '' ">
and asjbh = #{asjbh}
</if>)where rn <![CDATA[ > ]]> #{page}
</if>
)t1,(SELECT @rownum:=0) r
)b where rownum <![CDATA[ <= ]]> #{limit})a
where rownum <![CDATA[ > ]]> #{page}
</select>
<!--查询指定行数据-->
......
src/main/java/org/springblade/founder/qgccj/mapper/TbXwFxqtkywpxsMapper.xml
......@@ -75,18 +75,23 @@
</select>
<select id="queryAll" resultMap="TbXwFxqtkywpxsMap">
select * from(select
select a.* from (
select * from(
select @rownum := @rownum + 1 AS rownum, t1.* from (
select
XXZJBH, ASJBH, KEYYJ_JYQK, KYWP_SAWPBH, KYWP_SAWP_SAWPDM, KYWP_SAWP_DMBCMS, KYWP_WPMC, KYWP_PPXH, KYWP_WPGG, KYWP_WPBZH_WPBZHLBDM, KYWP_WPBZH_DMBCMS, KYWP_WPBZH_WPBZH, KYWP_WPYS_WPYSDM, KYWP_WPYS_DMBCMS, KYWP_WPJZRMBY, KYWP_WPSL, KYWP_WPZL, KYWP_JLDLDW, KYWP_WPTZMS, KYWP_WPZW_PDBZ, BLDW_GAJGJGDM, BLDW_GAJGMC, ZBR_XM, ZBR_GMSFHM, ZBR_LXDH, XBR_XM, XBR_GMSFHM, XBR_LXDH, BLSJ, XXSC_PDBZ, XXDJDW_GAJGJGDM, XXDJDW_GAJGMC, XXDJRY_XM, XXDJRY_GMSFHM, XXDJRY_LXDH, DJSJ, XXCZDW_GAJGJGDM, XXCZDW_GAJGMC, XXCZRY_XM, XXCZRY_GMSFHM, GXSJ, XXLYMS, XXRSKSJ, XXRBKSJ, XXRSK_PDBZ, XXRBK_PDBZ, GABXF, KYWP_JZWPBH,
(select name from sys_dictitem where groupid = 'CODE_SAWPFL' and code = t.KYWP_SAWP_SAWPDM ) as KYWP_SAWP_SAWPDMStr,
(select name from sys_dictitem where groupid = 'CODE_WPBSH' and code = t.KYWP_WPBZH_WPBZHLBDM ) as KYWP_WPBZH_WPBZHLBDMStr,
(select name from sys_dictitem where groupid = 'CODE_YS' and code = t.KYWP_WPYS_WPYSDM ) as KYWP_WPYS_WPYSDMStr,
(select name from sys_dictitem where groupid = 'CODE_UNIT' and code = t.BLDW_GAJGJGDM ) as BLDW_GAJGJGDMStr,
rownum rn
(select name from sys_dictitem where groupid = 'CODE_UNIT' and code = t.BLDW_GAJGJGDM ) as BLDW_GAJGJGDMStr
from tb_xw_fxqtkywpxs t
where xxsc_pdbz = '0' and rownum <![CDATA[ <= ]]> #{limit}
where xxsc_pdbz = '0'
<if test="asjbh != null and asjbh != '' ">
and asjbh = #{asjbh}
</if>)where rn <![CDATA[ > ]]> #{page}
</if>
)t1,(SELECT @rownum:=0) r
)b where rownum <![CDATA[ <= ]]> #{limit})a
where rownum <![CDATA[ > ]]> #{page}
</select>
<!--查询指定行数据-->
......
src/main/java/org/springblade/founder/qgccj/mapper/TbXwRybhMapper.xml
......@@ -558,7 +558,10 @@
</select>
<select id="queryAll" resultMap="TbXwRybhMap">
select * from (select
select a.* from (
select * from (
select @rownum := @rownum + 1 AS rownum, t1.* from (
select
xxzjbh, asjbh, wzmst_pdbz, ysbqhszry_pdbz, bhsj_kssj, bhsj_jssj, bhdd_dzmc, rsqfjgdm, rsshcddm, sshbw_jyqk,
ssjzrmby, sffxst_pdbz, bhr_asjxgrybh, bhr_xxfc_pdbz, bhr_stbh, bhr_xm, bhr_cyzj_cyzjdm, bhr_cyzj_dmbcms,
bhr_cyzj_zjhm, bhr_xbdm, bhr_csrq_rqgzxx, bhr_csrq_rqgzsx, bhr_gjdm, bhr_jgdm, bhr_mzdm, bhr_hjdz_xzqhdm,
......@@ -567,12 +570,15 @@
bhr_grahjhdtd_jyqk, bhr_yztzms, bhr_gzdw, bhr_lxdh, bhr_sfyxds_pdbz, bhr_rqx_jyqk, bhr_xdwp_jyqk, bhr_szzwbh,
bhr_rydnabh, bhr_bz, lxr_xm, lxr_cyzjdm, lxr_zjhm, xxsc_pdbz, xxdjdw_gajgjgdm, xxdjdw_gajgmc, xxdjry_xm,
xxdjry_gmsfhm, xxdjry_lxdh, djsj, xxczdw_gajgjgdm, xxczdw_gajgmc, xxczry_xm, xxczry_gmsfhm, gxsj, xxlyms,
xxrsksj, xxrbksj, xxrsk_pdbz, xxrbk_pdbz, bhr_jzrybh, gabxf, jzgxbh, if_collect,rownum rn
xxrsksj, xxrbksj, xxrsk_pdbz, xxrbk_pdbz, bhr_jzrybh, gabxf, jzgxbh, if_collect
from tb_xw_rybh
where xxsc_pdbz = '0' and rownum <![CDATA[ <= ]]> #{limit}
where xxsc_pdbz = '0'
<if test="asjbh != null and asjbh != '' ">
and asjbh = #{asjbh}
</if>)where rn <![CDATA[ > ]]> #{page}
</if>
)t1,(SELECT @rownum:=0) r
)b where rownum <![CDATA[ <= ]]> #{limit})a
where rownum <![CDATA[ > ]]> #{page}
</select>
<!--新增所有列-->
......
src/main/java/org/springblade/founder/qgccj/mapper/TbXwSsddfjdcMapper.xml
......@@ -298,11 +298,16 @@ ssddfjdc_soyr_zjhm, ssddfjdc_soyr_lxdh, chcx_zcxwnrms, chcx_zxsj01,
</update>
<select id="queryAll" resultType="org.springblade.founder.qgccj.entity.TbXwSsddfjdcQgccl">
select * from (select
<include refid="Base_Column_List"/>,rownum rn
select a.* from (
select * from (
select @rownum := @rownum + 1 AS rownum, t1.* from (
select
<include refid="Base_Column_List"/>
from tb_xw_ssddfjdc t
where asjbh = #{asjbh,jdbcType=VARCHAR} and xxsc_pdbz = '0'
and ROWNUM <![CDATA[ <= ]]> #{limit}) where RN <![CDATA[ > ]]> #{page}
) t1,(SELECT @rownum:=0) r
)b where rownum <![CDATA[ <= ]]> #{limit})a
where rownum <![CDATA[ > ]]> #{page}
</select>
<select id="queryCount" resultType="java.lang.Integer">
......
src/main/java/org/springblade/founder/qgccj/mapper/TbXwSsdyMapper.xml
......@@ -59,11 +59,16 @@ ssdy_dyxhdm, ssdy_wpsl, ssdy_wptzms, xxsc_pdbz,
</select>
<select id="queryAll" resultType="org.springblade.founder.qgccj.entity.TbXwSsdyQgccl">
select * from(select
<include refid="Base_Column_List"/>,rownum rn
select a.* from (
select * from (
select @rownum := @rownum + 1 AS rownum, t1.* from (
select
<include refid="Base_Column_List"/>
from tb_xw_ssdy t
where asjbh = #{asjbh,jdbcType=VARCHAR} and xxsc_pdbz = '0'
and ROWNUM <![CDATA[ <= ]]> #{limit}) where RN <![CDATA[ > ]]> #{page}
) t1,(SELECT @rownum:=0) r
)b where rownum <![CDATA[ <= ]]> #{limit})a
where rownum <![CDATA[ > ]]> #{page}
</select>
<select id="queryCount" resultType="java.lang.Integer">
......
src/main/java/org/springblade/founder/qgccj/mapper/TbXwSsjdcMapper.xml
......@@ -135,11 +135,16 @@
</select>
<select id="queryAll" resultType="org.springblade.founder.qgccj.entity.TbXwSsjdcQgccl">
select * from(select
<include refid="Base_Column_List"/>,rownum rn
select a.* from (
select * from (
select @rownum := @rownum + 1 AS rownum, t1.* from (
select
<include refid="Base_Column_List"/>
from tb_xw_ssjdc t
where asjbh = #{asjbh,jdbcType=VARCHAR} and xxsc_pdbz = '0'
and ROWNUM <![CDATA[ <= ]]> #{limit}) where RN <![CDATA[ > ]]> #{page}
) t1,(SELECT @rownum:=0) r
)b where rownum <![CDATA[ <= ]]> #{limit})a
where rownum <![CDATA[ > ]]> #{page}
</select>
<select id="queryCount" resultType="java.lang.Integer">
......
src/main/java/org/springblade/founder/qgccj/mapper/TbXwSsklMapper.xml
......@@ -62,11 +62,16 @@
</select>
<select id="queryAll" resultType="org.springblade.founder.qgccj.entity.TbXwSsklQgccl">
select * from(select
<include refid="Base_Column_List"/>,rownum rn
select a.* from (
select * from (
select @rownum := @rownum + 1 AS rownum, t1.* from (
select
<include refid="Base_Column_List"/>
from tb_xw_sskl t
where asjbh = #{asjbh,jdbcType=VARCHAR} and xxsc_pdbz = '0'
and ROWNUM <![CDATA[ <= ]]> #{limit}) where RN <![CDATA[ > ]]> #{page}
) t1,(SELECT @rownum:=0) r
)b where rownum <![CDATA[ <= ]]> #{limit})a
where rownum <![CDATA[ > ]]> #{page}
</select>
<select id="queryCount" resultType="java.lang.Integer">
......
src/main/java/org/springblade/founder/qgccj/mapper/TbXwSsqtwpMapper.xml
......@@ -95,11 +95,16 @@
</update>
<select id="queryAll" resultType="org.springblade.founder.qgccj.entity.TbXwSsqtwpQgccl">
select * from(select
<include refid="Base_Column_List"/>,rownum rn
select a.* from (
select * from (
select @rownum := @rownum + 1 AS rownum, t1.* from (
select
<include refid="Base_Column_List"/>
from tb_xw_ssqtwp t
where asjbh = #{asjbh,jdbcType=VARCHAR} and xxsc_pdbz = '0'
and ROWNUM <![CDATA[ <= ]]> #{limit}) where RN <![CDATA[ > ]]> #{page}
) t1,(SELECT @rownum:=0) r
)b where rownum <![CDATA[ <= ]]> #{limit})a
where rownum <![CDATA[ > ]]> #{page}
</select>
<select id="queryCount" resultType="java.lang.Integer">
......
src/main/java/org/springblade/founder/qgccj/mapper/TbXwSsqzMapper.xml
......@@ -65,11 +65,16 @@
</select>
<select id="queryAll" resultType="org.springblade.founder.qgccj.entity.TbXwSsqzQgccl">
select * from(select
<include refid="Base_Column_List"/>,rownum rn
select a.* from (
select * from (
select @rownum := @rownum + 1 AS rownum, t1.* from (
select
<include refid="Base_Column_List"/>
from tb_xw_ssqz t
where asjbh = #{asjbh,jdbcType=VARCHAR} and xxsc_pdbz = '0'
and ROWNUM <![CDATA[ <= ]]> #{limit}) where RN <![CDATA[ > ]]> #{page}
) t1,(SELECT @rownum:=0) r
)b where rownum <![CDATA[ <= ]]> #{limit})a
where rownum <![CDATA[ > ]]> #{page}
</select>
<select id="queryCount" resultType="java.lang.Integer">
......
src/main/java/org/springblade/founder/qgccj/mapper/TbXwSswwMapper.xml
......@@ -90,11 +90,16 @@
</update>
<select id="queryAll" resultType="org.springblade.founder.qgccj.entity.TbXwSswwQgccl">
select * from(select
<include refid="Base_Column_List"/>,rownum rn
select a.* from (
select * from (
select @rownum := @rownum + 1 AS rownum, t1.* from (
select
<include refid="Base_Column_List"/>
from tb_xw_ssww t
where asjbh = #{asjbh,jdbcType=VARCHAR} and xxsc_pdbz = '0'
and ROWNUM <![CDATA[ <= ]]> #{limit}) where RN <![CDATA[ > ]]> #{page}
) t1,(SELECT @rownum:=0) r
)b where rownum <![CDATA[ <= ]]> #{limit})a
where rownum <![CDATA[ > ]]> #{page}
</select>
<select id="queryCount" resultType="java.lang.Integer">
......
src/main/java/org/springblade/founder/qgccj/mapper/TbXwSszjMapper.xml
......@@ -77,11 +77,16 @@
</update>
<select id="queryAll" resultType="org.springblade.founder.qgccj.entity.TbXwSszjQgccj">
select * from(select
<include refid="Base_Column_List"/>,rownum rn
select a.* from (
select * from (
select @rownum := @rownum + 1 AS rownum, t1.* from (
select
<include refid="Base_Column_List"/>
from tb_xw_sszj t
where asjbh = #{asjbh,jdbcType=VARCHAR} and xxsc_pdbz = '0'
and ROWNUM <![CDATA[ <= ]]> #{limit}) where RN <![CDATA[ > ]]> #{page}
) t1,(SELECT @rownum:=0) r
)b where rownum <![CDATA[ <= ]]> #{limit})a
where rownum <![CDATA[ > ]]> #{page}
</select>
<select id="queryCount" resultType="java.lang.Integer">
......
src/main/java/org/springblade/founder/qgccj/mapper/TbXwSyydtxsbMapper.xml
......@@ -80,7 +80,11 @@
</select>
<select id="queryAll" resultType="org.springblade.founder.qgccj.entity.TbXwSsydtxsbQgccl">
select * from (select xxzjbh,
select a.* from (
select * from (
select @rownum := @rownum + 1 AS rownum, t1.* from (
select
xxzjbh,
asjbh,
ssydtxsb_sawpbh,
ssydtxsb_ppxh,
......@@ -121,11 +125,12 @@
wzimei,
(select name from sys_dictitem where code = t.ssydtxsb_wpysdm and groupid = 'CODE_YS') as ssydtxsb_wpysdmStr,
(select name from sys_dictitem where code = t.ssydtxsb_soyr_cyzjdm and groupid = 'CODE_ZJ') as ssydtxsb_soyr_cyzjdmStr,
(select name from sys_dictitem where code = t.ssydtxsb_ppxhdm and groupid = 'CODE_SJPP') as ssydtxsb_ppxhdmStr,
rownum rn
(select name from sys_dictitem where code = t.ssydtxsb_ppxhdm and groupid = 'CODE_SJPP') as ssydtxsb_ppxhdmStr
from tb_xw_ssydtxsb t
where asjbh = #{asjbh,jdbcType=VARCHAR} and xxsc_pdbz = '0'
and ROWNUM <![CDATA[ <= ]]> #{limit}) where RN <![CDATA[ > ]]> #{page}
) t1,(SELECT @rownum:=0) r
)b where rownum <![CDATA[ <= ]]> #{limit})a
where rownum <![CDATA[ > ]]> #{page}
</select>
<select id="queryCount" resultType="java.lang.Integer">
......
src/main/java/org/springblade/founder/qgccj/mapper/TbXwSzSzryMapper.xml
......@@ -397,13 +397,24 @@
</select>
<select id="queryAll" resultMap="TbXwSzSzryMap">
select * from (select
XXZJBH, ASJBH, SZ_JYQK, ZW_JYQK, SZDD_XZQHDM, SZDD_DZMC, SZRY_ASJXGRYBH, SZRY_XM, SZRY_CYZJ_CYZJDM, SZRY_CYZJ_DMBCMS, SZRY_CYZJ_ZJHM, SZRY_CSRQ, SZRY_XBDM, SZRY_GJDM, SZRY_JGDM, SZRY_MZDM, SZRY_HJDZ_XZQHDM, SZRY_HJDZ_DZMC, SZRY_XZZ_XZQHDM, SZRY_XZZ_DZMC, SZRY_GZDW, SZRY_LXDH, SZRY_XDWP_JYQK, SZRY_BZ, BLDW_GAJGJGDM, BLDW_GAJGMC, ZBR_XM, ZBR_GMSFHM, ZBR_LXDH, XBR_XM, XBR_GMSFHM, XBR_LXDH, BLSJ, XXSC_PDBZ, XXDJDW_GAJGJGDM, XXDJDW_GAJGMC, XXDJRY_XM, XXDJRY_GMSFHM, XXDJRY_LXDH, DJSJ, XXCZDW_GAJGJGDM, XXCZDW_GAJGMC, XXCZRY_XM, XXCZRY_GMSFHM, GXSJ, XXLYMS, XXRSKSJ, XXRBKSJ, XXRSK_PDBZ, XXRBK_PDBZ, SZRY_JZRYBH, GABXF,rownum rn
select a.* from (
select * from (
select @rownum := @rownum + 1 AS rownum, t1.* from (
select
XXZJBH, ASJBH, SZ_JYQK, ZW_JYQK, SZDD_XZQHDM, SZDD_DZMC, SZRY_ASJXGRYBH, SZRY_XM, SZRY_CYZJ_CYZJDM,
SZRY_CYZJ_DMBCMS, SZRY_CYZJ_ZJHM, SZRY_CSRQ, SZRY_XBDM, SZRY_GJDM, SZRY_JGDM, SZRY_MZDM, SZRY_HJDZ_XZQHDM,
SZRY_HJDZ_DZMC, SZRY_XZZ_XZQHDM, SZRY_XZZ_DZMC, SZRY_GZDW, SZRY_LXDH, SZRY_XDWP_JYQK, SZRY_BZ, BLDW_GAJGJGDM,
BLDW_GAJGMC, ZBR_XM, ZBR_GMSFHM, ZBR_LXDH, XBR_XM, XBR_GMSFHM, XBR_LXDH, BLSJ, XXSC_PDBZ, XXDJDW_GAJGJGDM,
XXDJDW_GAJGMC, XXDJRY_XM, XXDJRY_GMSFHM, XXDJRY_LXDH, DJSJ, XXCZDW_GAJGJGDM, XXCZDW_GAJGMC, XXCZRY_XM,
XXCZRY_GMSFHM, GXSJ, XXLYMS, XXRSKSJ, XXRBKSJ, XXRSK_PDBZ, XXRBK_PDBZ, SZRY_JZRYBH, GABXF
from tb_xw_sz_szry
where xxsc_pdbz = '0' and rownum <![CDATA[ <= ]]> #{limit}
where xxsc_pdbz = '0'
<if test="asjbh != null and asjbh != '' ">
and asjbh = #{asjbh}
</if>)where rn <![CDATA[ > ]]> #{page}
</if>
) t1,(SELECT @rownum:=0) r
)b where rownum <![CDATA[ <= ]]> #{limit})a
where rownum <![CDATA[ > ]]> #{page}
</select>
<!--新增所有列-->
......
src/main/java/org/springblade/founder/qgccj/mapper/TbXwWffzkyryMapper.xml
......@@ -552,13 +552,30 @@
</select>
<select id="queryAll" resultMap="TbXwWffzkyryMap">
select * from(select
XXZJBH, ASJBH, KEYYJ_JYQK, WFFZKYRY_ASJXGRYBH, WFFZKYRY_GTFZFZXYRSADWZYDM, WFFZKYRY_SFSZRY_PDBZ, WFFZKYRY_SFTAZS_PDBZ, WFFZKYRY_XM, WFFZKYRY_CYM, WFFZKYRY_BMCH, WFFZKYRY_CYZJ_CYZJDM, WFFZKYRY_CYZJ_DMBCMS, WFFZKYRY_CYZJ_ZJHM, WFFZKYRY_XBDM, WFFZKYRY_CSRQ, WFFZKYRY_GJDM, WFFZKYRY_JGDM, WFFZKYRY_MZDM, WFFZKYRY_SGXX, WFFZKYRY_SGSX, WFFZKYRY_TZXX, WFFZKYRY_TZSX, WFFZKYRY_ZCSX, WFFZKYRY_ZCXX, WFFZKYRY_TMTZMS, WFFZKYRY_TBBJMS, WFFZKYRY_RQTTZ_JYQK, WFFZKYRY_CSD_GJHDQDM, WFFZKYRY_CSD_XZQHDM, WFFZKYRY_CSD_DZMC, WFFZKYRY_HJDZ_XZQHDM, WFFZKYRY_HJDZ_DZMC, WFFZKYRY_XZZ_XZQHDM, WFFZKYRY_XZZ_DZMC, WFFZKYRY_JWZZ_GJHDQDM, WFFZKYRY_JWZZ_DZMC, WFFZKYRY_GZDW, WFFZKYRY_LXDH, WFFZKYRY_ZY_ZYLBDM, WFFZKYRY_ZY_DMBCMS, WFFZKYRY_ASJXGRYSF_ASJXGRYSFDM, WFFZKYRY_ASJXGRYSF_DMBCMS, WFFZKYRY_FZXYRTSZC_FZXYRTSZCDM, WFFZKYRY_FZXYRTSZC_DMBCMS, WFFZKYRY_SFYXDS_PDBZ, WFFZKYRY_LYDP_SAWPDM, WFFZKYRY_SFHY_PDBZ, WFFZKYRY_SFZDJBHZ_PDBZ, WFFZKYRY_XDWP_JYQK, WFFZKYRY_RDFZSS_PDBZ, WFFZKYRY_RDFZSS_ZCXWYJMS, WFFZKYRY_PCFZXY_PDBZ, WFFZKYRY_PCFZXY_ZCXWYJMS, WFFZKYRY_BZ, XXSC_PDBZ, XXDJDW_GAJGJGDM, XXDJDW_GAJGMC, XXDJRY_XM, XXDJRY_GMSFHM, XXDJRY_LXDH, DJSJ, XXCZDW_GAJGJGDM, XXCZDW_GAJGMC, XXCZRY_XM, XXCZRY_GMSFHM, GXSJ, XXLYMS, XXRSKSJ, XXRBKSJ, XXRSK_PDBZ, XXRBK_PDBZ, WFFZKYRY_JZRYBH, GABXF, WFFZKYRY_FXSJ,rownum rn
select a.* from (
select * from (
select @rownum := @rownum + 1 AS rownum, t1.* from (
select
XXZJBH, ASJBH, KEYYJ_JYQK, WFFZKYRY_ASJXGRYBH, WFFZKYRY_GTFZFZXYRSADWZYDM, WFFZKYRY_SFSZRY_PDBZ,
WFFZKYRY_SFTAZS_PDBZ, WFFZKYRY_XM, WFFZKYRY_CYM, WFFZKYRY_BMCH, WFFZKYRY_CYZJ_CYZJDM, WFFZKYRY_CYZJ_DMBCMS,
WFFZKYRY_CYZJ_ZJHM, WFFZKYRY_XBDM, WFFZKYRY_CSRQ, WFFZKYRY_GJDM, WFFZKYRY_JGDM, WFFZKYRY_MZDM, WFFZKYRY_SGXX,
WFFZKYRY_SGSX, WFFZKYRY_TZXX, WFFZKYRY_TZSX, WFFZKYRY_ZCSX, WFFZKYRY_ZCXX, WFFZKYRY_TMTZMS, WFFZKYRY_TBBJMS,
WFFZKYRY_RQTTZ_JYQK, WFFZKYRY_CSD_GJHDQDM, WFFZKYRY_CSD_XZQHDM, WFFZKYRY_CSD_DZMC, WFFZKYRY_HJDZ_XZQHDM,
WFFZKYRY_HJDZ_DZMC, WFFZKYRY_XZZ_XZQHDM, WFFZKYRY_XZZ_DZMC, WFFZKYRY_JWZZ_GJHDQDM, WFFZKYRY_JWZZ_DZMC,
WFFZKYRY_GZDW, WFFZKYRY_LXDH, WFFZKYRY_ZY_ZYLBDM, WFFZKYRY_ZY_DMBCMS, WFFZKYRY_ASJXGRYSF_ASJXGRYSFDM,
WFFZKYRY_ASJXGRYSF_DMBCMS, WFFZKYRY_FZXYRTSZC_FZXYRTSZCDM, WFFZKYRY_FZXYRTSZC_DMBCMS, WFFZKYRY_SFYXDS_PDBZ,
WFFZKYRY_LYDP_SAWPDM, WFFZKYRY_SFHY_PDBZ, WFFZKYRY_SFZDJBHZ_PDBZ, WFFZKYRY_XDWP_JYQK, WFFZKYRY_RDFZSS_PDBZ,
WFFZKYRY_RDFZSS_ZCXWYJMS, WFFZKYRY_PCFZXY_PDBZ, WFFZKYRY_PCFZXY_ZCXWYJMS, WFFZKYRY_BZ, XXSC_PDBZ, XXDJDW_GAJGJGDM,
XXDJDW_GAJGMC, XXDJRY_XM, XXDJRY_GMSFHM, XXDJRY_LXDH, DJSJ, XXCZDW_GAJGJGDM, XXCZDW_GAJGMC, XXCZRY_XM, XXCZRY_GMSFHM,
GXSJ, XXLYMS, XXRSKSJ, XXRBKSJ, XXRSK_PDBZ, XXRBK_PDBZ, WFFZKYRY_JZRYBH, GABXF, WFFZKYRY_FXSJ
from tb_xw_wffzkyry
where xxsc_pdbz = '0' and rownum <![CDATA[ <= ]]> #{limit}
where xxsc_pdbz = '0'
<if test="asjbh != null and asjbh != '' ">
and asjbh = #{asjbh}
</if>)where rn <![CDATA[ > ]]> #{page}
</if>
) t1,(SELECT @rownum:=0) r
)b where rownum <![CDATA[ <= ]]> #{limit})a
where rownum <![CDATA[ > ]]> #{page}
</select>
<!--新增所有列-->
......
src/main/java/org/springblade/founder/qgccj/mapper/TbXwZbfzxyrQgccjMapper.xml
......@@ -966,7 +966,11 @@
</select>
<select id="queryAll" resultMap="TbXwZbfzxyrMap">
select * from (select xxzjbh,
select a.* from (
select * from (
select @rownum := @rownum + 1 AS rownum, t1.* from (
select
xxzjbh,
asjbh,
xxfc_pdbz,
zcxshqfs_zcxshqfsdm,
......@@ -1081,17 +1085,16 @@
zhfzxyr_lxdh,
zhfzxyr_fxsj,
zhfzxyr_nld,
zhfzxyr_zhslxdh,
rownum rn
zhfzxyr_zhslxdh
from tb_xw_zbfzxyr
where xxsc_pdbz = '0' and rownum <![CDATA[ <= ]]> #{limit}
where xxsc_pdbz = '0'
<if test="asjbh != null and asjbh != '' ">
and asjbh = #{asjbh}
</if>
order by djsj desc
)where rn <![CDATA[ > ]]> #{page}
) t1,(SELECT @rownum:=0) r
)b where rownum <![CDATA[ <= ]]> #{limit})a
where rownum <![CDATA[ > ]]> #{page}
</select>
<!--新增所有列-->
......
src/main/java/org/springblade/founder/qgccj/service/impl/TbStRyGxrServiceImpl.java
......@@ -92,9 +92,7 @@ public class TbStRyGxrServiceImpl implements TbStRyGxrService {
/**
* 新增数据
*
* @param tbStRyGxr 实例对象
* @return 实例对象
** @return 实例对象
*/
@Override
public String insert(TbStRyGxrQgccj thisObj) {
......@@ -124,9 +122,7 @@ public class TbStRyGxrServiceImpl implements TbStRyGxrService {
/**
* 修改数据
*
* @param tbStRyGxr 实例对象
* @return 实例对象
** @return 实例对象
*/
@Override
public TbStRyGxrQgccj update(TbStRyGxrQgccj thisObj) {
......
src/main/java/org/springblade/founder/redis/mapper/DictitemMapper.xml
......@@ -39,7 +39,7 @@
and groupid=#{value, jdbcType=VARCHAR}
</if>
<if test="bzxx != null">
and code like #{bzxx,jdbcType=VARCHAR} || '%'
and code like concat(#{bzxx, jdbcType=VARCHAR },'%')
</if>
order by code
</select>
......
src/main/java/org/springblade/founder/ryythcj/mapper/TbStAppRyxxMapper.xml
......@@ -2,18 +2,18 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="org.springblade.founder.ryythcj.mapper.TbStAppRyxxMapper">
<select id="selectListByParay" resultType="org.springblade.founder.ryythcj.entity.TbStAppRyxx">
select *
from (select rownum r, t.*
from (
SELECT
select a.* from (
select * from (
select @rownum := @rownum + 1 AS rownum, t1.* from (
select
<include refid="ryxxQueryField"/>
FROM tb_st_app_ryxx
where xxsc_pdbz = '0'
<include refid="ryxxQueryParam"/>
order by djsj desc
) t
where rownum <![CDATA[ <= ]]> #{end})
where r <![CDATA[ > ]]> #{begin}
) t1,(SELECT @rownum:=0) r
)b where rownum <![CDATA[ <= ]]> #{end})a
where rownum <![CDATA[ > ]]> #{begin}
</select>
<select id="selectCountByParay" resultType="java.lang.Integer">
select count(1)
......@@ -91,25 +91,25 @@
</sql>
<sql id="ryxxQueryParam">
<if test="xxzjbh != null and xxzjbh != ''">
AND XXZJBH like #{xxzjbh , jdbcType=VARCHAR } || '%'
AND XXZJBH like concat(#{xxzjbh, jdbcType=VARCHAR },'%')
</if>
<if test="asjbh != null and asjbh != ''">
AND ASJBH like #{asjbh , jdbcType=VARCHAR } || '%'
AND ASJBH like concat(#{asjbh, jdbcType=VARCHAR },'%')
</if>
<if test="jzrybh != null and jzrybh != ''">
AND JZRYBH like #{jzrybh , jdbcType=VARCHAR } || '%'
AND JZRYBH like concat(#{jzrybh, jdbcType=VARCHAR },'%')
</if>
<if test="xm != null and xm != ''">
AND (XM like '%' || #{xm , jdbcType=VARCHAR } || '%'
or CYM like '%' || #{xm , jdbcType=VARCHAR } || '%'
or BM like '%' || #{xm , jdbcType=VARCHAR } || '%'
or XMPY like '%' || #{xm , jdbcType=VARCHAR } || '%')
AND (XM like concat('%',#{xm, jdbcType=VARCHAR },'%')
or CYM like concat('%',#{xm, jdbcType=VARCHAR },'%')
or BM like concat('%',#{xm, jdbcType=VARCHAR },'%')
or XMPY like concat('%',#{xm, jdbcType=VARCHAR },'%')
</if>
<if test="sfzh != null and sfzh != ''">
AND SFZH = #{sfzh , jdbcType=VARCHAR }
</if>
<if test="xmpy != null and xmpy != ''">
AND XMPY like '%' || #{xmpy , jdbcType=VARCHAR } || '%'
AND XMPY like concat('%',#{xmpy, jdbcType=VARCHAR },'%')
</if>
<if test="cym != null and cym != ''">
AND CYM = #{cym , jdbcType=VARCHAR }
......@@ -196,7 +196,7 @@
AND DJSJ <![CDATA[ <= ]]> #{djsjEnd , jdbcType=TIMESTAMP }
</if>
<if test="xxdjdwGajgjgdm != null and xxdjdwGajgjgdm != ''">
AND XXDJDW_GAJGJGDM like #{xxdjdwGajgjgdm , jdbcType=VARCHAR } || '%'
AND XXDJDW_GAJGJGDM like concat(#{xxdjdwGajgjgdm, jdbcType=VARCHAR },'%')
</if>
<if test="xxdjdwGajgmc != null and xxdjdwGajgmc != ''">
AND XXDJDW_GAJGMC = #{xxdjdwGajgmc , jdbcType=VARCHAR }
......
src/main/java/org/springblade/founder/ryythcj/service/impl/TbStAppRyxxServiceImpl.java
......@@ -34,7 +34,6 @@ import java.text.ParseException;
import java.util.*;
@Service
@DS("xzxt_hn")
public class TbStAppRyxxServiceImpl implements TbStAppRyxxService {
@Autowired
private TbStAppRyxxMapper tbStAppRyxxMapper;
......
src/main/java/org/springblade/founder/socketio/service/impl/MessageServiceImpl.java
......@@ -26,7 +26,6 @@ import java.util.Map;
* @date 2019/4/20
*/
@Service
@DS("db1")
public class MessageServiceImpl implements IMessageService {
@Autowired
private MessgeMapper messgeMapper;
......
src/main/java/org/springblade/founder/utils/service/impl/UnitcodeUnitServiceImpl.java
......@@ -15,7 +15,6 @@ import java.util.List;
import java.util.Map;
@Service
@DS("db1")
public class UnitcodeUnitServiceImpl implements UnitcodeUnitService {
@Autowired
private UnitcodeUnitMapper unitcodeUnitMapper;
......
src/main/java/org/springblade/founder/xcxt/mapper/TbStAppXsMapper.xml
......@@ -2,30 +2,30 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="org.springblade.founder.xcxt.mapper.TbStAppXsMapper">
<select id="selectListByParam" resultType="org.springblade.founder.xcxt.entity.TbStAppXs">
select *
from (select rownum r, t.*
from (
SELECT
select a.* from (
select * from (
select @rownum := @rownum + 1 AS rownum, t1.* from (
select
<include refid="selectXsField"/>
FROM TB_ST_APP_XS
FROM tb_st_app_xs
where XXSC_PDBZ = '0'
<include refid="selectXsParam"/>
order by DJSJ desc
) t
where rownum <![CDATA[ <= ]]> #{end})
where r <![CDATA[ > ]]> #{begin}
) t1,(SELECT @rownum:=0) r
)b where rownum <![CDATA[ <= ]]> #{end})a
where rownum <![CDATA[ > ]]> #{begin}
</select>
<select id="selectCountByParam" resultType="java.lang.Integer">
select count(1)
from TB_ST_APP_XS
from tb_st_app_xs
where XXSC_PDBZ = '0'
<include refid="selectXsParam"/>
</select>
<select id="selectXsByXxzjbh" resultType="org.springblade.founder.xcxt.entity.TbStAppXs">
select
<include refid="selectXsField"/>
from TB_ST_APP_XS
from tb_st_app_xs
where XXSC_PDBZ = '0'
and XXZJBH = #{xxzjbh,jdbcType=VARCHAR}
</select>
......@@ -46,7 +46,10 @@
XSMC,
XSMS,
XSZT,
decode(XSZT, '0', '草稿', '1', '已发布', '') as xsztStr,
(case
when XSZT='0' then '草稿'
when XSZT='1' then '已发布'
else '' end ) as xsztStr,
XCJD,
XCWD,
DJSJ,
......@@ -99,7 +102,7 @@
AND XXZJBH = #{xxzjbh , jdbcType=VARCHAR }
</if>
<if test="xsmc != null and xsmc != ''">
AND XSMC like '%' || #{xsmc , jdbcType=VARCHAR } || '%'
AND XSMC like concat('%',#{xsmc, jdbcType=VARCHAR},'%')
</if>
<if test="xsms != null and xsms != ''">
AND XSMS = #{xsms , jdbcType=VARCHAR }
......@@ -120,7 +123,7 @@
AND DJSJ <![CDATA[ >= ]]> #{djsjEnd , jdbcType=TIMESTAMP }
</if>
<if test="xxdjdwGajgjgdm != null and xxdjdwGajgjgdm != ''">
AND XXDJDW_GAJGJGDM like #{xxdjdwGajgjgdm , jdbcType=VARCHAR } || '%'
AND XXDJDW_GAJGJGDM like concat(#{xxdjdwGajgjgdm, jdbcType=VARCHAR},'%')
</if>
<if test="xxdjdwGajgmc != null and xxdjdwGajgmc != ''">
AND XXDJDW_GAJGMC = #{xxdjdwGajgmc , jdbcType=VARCHAR }
......
src/main/java/org/springblade/founder/xcxt/service/impl/TbStAppXsServiceImpl.java
......@@ -50,7 +50,6 @@ public class TbStAppXsServiceImpl implements TbStAppXsService {
Utils.setUserDjxxAndCzxx(xs);
//保存基本信息
tbStAppXsMapper.insert(xs);
//关联附件信息
glfjxx(xs);
return xxzjbh;
......
src/main/java/org/springblade/founder/xcxx/entity/TbStAppWzxx.java
......@@ -13,7 +13,7 @@ import java.util.Date;
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("TB_ST_APP_WZXX")
@TableName("tb_st_app_wzxx")
public class TbStAppWzxx extends BaseModel {
@TableId(type = IdType.INPUT)
private String xxzjbh;
......
src/main/java/org/springblade/founder/xcxx/mapper/TbStAppWzxxMapper.xml
......@@ -4,14 +4,14 @@
<select id="selectListByParam" resultType="org.springblade.founder.xcxx.entity.TbStAppWzxx">
SELECT
<include refid="selectField"/>
FROM TB_ST_APP_WZXX
FROM tb_st_app_wzxx
where XXSC_PDBZ = '0'
<include refid="selectParam"/>
order by djsj desc
</select>
<select id="selectCountByParam" resultType="java.lang.Integer">
select count(1)
from TB_ST_APP_WZXX
from tb_st_app_wzxx
where XXSC_PDBZ = '0'
<include refid="selectParam"/>
</select>
......@@ -20,7 +20,7 @@
XXZJBH,
WZMC,
WZLX,
(select name from SYS_DICTITEM where GROUPID = 'CODE_WZLXDM' and code = WZLX) as wzlxStr,
(select name from sys_dictitem where GROUPID = 'CODE_WZLXDM' and code = WZLX) as wzlxStr,
WZJD,
WZWD,
WZXX,
......
src/main/java/org/springblade/founder/xcxx/mapper/XcxxMapper.xml
......@@ -34,8 +34,10 @@
</resultMap>
<select id="selectPageList" resultMap="baseResultMap">
select * from (select rownum r,t.* from (
SELECT
select a.* from (
select * from (
select @rownum := @rownum + 1 AS rownum, t1.* from (
select
XCBH ,
GLXXLX ,
GLXX_XXZJBH ,
......@@ -64,11 +66,11 @@
XXRBK_PDBZ ,
XXSC_PDBZ ,
CKSJ
FROM TB_ST_APP_XCXX
FROM tb_st_app_xcxx
where xxsc_pdbz = '0'
<if test="tbStAppXcxx.xcmc != null and tbStAppXcxx.xcmc != ''">
AND (XCMC like '%' || #{tbStAppXcxx.xcmc , jdbcType=VARCHAR } || '%' or
xcbh like '%' || #{tbStAppXcxx.xcmc , jdbcType=VARCHAR } || '%')
AND (XCMC like concat('%',#{tbStAppXcxx.xcmc, jdbcType=VARCHAR },'%') or
xcbh like concat('%',#{tbStAppXcxx.xcmc, jdbcType=VARCHAR },'%'))
</if>
<if test="tbStAppXcxx.xcdlwzJdStrat != null">
AND XCDLWZ_JD <![CDATA[ >= ]]> #{tbStAppXcxx.xcdlwzJdStrat , jdbcType=INTEGER }
......@@ -89,7 +91,7 @@
AND DJSJ = #{tbStAppXcxx.djsj , jdbcType=TIMESTAMP }
</if>
<if test="tbStAppXcxx.xxdjdwGajgjgdm != null and tbStAppXcxx.xxdjdwGajgjgdm != ''">
AND XXDJDW_GAJGJGDM like '%' || #{tbStAppXcxx.xxdjdwGajgjgdm , jdbcType=VARCHAR } || '%'
AND XXDJDW_GAJGJGDM like concat('%',#{tbStAppXcxx.xxdjdwGajgjgdm jdbcType=VARCHAR },'%')
</if>
<if test="tbStAppXcxx.cksjStart != null">
AND CKSJ <![CDATA[ >= ]]> #{tbStAppXcxx.cksjStart , jdbcType=TIMESTAMP }
......@@ -111,16 +113,18 @@
</foreach>
</if>
order by djsj desc
) t where rownum <![CDATA[ <= ]]> #{tbStAppXcxx.end} ) where r <![CDATA[ > ]]> #{tbStAppXcxx.begin}
) t1,(SELECT @rownum:=0) r
)b where rownum <![CDATA[ <= ]]> #{tbStAppXcxx.end})a
where rownum <![CDATA[ > ]]> #{tbStAppXcxx.begin}
</select>
<select id="selectPageCount" resultType="java.lang.Integer">
SELECT
count(1)
FROM TB_ST_APP_XCXX
FROM tb_st_app_xcxx
where xxsc_pdbz = '0'
<if test="tbStAppXcxx.xcmc != null and tbStAppXcxx.xcmc != ''">
AND (XCMC like '%' || #{tbStAppXcxx.xcmc , jdbcType=VARCHAR } || '%' or
xcbh like '%' || #{tbStAppXcxx.xcmc , jdbcType=VARCHAR } || '%')
AND (XCMC like concat('%',#{tbStAppXcxx.xcmc, jdbcType=VARCHAR},'%') or
xcbh like concat('%',#{tbStAppXcxx.xcmc, jdbcType=VARCHAR},'%'))
</if>
<if test="tbStAppXcxx.xcdlwzJdStrat != null">
AND XCDLWZ_JD <![CDATA[ >= ]]> #{tbStAppXcxx.xcdlwzJdStrat , jdbcType=INTEGER }
......@@ -141,7 +145,7 @@
AND DJSJ = #{tbStAppXcxx.djsj , jdbcType=TIMESTAMP }
</if>
<if test="tbStAppXcxx.xxdjdwGajgjgdm != null and tbStAppXcxx.xxdjdwGajgjgdm != ''">
AND XXDJDW_GAJGJGDM like '%' || #{tbStAppXcxx.xxdjdwGajgjgdm , jdbcType=VARCHAR } || '%'
AND XXDJDW_GAJGJGDM like concat('%',#{tbStAppXcxx.xxdjdwGajgjgdm, jdbcType=VARCHAR},'%')
</if>
<if test="tbStAppXcxx.cksjStart != null">
AND CKSJ <![CDATA[ >= ]]> #{tbStAppXcxx.cksjStart , jdbcType=TIMESTAMP }
......
src/main/java/org/springblade/founder/xcxx/service/impl/TbStAppWzxxServiceImpl.java
......@@ -19,7 +19,6 @@ import java.util.List;
import java.util.Map;
@Service
@DS("xzxt_hn")
public class TbStAppWzxxServiceImpl implements TbStAppWzxxService {
@Autowired
......
src/main/java/org/springblade/founder/xcxx/service/impl/XcxxServiceImpl.java
......@@ -36,7 +36,6 @@ import java.util.Map;
import java.util.Set;
@Service
@DS("xzxt_hn")
public class XcxxServiceImpl implements XcxxService {
@Autowired
......
src/main/java/org/springblade/founder/xxtz/mapper/XxtzMapper.xml
......@@ -3,18 +3,18 @@
<mapper namespace="org.springblade.founder.xxtz.mapper.XxtzMapper">
<select id="selectXsajCountByDw" resultType="java.lang.Integer">
select count(1)
from TB_ST_ASJ
from tb_st_asj
where XXSC_PDBZ = '0'
and XXDJDW_GAJGJGDM like #{dwlike} || '%'
and ASJFSSJ_ASJFSKSSJ <![CDATA[ > ]]> to_date(#{date}, 'yyyy-mm-dd hh24:mi:ss')
and XXDJDW_GAJGJGDM like concat(#{dwlike},'%')
and ASJFSSJ_ASJFSKSSJ <![CDATA[ > ]]> STR_TO_DATE(#{date}, 'yyyy-mm-dd hh24:mi:ss')
</select>
<select id="selectYphXsajCountByDw" resultType="java.lang.Integer">
select count(1)
from TB_ST_ASJ
from tb_st_asj
where XXSC_PDBZ = '0'
and ZCJDDM = '0600'
and XXDJDW_GAJGJGDM like #{dwlike} || '%'
and ASJFSSJ_ASJFSKSSJ <![CDATA[ > ]]> to_date(#{date}, 'yyyy-mm-dd hh24:mi:ss')
and XXDJDW_GAJGJGDM like concat(#{dwlike},'%')
and ASJFSSJ_ASJFSKSSJ <![CDATA[ > ]]> STR_TO_DATE(#{date}, 'yyyy-mm-dd hh24:mi:ss')
</select>
<select id="selectHcslByDjr" resultType="java.lang.Integer">
select count(1)
......@@ -26,31 +26,31 @@
</select>
<select id="selectXcxxCountByDjr" resultType="java.lang.Integer">
select count(1)
from TB_ST_APP_XCXX
from tb_st_app_xcxx
where XXSC_PDBZ = '0'
and XXDJRY_GMSFHM = #{zjhm,jdbcType=VARCHAR}
</select>
<select id="selectRyxxCountByDjr" resultType="java.lang.Integer">
select count(1)
from TB_ST_APP_RYXX
from tb_st_app_ryxx
where XXSC_PDBZ = '0'
and XXDJRY_GMSFHM = #{zjhm,jdbcType=VARCHAR}
</select>
<select id="selectDzblCountByDjr" resultType="java.lang.Integer">
select count(1)
from TB_ST_APP_DZBL
from tb_st_app_dzbl
where XXSC_PDBZ = '0'
and XXDJRY_GMSFHM = #{zjhm,jdbcType=VARCHAR}
</select>
<select id="selectXsxxCountByDjr" resultType="java.lang.Integer">
select count(1)
from TB_ST_APP_XS
from tb_st_app_xs
where XXSC_PDBZ = '0'
and XXDJRY_GMSFHM = #{zjhm,jdbcType=VARCHAR}
</select>
<select id="selectXssbCountByDjr" resultType="java.lang.Integer">
select count(1)
from TB_ST_APP_XS
from tb_st_app_xs
where XXSC_PDBZ = '0'
and XSZT = '1'
and XXDJRY_GMSFHM = #{zjhm,jdbcType=VARCHAR}
......
src/main/java/org/springblade/founder/xxtz/service/impl/XxtzServiceImpl.java
......@@ -46,7 +46,6 @@ public class XxtzServiceImpl implements XxtzService {
}
@Override
@DS("db1")
public Integer getHcsl() {
XzxtUser userXzxt = SecureUtil.getUserXzxt();
return xxtzMapper.selectHcslByDjr(userXzxt.getIdentitycard());
......
src/main/java/org/springblade/founder/ydjwhc/mapper/QgBjHcMapper.xml
......@@ -12,14 +12,14 @@
asj.JYAQ as jyaq,
asj.ASJFSDD_DQJD as jd,
asj.ASJFSDD_DQWD as wd
from TB_ST_ASJ asj,
TB_XW_ZBFZXYR xyr
from tb_st_asj asj,
tb_xw_zbfzxyr xyr
where xyr.ZHFZXYR_CYZJ_ZJHM = #{sfzh,jdbcType=VARCHAR}
and xyr.asjbh = asj.asjbh
and xyr.xxsc_pdbz = '0'
and asj.xxsc_pdbz = '0'
<if test="qsAjList != null and qsAjList.size() > 0">
and not exists(select asjbh from TB_ST_ASJ where asjbh in
and not exists(select asjbh from tb_st_asj where asjbh in
<foreach collection="qsAjList" item="item" open="(" separator=", " close=")">
#{item.asjbh,jdbcType=VARCHAR}
</foreach>)
......@@ -36,11 +36,11 @@
asj.JYAQ as jyaq,
asj.ASJFSDD_DQJD as jd,
asj.ASJFSDD_DQWD as wd
from TB_ST_ASJ asj
from tb_st_asj asj
where asj.xxsc_pdbz = '0'
and asj.JYAQ like '%' || #{cphm,jdbcType=VARCHAR} || '%'
and asj.JYAQ like concat(concat('%', #{cphm,jdbcType=VARCHAR }),'%')
<if test="qsAjList != null and qsAjList.size() > 0">
and not exists(select asjbh from TB_ST_ASJ where asjbh in
and not exists(select asjbh from tb_st_asj where asjbh in
<foreach collection="qsAjList" item="item" open="(" separator=", " close=")">
#{item.asjbh,jdbcType=VARCHAR}
</foreach>)
......
src/main/java/org/springblade/founder/ydjwhc/mapper/QsBjHcMapper.xml
......@@ -6,7 +6,7 @@
CODE_TXT as CODE,
AJLB_CODE_TXT as AJLB,
SABQ_TXT as SABQ
from TB_ST_RYBZ
from tb_st_rybz
where ZJHM = #{sfzh,jdbcType=VARCHAR}
and xxsc_pdbz = '0'
</select>
......@@ -21,9 +21,9 @@
asj.JYAQ as jyaq,
asj.ASJFSDD_DQJD as jd,
asj.ASJFSDD_DQWD as wd,
(select name from SYS_DICTITEM where GROUPID = 'CODE_AJLB' and CODE = asj.ajlbdm) as ajlb
from TB_ST_ASJ asj,
TB_XW_ZBFZXYR xyr
(select name from sys_dictitem where GROUPID = 'CODE_AJLB' and CODE = asj.ajlbdm) as ajlb
from tb_st_asj asj,
tb_xw_zbfzxyr xyr
where xyr.ZHFZXYR_CYZJ_ZJHM = #{sfzh,jdbcType=VARCHAR}
and xyr.asjbh = asj.asjbh
and xyr.xxsc_pdbz = '0'
......@@ -41,15 +41,15 @@
asj.JYAQ as jyaq,
asj.ASJFSDD_DQJD as jd,
asj.ASJFSDD_DQWD as wd,
(select name from SYS_DICTITEM where GROUPID = 'CODE_AJLB' and CODE = asj.ajlbdm) as ajlb
from TB_ST_ASJ asj
(select name from sys_dictitem where GROUPID = 'CODE_AJLB' and CODE = asj.ajlbdm) as ajlb
from tb_st_asj asj
where asj.xxsc_pdbz = '0'
and JYAQ like '%' || #{cphm,jdbcType=VARCHAR} || '%'
and JYAQ like concat('%',#{cphm, jdbcType=VARCHAR },'%')
order by asj.djsj desc
</select>
<select id="getNameByCodeAndGroupid" resultType="java.lang.String">
select name
from SYS_DICTITEM
from sys_dictitem
where code = #{code}
and groupid = #{groupid}
</select>
......@@ -64,8 +64,8 @@
asj.JYAQ as jyaq,
asj.ASJFSDD_DQJD as jd,
asj.ASJFSDD_DQWD as wd,
(select name from SYS_DICTITEM where GROUPID = 'CODE_AJLB' and CODE = asj.ajlbdm) as ajlb
from TB_ST_ASJ asj
(select name from sys_dictitem where GROUPID = 'CODE_AJLB' and CODE = asj.ajlbdm) as ajlb
from tb_st_asj asj
where asj.xxsc_pdbz = '0'
and asj.ASJBH = #{asjbh,jdbcType=VARCHAR}
order by asj.djsj desc
......
src/main/java/org/springblade/founder/ydjwhc/mapper/ZbxxjsMapper.xml
......@@ -12,8 +12,8 @@
JYAQ as jyaq,
ASJFSDD_DQJD as jd,
ASJFSDD_DQWD as wd,
(select name from SYS_DICTITEM where GROUPID = 'CODE_AJLB' and CODE = ajlbdm) as ajlb
from TB_ST_ASJ
(select name from sys_dictitem where GROUPID = 'CODE_AJLB' and CODE = ajlbdm) as ajlb
from tb_st_asj
where XXSC_PDBZ = '0'
and ASJFSDD_DQJD between #{jdStart} and #{jdEnd}
and ASJFSDD_DQWD between #{wdStart} and #{wdEnd}
......@@ -28,11 +28,11 @@
select zjhm,
xm,
xbdm,
(select name from SYS_DICTITEM where GROUPID = 'CODE_XB' and code = xbdm) as xbStr,
(select name from sys_dictitem where GROUPID = 'CODE_XB' and code = xbdm) as xbStr,
mzdm,
(select name from SYS_DICTITEM where GROUPID = 'CODE_MZ' and code = mzdm) as mzStr,
(select name from sys_dictitem where GROUPID = 'CODE_MZ' and code = mzdm) as mzStr,
xzqhdm,
(select name from SYS_DICTITEM where GROUPID = 'CODE_XZQH' and code = xzqhdm) as xzqhStr,
(select name from sys_dictitem where GROUPID = 'CODE_XZQH' and code = xzqhdm) as xzqhStr,
code,
zdy_code,
ajlb_code,
......@@ -51,7 +51,7 @@
syrk_zxjd,
syrk_zxwd,
syrk_djsj
from TB_ST_RYBZ
from tb_st_rybz
where XXSC_PDBZ = '0'
and syrk_zxjd between #{jdStart} and #{jdEnd}
and syrk_zxwd between #{wdStart} and #{wdEnd}
......
src/main/java/org/springblade/founder/ydjwhc/mapper/rybjhcMapper.xml
......@@ -3,7 +3,7 @@
<mapper namespace="org.springblade.founder.ydjwhc.mapper.RyxxbjhcDao">
<select id="getFzxyrByZjhm" parameterType="java.lang.String" resultType="java.lang.Integer">
select count(1)
from TB_XW_ZBFZXYR
from tb_xw_zbfzxyr
where zhfzxyr_cyzj_zjhm = #{zjhm}
</select>
......@@ -15,7 +15,7 @@
<select id="getZtryByZjhm" parameterType="java.lang.String" resultType="java.lang.Integer">
select count(1)
from TB_YW_ZTRY
from tb_yw_ztry
where zjhm = #{zjhm} and xxsc_pdbz = '0'
</select>
......
src/main/java/org/springblade/founder/ydjwhc/service/impl/QgBjHcServiceImpl.java
......@@ -32,6 +32,9 @@ public class QgBjHcServiceImpl implements QgBjHcService {
@Override
public List<HcAjJg> selectAjByCphm(String cphm, List<HcAjJg> qsAjList) {
if (qsAjList.size() == 0) {
qsAjList.add(null);
}
return qgBjHcMapper.selectAjByCphm(cphm, qsAjList);
}
}
src/main/java/org/springblade/modules/auth/controller/AuthController.java
......@@ -58,7 +58,6 @@ import java.util.concurrent.TimeUnit;
@RestController
@RequestMapping("blade-auth")
@Api(value = "用户授权认证", tags = "授权接口")
@DS("db1")
public class AuthController {
private RedisUtil redisUtil;
......@@ -93,9 +92,9 @@ public class AuthController {
if (userInfo == null || userInfo.getUser() == null) {
return R.fail(TokenUtil.USER_NOT_FOUND);
}
if (userInfo.getPermissions() == null || userInfo.getPermissions().size() == 0){
return R.fail(TokenUtil.USER_NOT_PERMISSIONS);
}
// if (userInfo.getPermissions() == null || userInfo.getPermissions().size() == 0){
// return R.fail(TokenUtil.USER_NOT_PERMISSIONS);
// }
return R.data(TokenUtil.createAuthInfo(userInfo));
}
......
src/main/java/org/springblade/modules/system/mapper/DictMapper.xml
......@@ -38,13 +38,6 @@
from blade_dict where code = #{param1} and dict_key = #{param2} and is_deleted = 0 limit 1
</select>
<!-- oracle 版本 -->
<!--<select id="getValue" resultType="java.lang.String">
select
dict_value
from blade_dict where code = #{param1, jdbcType=VARCHAR} and dict_key = #{param2} rownum 1
</select>-->
<select id="getList" resultMap="dictResultMap">
select code, dict_key, dict_value, sort, remark from blade_dict where code = #{param1} and dict_key >= 0 and is_deleted = 0
</select>
......
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
......@@ -185,18 +185,18 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
String str = StringUtils.join(nameList, ",");
userNew.setUserRoles(idList);
userNew.setUserRolesStr(str);
List<Map<String, String>> userMenusName = sysUserMapper.getUserMenus(idList);
if (userMenusName != null && userMenusName.size() > 0){
ArrayList<String> menuNameList = new ArrayList<>();
ArrayList<String> menuCodeList = new ArrayList<>();
for (Map<String, String> map : userMenusName) {
menuNameList.add(map.get("menuName"));
menuCodeList.add(map.get("menuCode"));
}
String menuStr = StringUtils.join(menuNameList, ",");
userNew.setUserMenus(menuCodeList);
userNew.setUserMenusStr(menuStr);
}
// List<Map<String, String>> userMenusName = sysUserMapper.getUserMenus(idList);
// if (userMenusName != null && userMenusName.size() > 0){
// ArrayList<String> menuNameList = new ArrayList<>();
// ArrayList<String> menuCodeList = new ArrayList<>();
// for (Map<String, String> map : userMenusName) {
// menuNameList.add(map.get("menuName"));
// menuCodeList.add(map.get("menuCode"));
// }
// String menuStr = StringUtils.join(menuNameList, ",");
// userNew.setUserMenus(menuCodeList);
// userNew.setUserMenusStr(menuStr);
// }
}
}
userInfo.setUser(userNew);
......@@ -277,7 +277,6 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
}
@Override
@DS("db1")
public String updatePassword(String userId, String oldPassword, String newPassword, String newPassword1) {
if (StringUtils.isEmpty(userId)){
return "202#用户id不能为空";
......
src/main/resources/application-dev.yml
......@@ -8,7 +8,7 @@ spring:
##redis 单机环境配置
host: 127.0.0.1
port: 6379
password:
password: 12345678
database: 0
ssl: false
# host: 74.6.54.152
......@@ -32,27 +32,18 @@ spring:
primary: xzxt_hn # 配置默认数据库
datasource:
xzxt_hn: #海南
# url: jdbc:oracle:thin:@10.184.17.3:1521:HNXZXT1
# username: XZXT
# password: XzxtPwd#46
url: jdbc:mysql://47.92.223.200:3365/xzxt?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
username: xzxt
password: xzxt
driver-class-name: com.mysql.cj.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
xzxt_qg: #全国
# url: jdbc:oracle:thin:@10.2.164.176:1521:xzdb176
# username: FZ_TS
# password: FZ_TS
url: jdbc:oracle:thin:@47.92.129.99:1560:orcl
username: XZXT
password: XzPwd#11022
driver-class-name: oracle.jdbc.driver.OracleDriver
type: com.alibaba.druid.pool.DruidDataSource
db1: #mysql库
# url: jdbc:mysql://74.10.26.176:4606/xzxt?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
# username: xzxt
# password: XzxtPwd_46
url: jdbc:oracle:thin:@47.92.129.99:1560:orcl
username: XZXT
password: XzPwd#11022
......
src/main/resources/application.yml
......@@ -9,7 +9,7 @@ server:
# 阻塞任务线程池, 当执行类似servlet请求阻塞操作, undertow会从这个线程池中取得线程,它的值设置取决于系统的负载
# 以下的配置会影响buffer,这些buffer会用于服务器连接的IO操作,有点类似netty的池化内存管理
buffer-size: 1024
# 是否分配的直接内存
# 是否分配的直接
direct-buffers: true
#spring配置
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment