Skip to content

S
sv-springboot
Commit a46126c8 by Suvalue
Options

语句关键字修改

parent 70660722
Showing with 185 additions and 160 deletions
bsoft-api/src/main/java/com/bsoft/api/mapper/SerProjValueSzMapper.java
......@@ -17,6 +17,6 @@ public interface SerProjValueSzMapper {
int updateByPrimaryKey(SerProjValueSz record);
List<SerProjValueSz> selectByProj(@Param("projId") BigDecimal projId,@Param("date") Integer date,
@Param("deptCode") String deptCode,@Param("hosCode") String hosCode);
SerProjValueSz selectByProj(@Param("projId") BigDecimal projId,@Param("date") Integer date,
@Param("deptCode") String deptCode,@Param("hosCode") String hosCode);
}
\ No newline at end of file
bsoft-api/src/main/java/com/bsoft/api/service/Impl/SerProjValueServiceImpl.java
......@@ -49,7 +49,7 @@ public class SerProjValueServiceImpl implements SerProjValueService {
List<ProjectInfo> projectInfo = null;
List<SerProjValueResp> values = null;
List<SerProjValueResp> resultValues = null;
List<SerProjValueSz> valueSzs = null;
SerProjValueSz valueSz = null;
for(Map<String,Object> enumInfo : enumList){
projectValue = new ProjectValue();
projectValue.setTypeId((Integer)enumInfo.get("value"));
......@@ -60,8 +60,12 @@ public class SerProjValueServiceImpl implements SerProjValueService {
values = serProjValueMapper.selectValue(projectType,(Integer)enumInfo.get("value"),
projInfo.getExponentId(),deptCode,date,BudgetType.NOT.getValue(),orgCode);
for(SerProjValueResp value : values){
valueSzs = projValueSzMapper.selectByProj(value.getProjId(),date,deptCode,orgCode);
value.setValueSz(valueSzs);
valueSz = projValueSzMapper.selectByProj(value.getProjId(),date,deptCode,orgCode);
if(valueSz != null){
value.setSz(valueSz.getSz());
value.setZxpl(valueSz.getZxpl());
valueSz = null;
}
}
resultValues = getLevelData(values,BigDecimal.valueOf(PROJ_TOP_PARENT_ID));
if(resultValues != null && resultValues.size() > 0)
......@@ -114,6 +118,7 @@ public class SerProjValueServiceImpl implements SerProjValueService {
List<Map<String,Object>> enumList = ProjectType.all();
SummaryProjType projType = null;
List<ProjectInfo> projectInfo = null;
SerProjValueSz valueSz = null;
if(enumList != null && enumList.size() > 0){
for(Map<String,Object> enumInfo : enumList){
projType = new SummaryProjType();
......@@ -122,7 +127,12 @@ public class SerProjValueServiceImpl implements SerProjValueService {
null,summary.getDeptCode(),date,budgetType,orgCode);
if(values != null){
for(SerProjValueResp value : values){
value.setValueSz(projValueSzMapper.selectByProj(value.getProjId(),date,summary.getDeptCode(),orgCode));
valueSz = projValueSzMapper.selectByProj(value.getProjId(),date,summary.getDeptCode(),orgCode);
if(valueSz != null){
value.setSz(valueSz.getSz());
value.setZxpl(valueSz.getZxpl());
valueSz = null;
}
}
projType.setProject(values);
}
......
bsoft-api/src/main/resources/application-dev.properties
#### \u5F00\u53D1\u73AF\u5883 ###################################################
jdbc.url=jdbc:mysql://192.168.18.176:3306/scml_zp_cs?useUnicode=true&characterEncoding=utf8&useSSL=false&autoReconnect=true&rewriteBatchedStatements=TRUE
jdbc.username=root
jdbc.password=Suvalue2016
jdbc.driverClass=com.mysql.jdbc.Driver
spring.datasource.url=jdbc:mysql://192.168.18.176:3306/scml_zp_cs?useUnicode=true&characterEncoding=utf8&useSSL=false&autoReconnect=true&rewriteBatchedStatements=TRUE&serverTimezone=UTC
spring.datasource.username=root
spring.datasource.password=Suvalue2016
spring.datasource.driver-class-name=com.mysql.jdbc.Driver
spring.datasource.driver-class-name=oracle.jdbc.driver.OracleDriver
spring.datasource.username=ch
spring.datasource.password=123456
spring.datasource.url=jdbc:oracle:thin:@192.168.18.171:1521:his
#spring.datasource.driver-class-name=oracle.jdbc.driver.OracleDriver
#spring.datasource.username=ch
#spring.datasource.password=123456
#spring.datasource.url=jdbc:oracle:thin:@192.168.18.171:1521:his
# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA40\uFF09
spring.redis.database=1
......
bsoft-api/src/main/resources/application-test.properties
#### \u6D4B\u8BD5\u73AF\u5883 ###################################################
jdbc.url=jdbc:mysql://192.168.18.176:3306/scml_zp_cs?useUnicode=true&characterEncoding=utf8&useSSL=false&autoReconnect=true&rewriteBatchedStatements=TRUE
jdbc.username=root
jdbc.password=Suvalue2016
jdbc.driverClass=com.mysql.jdbc.Driver
spring.datasource.url=jdbc:mysql://192.168.18.176:3306/scml_zp_cs?useUnicode=true&characterEncoding=utf8&useSSL=false&autoReconnect=true&rewriteBatchedStatements=TRUE&serverTimezone=UTC
spring.datasource.username=root
spring.datasource.password=Suvalue2016
spring.datasource.driver-class-name=com.mysql.jdbc.Driver
spring.datasource.driver-class-name=oracle.jdbc.driver.OracleDriver
spring.datasource.username=scml_zp_cs
spring.datasource.password=123
spring.datasource.url=jdbc:oracle:thin:@192.168.18.171:1521:his
#spring.datasource.driver-class-name=oracle.jdbc.driver.OracleDriver
#spring.datasource.username=scml_zp_cs
#spring.datasource.password=123
#spring.datasource.url=jdbc:oracle:thin:@192.168.18.171:1521:his
# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA40\uFF09
spring.redis.database=1
......
bsoft-api/src/main/resources/mapper/DicDimMapper.xml
......@@ -18,7 +18,7 @@
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
SELECT LAST_INSERT_ID()
</selectKey>
insert into DIC_DIM (CREATE_DATE, CREATE_USERID, "STATE",
insert into DIC_DIM (CREATE_DATE, CREATE_USERID, `STATE`,
DIM_NAME, DIM_FIELD, DIM_TYPE
)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
......@@ -29,19 +29,19 @@
update DIC_DIM
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
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
</select>
<select id="selectByPageid" resultMap="BaseResultMap">
......
bsoft-api/src/main/resources/mapper/DicIndMapper.xml
......@@ -23,7 +23,7 @@
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
select SEQ_DIC_IND_ID.nextval from dual
</selectKey>
insert into DIC_IND (CREATE_DATE, CREATE_USERID, STATE,
insert into DIC_IND (CREATE_DATE, CREATE_USERID, `STATE`,
IND_CODE, IND_NAME, COMPUTE_MODE,
EXEC_SQL, `DESCRIBE`)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
......@@ -34,7 +34,7 @@
update DIC_IND
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},
......@@ -43,18 +43,18 @@
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, IND_CODE, IND_NAME, COMPUTE_MODE, EXEC_SQL,
select ID, CREATE_DATE, CREATE_USERID, `STATE`, IND_CODE, IND_NAME, COMPUTE_MODE, EXEC_SQL,
`DESCRIBE`
from DIC_IND
where ID = #{id,jdbcType=DECIMAL}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, IND_CODE, IND_NAME, COMPUTE_MODE, EXEC_SQL,
select ID, CREATE_DATE, CREATE_USERID, `STATE`, IND_CODE, IND_NAME, COMPUTE_MODE, EXEC_SQL,
`DESCRIBE`
from DIC_IND
</select>
<select id="selectAllByFilter" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, IND_CODE, IND_NAME,IND_FIELD, COMPUTE_MODE, EXEC_SQL,
select ID, CREATE_DATE, CREATE_USERID, `STATE`, IND_CODE, IND_NAME,IND_FIELD, COMPUTE_MODE, EXEC_SQL,
`DESCRIBE`
from DIC_IND
where IND_NAME LIKE CONCAT('%',#{filter,jdbcType=VARCHAR})
......
bsoft-api/src/main/resources/mapper/DicOrgMapper.xml
......@@ -45,7 +45,7 @@
update DIC_ORG
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},
......@@ -57,13 +57,13 @@
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, "STATE", ORG_CODE, ORG_NAME, ORG_NO, ORG_SHORT_NAME,
select ID, CREATE_DATE, CREATE_USERID, `STATE`, ORG_CODE, ORG_NAME, ORG_NO, ORG_SHORT_NAME,
ORG_GROUP, ORG_TYPE, ORG_ADDRESS, PARENT_ID
from DIC_ORG
where ID = #{id,jdbcType=DECIMAL}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, "STATE", ORG_CODE, ORG_NAME, ORG_NO, ORG_SHORT_NAME,
select ID, CREATE_DATE, CREATE_USERID, `STATE`, ORG_CODE, ORG_NAME, ORG_NO, ORG_SHORT_NAME,
ORG_GROUP, ORG_TYPE, ORG_ADDRESS, PARENT_ID
from DIC_ORG
</select>
......
bsoft-api/src/main/resources/mapper/SerBlockMapper.xml
......@@ -18,7 +18,7 @@
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
SELECT LAST_INSERT_ID()
</selectKey>
insert into SER_BLOCK (CREATE_DATE, CREATE_USERID, "STATE",
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},
......@@ -29,19 +29,19 @@
update SER_BLOCK
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
"STATE" = #{state,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
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
select ID, CREATE_DATE, CREATE_USERID, `STATE`, BLOCK_CODE, BLOCK_NAME, RETURN_TYPE
from SER_BLOCK
</select>
</mapper>
\ No newline at end of file
bsoft-api/src/main/resources/mapper/SerDepartmentMapper.xml
......@@ -18,7 +18,7 @@
<selectKey keyProperty="id" order="AFTER" resultType="java.math.BigDecimal">
SELECT LAST_INSERT_ID()
</selectKey>
insert into SER_DEPARTMENT (CREATE_DATE, CREATE_USERID, "STATE",
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})
......@@ -27,19 +27,19 @@
update SER_DEPARTMENT
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}
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
select ID, CREATE_DATE, CREATE_USERID, `STATE`, ORG_ID, KSBM, KSMC
from SER_DEPARTMENT
where ID = #{id,jdbcType=DECIMAL}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, "STATE", ORG_ID, KSBM, KSMC
select ID, CREATE_DATE, CREATE_USERID, `STATE`, ORG_ID, KSBM, KSMC
from SER_DEPARTMENT
</select>
<select id="selectSummaryDept" resultMap="BaseResultMap">
......@@ -47,7 +47,7 @@
from SER_PROJ_VALUE
where 1=1
<if test="date!=null">
and "DATE"=#{date}
and `DATE`=#{date}
</if>
GROUP BY DEPT_CODE,DEPT_NAME,SORT
order by SORT
......
bsoft-api/src/main/resources/mapper/SerDeptDocRsMapper.xml
......@@ -21,7 +21,7 @@
<selectKey keyProperty="id" order="AFTER" resultType="java.math.BigDecimal">
SELECT LAST_INSERT_ID()
</selectKey>
insert into SER_DEPT_DOC_RS (CREATE_DATE, CREATE_USERID, "STATE",
insert into SER_DEPT_DOC_RS (CREATE_DATE, CREATE_USERID, `STATE`,
ORG_ID, KSBM, KSMC,
YSBM, YSMC, YSLX)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
......@@ -32,7 +32,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 +42,12 @@
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
bsoft-api/src/main/resources/mapper/SerDimValueMapper.xml
......@@ -32,12 +32,12 @@
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
select ID, ORG_ID, ITEM_NAME, ITEM_VALUE, "DATE", DIM_ID
select ID, ORG_ID, ITEM_NAME, ITEM_VALUE, `DATE`, DIM_ID
from SER_DIM_VALUE
where ID = #{id,jdbcType=DECIMAL}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, ORG_ID, ITEM_NAME, ITEM_VALUE, "DATE", DIM_ID
select ID, ORG_ID, ITEM_NAME, ITEM_VALUE, `DATE`, DIM_ID
from SER_DIM_VALUE
</select>
<select id="selectByDimId" resultMap="BaseResultMap">
......@@ -53,7 +53,7 @@
and dv.ORG_ID=#{orgId,jdbcType=DECIMAL}
</if>
<if test="date!=null">
and dv."DATE"=#{date,jdbcType=VARCHAR}
and dv.`DATE`=#{date,jdbcType=VARCHAR}
</if>
</select>
</mapper>
\ No newline at end of file
bsoft-api/src/main/resources/mapper/SerDiseaseDocRsMapper.xml
......@@ -38,16 +38,16 @@
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
select ID, ORG_ID, DOC_CODE, DOC_NAME, MDC_CODE, "DATE", DEPT_CODE, DEPT_NAME
select ID, ORG_ID, DOC_CODE, DOC_NAME, MDC_CODE, `DATE`, DEPT_CODE, DEPT_NAME
from SER_DISEASE_DOC_RS
where ID = #{id,jdbcType=DECIMAL}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, ORG_ID, DOC_CODE, DOC_NAME, MDC_CODE, "DATE", DEPT_CODE, DEPT_NAME
select ID, ORG_ID, DOC_CODE, DOC_NAME, MDC_CODE, `DATE`, DEPT_CODE, DEPT_NAME
from SER_DISEASE_DOC_RS
</select>
<select id="selectByCode" resultMap="BaseResultMap">
select ID, ORG_ID, DOC_CODE, DOC_NAME, MDC_CODE, "DATE", DEPT_CODE, DEPT_NAME
select ID, ORG_ID, DOC_CODE, DOC_NAME, MDC_CODE, `DATE`, DEPT_CODE, DEPT_NAME
from SER_DISEASE_DOC_RS
where 1=1
<if test="docCode!=null">
......@@ -60,11 +60,11 @@
and DEPT_CODE = #{deptCode,jdbcType=VARCHAR}
</if>
<if test="date!=null">
and "DATE" = #{date,jdbcType=VARCHAR}
and `DATE` = #{date,jdbcType=VARCHAR}
</if>
</select>
<select id="selectByRelation" resultMap="BaseResultMap">
select ID, ORG_ID, DOC_CODE, DOC_NAME, MDC_CODE, "DATE", DEPT_CODE, DEPT_NAME
select ID, ORG_ID, DOC_CODE, DOC_NAME, MDC_CODE, `DATE`, DEPT_CODE, DEPT_NAME
from SER_DISEASE_DOC_RS
where 1=1
<if test="docCode!=null">
......@@ -80,7 +80,7 @@
and DEPT_CODE = #{deptCode,jdbcType=VARCHAR}
</if>
<if test="date!=null">
and "DATE" = #{date,jdbcType=VARCHAR}
and `DATE` = #{date,jdbcType=VARCHAR}
</if>
</select>
</mapper>
\ No newline at end of file
bsoft-api/src/main/resources/mapper/SerDiseaseMapper.xml
......@@ -31,9 +31,9 @@
<selectKey keyProperty="id" order="AFTER" resultType="java.math.BigDecimal">
SELECT LAST_INSERT_ID()
</selectKey>
insert into SER_DISEASE (CREATE_DATE, CREATE_USERID, "STATE",
MDC_CODE, MDC_NAME, "DATE",
MDC_NUM, PARENT_ID, "LEVEL",
insert into SER_DISEASE (CREATE_DATE, CREATE_USERID, `STATE`,
MDC_CODE, MDC_NAME, `DATE`,
MDC_NUM, PARENT_ID, `LEVEL`,
ORG_ID, ORG_NAME, PARENT_CODE
)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
......@@ -43,16 +43,17 @@
)
</insert>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, "STATE", MDC_CODE, MDC_NAME, "DATE", MDC_NUM,
PARENT_ID, "LEVEL", ORG_ID, ORG_NAME, PARENT_CODE
select ID, CREATE_DATE, CREATE_USERID, `STATE`, MDC_CODE, MDC_NAME, `DATE`, MDC_NUM,
PARENT_ID, `LEVEL`, ORG_ID, ORG_NAME, PARENT_CODE
from SER_DISEASE
</select>
<select id="selectByCode" resultMap="BaseResultMap">
select DISTINCT 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
select DISTINCT 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
from SER_DISEASE d,SER_DISEASE_DOC_RS rs
where d.STATE=1
and rs.MDC_CODE=d.MDC_CODE and rs.MDC_CODE = #{code,jdbcType=VARCHAR} and rs."DATE" = #{date,jdbcType=VARCHAR} and d."DATE" =#{date,jdbcType=VARCHAR}
and rs.MDC_CODE=d.MDC_CODE and rs.MDC_CODE = #{code,jdbcType=VARCHAR} and rs.`DATE` = #{date,jdbcType=VARCHAR}
and d.`DATE` =#{date,jdbcType=VARCHAR}
<if test="docCode!=null">
and rs.DOC_CODE=#{docCode,jdbcType=VARCHAR}
</if>
......@@ -61,12 +62,12 @@
</if>
</select>
<select id="selectByMdcName" resultMap="BaseResultMap">
select DISTINCT 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
select DISTINCT 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
from SER_DISEASE d,SER_DISEASE_DOC_RS rs
where 1 = 1 and STATE=1 and rs.MDC_CODE=d.MDC_CODE
<if test="date!=null">
and d."DATE" = #{date,jdbcType=VARCHAR} and rs."DATE" = #{date,jdbcType=VARCHAR}
and d.`DATE` = #{date,jdbcType=VARCHAR} and rs.`DATE` = #{date,jdbcType=VARCHAR}
</if>
<if test="docCode!=null">
and rs.DOC_CODE=#{docCode,jdbcType=VARCHAR}
......@@ -80,15 +81,15 @@
order by d.MDC_NUM
</select>
<select id="selectByLevel" resultMap="DiseaseLevel">
select DISTINCT 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
select DISTINCT 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
from SER_DISEASE d,SER_DISEASE_DOC_RS rs
where 1 = 1 and STATE=1 and rs.MDC_CODE=d.MDC_CODE
<if test="date!=null">
and d."DATE" = #{date,jdbcType=VARCHAR} and rs."DATE" = #{date,jdbcType=VARCHAR}
and d.`DATE` = #{date,jdbcType=VARCHAR} and rs.`DATE` = #{date,jdbcType=VARCHAR}
</if>
<if test="level!=null">
and d."LEVEL" = #{level,jdbcType=DECIMAL}
and d.`LEVEL` = #{level,jdbcType=DECIMAL}
</if>
<if test="docCode!=null">
and rs.DOC_CODE = #{docCode,jdbcType=DECIMAL}
......@@ -107,12 +108,12 @@
order by d.MDC_NUM
</select>
<select id="selectByParentId" resultMap="DiseaseLevel">
select DISTINCT 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
select DISTINCT 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
from SER_DISEASE d,SER_DISEASE_DOC_RS rs
where 1 = 1 and STATE=1 and STATE=1 and rs.MDC_CODE=d.MDC_CODE
<if test="date!=null">
and d."DATE" = #{date,jdbcType=VARCHAR} and rs."DATE" = #{date,jdbcType=VARCHAR}
and d.`DATE` = #{date,jdbcType=VARCHAR} and rs.`DATE` = #{date,jdbcType=VARCHAR}
</if>
<if test="parentId!=null">
and d.PARENT_ID = #{parentId,jdbcType=DECIMAL}
......@@ -138,11 +139,11 @@
</select>
<select id="selectSonById" resultMap="DiseaseLevel">
select DISTINCT 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.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME
from SER_DISEASE d,SER_DISEASE_DOC_RS rs
where 1 = 1 and STATE=1 and STATE=1 and rs.MDC_CODE=d.MDC_CODE
<if test="date!=null">
and d."DATE" = #{date,jdbcType=VARCHAR} and rs."DATE" = #{date,jdbcType=VARCHAR}
and d.`DATE` = #{date,jdbcType=VARCHAR} and rs.`DATE` = #{date,jdbcType=VARCHAR}
</if>
<if test="diseaseId!=null">
and d.PARENT_ID=#{diseaseId,jdbcType=DECIMAL}
......
bsoft-api/src/main/resources/mapper/SerDoctorMapper.xml
......@@ -19,7 +19,7 @@
<selectKey keyProperty="id" order="AFTER" resultType="java.math.BigDecimal">
SELECT LAST_INSERT_ID()
</selectKey>
insert into SER_DOCTOR (CREATE_DATE, CREATE_USERID, "STATE",
insert into SER_DOCTOR (CREATE_DATE, CREATE_USERID, `STATE`,
ORG_ID, YSBM, YSMC,
YSLX)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
......@@ -30,7 +30,7 @@
update SER_DOCTOR
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
"STATE" = #{state,jdbcType=DECIMAL},
`STATE` = #{state,jdbcType=DECIMAL},
ORG_ID = #{orgId,jdbcType=VARCHAR},
YSBM = #{ysbm,jdbcType=VARCHAR},
YSMC = #{ysmc,jdbcType=VARCHAR},
......@@ -38,18 +38,18 @@
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, "STATE", ORG_ID, YSBM, YSMC, YSLX
select ID, CREATE_DATE, CREATE_USERID, `STATE`, ORG_ID, YSBM, YSMC, YSLX
from SER_DOCTOR
where ID = #{id,jdbcType=DECIMAL}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, "STATE", ORG_ID, YSBM, YSMC, YSLX
select ID, CREATE_DATE, CREATE_USERID, `STATE`, ORG_ID, YSBM, YSMC, YSLX
from SER_DOCTOR
</select>
<select id="selectDoctor" resultMap="BaseResultMap">
SELECT DISTINCT d.*
FROM SER_DEPT_DOC_RS ddr
join SER_DOCTOR d on d.YSBM=ddr.YSBM
where d.STATE = 1 and ddr.STATE = 1 and ddr.KSBM = #{dept,jdbcType=VARCHAR}
where d.`STATE` = 1 and ddr.`STATE` = 1 and ddr.KSBM = #{dept,jdbcType=VARCHAR}
</select>
</mapper>
\ No newline at end of file
bsoft-api/src/main/resources/mapper/SerPageBlockRsMapper.xml
......@@ -18,7 +18,7 @@
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
SELECT LAST_INSERT_ID()
</selectKey>
insert into SER_PAGE_BLOCK_RS (CREATE_DATE, CREATE_USERID, "STATE",
insert into SER_PAGE_BLOCK_RS (CREATE_DATE, CREATE_USERID, `STATE`,
BLOCK_ID, PAGE_ID, WHERE_CLAUSE
)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
......@@ -29,23 +29,23 @@
update SER_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}
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, "STATE", BLOCK_ID, PAGE_ID, WHERE_CLAUSE
select ID, CREATE_DATE, CREATE_USERID, `STATE`, BLOCK_ID, PAGE_ID, WHERE_CLAUSE
from SER_PAGE_BLOCK_RS
where ID = #{id,jdbcType=DECIMAL}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, "STATE", BLOCK_ID, PAGE_ID, WHERE_CLAUSE
select ID, CREATE_DATE, CREATE_USERID, `STATE`, BLOCK_ID, PAGE_ID, WHERE_CLAUSE
from SER_PAGE_BLOCK_RS
</select>
<select id="selectByPageId" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, BLOCK_ID, PAGE_ID,WHERE_CLAUSE
select ID, CREATE_DATE, CREATE_USERID, `STATE`, BLOCK_ID, PAGE_ID,WHERE_CLAUSE
from SER_PAGE_BLOCK_RS
where PAGE_ID=#{pageID,jdbcType=DECIMAL}
</select>
......
bsoft-api/src/main/resources/mapper/SerPageFieldMapper.xml
......@@ -14,7 +14,7 @@
<selectKey keyProperty="id" order="AFTER" resultType="java.math.BigDecimal">
SELECT LAST_INSERT_ID()
</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
select ID, CREATE_DATE, CREATE_USERID, `STATE`, FIELD_CODE, FIELD_NAME, REMARK
from SER_PAGE_FIELD
</select>
</mapper>
\ No newline at end of file
bsoft-api/src/main/resources/mapper/SerPageMapper.xml
......@@ -17,7 +17,7 @@
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
SELECT LAST_INSERT_ID()
</selectKey>
insert into SER_PAGE (CREATE_DATE, CREATE_USERID, "STATE",
insert into SER_PAGE (CREATE_DATE, CREATE_USERID, `STATE`,
PAGE_CODE, PAGE_NAME)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{pageCode,jdbcType=VARCHAR}, #{pageName,jdbcType=VARCHAR})
......@@ -26,18 +26,18 @@
update SER_PAGE
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
"STATE" = #{state,jdbcType=DECIMAL},
`STATE` = #{state,jdbcType=DECIMAL},
PAGE_CODE = #{pageCode,jdbcType=VARCHAR},
PAGE_NAME = #{pageName,jdbcType=VARCHAR}
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, "STATE", PAGE_CODE, PAGE_NAME
select ID, CREATE_DATE, CREATE_USERID, `STATE`, PAGE_CODE, PAGE_NAME
from SER_PAGE
where ID = #{id,jdbcType=DECIMAL}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, "STATE", PAGE_CODE, PAGE_NAME
select ID, CREATE_DATE, CREATE_USERID, `STATE`, PAGE_CODE, PAGE_NAME
from SER_PAGE
</select>
<select id="selectByCodeAndDim" resultMap="BaseResultMap">
......
bsoft-api/src/main/resources/mapper/SerPageProjFieldRsMapper.xml
......@@ -16,7 +16,7 @@
<selectKey keyProperty="id" order="AFTER" resultType="java.math.BigDecimal">
SELECT LAST_INSERT_ID()
</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,7 @@
#{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>
......
bsoft-api/src/main/resources/mapper/SerPageProjMapper.xml
......@@ -14,7 +14,7 @@
<selectKey keyProperty="id" order="AFTER" resultType="java.math.BigDecimal">
SELECT LAST_INSERT_ID()
</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
bsoft-api/src/main/resources/mapper/SerPageProjValueMapper.xml
......@@ -30,7 +30,7 @@
<selectKey keyProperty="id" order="AFTER" resultType="java.math.BigDecimal">
SELECT LAST_INSERT_ID()
</selectKey>
insert into SER_PAGE_PROJ_VALUE (CREATE_DATE, CREATE_USERID, "STATE",
insert into SER_PAGE_PROJ_VALUE (CREATE_DATE, CREATE_USERID, `STATE`,
DEPT_CODE, DATE_FILTER, DATA_CATEGORY,
PROJ_TYPE, PROJ_ID, FIELD_ID,
FIELD_VALUE, FIELD_UNIT)
......@@ -40,7 +40,7 @@
#{fieldValue,jdbcType=VARCHAR}, #{fieldUnit,jdbcType=VARCHAR})
</insert>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, "STATE", DEPT_CODE, DATE_FILTER, DATA_CATEGORY,
select ID, CREATE_DATE, CREATE_USERID, `STATE`, DEPT_CODE, DATE_FILTER, DATA_CATEGORY,
PROJ_TYPE, PROJ_ID, FIELD_ID, FIELD_VALUE, FIELD_UNIT
from SER_PAGE_PROJ_VALUE
</select>
......
bsoft-api/src/main/resources/mapper/SerPageValueConfigMapper.xml
......@@ -18,7 +18,7 @@
<selectKey keyProperty="id" order="AFTER" resultType="java.math.BigDecimal">
SELECT LAST_INSERT_ID()
</selectKey>
insert into SER_PAGE_VALUE_CONFIG (CREATE_DATE, CREATE_USERID, "STATE",
insert into SER_PAGE_VALUE_CONFIG (CREATE_DATE, CREATE_USERID, `STATE`,
PAGE, PAGE_NAME, SQLSTR
)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
......@@ -29,19 +29,19 @@
update SER_PAGE_VALUE_CONFIG
set CREATE_DATE = #{createDate,jdbcType=TIMESTAMP},
CREATE_USERID = #{createUserid,jdbcType=DECIMAL},
"STATE" = #{state,jdbcType=DECIMAL},
`STATE` = #{state,jdbcType=DECIMAL},
PAGE = #{page,jdbcType=DECIMAL},
PAGE_NAME = #{pageName,jdbcType=VARCHAR},
SQLSTR = #{sqlstr,jdbcType=VARCHAR}
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, "STATE", PAGE, PAGE_NAME, SQLSTR
select ID, CREATE_DATE, CREATE_USERID, `STATE`, PAGE, PAGE_NAME, SQLSTR
from SER_PAGE_VALUE_CONFIG
where ID = #{id,jdbcType=DECIMAL}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, "STATE", PAGE, PAGE_NAME, SQLSTR
select ID, CREATE_DATE, CREATE_USERID, `STATE`, PAGE, PAGE_NAME, SQLSTR
from SER_PAGE_VALUE_CONFIG
</select>
<select id="selectByPage" resultMap="BaseResultMap">
......
bsoft-api/src/main/resources/mapper/SerProjMapper.xml
......@@ -29,8 +29,8 @@
<selectKey keyProperty="id" order="AFTER" resultType="java.math.BigDecimal">
SELECT LAST_INSERT_ID()
</selectKey>
insert into SER_PROJ (CREATE_DATE, CREATE_USERID, "STATE",
"TYPE", PROJ_TYPE, PROJ_NAME,
insert into SER_PROJ (CREATE_DATE, CREATE_USERID, `STATE`,
`TYPE`, PROJ_TYPE, PROJ_NAME,
IS_BUDGET, TYPE_STATE, SORT
)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
......@@ -42,8 +42,8 @@
update SER_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},
......@@ -52,21 +52,21 @@
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, "STATE", "TYPE", PROJ_TYPE, PROJ_NAME, IS_BUDGET,
select ID, CREATE_DATE, CREATE_USERID, `STATE`, `TYPE`, PROJ_TYPE, PROJ_NAME, IS_BUDGET,
TYPE_STATE, SORT
from SER_PROJ
where ID = #{id,jdbcType=DECIMAL}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, "STATE", "TYPE", PROJ_TYPE, PROJ_NAME, IS_BUDGET,
select ID, CREATE_DATE, CREATE_USERID, `STATE`, `TYPE`, PROJ_TYPE, PROJ_NAME, IS_BUDGET,
TYPE_STATE, SORT
from SER_PROJ
</select>
<select id="selectState" resultMap="ProjectInfo">
select DISTINCT p.TYPE as EXPONENT_ID,e.EXPONENT_NAME,e.SORT
from ser_proj p
join DIC_EXPONENT e on e.EXPONENT_ID=p.TYPE and e.STATE = 1
where p.STATE = 1
join DIC_EXPONENT 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>
......@@ -81,10 +81,10 @@
join SER_PROJ p on p.ID =v.PROJ_ID and p.STATE = 1
where 1=1
<if test="date!=null">
and v."DATE"=#{date}
and v.`DATE`= LEFT(#{date,jdbcType=DECIMAL},4)
</if>
<if test="budgetType!=null">
and BitAnd(IS_BUDGET,#{budgetType})>0
and IS_BUDGET&amp;#{budgetType,jdbcType=DECIMAL})>0
</if>
GROUP BY v.DEPT_CODE,v.SORT
order by v.SORT
......
bsoft-api/src/main/resources/mapper/SerProjValueMapper.xml
......@@ -42,7 +42,7 @@
<selectKey keyProperty="id" order="AFTER" resultType="java.math.BigDecimal">
SELECT LAST_INSERT_ID()
</selectKey>
insert into SER_PROJ_VALUE (CREATE_DATE, CREATE_USERID, "STATE",
insert into SER_PROJ_VALUE (CREATE_DATE, CREATE_USERID, `STATE`,
PROJ_ID, QNZ, WQQS,
LS, MB, CSYSZ, CSYSZ_TB,
YSZ, YSZ_TB, SZ, ZXPL,
......@@ -75,7 +75,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},
......@@ -87,15 +87,15 @@
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, "STATE", PROJ_ID, QNZ, WQQS, LS, MB, CSYSZ,
CSYSZ_TB, YSZ, YSZ_TB, SZ, ZXPL, "DATE", DEPT_CODE, SORT, VERSION, QNZ_UNIT, CSYSZ_UNIT,
select ID, CREATE_DATE, CREATE_USERID, `STATE`, PROJ_ID, QNZ, WQQS, LS, MB, CSYSZ,
CSYSZ_TB, YSZ, YSZ_TB, SZ, ZXPL, `DATE`, DEPT_CODE, SORT, VERSION, QNZ_UNIT, CSYSZ_UNIT,
YSZ_UNIT, SZ_UNIT, HOSCODE
from SER_PROJ_VALUE
where ID = #{id,jdbcType=DECIMAL}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, `STATE`, PROJ_ID, QNZ, WQQS, LS, MB, CSYSZ,
CSYSZ_TB, YSZ, YSZ_TB, SZ, ZXPL, "DATE", DEPT_CODE, SORT, VERSION, QNZ_UNIT, CSYSZ_UNIT,
CSYSZ_TB, YSZ, YSZ_TB, SZ, ZXPL, `DATE`, DEPT_CODE, SORT, VERSION, QNZ_UNIT, CSYSZ_UNIT,
YSZ_UNIT, SZ_UNIT, WQQS_ZYPZ_JS, DEPT_NAME, HOSCODE
from SER_PROJ_VALUE
</select>
......@@ -106,12 +106,12 @@
(
SELECT v.PROJ_ID,MAX(v.VERSION) AS VERSION
FROM SER_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" = #{date,jdbcType=DECIMAL}
AND v.`DATE` = LEFT(#{date,jdbcType=DECIMAL},4)
</if>
<if test="hosCode!=null">
AND v.HOSCODE = #{hosCode,jdbcType=VARCHAR}
......@@ -123,7 +123,7 @@
AND v.DEPT_CODE = #{dept,jdbcType=VARCHAR}
</if>
<if test="date!=null">
AND v."DATE" = #{date,jdbcType=DECIMAL}
AND v.`DATE` = LEFT(#{date,jdbcType=DECIMAL},4)
</if>
<if test="hosCode!=null">
AND v.HOSCODE = #{hosCode,jdbcType=VARCHAR}
......@@ -136,10 +136,10 @@
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 BitAnd(p.IS_BUDGET,#{budgetType})>0
AND p.IS_BUDGET&amp;#{budgetType,jdbcType=DECIMAL}>0
</if>
ORDER BY p.SORT
</select>
......
bsoft-api/src/main/resources/mapper/SerProjValueSzMapper.xml
......@@ -21,8 +21,8 @@
<selectKey keyProperty="id" order="AFTER" resultType="java.math.BigDecimal">
SELECT LAST_INSERT_ID()
</selectKey>
insert into SER_PROJ_VALUE_SZ (CREATE_DATE, CREATE_USERID, "STATE",
PROJ_ID, SZ, ZXPL, "DATE",
insert into SER_PROJ_VALUE_SZ (CREATE_DATE, CREATE_USERID, `STATE`,
PROJ_ID, SZ, ZXPL, `DATE`,
DEPT_CODE, HOSCODE)
values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
#{projId,jdbcType=DECIMAL}, #{sz,jdbcType=DECIMAL}, #{zxpl,jdbcType=DECIMAL}, #{date,jdbcType=DECIMAL},
......@@ -32,23 +32,23 @@
update SER_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},
HOSCODE = #{hoscode,jdbcType=VARCHAR}
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, "STATE", PROJ_ID, SZ, ZXPL, "DATE", DEPT_CODE,
select ID, CREATE_DATE, CREATE_USERID, `STATE`, PROJ_ID, SZ, ZXPL, `DATE`, DEPT_CODE,
HOSCODE
from SER_PROJ_VALUE_SZ
where ID = #{id,jdbcType=DECIMAL}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, "STATE", PROJ_ID, SZ, ZXPL, "DATE", DEPT_CODE,
select ID, CREATE_DATE, CREATE_USERID, "STATE", PROJ_ID, SZ, ZXPL, `DATE`, DEPT_CODE,
HOSCODE
from SER_PROJ_VALUE_SZ
</select>
......@@ -56,8 +56,8 @@
select *
from SER_PROJ_VALUE_SZ
where STATE = 1 and PROJ_ID = #{projId,jdbcType=DECIMAL}
and LEFT("DATE",4) = #{date,jdbcType=DECIMAL}
and `DATE` = #{date,jdbcType=DECIMAL}
and DEPT_CODE = #{deptCode,jdbcType=VARCHAR} and HOSCODE = #{hosCode,jdbcType=VARCHAR}
order by "DATE" desc
order by `DATE` desc
</select>
</mapper>
\ No newline at end of file
bsoft-api/src/main/resources/mapper/SysMenuMapper.xml
......@@ -35,7 +35,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},
......@@ -45,13 +45,13 @@
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select ID, CREATE_DATA, CREATE_USERID, "STATE", MENU_NAME, MENU_URL, MENU_IMAGE,
select ID, CREATE_DATA, CREATE_USERID, `STATE`, MENU_NAME, MENU_URL, MENU_IMAGE,
PARENT_ID, PAGE_CODE, SORT
from SYS_MENU
where ID = #{id,jdbcType=DECIMAL}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATA, CREATE_USERID, "STATE", MENU_NAME, MENU_URL, MENU_IMAGE,
select ID, CREATE_DATA, CREATE_USERID, `STATE`, MENU_NAME, MENU_URL, MENU_IMAGE,
PARENT_ID, PAGE_CODE, SORT
from SYS_MENU
</select>
......
bsoft-api/src/main/resources/mapper/SysRoleMapper.xml
......@@ -26,18 +26,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>
</mapper>
\ No newline at end of file
bsoft-api/src/main/resources/mapper/SysRoleMenuRsMapper.xml
......@@ -17,7 +17,7 @@
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
SELECT LAST_INSERT_ID()
</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})
......@@ -26,18 +26,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
bsoft-api/src/main/resources/mapper/SysUserMapper.xml
......@@ -26,8 +26,8 @@
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
SELECT LAST_INSERT_ID()
</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)
......@@ -41,10 +41,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},
......@@ -56,21 +56,21 @@
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, "STATE", USER_CODE, USER_NAME, "PASSWORD",
select ID, CREATE_DATE, CREATE_USERID, `STATE`, USER_CODE, USER_NAME, `PASSWORD`,
IDCARD, SEX, MOBILE, PAGE_COUNT, ERROR_COUNT, ERROR_TIME, LAST_TIME, LAST_IP
from SYS_USER
where ID = #{id,jdbcType=DECIMAL}
</select>
<select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, "STATE", USER_CODE, USER_NAME, "PASSWORD",
select ID, CREATE_DATE, CREATE_USERID, `STATE`, USER_CODE, USER_NAME, `PASSWORD`,
IDCARD, SEX, MOBILE, PAGE_COUNT, ERROR_COUNT, ERROR_TIME, LAST_TIME, LAST_IP
from SYS_USER
</select>
<select id="selectByCode" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, STATE, USER_CODE, USER_NAME, PASSWORD, IDCARD,
select ID, CREATE_DATE, CREATE_USERID, `STATE`, USER_CODE, USER_NAME, `PASSWORD`, IDCARD,
SEX, MOBILE, PAGE_COUNT, ERROR_COUNT, ERROR_TIME, LAST_TIME, LAST_IP
from SYS_USER
where USER_CODE=#{userCode,jdbcType=VARCHAR}
and STATE != 0
and `STATE` != 0
</select>
</mapper>
\ No newline at end of file
bsoft-api/src/main/resources/mapper/SysUserMenuRsMapper.xml
......@@ -17,7 +17,7 @@
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
SELECT LAST_INSERT_ID()
</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})
......@@ -26,18 +26,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
bsoft-api/src/main/resources/mapper/SysUserOrgRsMapper.xml
......@@ -17,7 +17,7 @@
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
SELECT LAST_INSERT_ID()
</selectKey>
insert into SYS_USER_ORG_RS (CREATE_DATE, CREATE_USERID, "STATE",
insert into SYS_USER_ORG_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})
......@@ -26,18 +26,18 @@
update SYS_USER_ORG_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_ORG_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_ORG_RS
</select>
</mapper>
\ No newline at end of file
bsoft-api/src/main/resources/mapper/SysUserRoleRsMapper.xml
......@@ -17,7 +17,7 @@
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
SELECT LAST_INSERT_ID()
</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})
......@@ -26,18 +26,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">
......
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