Skip to content

S
sv-springboot
Commit ec265523 by Suvalue
Options

数据库修改到psql

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