提交:11

yq-admin/src/main/java/yq/web/controller/mine/MineWarningController.java

@@ -44,7 +44,7 @@ public class MineWarningController extends BaseController
     public TableDataInfo list(MineWarning mineWarning)
     {
         startPage();
-        List<MineWarningVo> list = mineWarningService.selectMineWarningList(mineWarning);
+        List<MineWarning> list = mineWarningService.selectMineWarningList(mineWarning);
         return getDataTable(list);
     }
 
@@ -67,8 +67,8 @@ public class MineWarningController extends BaseController
     @Log(title = "【预警导出】", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, MineWarning mineWarning){
-        List<MineWarningVo> list = mineWarningService.selectMineWarningList(mineWarning);
-        ExcelUtil<MineWarningVo> util = new ExcelUtil<MineWarningVo>(MineWarningVo.class);
+        List<MineWarning> list = mineWarningService.selectMineWarningList(mineWarning);
+        ExcelUtil<MineWarning> util = new ExcelUtil<MineWarning>(MineWarning.class);
         util.exportExcel(response, list, "健康数据");
     }
 

yq-system/src/main/java/yq/system/domain/MineWarning.java

@@ -30,6 +30,13 @@ public class MineWarning  {
     @Excel(name = "姓名")
     private String faceName;
 
+    @Excel(name = "年龄")
+    private Long age;
+
+    /** 手机号 */
+    @Excel(name = "手机号")
+    private String facePhone;
+
     @NotNull(message = "groupId不能为空")
     private Long groupId;
 

yq-system/src/main/java/yq/system/mapper/MineWarningMapper.java

@@ -26,7 +26,7 @@ public interface MineWarningMapper
      * @param mineWarning 【请填写功能名称】
      * @return 【请填写功能名称】集合
      */
-    public List<MineWarningVo> selectMineWarningList(MineWarning mineWarning);
+    public List<MineWarning> selectMineWarningList(MineWarning mineWarning);
 
     public List<MineWarning> selectMineWarningMedicalList(MineWarning mineWarning);
 

yq-system/src/main/java/yq/system/service/IMineWarningService.java

@@ -26,7 +26,7 @@ public interface IMineWarningService
      * @param mineWarning 【请填写功能名称】
      * @return 【请填写功能名称】集合
      */
-    public List<MineWarningVo> selectMineWarningList(MineWarning mineWarning);
+    public List<MineWarning> selectMineWarningList(MineWarning mineWarning);
     /**
      * 查询【请填写功能名称】列表
      *

yq-system/src/main/java/yq/system/service/impl/MineWarningServiceImpl.java

@@ -50,7 +50,7 @@ public class MineWarningServiceImpl implements IMineWarningService
      * @return 【请填写功能名称】
      */
     @Override
-    public List<MineWarningVo> selectMineWarningList(MineWarning mineWarning)
+    public List<MineWarning> selectMineWarningList(MineWarning mineWarning)
     {
         return mineWarningMapper.selectMineWarningList(mineWarning);
     }

yq-system/src/main/resources/mapper/system/MineWarningMapper.xml

@@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="yq.system.mapper.MineWarningMapper">
     
-    <resultMap type="MineWarningVo" id="MineWarningResult">
+    <resultMap type="MineWarning" id="MineWarningResult">
         <result property="id"    column="id"    />
         <result property="faceId"    column="face_id"    />
         <result property="bpHigh"    column="bp_high"    />
@@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="faceName"    column="face_name"    />
         <result property="facePhone"    column="face_phone"    />
         <result property="age"    column="age"    />
+        <result property="groupId"    column="group_id"    />
     </resultMap>
 
     <sql id="selectMineWarningVo">
@@ -36,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             mf.face_name,
             mf.age,
             mf.face_phone,
+            mf.group_id,
             mg.mine_group_name
         FROM
             mine_warning  mw
@@ -87,6 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="mineGroupName != null  and mineGroupName != ''"> and mg.mine_group_name like concat('%', #{mineGroupName}, '%')</if>
             <if test="faceName != null  and faceName != ''"> and mf.face_name like concat('%', #{faceName}, '%')</if>
+            <if test="groupId != null  "> and mf.group_id =#{groupId}</if>
             <if test="bpHigh != null "> and mw.bp_high = #{bpHigh}</if>
             <if test="bpLow != null "> and mw.bp_low = #{bpLow}</if>
             <if test="groupId != null "> and mg.id = #{groupId}</if>