Skip to content

S
sv-springboot
Commit 8183cb92 by Suvalue
Options

根据疾病名称搜索疾病 

预算编制汇总数据根据用户科室查询
parent 66b068d4
Showing with 82 additions and 46 deletions
bsoft-api/src/main/java/com/bsoft/api/mapper/SerProjMapper.java
...@@ -22,5 +22,5 @@ public interface SerProjMapper { ...@@ -22,5 +22,5 @@ public interface SerProjMapper {
List<ProjectInfo> selectState(@Param("projType") Integer projType, List<ProjectInfo> selectState(@Param("projType") Integer projType,
@Param("typeState") Integer typeState); @Param("typeState") Integer typeState);
List<Summary> selectDept(@Param("date") Integer date,@Param("budgetType") Integer budgetType); List<Summary> selectDept(@Param("date") Integer date, @Param("budgetType") Integer budgetType, @Param("userId") Long userId);
} }
\ No newline at end of file
bsoft-api/src/main/resources/application-test.properties
#### \u6D4B\u8BD5\u73AF\u5883 ################################################### #### \u6D4B\u8BD5\u73AF\u5883 ###################################################
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.url=jdbc:mysql://192.168.18.176:3306/scml_sy_test1.0?useUnicode=true&characterEncoding=utf8&useSSL=false&autoReconnect=true&rewriteBatchedStatements=TRUE&serverTimezone=UTC
spring.datasource.username=root spring.datasource.username=root
spring.datasource.password=Suvalue2016 spring.datasource.password=Suvalue2016
spring.datasource.driver-class-name=com.mysql.jdbc.Driver spring.datasource.driver-class-name=com.mysql.jdbc.Driver
......
bsoft-api/src/main/resources/mapper/SerDiseaseMapper.xml
...@@ -2,30 +2,30 @@ ...@@ -2,30 +2,30 @@
<!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.bsoft.api.mapper.SerDiseaseMapper"> <mapper namespace="com.bsoft.api.mapper.SerDiseaseMapper">
<resultMap id="BaseResultMap" type="com.bsoft.api.model.SerDisease"> <resultMap id="BaseResultMap" type="com.bsoft.api.model.SerDisease">
<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="MDC_CODE" jdbcType="VARCHAR" property="mdcCode" /> <result column="MDC_CODE" jdbcType="VARCHAR" property="mdcCode"/>
<result column="MDC_NAME" jdbcType="VARCHAR" property="mdcName" /> <result column="MDC_NAME" jdbcType="VARCHAR" property="mdcName"/>
<result column="DATE" jdbcType="DECIMAL" property="date" /> <result column="DATE" jdbcType="DECIMAL" property="date"/>
<result column="MDC_NUM" jdbcType="VARCHAR" property="mdcNum" /> <result column="MDC_NUM" jdbcType="VARCHAR" property="mdcNum"/>
<result column="PARENT_ID" jdbcType="DECIMAL" property="parentId" /> <result column="PARENT_ID" jdbcType="DECIMAL" property="parentId"/>
<result column="LEVEL" jdbcType="DECIMAL" property="level" /> <result column="LEVEL" jdbcType="DECIMAL" property="level"/>
<result column="ORG_ID" jdbcType="DECIMAL" property="orgId" /> <result column="ORG_ID" jdbcType="DECIMAL" property="orgId"/>
<result column="ORG_NAME" jdbcType="VARCHAR" property="orgName" /> <result column="ORG_NAME" jdbcType="VARCHAR" property="orgName"/>
<result column="PARENT_CODE" jdbcType="VARCHAR" property="parentCode" /> <result column="PARENT_CODE" jdbcType="VARCHAR" property="parentCode"/>
</resultMap> </resultMap>
<resultMap id="DiseaseLevel" type="com.bsoft.api.model.respmodel.DiseaseLevel"> <resultMap id="DiseaseLevel" type="com.bsoft.api.model.respmodel.DiseaseLevel">
<id column="ID" jdbcType="DECIMAL" property="id" /> <id column="ID" jdbcType="DECIMAL" property="id"/>
<result column="MDC_CODE" jdbcType="VARCHAR" property="mdcCode" /> <result column="MDC_CODE" jdbcType="VARCHAR" property="mdcCode"/>
<result column="MDC_NAME" jdbcType="VARCHAR" property="mdcName" /> <result column="MDC_NAME" jdbcType="VARCHAR" property="mdcName"/>
<result column="DATE" jdbcType="DECIMAL" property="date" /> <result column="DATE" jdbcType="DECIMAL" property="date"/>
<result column="MDC_NUM" jdbcType="VARCHAR" property="mdcNum" /> <result column="MDC_NUM" jdbcType="VARCHAR" property="mdcNum"/>
<result column="PARENT_ID" jdbcType="DECIMAL" property="parentId" /> <result column="PARENT_ID" jdbcType="DECIMAL" property="parentId"/>
<result column="LEVEL" jdbcType="DECIMAL" property="level" /> <result column="LEVEL" jdbcType="DECIMAL" property="level"/>
<result column="ORG_ID" jdbcType="DECIMAL" property="orgId" /> <result column="ORG_ID" jdbcType="DECIMAL" property="orgId"/>
<result column="ORG_NAME" jdbcType="VARCHAR" property="orgName" /> <result column="ORG_NAME" jdbcType="VARCHAR" property="orgName"/>
</resultMap> </resultMap>
<insert id="insert" parameterType="com.bsoft.api.model.SerDisease"> <insert id="insert" parameterType="com.bsoft.api.model.SerDisease">
<selectKey keyProperty="id" order="AFTER" resultType="java.math.BigDecimal"> <selectKey keyProperty="id" order="AFTER" resultType="java.math.BigDecimal">
...@@ -43,8 +43,19 @@ ...@@ -43,8 +43,19 @@
) )
</insert> </insert>
<select id="selectAll" resultMap="BaseResultMap"> <select id="selectAll" resultMap="BaseResultMap">
select ID, CREATE_DATE, CREATE_USERID, `STATE`, MDC_CODE, MDC_NAME, `DATE`, MDC_NUM, select ID,
PARENT_ID, `LEVEL`, ORG_ID, ORG_NAME, PARENT_CODE CREATE_DATE,
CREATE_USERID,
`STATE`,
MDC_CODE,
MDC_NAME,
`DATE`,
MDC_NUM,
PARENT_ID,
`LEVEL`,
ORG_ID,
ORG_NAME,
PARENT_CODE
from SER_DISEASE from SER_DISEASE
</select> </select>
<select id="selectByCode" resultMap="BaseResultMap"> <select id="selectByCode" resultMap="BaseResultMap">
...@@ -66,7 +77,7 @@ ...@@ -66,7 +77,7 @@
and rs.DEPT_CODE=#{deptCode,jdbcType=VARCHAR} and rs.DEPT_CODE=#{deptCode,jdbcType=VARCHAR}
</if> </if>
<if test="mdcName!=null"> <if test="mdcName!=null">
and d.MDC_NAME like '%'||#{mdcName,jdbcType=VARCHAR}||'%' and INSTR(d.MDC_NAME,#{mdcName,jdbcType=VARCHAR})>0
</if> </if>
order by d.MDC_NUM order by d.MDC_NUM
</select> </select>
......
bsoft-api/src/main/resources/mapper/SerProjMapper.xml
...@@ -2,27 +2,28 @@ ...@@ -2,27 +2,28 @@
<!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.bsoft.api.mapper.SerProjMapper"> <mapper namespace="com.bsoft.api.mapper.SerProjMapper">
<resultMap id="BaseResultMap" type="com.bsoft.api.model.SerProj"> <resultMap id="BaseResultMap" type="com.bsoft.api.model.SerProj">
<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="TYPE" jdbcType="DECIMAL" property="type" /> <result column="TYPE" jdbcType="DECIMAL" property="type"/>
<result column="PROJ_TYPE" jdbcType="DECIMAL" property="projType" /> <result column="PROJ_TYPE" jdbcType="DECIMAL" property="projType"/>
<result column="PROJ_NAME" jdbcType="VARCHAR" property="projName" /> <result column="PROJ_NAME" jdbcType="VARCHAR" property="projName"/>
<result column="IS_BUDGET" jdbcType="DECIMAL" property="isBudget" /> <result column="IS_BUDGET" jdbcType="DECIMAL" property="isBudget"/>
<result column="TYPE_STATE" jdbcType="DECIMAL" property="typeState" /> <result column="TYPE_STATE" jdbcType="DECIMAL" property="typeState"/>
<result column="SORT" jdbcType="DECIMAL" property="sort" /> <result column="SORT" jdbcType="DECIMAL" property="sort"/>
<result column="PARENT" jdbcType="DECIMAL" property="parent" /> <result column="PARENT" jdbcType="DECIMAL" property="parent"/>
</resultMap> </resultMap>
<resultMap id="Summary" type="com.bsoft.api.model.respmodel.Summary"> <resultMap id="Summary" type="com.bsoft.api.model.respmodel.Summary">
<result column="DEPT_CODE" jdbcType="VARCHAR" property="deptCode" /> <result column="DEPT_CODE" jdbcType="VARCHAR" property="deptCode"/>
</resultMap> </resultMap>
<resultMap id="ProjectInfo" type="com.bsoft.api.model.respmodel.ProjectInfo"> <resultMap id="ProjectInfo" type="com.bsoft.api.model.respmodel.ProjectInfo">
<result column="EXPONENT_ID" jdbcType="DECIMAL" property="exponentId" /> <result column="EXPONENT_ID" jdbcType="DECIMAL" property="exponentId"/>
<result column="EXPONENT_NAME" jdbcType="VARCHAR" property="exponentName" /> <result column="EXPONENT_NAME" jdbcType="VARCHAR" property="exponentName"/>
</resultMap> </resultMap>
<delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal"> <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
delete from SER_PROJ delete
from SER_PROJ
where ID = #{id,jdbcType=DECIMAL} where ID = #{id,jdbcType=DECIMAL}
</delete> </delete>
<insert id="insert" parameterType="com.bsoft.api.model.SerProj"> <insert id="insert" parameterType="com.bsoft.api.model.SerProj">
...@@ -52,14 +53,30 @@ ...@@ -52,14 +53,30 @@
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`, `TYPE`, PROJ_TYPE, PROJ_NAME, IS_BUDGET, select ID,
TYPE_STATE, SORT CREATE_DATE,
CREATE_USERID,
`STATE`,
`TYPE`,
PROJ_TYPE,
PROJ_NAME,
IS_BUDGET,
TYPE_STATE,
SORT
from SER_PROJ from SER_PROJ
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`, `TYPE`, PROJ_TYPE, PROJ_NAME, IS_BUDGET, select ID,
TYPE_STATE, SORT CREATE_DATE,
CREATE_USERID,
`STATE`,
`TYPE`,
PROJ_TYPE,
PROJ_NAME,
IS_BUDGET,
TYPE_STATE,
SORT
from SER_PROJ from SER_PROJ
</select> </select>
<select id="selectState" resultMap="ProjectInfo"> <select id="selectState" resultMap="ProjectInfo">
...@@ -80,6 +97,13 @@ ...@@ -80,6 +97,13 @@
from SER_PROJ_VALUE v from SER_PROJ_VALUE v
join SER_PROJ p on p.ID =v.PROJ_ID and p.STATE = 1 join SER_PROJ p on p.ID =v.PROJ_ID and p.STATE = 1
where 1=1 where 1=1
and EXISTS(select o2.ORG_CODE as DEPT_CODE
from SYS_USER_ORG_RS rs2
join DIC_ORG o2 on o2.id = rs2.ORG_ID and rs2.STATE = 1
where o2.STATE = 1
and rs2.USER_ID = #{userId,jdbcType=DECIMAL}
and o2.ORG_CODE = v.DEPT_CODE
)
<if test="date!=null"> <if test="date!=null">
and v.`DATE`= LEFT(#{date,jdbcType=DECIMAL},4) and v.`DATE`= LEFT(#{date,jdbcType=DECIMAL},4)
</if> </if>
......
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