From 3493b4809201bf6ba1bd859006639485f1b3eb41 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 08 十二月 2023 14:27:34 +0800
Subject: [PATCH] zjh 2023/12/08--1

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHarmTypeController.java |    3 +
 ltkj-hosp/src/main/resources/mapper/hosp/TjHarmTypeMapper.xml                     |   49 ++++++++++++++++++++++++
 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomer.java                      |    2 
 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjHarmType.java                      |   12 +++---
 4 files changed, 58 insertions(+), 8 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHarmTypeController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHarmTypeController.java
index 92f8fe4..46060a9 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjHarmTypeController.java
+++ b/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);
     }
 
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomer.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomer.java
index 2e75a14..b39f390 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjCustomer.java
+++ b/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;
 
     /**
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjHarmType.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjHarmType.java
index 5851ab7..ab533bb 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjHarmType.java
+++ b/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
diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/TjHarmTypeMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/TjHarmTypeMapper.xml
new file mode 100644
index 0000000..1347966
--- /dev/null
+++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjHarmTypeMapper.xml
@@ -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>

--
Gitblit v1.8.0