增加住院采血程序，以及若干BUG
This commit is contained in:
jiangs
parent
0ed4cb41f8
commit
710b085b8e
@ -116,7 +116,7 @@ public class DataScopeAspect {
|
||||
} else if (DATA_SCOPE_DEPT.equals(dataScope)) {
|
||||
sqlString.append(StringUtils.format(" OR {}.dept_id = {} ", deptAlias, user.getDeptId()));
|
||||
} else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope)) {
|
||||
sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )", deptAlias, user.getDeptId(), user.getDeptId()));
|
||||
sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or dbo.find_in_set( {} , ancestors ) > 0 )", deptAlias, user.getDeptId(), user.getDeptId()));
|
||||
} else if (DATA_SCOPE_SELF.equals(dataScope)) {
|
||||
if (StringUtils.isNotBlank(userAlias)) {
|
||||
sqlString.append(StringUtils.format(" OR {}.user_id = {} ", userAlias, user.getUserId()));
|
||||
|
||||
@ -110,7 +110,7 @@ public class SecurityConfig {
|
||||
// 对于登录login 注册register 验证码captchaImage 允许匿名访问
|
||||
requests.antMatchers("/login", "/register", "/captchaImage").permitAll()
|
||||
// 静态资源，可匿名访问
|
||||
.antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
|
||||
.antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**","/zyreq/**").permitAll()
|
||||
.antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
|
||||
.antMatchers("/doc.html").permitAll() //Knife4j 过滤
|
||||
// 除上面外的所有请求全部需要鉴权认证
|
||||
|
||||
@ -11,7 +11,6 @@ import com.czlis.common.core.domain.entity.SysUser;
|
||||
*
|
||||
* @author admin
|
||||
*/
|
||||
@Mapper
|
||||
public interface SysUserMapper {
|
||||
/**
|
||||
* 根据条件分页查询用户列表
|
||||
|
||||
@ -85,7 +85,7 @@
|
||||
<!-- 打印mysql日志 name= 存放mapper的包名; 注意mybatis-plus.configuration.log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
|
||||
如果log-impl: org.apache.ibatis.logging.stdout.StdOutImpl ;则只会打印到控制台;不会存放到文件
|
||||
-->
|
||||
<logger name="com.czlis.liswork.mapper" level="DEBUG" additivity="false">
|
||||
<logger name="com.czlis.**.mapper" level="DEBUG" additivity="false">
|
||||
<appender-ref ref="stdout"/>
|
||||
<appender-ref ref="mysql_log" />
|
||||
</logger>
|
||||
|
||||
@ -75,11 +75,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
</select>
|
||||
|
||||
<select id="selectChildrenDeptById" parameterType="Long" resultMap="SysDeptResult">
|
||||
select * from sys_dept where dbo.find_in_set(#{deptId}, ancestors)
|
||||
select * from sys_dept where dbo.find_in_set(#{deptId}, ancestors) > 0
|
||||
</select>
|
||||
|
||||
<select id="selectNormalChildrenDeptById" parameterType="Long" resultType="int">
|
||||
select count(*) from sys_dept where status = 0 and del_flag = '0' and dbo.find_in_set(#{deptId}, ancestors)
|
||||
select count(*) from sys_dept where status = 0 and del_flag = '0' and dbo.find_in_set(#{deptId}, ancestors) > 0
|
||||
</select>
|
||||
|
||||
<select id="checkDeptNameUnique" resultMap="SysDeptResult">
|
||||
|
||||
@ -79,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
AND u.create_time <= CONVERT(varchar(100), #{params.endTime}, 120)
|
||||
</if>
|
||||
<if test="deptId != null and deptId != 0">
|
||||
AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE dbo.find_in_set(#{deptId}, ancestors) ))
|
||||
AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE dbo.find_in_set(#{deptId}, ancestors) > 0 ))
|
||||
</if>
|
||||
<!-- 数据范围过滤 -->
|
||||
${params.dataScope}
|
||||
|
||||
@ -39,4 +39,6 @@ public class ZycxController extends BaseController {
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -1,9 +1,11 @@
|
||||
package com.czlis.zycx.mapper;
|
||||
|
||||
import com.czlis.zycx.pojo.Web_getBarcode;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
public interface ZycxMapper {
|
||||
|
||||
List<Web_getBarcode> getSQDInfo(Web_getBarcode web_getBarcode);
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
package com.czlis.zycx.pojo;
|
||||
|
||||
import com.czlis.common.core.domain.BaseEntity;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
@ -10,7 +11,7 @@ import java.util.Date;
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class Web_getBarcode {
|
||||
public class Web_getBarcode extends BaseEntity {
|
||||
private String sqh;
|
||||
private String ksdh;
|
||||
private String sqys;
|
||||
|
||||
@ -1,21 +1,27 @@
|
||||
package com.czlis.zycx.service.impl;
|
||||
|
||||
import com.czlis.common.core.domain.Result;
|
||||
import com.czlis.zycx.mapper.ZycxMapper;
|
||||
import com.czlis.zycx.pojo.Web_getBarcode;
|
||||
import com.czlis.zycx.service.ZycxService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
@Slf4j
|
||||
@Service
|
||||
public class ZycxServiceImpl implements ZycxService {
|
||||
|
||||
@Autowired
|
||||
private ZycxMapper zycxMapper;
|
||||
|
||||
|
||||
@Override
|
||||
public List<Web_getBarcode> getSQDInfo(Web_getBarcode webGetBarcode) {
|
||||
|
||||
return null;
|
||||
return zycxMapper.getSQDInfo(webGetBarcode);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -45,12 +45,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
FROM web_getBarcode
|
||||
</sql>
|
||||
|
||||
<select id="getSQDInfo">
|
||||
<select id="getSQDInfo" parameterType="com.czlis.zycx.pojo.Web_getBarcode" resultType="com.czlis.zycx.pojo.Web_getBarcode">
|
||||
<include refid="selectWeb_getBarcodeVo"></include>
|
||||
<![CDATA[
|
||||
where sqsj >= #{sqsj} and sqsj <= #{sqsj}
|
||||
]]>
|
||||
<if test="sqh"></if>
|
||||
<if test="sqh != null and sqh != ''"> and sqh = #{sqh}</if>
|
||||
<if test="zt != null and zt != ''"> and zt = #{zt}</if>
|
||||
<if test="ksdh != null and ksdh != ''"> and ksdh = #{ksdh}</if>
|
||||
<if test="brly != null and brly != ''"> and brly = #{brly}</if>
|
||||
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
|
||||
AND sqsj >= CONVERT(varchar(100), #{params.beginTime}, 120)
|
||||
</if>
|
||||
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
|
||||
AND sqsj <= CONVERT(varchar(100), #{params.endTime}, 120)
|
||||
</if>
|
||||
</select>
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user