Skip to content

S
sv-springboot
Commit ec265523 by Suvalue
Options

数据库修改到psql

parent 46c29070
Showing with 246 additions and 274 deletions
hs-api/pom.xml
......@@ -58,9 +58,9 @@
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.oracle</groupId>
<artifactId>ojdbc6</artifactId>
<version>6.0</version>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
......@@ -168,7 +168,6 @@
<!--endregion-->
</dependencies>
</plugin>
</plugins>
......
hs-api/src/main/java/com/hs/api/mapper/SerBlockMapper.java deleted 100644 → 0
package com.hs.api.mapper;
import com.hs.api.model.SerBlock;
import java.util.List;
public interface SerBlockMapper {
int deleteByPrimaryKey(Long id);
int insert(SerBlock record);
SerBlock selectByPrimaryKey(Long id);
List<SerBlock> selectAll();
int updateByPrimaryKey(SerBlock record);
}
\ No newline at end of file
hs-api/src/main/resources/mapper/DicDimMapper.xml
......@@ -17,7 +17,7 @@
</delete>
<insert id="insert" parameterType="com.hs.api.model.DicDim">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
SELECT LAST_INSERT_ID()
select nextval('dic_dim_info_id_seq')
</selectKey>
insert into dic_dim_info (CREATE_DATE, CREATE_USERID, `STATE`,
DIM_NAME, DIM_FIELD, DIM_TYPE
......@@ -30,19 +30,19 @@
update dic_dim_info
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
`STATE` = #{state,jdbcType=DECIMAL},
STATE = #{state,jdbcType=DECIMAL},
DIM_NAME = #{dimName,jdbcType=VARCHAR},
DIM_FIELD = #{dimField,jdbcType=VARCHAR},
DIM_TYPE = #{dimType,jdbcType=DECIMAL}
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, `STATE`, DIM_NAME, DIM_FIELD, DIM_TYPE
select ID, CREATE_DATE, CREATE_USERID, STATE, DIM_NAME, DIM_FIELD, DIM_TYPE
from dic_dim_info
where ID = #{id,jdbcType=DECIMAL}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, `STATE`, DIM_NAME, DIM_FIELD, DIM_TYPE
select ID, CREATE_DATE, CREATE_USERID, STATE, DIM_NAME, DIM_FIELD, DIM_TYPE
from dic_dim_info
</select>
<select id="selectByPageid" resultMap="BaseResultMap">
......
hs-api/src/main/resources/mapper/DicIndMapper.xml
......@@ -21,9 +21,12 @@
where ID = #{id,jdbcType=DECIMAL}
</delete>
<insert id="insert" parameterType="com.hs.api.model.DicInd">
insert into dic_ind_info (CREATE_DATE, CREATE_USERID, `STATE`,
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
SELECT nextval('dic_ind_info_id_seq')
</selectKey>
insert into dic_ind_info (CREATE_DATE, CREATE_USERID, STATE,
IND_CODE, IND_NAME, COMPUTE_MODE,
EXEC_SQL, `DESCRIBE`)
EXEC_SQL, DESCRIBE)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{indCode,jdbcType=VARCHAR}, #{indName,jdbcType=VARCHAR}, #{computeMode,jdbcType=DECIMAL},
#{execSql,jdbcType=VARCHAR}, #{describe,jdbcType=VARCHAR})
......@@ -32,24 +35,24 @@
update dic_ind_info
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
`STATE` = #{state,jdbcType=DECIMAL},
STATE = #{state,jdbcType=DECIMAL},
IND_CODE = #{indCode,jdbcType=VARCHAR},
IND_NAME = #{indName,jdbcType=VARCHAR},
COMPUTE_MODE = #{computeMode,jdbcType=DECIMAL},
EXEC_SQL = #{execSql,jdbcType=VARCHAR},
`DESCRIBE` = #{describe,jdbcType=VARCHAR}
DESCRIBE = #{describe,jdbcType=VARCHAR}
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select ID,
CREATE_DATE,
CREATE_USERID,
`STATE`,
STATE,
IND_CODE,
IND_NAME,
COMPUTE_MODE,
EXEC_SQL,
`DESCRIBE`
DESCRIBE
from dic_ind_info
where ID = #{id,jdbcType=DECIMAL}
</select>
......@@ -57,27 +60,27 @@
select ID,
CREATE_DATE,
CREATE_USERID,
`STATE`,
STATE,
IND_CODE,
IND_NAME,
COMPUTE_MODE,
EXEC_SQL,
`DESCRIBE`
DESCRIBE
from dic_ind_info
</select>
<select id="selectAllByFilter" resultMap="BaseResultMap">
select ID,
CREATE_DATE,
CREATE_USERID,
`STATE`,
STATE,
IND_CODE,
IND_NAME,
IND_FIELD,
COMPUTE_MODE,
EXEC_SQL,
`DESCRIBE`
DESCRIBE
from dic_ind_info
where INSTR(IND_NAME, #{filter,jdbcType=VARCHAR}) > 0
or INSTR(IND_FIELD, #{filter,jdbcType=VARCHAR}) > 0
where IND_NAME ~* #{filter,jdbcType=VARCHAR}
or IND_FIELD ~* #{filter,jdbcType=VARCHAR}
</select>
</mapper>
\ No newline at end of file
hs-api/src/main/resources/mapper/DicOrgMapper.xml
......@@ -32,9 +32,9 @@
</delete>
<insert id="insert" parameterType="com.hs.api.model.DicOrg">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
SELECT LAST_INSERT_ID()
SELECT nextval('sys_subject_id_seq')
</selectKey>
insert into sys_subject (CREATE_DATE, CREATE_USERID, `STATE`,
insert into sys_subject (CREATE_DATE, CREATE_USERID, STATE,
ORG_CODE, ORG_NAME, ORG_NO,
ORG_SHORT_NAME, ORG_GROUP, ORG_TYPE,
ORG_ADDRESS, PARENT_ID)
......@@ -47,7 +47,7 @@
update sys_subject
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
`STATE` = #{state,jdbcType=DECIMAL},
STATE = #{state,jdbcType=DECIMAL},
ORG_CODE = #{orgCode,jdbcType=VARCHAR},
ORG_NAME = #{orgName,jdbcType=VARCHAR},
ORG_NO = #{orgNo,jdbcType=VARCHAR},
......@@ -62,7 +62,7 @@
select ID,
CREATE_DATE,
CREATE_USERID,
`STATE`,
STATE,
ORG_CODE,
ORG_NAME,
ORG_NO,
......@@ -78,7 +78,7 @@
select ID,
CREATE_DATE,
CREATE_USERID,
`STATE`,
STATE,
ORG_CODE,
ORG_NAME,
ORG_NO,
......
hs-api/src/main/resources/mapper/SerBlockMapper.xml deleted 100644 → 0
<?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="com.hs.api.mapper.SerBlockMapper">
<resultMap id="BaseResultMap" type="com.hs.api.model.SerBlock">
<id column="ID" jdbcType="DECIMAL" property="id"/>
<result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate"/>
<result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid"/>
<result column="STATE" jdbcType="DECIMAL" property="state"/>
<result column="BLOCK_CODE" jdbcType="VARCHAR" property="blockCode"/>
<result column="BLOCK_NAME" jdbcType="VARCHAR" property="blockName"/>
<result column="RETURN_TYPE" jdbcType="DECIMAL" property="returnType"/>
</resultMap>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete
from SER_BLOCK
where ID = #{id,jdbcType=DECIMAL}
</delete>
<insert id="insert" parameterType="com.hs.api.model.SerBlock">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
SELECT LAST_INSERT_ID()
</selectKey>
insert into SER_BLOCK (CREATE_DATE, CREATE_USERID, `STATE`,
BLOCK_CODE, BLOCK_NAME, RETURN_TYPE
)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{blockCode,jdbcType=VARCHAR}, #{blockName,jdbcType=VARCHAR}, #{returnType,jdbcType=DECIMAL}
)
</insert>
<update id="updateByPrimaryKey" parameterType="com.hs.api.model.SerBlock">
update SER_BLOCK
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
`STATE` = #{state,jdbcType=DECIMAL},
BLOCK_CODE = #{blockCode,jdbcType=VARCHAR},
BLOCK_NAME = #{blockName,jdbcType=VARCHAR},
RETURN_TYPE = #{returnType,jdbcType=DECIMAL}
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, `STATE`, BLOCK_CODE, BLOCK_NAME, RETURN_TYPE
from SER_BLOCK
where ID = #{id,jdbcType=DECIMAL}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, `STATE`, BLOCK_CODE, BLOCK_NAME, RETURN_TYPE
from SER_BLOCK
</select>
</mapper>
\ No newline at end of file
hs-api/src/main/resources/mapper/SerDepartmentMapper.xml
......@@ -12,36 +12,31 @@
</resultMap>
<delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
delete
from SER_DEPARTMENT
from sys_subject
where ID = #{id,jdbcType=DECIMAL}
</delete>
<insert id="insert" parameterType="com.hs.api.model.SerDepartment">
<selectKey keyProperty="id" order="AFTER" resultType="java.math.BigDecimal">
SELECT LAST_INSERT_ID()
SELECT nextval('sys_subject_id_seq')
</selectKey>
insert into SER_DEPARTMENT (CREATE_DATE, CREATE_USERID, `STATE`,
ORG_ID, KSBM, KSMC)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{orgId,jdbcType=VARCHAR}, #{ksbm,jdbcType=VARCHAR}, #{ksmc,jdbcType=VARCHAR})
insert into sys_subject (CREATE_DATE, CREATE_USERID, STATE
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL})
</insert>
<update id="updateByPrimaryKey" parameterType="com.hs.api.model.SerDepartment">
update SER_DEPARTMENT
update sys_subject
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
`STATE` = #{state,jdbcType=DECIMAL},
ORG_ID = #{orgId,jdbcType=VARCHAR},
KSBM = #{ksbm,jdbcType=VARCHAR},
KSMC = #{ksmc,jdbcType=VARCHAR}
STATE = #{state,jdbcType=DECIMAL}
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, `STATE`, ORG_ID, KSBM, KSMC
from SER_DEPARTMENT
select ID, CREATE_DATE, CREATE_USERID, STATE
from sys_subject
where ID = #{id,jdbcType=DECIMAL}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, `STATE`, ORG_ID, KSBM, KSMC
from SER_DEPARTMENT
select ID, CREATE_DATE, CREATE_USERID, STATE
from sys_subject
</select>
<select id="selectSummaryDept" resultMap="BaseResultMap">
select DEPT_CODE as KSBM,DEPT_NAME as KSMC
......
hs-api/src/main/resources/mapper/SerDeptDocRsMapper.xml
......@@ -2,19 +2,20 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hs.api.mapper.SerDeptDocRsMapper">
<resultMap id="BaseResultMap" type="com.hs.api.model.SerDeptDocRs">
<id column="ID" jdbcType="DECIMAL" property="id" />
<result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate" />
<result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" />
<result column="STATE" jdbcType="DECIMAL" property="state" />
<result column="ORG_ID" jdbcType="VARCHAR" property="orgId" />
<result column="KSBM" jdbcType="VARCHAR" property="ksbm" />
<result column="KSMC" jdbcType="VARCHAR" property="ksmc" />
<result column="YSBM" jdbcType="VARCHAR" property="ysbm" />
<result column="YSMC" jdbcType="VARCHAR" property="ysmc" />
<result column="YSLX" jdbcType="VARCHAR" property="yslx" />
<id column="ID" jdbcType="DECIMAL" property="id"/>
<result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate"/>
<result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid"/>
<result column="STATE" jdbcType="DECIMAL" property="state"/>
<result column="ORG_ID" jdbcType="VARCHAR" property="orgId"/>
<result column="KSBM" jdbcType="VARCHAR" property="ksbm"/>
<result column="KSMC" jdbcType="VARCHAR" property="ksmc"/>
<result column="YSBM" jdbcType="VARCHAR" property="ysbm"/>
<result column="YSMC" jdbcType="VARCHAR" property="ysmc"/>
<result column="YSLX" jdbcType="VARCHAR" property="yslx"/>
</resultMap>
<delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
delete from SER_DEPT_DOC_RS
delete
from SER_DEPT_DOC_RS
where ID = #{id,jdbcType=DECIMAL}
</delete>
<insert id="insert" parameterType="com.hs.api.model.SerDeptDocRs">
......@@ -32,7 +33,7 @@
update SER_DEPT_DOC_RS
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
`STATE` = #{state,jdbcType=DECIMAL},
STATE = #{state,jdbcType=DECIMAL},
ORG_ID = #{orgId,jdbcType=VARCHAR},
KSBM = #{ksbm,jdbcType=VARCHAR},
KSMC = #{ksmc,jdbcType=VARCHAR},
......@@ -42,12 +43,30 @@
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, `STATE`, ORG_ID, KSBM, KSMC, YSBM, YSMC, YSLX
select ID,
CREATE_DATE,
CREATE_USERID,
` STATE `,
ORG_ID,
KSBM,
KSMC,
YSBM,
YSMC,
YSLX
from SER_DEPT_DOC_RS
where ID = #{id,jdbcType=DECIMAL}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, `STATE`, ORG_ID, KSBM, KSMC, YSBM, YSMC, YSLX
select ID,
CREATE_DATE,
CREATE_USERID,
` STATE `,
ORG_ID,
KSBM,
KSMC,
YSBM,
YSMC,
YSLX
from SER_DEPT_DOC_RS
</select>
</mapper>
\ No newline at end of file
hs-api/src/main/resources/mapper/SerDiseaseMapper.xml
......@@ -37,11 +37,11 @@
</resultMap>
<insert id="insert" parameterType="com.hs.api.model.SerDisease">
<selectKey keyProperty="id" order="AFTER" resultType="java.math.BigDecimal">
SELECT LAST_INSERT_ID()
SELECT nextval('dic_disease_id_seq')
</selectKey>
insert into dic_disease (CREATE_DATE, CREATE_USERID, `STATE`,
MDC_CODE, MDC_NAME, `DATE`,
MDC_NUM, PARENT_ID, `LEVEL`,
insert into dic_disease (CREATE_DATE, CREATE_USERID, STATE,
MDC_CODE, MDC_NAME, DATE,
MDC_NUM, PARENT_ID, LEVEL,
ORG_ID, ORG_NAME, PARENT_CODE,GROUP_TYPE
)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
......@@ -55,13 +55,13 @@
select ID,
CREATE_DATE,
CREATE_USERID,
`STATE`,
STATE,
MDC_CODE,
MDC_NAME,
`DATE`,
DATE,
MDC_NUM,
PARENT_ID,
`LEVEL`,
LEVEL,
ORG_ID,
ORG_NAME,
PARENT_CODE,
......@@ -75,10 +75,10 @@
and d.MDC_CODE = #{code,jdbcType=VARCHAR}
</select>
<select id="selectByMdcName" resultMap="DiseaseName">
select d.*,d2.MDC_NAME as PARENT_MDC_NAME,d2.`LEVEL` as PARENT_MDC_LEVEL
select d.*,d2.MDC_NAME as PARENT_MDC_NAME,d2.LEVEL as PARENT_MDC_LEVEL
from (
SELECT null as PARENT_MDC_CODE,ZBZBM as MDC_CODE,ZBZ as MDC_NAME
FROM `val_block_values_1_2_2`
FROM val_block_values_1_2_2
where 1=1
<if test="date!=null">
and TIME = #{date}
......@@ -92,7 +92,7 @@
UNION
SELECT ZBZBM as PARENT_MDC_CODE,YJBZBM as MDC_CODE,YJBZ as MDC_NAME
FROM `val_block_values_1_5_2`
FROM val_block_values_1_5_2
where 1=1
<if test="date!=null">
and TIME = #{date}
......@@ -109,18 +109,18 @@
where 1=1
<if test="mdcNameList!=null">
<foreach item="item" index="index" collection="mdcNameList">
and INSTR(d.MDC_NAME,#{item,jdbcType=VARCHAR})>0
and d.MDC_NAME ~* #{item,jdbcType=VARCHAR}
</foreach>
</if>
</select>
<select id="selectByLevel" resultMap="DiseaseLevel">
select d.ID, d.CREATE_DATE, d.CREATE_USERID, d.`STATE`, d.MDC_CODE, d.MDC_NAME, d.`DATE`,d.MDC_NUM,
d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME,d.GROUP_TYPE,val.ZLS
select d.ID, d.CREATE_DATE, d.CREATE_USERID, d.STATE, d.MDC_CODE, d.MDC_NAME, d.DATE,d.MDC_NUM,
d.PARENT_ID, d.LEVEL, d.ORG_ID, d.ORG_NAME,d.GROUP_TYPE,val.ZLS
from dic_disease d
<if test="deptCode!=null">
join (select ZBZBM,KSBM,ZLS as ZLS
from val_block_values_1_2_2
where `TIME`=#{date} and ZLS>0
where TIME=#{date} and ZLS>0
and KSBM=#{deptCode,jdbcType=VARCHAR}
group by ZBZBM,KSBM) val on val.ZBZBM = d.MDC_CODE
</if>
......@@ -131,35 +131,35 @@
</if>
where 1 = 1 and STATE=1
<if test="level!=null">
and d.`LEVEL` = #{level,jdbcType=DECIMAL}
and d.LEVEL = #{level,jdbcType=DECIMAL}
</if>
order by val.ZLS desc
</select>
<select id="selectByLevelNoZBZ" resultMap="DiseaseLevel">
select d.ID, d.CREATE_DATE, d.CREATE_USERID, d.`STATE`, d.MDC_CODE, d.MDC_NAME, d.`DATE`,d.MDC_NUM,
d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME,d.GROUP_TYPE
select d.ID, d.CREATE_DATE, d.CREATE_USERID, d.STATE, d.MDC_CODE, d.MDC_NAME, d.DATE,d.MDC_NUM,
d.PARENT_ID, d.LEVEL , d.ORG_ID, d.ORG_NAME,d.GROUP_TYPE
from dic_disease d
where 1 = 1 and STATE=1
<if test="level!=null">
and d.`LEVEL` = #{level,jdbcType=DECIMAL}
and d.LEVEL = #{level,jdbcType=DECIMAL}
</if>
order by d.MDC_NUM
</select>
<select id="selectByParentId" resultMap="DiseaseLevel">
select d.ID, d.CREATE_DATE, d.CREATE_USERID, d.`STATE`, d.MDC_CODE, d.MDC_NAME, d.`DATE`,d.MDC_NUM,
d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME,d.GROUP_TYPE,val.ZLS
select d.ID, d.CREATE_DATE, d.CREATE_USERID, d.STATE, d.MDC_CODE, d.MDC_NAME, d.DATE,d.MDC_NUM,
d.PARENT_ID, d.LEVEL, d.ORG_ID, d.ORG_NAME,d.GROUP_TYPE,val.ZLS
from dic_disease d
<if test="deptCode!=null">
join (select ZBZBM,KSBM,ZLS as ZLS
from val_block_values_1_2_2
where `TIME`=#{date} and ZLS>0
where TIME=#{date} and ZLS>0
and KSBM=#{deptCode,jdbcType=VARCHAR}
group by ZBZBM,KSBM) val on val.ZBZBM = d.MDC_CODE
</if>
<if test="deptCode==null">
join (select ZBZBM,SUM(ZLS) as ZLS
from val_block_values_1_1_2
where `TIME`=#{date} and ZLS>0
where TIME=#{date} and ZLS>0
group by ZBZBM) val on val.ZBZBM = d.MDC_CODE
</if>
where 1 = 1 and STATE=1 and STATE=1
......@@ -169,20 +169,20 @@
order by val.ZLS desc
</select>
<select id="selectByParentIdNoZbz" resultMap="DiseaseLevel">
select d.ID, d.CREATE_DATE, d.CREATE_USERID, d.`STATE`, d.MDC_CODE, d.MDC_NAME, d.`DATE`,d.MDC_NUM,
d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME,d.GROUP_TYPE,val.ZLS
select d.ID, d.CREATE_DATE, d.CREATE_USERID, d.STATE, d.MDC_CODE, d.MDC_NAME, d.DATE,d.MDC_NUM,
d.PARENT_ID, d.LEVEL, d.ORG_ID, d.ORG_NAME,d.GROUP_TYPE,val.ZLS
from dic_disease d
<if test="deptCode!=null">
join (select YJBZBM,KSBM,ZLS as ZLS
from val_block_values_1_5_2
where `TIME`=#{date}
where TIME=#{date}
and KSBM=#{deptCode,jdbcType=VARCHAR}
group by YJBZBM,KSBM) val on val.YJBZBM = d.MDC_CODE
</if>
<if test="deptCode==null">
join (select YJBZBM,ZLS as ZLS
from val_block_values_1_3_2
where `TIME`=#{date}
where TIME=#{date}
group by YJBZBM) val on val.YJBZBM = d.MDC_CODE
</if>
where 1 = 1 and STATE=1 and STATE=1
......@@ -196,7 +196,7 @@
from dic_disease d
join (select ZBZBM,ZLS as ZLS
from val_block_values_1_1_2
where `TIME`=#{date} and ZLS>0
where TIME=#{date} and ZLS>0
group by ZBZBM) val on val.ZBZBM = d.MDC_CODE
where 1 = 1 and d.STATE=1
<if test="diseaseId!=null">
......@@ -213,13 +213,13 @@
</if>
</select>
<select id="selectSonById" resultMap="DiseaseLevel">
select d.ID, d.CREATE_DATE, d.CREATE_USERID, d.STATE, d.MDC_CODE, d.MDC_NAME, d.`DATE`,d.MDC_NUM,
d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME,d.GROUP_TYPE,val.ZLS
select d.ID, d.CREATE_DATE, d.CREATE_USERID, d.STATE, d.MDC_CODE, d.MDC_NAME, d.DATE,d.MDC_NUM,
d.PARENT_ID, d.LEVEL, d.ORG_ID, d.ORG_NAME,d.GROUP_TYPE,val.ZLS
from dic_disease d
<if test="deptCode!=null">
left join (select YJBZBM,KSBM,ZLS as ZLS
from val_block_values_1_5_2
where `TIME`=#{date}
where TIME=#{date}
and KSBM=#{deptCode,jdbcType=VARCHAR}
group by YJBZBM,KSBM) val on val.YJBZBM = d.MDC_CODE
</if>
......
hs-api/src/main/resources/mapper/SerPageBlockRsMapper.xml
......@@ -18,7 +18,7 @@
</delete>
<insert id="insert" parameterType="com.hs.api.model.SerPageBlockRs">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
SELECT LAST_INSERT_ID()
SELECT nextval('dic_page_block_rs_id_seq')
</selectKey>
insert into dic_page_block_rs (CREATE_DATE, CREATE_USERID, `STATE`,
BLOCK_ID, PAGE_ID, WHERE_CLAUSE,`TABLE_NAME`
......@@ -32,22 +32,22 @@
update dic_page_block_rs
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
`STATE` = #{state,jdbcType=DECIMAL},
STATE = #{state,jdbcType=DECIMAL},
BLOCK_ID = #{blockId,jdbcType=DECIMAL},
PAGE_ID = #{pageId,jdbcType=DECIMAL},
WHERE_CLAUSE = #{whereClause,jdbcType=VARCHAR},
`TABLE_NAME` = #{tableName,jdbcType=VARCHAR}
TABLE_NAME= #{tableName,jdbcType=VARCHAR}
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select ID,
CREATE_DATE,
CREATE_USERID,
`STATE`,
STATE,
BLOCK_ID,
PAGE_ID,
WHERE_CLAUSE,
`TABLE_NAME`
TABLE_NAME
from dic_page_block_rs
where ID = #{id,jdbcType=DECIMAL}
</select>
......@@ -55,24 +55,24 @@
select ID,
CREATE_DATE,
CREATE_USERID,
`STATE`,
STATE,
BLOCK_ID,
PAGE_ID,
WHERE_CLAUSE,
`TABLE_NAME`
TABLE_NAME
from dic_page_block_rs
</select>
<select id="selectByPageId" resultMap="BaseResultMap">
select ID,
CREATE_DATE,
CREATE_USERID,
`STATE`,
STATE,
BLOCK_ID,
PAGE_ID,
WHERE_CLAUSE,
`TABLE_NAME`
TABLE_NAME
from dic_page_block_rs
where PAGE_ID = #{pageID,jdbcType=DECIMAL}
and `STATE` = 1
and STATE = 1
</select>
</mapper>
\ No newline at end of file
hs-api/src/main/resources/mapper/SerPageFieldMapper.xml
......@@ -12,9 +12,9 @@
</resultMap>
<insert id="insert" parameterType="com.hs.api.model.SerPageField">
<selectKey keyProperty="id" order="AFTER" resultType="java.math.BigDecimal">
SELECT LAST_INSERT_ID()
SELECT nextval('SER_PAGE_FIELD_id_seq')
</selectKey>
insert into SER_PAGE_FIELD (CREATE_DATE, CREATE_USERID, `STATE`,
insert into ser_page_field (CREATE_DATE, CREATE_USERID, STATE,
FIELD_CODE, FIELD_NAME, REMARK
)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
......@@ -22,7 +22,7 @@
)
</insert>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, `STATE`, FIELD_CODE, FIELD_NAME, REMARK
from SER_PAGE_FIELD
select ID, CREATE_DATE, CREATE_USERID, STATE, FIELD_CODE, FIELD_NAME, REMARK
from ser_page_field
</select>
</mapper>
\ No newline at end of file
hs-api/src/main/resources/mapper/SerPageMapper.xml
......@@ -16,7 +16,7 @@
</delete>
<insert id="insert" parameterType="com.hs.api.model.SerPage">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
SELECT LAST_INSERT_ID()
SELECT nextval('dic_page_info_id_seq')
</selectKey>
insert into dic_page_info (CREATE_DATE, CREATE_USERID, `STATE`,
PAGE_CODE, PAGE_NAME)
......
hs-api/src/main/resources/mapper/SerPageProjFieldRsMapper.xml
......@@ -2,21 +2,21 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.hs.api.mapper.SerPageProjFieldRsMapper">
<resultMap id="BaseResultMap" type="com.hs.api.model.SerPageProjFieldRs">
<result column="ID" jdbcType="DECIMAL" property="id" />
<result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate" />
<result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" />
<result column="STATE" jdbcType="DECIMAL" property="state" />
<result column="PROJ_TYPE" jdbcType="DECIMAL" property="projType" />
<result column="PROJ_ID" jdbcType="DECIMAL" property="projId" />
<result column="FIELD_ID" jdbcType="DECIMAL" property="fieldId" />
<result column="REMARK" jdbcType="VARCHAR" property="remark" />
<result column="SORT" jdbcType="DECIMAL" property="sort" />
<result column="ID" jdbcType="DECIMAL" property="id"/>
<result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate"/>
<result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid"/>
<result column="STATE" jdbcType="DECIMAL" property="state"/>
<result column="PROJ_TYPE" jdbcType="DECIMAL" property="projType"/>
<result column="PROJ_ID" jdbcType="DECIMAL" property="projId"/>
<result column="FIELD_ID" jdbcType="DECIMAL" property="fieldId"/>
<result column="REMARK" jdbcType="VARCHAR" property="remark"/>
<result column="SORT" jdbcType="DECIMAL" property="sort"/>
</resultMap>
<insert id="insert" parameterType="com.hs.api.model.SerPageProjFieldRs">
<selectKey keyProperty="id" order="AFTER" resultType="java.math.BigDecimal">
SELECT LAST_INSERT_ID()
SELECT nextval('ser_page_proj_field_rs_id_seq')
</selectKey>
insert into SER_PAGE_PROJ_FIELD_RS (CREATE_DATE, CREATE_USERID, `STATE`,
insert into SER_PAGE_PROJ_FIELD_RS (CREATE_DATE, CREATE_USERID, STATE,
PROJ_TYPE, PROJ_ID, FIELD_ID,
REMARK, SORT)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
......@@ -24,7 +24,14 @@
#{remark,jdbcType=VARCHAR}, #{sort,jdbcType=DECIMAL})
</insert>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, `STATE`, PROJ_TYPE, PROJ_ID, FIELD_ID, REMARK,
select ID,
CREATE_DATE,
CREATE_USERID,
STATE,
PROJ_TYPE,
PROJ_ID,
FIELD_ID,
REMARK,
SORT
from SER_PAGE_PROJ_FIELD_RS
</select>
......
hs-api/src/main/resources/mapper/SerPageProjMapper.xml
......@@ -12,9 +12,9 @@
</resultMap>
<insert id="insert" parameterType="com.hs.api.model.SerPageProj">
<selectKey keyProperty="id" order="AFTER" resultType="java.math.BigDecimal">
SELECT LAST_INSERT_ID()
SELECT nextval('seq_page_proj')
</selectKey>
insert into SER_PAGE_PROJ (CREATE_DATE, CREATE_USERID, `STATE`,
insert into SER_PAGE_PROJ (CREATE_DATE, CREATE_USERID, STATE,
PROJ_NAME, PROJ_CODE, PROJ_TYPE
)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
......@@ -22,7 +22,7 @@
)
</insert>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, `STATE`, PROJ_NAME, PROJ_CODE, PROJ_TYPE
select ID, CREATE_DATE, CREATE_USERID, STATE, PROJ_NAME, PROJ_CODE, PROJ_TYPE
from SER_PAGE_PROJ
</select>
</mapper>
\ No newline at end of file
hs-api/src/main/resources/mapper/SerProjMapper.xml
......@@ -23,12 +23,12 @@
</resultMap>
<delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
delete
from SER_PROJ
from dic_bgt_proj
where ID = #{id,jdbcType=DECIMAL}
</delete>
<insert id="insert" parameterType="com.hs.api.model.SerProj">
<selectKey keyProperty="id" order="AFTER" resultType="java.math.BigDecimal">
SELECT LAST_INSERT_ID()
SELECT nextval('dic_bgt_proj_id_seq')
</selectKey>
insert into dic_bgt_proj (CREATE_DATE, CREATE_USERID, `STATE`,
`TYPE`, PROJ_TYPE, PROJ_NAME,
......@@ -43,8 +43,8 @@
update dic_bgt_proj
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
`STATE` = #{state,jdbcType=DECIMAL},
`TYPE` = #{type,jdbcType=DECIMAL},
STATE = #{state,jdbcType=DECIMAL},
TYPE = #{type,jdbcType=DECIMAL},
PROJ_TYPE = #{projType,jdbcType=DECIMAL},
PROJ_NAME = #{projName,jdbcType=VARCHAR},
IS_BUDGET = #{isBudget,jdbcType=DECIMAL},
......@@ -56,8 +56,8 @@
select ID,
CREATE_DATE,
CREATE_USERID,
`STATE`,
`TYPE`,
STATE,
TYPE,
PROJ_TYPE,
PROJ_NAME,
IS_BUDGET,
......@@ -70,8 +70,8 @@
select ID,
CREATE_DATE,
CREATE_USERID,
`STATE`,
`TYPE`,
STATE,
TYPE,
PROJ_TYPE,
PROJ_NAME,
IS_BUDGET,
......@@ -82,8 +82,8 @@
<select id="selectState" resultMap="ProjectInfo">
select DISTINCT p.TYPE as EXPONENT_ID,e.EXPONENT_NAME,e.SORT
from dic_bgt_proj p
join dic_bgt_energy e on e.EXPONENT_ID=p.`TYPE` and e.STATE = 1
where p.`STATE` = 1
join dic_bgt_energy e on e.EXPONENT_ID=p.TYPE and e.STATE = 1
where p.STATE = 1
<if test="projType!=null">
and p.PROJ_TYPE = #{projType,jdbcType=DECIMAL}
</if>
......@@ -105,7 +105,7 @@
and o2.ORG_CODE = v.DEPT_CODE
) or v.DEPT_CODE = '全院')
<if test="date!=null">
and v.`DATE`= LEFT(#{date,jdbcType=DECIMAL},4)
and v.DATE= cast(substr(#{date,jdbcType=VARCHAR}, 0, 5) as integer)
</if>
<if test="budgetType!=null">
and IS_BUDGET&amp;#{budgetType,jdbcType=DECIMAL}>0
......
hs-api/src/main/resources/mapper/SerProjValueMapper.xml
......@@ -74,11 +74,11 @@
where ID = #{id,jdbcType=DECIMAL}
</delete>
<insert id="insert" parameterType="com.hs.api.model.SerProjValue">
insert into val_proj_value (CREATE_DATE, CREATE_USERID, `STATE`,
insert into val_proj_value (CREATE_DATE, CREATE_USERID, STATE,
PROJ_ID, QNZ, WQQS,
LS, MB, CSYSZ, CSYSZ_TB,
YSZ, YSZ_TB, SZ, ZXPL,
`DATE`, DEPT_CODE, SORT,
DATE, DEPT_CODE, SORT,
VERSION, QNZ_UNIT, CSYSZ_UNIT,
YSZ_UNIT, SZ_UNIT, WQQS_ZYPZ_JS,
DEPT_NAME, HOS_CODE)
......@@ -95,7 +95,7 @@
update val_proj_value
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
`STATE` = #{state,jdbcType=DECIMAL},
STATE = #{state,jdbcType=DECIMAL},
PROJ_ID = #{projId,jdbcType=DECIMAL},
QNZ = #{qnz,jdbcType=DECIMAL},
WQQS = #{wqqs,jdbcType=DECIMAL},
......@@ -107,7 +107,7 @@
YSZ_TB = #{yszTb,jdbcType=DECIMAL},
SZ = #{sz,jdbcType=DECIMAL},
ZXPL = #{zxpl,jdbcType=DECIMAL},
`DATE` = #{date,jdbcType=DECIMAL},
DATE = #{date,jdbcType=DECIMAL},
DEPT_CODE = #{deptCode,jdbcType=VARCHAR},
SORT = #{sort,jdbcType=DECIMAL},
VERSION = #{version,jdbcType=VARCHAR},
......@@ -119,10 +119,9 @@
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
select ID,
CREATE_DATE,
select CREATE_DATE,
CREATE_USERID,
`STATE`,
STATE,
PROJ_ID,
QNZ,
WQQS,
......@@ -134,7 +133,7 @@
YSZ_TB,
SZ,
ZXPL,
`DATE`,
DATE,
DEPT_CODE,
SORT,
VERSION,
......@@ -150,7 +149,7 @@
select ID,
CREATE_DATE,
CREATE_USERID,
`STATE`,
STATE,
PROJ_ID,
QNZ,
WQQS,
......@@ -162,7 +161,7 @@
YSZ_TB,
SZ,
ZXPL,
`DATE`,
DATE,
DEPT_CODE,
SORT,
VERSION,
......@@ -182,12 +181,12 @@
(
SELECT v.PROJ_ID,MAX(v.VERSION) AS VERSION
FROM val_proj_value v
WHERE v.`STATE` = 1
WHERE v.STATE = 1
<if test="dept!=null">
AND v.DEPT_CODE = #{dept,jdbcType=VARCHAR}
</if>
<if test="date!=null">
AND v.`DATE` = LEFT(#{date,jdbcType=DECIMAL},4)
AND v.DATE = cast(substr(#{date,jdbcType=VARCHAR}, 0, 5) as integer)
</if>
<if test="hosCode!=null">
AND v.HOS_CODE = #{hosCode,jdbcType=VARCHAR}
......@@ -199,16 +198,16 @@
AND v.DEPT_CODE = #{dept,jdbcType=VARCHAR}
</if>
<if test="date!=null">
AND v.`DATE` = LEFT(#{date,jdbcType=DECIMAL},4)
AND v.DATE = cast(substr(#{date,jdbcType=VARCHAR}, 0, 5) as integer)
</if>
<if test="hosCode!=null">
AND v.HOS_CODE = #{hosCode,jdbcType=VARCHAR}
</if>
left join val_proj_value_sz sz on sz.PROJ_ID = m.PROJ_ID
AND sz.DEPT_CODE = v.DEPT_CODE
AND sz.`DATE` = #{date,jdbcType=DECIMAL}
AND sz.DATE = #{date,jdbcType=DECIMAL}
AND sz.HOS_CODE = v.HOS_CODE
WHERE 1 = 1 and p.`STATE` = 1
WHERE 1 = 1 and p.STATE = 1
<if test="projType!=null">
AND p.PROJ_TYPE = #{projType,jdbcType=DECIMAL}
</if>
......@@ -216,7 +215,7 @@
AND p.TYPE_STATE = #{typeState,jdbcType=DECIMAL}
</if>
<if test="exponentId!=null">
AND p.`TYPE` = #{exponentId,jdbcType=DECIMAL}
AND p.TYPE = #{exponentId,jdbcType=DECIMAL}
</if>
<if test="budgetType!=null">
AND p.IS_BUDGET&amp;#{budgetType,jdbcType=DECIMAL}>0
......@@ -224,12 +223,14 @@
ORDER BY p.SORT
</select>
<delete id="deleteByDeptWithDate">
delete v
delete
from val_proj_value v
JOIN dic_bgt_proj p ON p.ID = v.PROJ_ID
WHERE p.PROJ_TYPE = #{projType,jdbcType=DECIMAL}
AND p.IS_BUDGET &amp; 1 > 0
AND v.`DATE` = LEFT(#{date,jdbcType=DECIMAL}, 4)
using dic_bgt_proj p
WHERE p.ID = v.PROJ_ID
and p.PROJ_TYPE = #{projType,jdbcType=DECIMAL}
AND p.IS_BUDGET &amp; 1
> 0
AND v.DATE = cast(substr(#{date,jdbcType=VARCHAR}, 0, 5) as integer) , 4)
AND v.DEPT_CODE = #{dept,jdbcType=VARCHAR}
AND v.HOS_CODE = #{orgCode,jdbcType=VARCHAR}
</delete>
......@@ -240,7 +241,8 @@
JOIN dic_bgt_proj p ON p.ID = v.PROJ_ID
WHERE p.PROJ_TYPE = #{projType,jdbcType=DECIMAL}
AND p.IS_BUDGET &amp; 1 > 0
AND v.`DATE` = LEFT(#{date,jdbcType=DECIMAL}, 4)
AND v.DATE = LEFT(#{date,jdbcType=DECIMAL}
, 4)
AND v.DEPT_CODE = #{dept,jdbcType=VARCHAR}
AND v.HOS_CODE = #{orgCode,jdbcType=VARCHAR}
</insert>
......@@ -264,15 +266,17 @@
sz.ZXPL as ZXPL2
FROM dic_bgt_proj p
left JOIN val_proj_value v ON v.PROJ_ID = p.ID
AND v.`DATE` = LEFT(#{date,jdbcType=DECIMAL}, 4)
AND v.DATE = cast(substr(#{date,jdbcType=VARCHAR}, 0, 5) as integer)
AND v.HOS_CODE = #{hosCode,jdbcType=VARCHAR}
left join val_proj_value_sz sz on sz.PROJ_ID = p.ID
left join val_proj_value_sz sz
on sz.PROJ_ID = p.ID
AND sz.DEPT_CODE = v.DEPT_CODE
AND sz.`DATE` = #{date,jdbcType=DECIMAL}
AND sz.DATE = #{date,jdbcType=DECIMAL}
AND sz.HOS_CODE = v.HOS_CODE
WHERE 1 = 1
and p.`STATE` = 1
AND p.IS_BUDGET &amp; 2 > 0
and p.STATE = 1
AND p.IS_BUDGET &amp; 2
> 0
ORDER BY p.SORT
</select>
</mapper>
\ No newline at end of file
hs-api/src/main/resources/mapper/SerProjValueSzMapper.xml
......@@ -20,10 +20,10 @@
</delete>
<insert id="insert" parameterType="com.hs.api.model.SerProjValueSz">
<selectKey keyProperty="id" order="AFTER" resultType="java.math.BigDecimal">
SELECT LAST_INSERT_ID()
SELECT nextval('val_proj_value_sz_id_seq')
</selectKey>
insert into VAL_PROJ_VALUE_SZ (CREATE_DATE, CREATE_USERID, `STATE`,
PROJ_ID, SZ, ZXPL, `DATE`,
insert into VAL_PROJ_VALUE_SZ (CREATE_DATE, CREATE_USERID, STATE,
PROJ_ID, SZ, ZXPL, DATE,
DEPT_CODE, HOS_CODE)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{projId,jdbcType=DECIMAL}, #{sz,jdbcType=DECIMAL}, #{zxpl,jdbcType=DECIMAL}, #{date,jdbcType=DECIMAL},
......@@ -33,11 +33,11 @@
update VAL_PROJ_VALUE_SZ
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
`STATE` = #{state,jdbcType=DECIMAL},
STATE = #{state,jdbcType=DECIMAL},
PROJ_ID = #{projId,jdbcType=DECIMAL},
SZ = #{sz,jdbcType=DECIMAL},
ZXPL = #{zxpl,jdbcType=DECIMAL},
`DATE` = #{date,jdbcType=DECIMAL},
DATE = #{date,jdbcType=DECIMAL},
DEPT_CODE = #{deptCode,jdbcType=VARCHAR},
HOS_CODE = #{hoscode,jdbcType=VARCHAR}
where ID = #{id,jdbcType=DECIMAL}
......@@ -46,11 +46,11 @@
select ID,
CREATE_DATE,
CREATE_USERID,
`STATE`,
STATE,
PROJ_ID,
SZ,
ZXPL,
`DATE`,
DATE,
DEPT_CODE,
HOS_CODE
from VAL_PROJ_VALUE_SZ
......@@ -60,11 +60,11 @@
select ID,
CREATE_DATE,
CREATE_USERID,
`STATE`,
STATE,
PROJ_ID,
SZ,
ZXPL,
`DATE`,
DATE,
DEPT_CODE,
HOS_CODE
from VAL_PROJ_VALUE_SZ
......@@ -74,9 +74,9 @@
from VAL_PROJ_VALUE_SZ
where STATE = 1
and PROJ_ID = #{projId,jdbcType=DECIMAL}
and `DATE` = #{date,jdbcType=DECIMAL}
and DATE = #{date,jdbcType=DECIMAL}
and DEPT_CODE = #{deptCode,jdbcType=VARCHAR}
and HOS_CODE = #{hosCode,jdbcType=VARCHAR}
order by `DATE` desc
order by DATE desc
</select>
</mapper>
\ No newline at end of file
hs-api/src/main/resources/mapper/SysMenuMapper.xml
......@@ -21,9 +21,9 @@
</delete>
<insert id="insert" parameterType="com.hs.api.model.SysMenu">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
SELECT LAST_INSERT_ID()
SELECT nextval('sys_menu_id_seq')
</selectKey>
insert into SYS_MENU (CREATE_DATA, CREATE_USERID, `STATE`,
insert into SYS_MENU (CREATE_DATA, CREATE_USERID, STATE,
MENU_NAME, MENU_URL, MENU_IMAGE,
PARENT_ID, PAGE_CODE, SORT
)
......@@ -36,7 +36,7 @@
update SYS_MENU
set CREATE_DATA = #{createData,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
`STATE` = #{state,jdbcType=DECIMAL},
STATE = #{state,jdbcType=DECIMAL},
MENU_NAME = #{menuName,jdbcType=VARCHAR},
MENU_URL = #{menuUrl,jdbcType=VARCHAR},
MENU_IMAGE = #{menuImage,jdbcType=VARCHAR},
......@@ -49,7 +49,7 @@
select ID,
CREATE_DATA,
CREATE_USERID,
`STATE`,
STATE,
MENU_NAME,
MENU_URL,
MENU_IMAGE,
......@@ -63,7 +63,7 @@
select ID,
CREATE_DATA,
CREATE_USERID,
`STATE`,
STATE,
MENU_NAME,
MENU_URL,
MENU_IMAGE,
......
hs-api/src/main/resources/mapper/SysRoleMapper.xml
......@@ -16,9 +16,9 @@
</delete>
<insert id="insert" parameterType="com.hs.api.model.SysRole">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
SELECT LAST_INSERT_ID()
SELECT nextval('sys_role_id_seq')
</selectKey>
insert into SYS_ROLE (CREATE_DATE, CREATE_USERID, `STATE`,
insert into SYS_ROLE (CREATE_DATE, CREATE_USERID, STATE,
ROLE_NAME, ROLE_CODE)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{roleName,jdbcType=VARCHAR}, #{roleCode,jdbcType=DECIMAL})
......@@ -27,18 +27,18 @@
update SYS_ROLE
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
`STATE` = #{state,jdbcType=DECIMAL},
STATE = #{state,jdbcType=DECIMAL},
ROLE_NAME = #{roleName,jdbcType=VARCHAR},
ROLE_CODE = #{roleCode,jdbcType=DECIMAL}
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, `STATE`, ROLE_NAME, ROLE_CODE
select ID, CREATE_DATE, CREATE_USERID, STATE, ROLE_NAME, ROLE_CODE
from SYS_ROLE
where ID = #{id,jdbcType=DECIMAL}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, `STATE`, ROLE_NAME, ROLE_CODE
select ID, CREATE_DATE, CREATE_USERID, STATE, ROLE_NAME, ROLE_CODE
from SYS_ROLE
</select>
<select id="selectByUser" resultMap="BaseResultMap">
......
hs-api/src/main/resources/mapper/SysRoleMenuRsMapper.xml
......@@ -16,9 +16,9 @@
</delete>
<insert id="insert" parameterType="com.hs.api.model.SysRoleMenuRs">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
SELECT LAST_INSERT_ID()
SELECT nextval('sys_role_menu_rs_id_seq')
</selectKey>
insert into SYS_ROLE_MENU_RS (CREATE_DATE, CREATE_USERID, `STATE`,
insert into SYS_ROLE_MENU_RS (CREATE_DATE, CREATE_USERID, STATE,
MENU_ID, ROLE_ID)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{menuId,jdbcType=DECIMAL}, #{roleId,jdbcType=DECIMAL})
......@@ -27,18 +27,18 @@
update SYS_ROLE_MENU_RS
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
`STATE` = #{state,jdbcType=DECIMAL},
STATE = #{state,jdbcType=DECIMAL},
MENU_ID = #{menuId,jdbcType=DECIMAL},
ROLE_ID = #{roleId,jdbcType=DECIMAL}
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, `STATE`, MENU_ID, ROLE_ID
select ID, CREATE_DATE, CREATE_USERID, STATE, MENU_ID, ROLE_ID
from SYS_ROLE_MENU_RS
where ID = #{id,jdbcType=DECIMAL}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, `STATE`, MENU_ID, ROLE_ID
select ID, CREATE_DATE, CREATE_USERID, STATE, MENU_ID, ROLE_ID
from SYS_ROLE_MENU_RS
</select>
</mapper>
\ No newline at end of file
hs-api/src/main/resources/mapper/SysUserMapper.xml
......@@ -26,10 +26,10 @@
</delete>
<insert id="insert" parameterType="com.hs.api.model.SysUser">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
SELECT LAST_INSERT_ID()
SELECT nextval('sys_user_id_seq')
</selectKey>
insert into SYS_USER (CREATE_DATE, CREATE_USERID, `STATE`,
USER_CODE, USER_NAME, `PASSWORD`,
insert into SYS_USER (CREATE_DATE, CREATE_USERID, STATE,
USER_CODE, USER_NAME, PASSWORD,
IDCARD, SEX, MOBILE,
PAGE_COUNT, ERROR_COUNT, ERROR_TIME,
LAST_TIME, LAST_IP,MAC_ADDRESS)
......@@ -43,10 +43,10 @@
update SYS_USER
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
`STATE` = #{state,jdbcType=DECIMAL},
STATE = #{state,jdbcType=DECIMAL},
USER_CODE = #{userCode,jdbcType=VARCHAR},
USER_NAME = #{userName,jdbcType=VARCHAR},
`PASSWORD` = #{password,jdbcType=VARCHAR},
PASSWORD = #{password,jdbcType=VARCHAR},
IDCARD = #{idcard,jdbcType=VARCHAR},
SEX = #{sex,jdbcType=VARCHAR},
MOBILE = #{mobile,jdbcType=VARCHAR},
......@@ -62,10 +62,10 @@
select ID,
CREATE_DATE,
CREATE_USERID,
`STATE`,
STATE,
USER_CODE,
USER_NAME,
`PASSWORD`,
PASSWORD,
IDCARD,
SEX,
MOBILE,
......@@ -82,10 +82,10 @@
select ID,
CREATE_DATE,
CREATE_USERID,
`STATE`,
STATE,
USER_CODE,
USER_NAME,
`PASSWORD`,
PASSWORD,
IDCARD,
SEX,
MOBILE,
......@@ -101,10 +101,10 @@
select ID,
CREATE_DATE,
CREATE_USERID,
`STATE`,
STATE,
USER_CODE,
USER_NAME,
`PASSWORD`,
PASSWORD,
IDCARD,
SEX,
MOBILE,
......@@ -116,6 +116,6 @@
MAC_ADDRESS
from SYS_USER
where USER_CODE = #{userCode,jdbcType=VARCHAR}
and `STATE` != 0
and STATE != 0
</select>
</mapper>
\ No newline at end of file
hs-api/src/main/resources/mapper/SysUserMenuRsMapper.xml
......@@ -16,9 +16,9 @@
</delete>
<insert id="insert" parameterType="com.hs.api.model.SysUserMenuRs">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
SELECT LAST_INSERT_ID()
SELECT nextval('sys_user_menu_rs_id_seq')
</selectKey>
insert into SYS_USER_MENU_RS (CREATE_DATE, CREATE_USERID, `STATE`,
insert into SYS_USER_MENU_RS (CREATE_DATE, CREATE_USERID, STATE,
USER_ID, MENU_ID)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{userId,jdbcType=DECIMAL}, #{menuId,jdbcType=DECIMAL})
......@@ -27,18 +27,18 @@
update SYS_USER_MENU_RS
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
`STATE` = #{state,jdbcType=DECIMAL},
STATE = #{state,jdbcType=DECIMAL},
USER_ID = #{userId,jdbcType=DECIMAL},
MENU_ID = #{menuId,jdbcType=DECIMAL}
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, `STATE`, USER_ID, MENU_ID
select ID, CREATE_DATE, CREATE_USERID, STATE, USER_ID, MENU_ID
from SYS_USER_MENU_RS
where ID = #{id,jdbcType=DECIMAL}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, `STATE`, USER_ID, MENU_ID
select ID, CREATE_DATE, CREATE_USERID, STATE, USER_ID, MENU_ID
from SYS_USER_MENU_RS
</select>
</mapper>
\ No newline at end of file
hs-api/src/main/resources/mapper/SysUserOrgRsMapper.xml
......@@ -16,9 +16,9 @@
</delete>
<insert id="insert" parameterType="com.hs.api.model.SysUserOrgRs">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
SELECT LAST_INSERT_ID()
SELECT nextval('sys_user_sbj_rs')
</selectKey>
insert into sys_user_sbj_rs (CREATE_DATE, CREATE_USERID, `STATE`,
insert into sys_user_sbj_rs (CREATE_DATE, CREATE_USERID, STATE,
USER_ID, ORG_ID)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{userId,jdbcType=DECIMAL}, #{orgId,jdbcType=DECIMAL})
......@@ -27,18 +27,18 @@
update sys_user_sbj_rs
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
`STATE` = #{state,jdbcType=DECIMAL},
STATE = #{state,jdbcType=DECIMAL},
USER_ID = #{userId,jdbcType=DECIMAL},
ORG_ID = #{orgId,jdbcType=DECIMAL}
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, `STATE`, USER_ID, ORG_ID
select ID, CREATE_DATE, CREATE_USERID, STATE, USER_ID, ORG_ID
from sys_user_sbj_rs
where ID = #{id,jdbcType=DECIMAL}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, `STATE`, USER_ID, ORG_ID
select ID, CREATE_DATE, CREATE_USERID, STATE, USER_ID, ORG_ID
from sys_user_sbj_rs
</select>
</mapper>
\ No newline at end of file
hs-api/src/main/resources/mapper/SysUserRoleRsMapper.xml
......@@ -16,9 +16,9 @@
</delete>
<insert id="insert" parameterType="com.hs.api.model.SysUserRoleRs">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
SELECT LAST_INSERT_ID()
SELECT nextval('sys_user_role_rs_id_seq')
</selectKey>
insert into SYS_USER_ROLE_RS (CREATE_DATE, CREATE_USERID, `STATE`,
insert into SYS_USER_ROLE_RS (CREATE_DATE, CREATE_USERID, STATE,
USER_ID, ROLE_ID)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{userId,jdbcType=DECIMAL}, #{roleId,jdbcType=DECIMAL})
......@@ -27,18 +27,18 @@
update SYS_USER_ROLE_RS
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
`STATE` = #{state,jdbcType=DECIMAL},
STATE = #{state,jdbcType=DECIMAL},
USER_ID = #{userId,jdbcType=DECIMAL},
ROLE_ID = #{roleId,jdbcType=DECIMAL}
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, `STATE`, USER_ID, ROLE_ID
select ID, CREATE_DATE, CREATE_USERID, STATE, USER_ID, ROLE_ID
from SYS_USER_ROLE_RS
where ID = #{id,jdbcType=DECIMAL}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, `STATE`, USER_ID, ROLE_ID
select ID, CREATE_DATE, CREATE_USERID, STATE, USER_ID, ROLE_ID
from SYS_USER_ROLE_RS
</select>
<select id="selectRoleByUser" resultMap="BaseResultMap">
......
hs-api/src/main/resources/mapper/SysVersionMapper.xml
......@@ -15,7 +15,7 @@
</delete>
<insert id="insert" parameterType="com.hs.api.model.SysVersion">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
SELECT LAST_INSERT_ID()
SELECT nextval('sys_version_id_seq')
</selectKey>
insert into sys_version (UPDATE_TIME, BAH_DATE, VERSION,
REMARKS)
......@@ -43,6 +43,6 @@
select *
from sys_version
order by UPDATE_TIME desc, BAH_DATE desc
limit 0,1
limit 1
</select>
</mapper>
\ No newline at end of file
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