zjh
2023-12-08 3493b4809201bf6ba1bd859006639485f1b3eb41
zjh 2023/12/08--1
3个文件已修改
1个文件已添加
66 ■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHarmTypeController.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomer.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjHarmType.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/resources/mapper/hosp/TjHarmTypeMapper.xml 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHarmTypeController.java
@@ -41,7 +41,8 @@
    @GetMapping("/list")
    public TableDataInfo list(TjHarmType tjHarmType) {
        startPage();
        List<TjHarmType> list = tjHarmTypeService.list();
//        List<TjHarmType> list = tjHarmTypeService.list();
        List<TjHarmType> list = tjHarmTypeService.selectTjHarmTypeList(tjHarmType);
        return getDataTable(list);
    }
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomer.java
@@ -212,7 +212,7 @@
     * 体检时间
     */
    @TableField(exist = false)
    @JsonFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date tjTime;
    /**
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjHarmType.java
@@ -27,7 +27,7 @@
    /**
     * id
     */
    @TableId(type= IdType.AUTO)
    @TableId(type= IdType.ASSIGN_ID)
    @JsonSerialize(using = ToStringSerializer.class)
    private String aid;
@@ -35,13 +35,13 @@
     * $column.columnComment
     */
    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
    private String harmpinyin;
    private String harmPinYin;
    /**
     * $column.columnComment
     */
    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
    private String harmtype;
    private String harmType;
    /**
     * $column.columnComment
@@ -53,19 +53,19 @@
     * $column.columnComment
     */
    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
    private String harminfo;
    private String harmInfo;
    /**
     * $column.columnComment
     */
    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
    private String externalcode;
    private String externalCode;
    /**
     * $column.columnComment
     */
    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
    private String harmcode;
    private String harmCode;
    /**
     * $column.columnComment
ltkj-hosp/src/main/resources/mapper/hosp/TjHarmTypeMapper.xml
New file
@@ -0,0 +1,49 @@
<?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.ltkj.hosp.mapper.TjHarmTypeMapper">
    <resultMap type="TjHarmType" id="TjHarmTypeResult">
        <result property="aid" column="aid"/>
        <result property="harmPinYin" column="harm_pin_yin"/>
        <result property="harmType" column="harm_type"/>
        <result property="sort" column="sort"/>
        <result property="harmInfo" column="harm_info"/>
        <result property="externalCode" column="external_code"/>
        <result property="harmCode" column="harm_code"/>
        <result property="type" column="type"/>
        <result property="protection" column="protection"/>
    </resultMap>
    <sql id="selectTjHarmTypeVo">
        select
            aid,
            harm_pin_yin,
            harm_type,
            sort,
            harm_info,
            external_code,
            harm_code,
            type,
            protection
        from tj_harm_type
    </sql>
    <select id="selectTjHarmTypeList" parameterType="TjHarmType" resultMap="TjHarmTypeResult">
        <include refid="selectTjHarmTypeVo"/>
        <where>
            <if test="harmCode   != null  and harmCode  != ''">
                and harm_code = #{harmCode}
            </if>
            <if test=" harmType != null  and  harmType != ''">
                and  harm_type = #{harmType}
            </if>
            <if test="harmPinYin   != null  and harmPinYin   != ''">
                and harm_pin_yin   = #{harmPinYin}
            </if>
        </where>
    </select>
</mapper>