下载备注

src/main/java/com/izouma/awesomeadmin/dao/OrderRepairDetailMapper.java

@@ -29,5 +29,7 @@ public interface OrderRepairDetailMapper{
     OrderRepairDetail queryOrderRepairDetail(OrderRepairDetail record);
 
     List<OrderRepairDetail> query(OrderRepairDetail record);
+
+    List<OrderRepairDetail> queryAllOrderRepairDetailExportRemark(OrderRepairDetail record);
 }
 

src/main/java/com/izouma/awesomeadmin/dao/OrderRepairDetailMapper.xml

@@ -1,19 +1,19 @@
 <?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.izouma.awesomeadmin.dao.OrderRepairDetailMapper" >
-    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.OrderRepairDetail" >
-                <id column="id" property="id" jdbcType="INTEGER" />
-                                        <result column="del_flag" property="delFlag" jdbcType="CHAR" />
-                                <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
-                                <result column="update_user" property="updateUser" jdbcType="VARCHAR" />
-                                <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
-                                <result column="create_user" property="createUser" jdbcType="VARCHAR" />
-                                <result column="repair_id" property="repairId" jdbcType="VARCHAR" />
-                                <result column="image_id" property="imageId" jdbcType="VARCHAR" />
-                                <result column="remark" property="remark" jdbcType="VARCHAR" />
-            </resultMap>
-    <sql id="Base_Column_List" >
-        <trim  suffixOverrides="," >
+<mapper namespace="com.izouma.awesomeadmin.dao.OrderRepairDetailMapper">
+    <resultMap id="BaseResultMap" type="com.izouma.awesomeadmin.model.OrderRepairDetail">
+        <id column="id" property="id" jdbcType="INTEGER"/>
+        <result column="del_flag" property="delFlag" jdbcType="CHAR"/>
+        <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
+        <result column="update_user" property="updateUser" jdbcType="VARCHAR"/>
+        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
+        <result column="create_user" property="createUser" jdbcType="VARCHAR"/>
+        <result column="repair_id" property="repairId" jdbcType="VARCHAR"/>
+        <result column="image_id" property="imageId" jdbcType="VARCHAR"/>
+        <result column="remark" property="remark" jdbcType="VARCHAR"/>
+    </resultMap>
+    <sql id="Base_Column_List">
+        <trim suffixOverrides=",">
             id,
 
             del_flag,
@@ -32,150 +32,154 @@
 
             remark,
 
-            </trim>
+        </trim>
     </sql>
-    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
         select
-        <include refid="Base_Column_List" />
+        <include refid="Base_Column_List"/>
         from order_repair_detail
         where id = #{id,jdbcType=INTEGER}
     </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
         delete from order_repair_detail
         where id = #{id,jdbcType=INTEGER}
     </delete>
-    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.OrderRepairDetail" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertSelective" parameterType="com.izouma.awesomeadmin.model.OrderRepairDetail" useGeneratedKeys="true"
+            keyProperty="id">
         insert into order_repair_detail
-        <trim prefix="(" suffix=")" suffixOverrides="," >
-                <if test="id!= null" >
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id!= null">
                 id,
             </if>
-                <if test="delFlag!= null" >
+            <if test="delFlag!= null">
                 del_flag,
             </if>
-                <if test="updateTime!= null" >
+            <if test="updateTime!= null">
                 update_time,
             </if>
-                <if test="updateUser!= null" >
+            <if test="updateUser!= null">
                 update_user,
             </if>
-                <if test="createTime!= null" >
+            <if test="createTime!= null">
                 create_time,
             </if>
-                <if test="createUser!= null" >
+            <if test="createUser!= null">
                 create_user,
             </if>
-                <if test="repairId!= null" >
+            <if test="repairId!= null">
                 repair_id,
             </if>
-                <if test="imageId!= null" >
+            <if test="imageId!= null">
                 image_id,
             </if>
-                <if test="remark!= null" >
+            <if test="remark!= null">
                 remark,
             </if>
-            </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides="," >
-                    <if test="id != null" >
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">
                 #{id,jdbcType=INTEGER},
             </if>
-                    <if test="delFlag != null" >
+            <if test="delFlag != null">
                 #{delFlag,jdbcType=CHAR},
             </if>
-                    <if test="updateTime != null" >
+            <if test="updateTime != null">
                 #{updateTime,jdbcType=TIMESTAMP},
             </if>
-                    <if test="updateUser != null" >
+            <if test="updateUser != null">
                 #{updateUser,jdbcType=VARCHAR},
             </if>
-                    <if test="createTime != null" >
+            <if test="createTime != null">
                 #{createTime,jdbcType=TIMESTAMP},
             </if>
-                    <if test="createUser != null" >
+            <if test="createUser != null">
                 #{createUser,jdbcType=VARCHAR},
             </if>
-                    <if test="repairId != null" >
+            <if test="repairId != null">
                 #{repairId,jdbcType=VARCHAR},
             </if>
-                    <if test="imageId != null" >
+            <if test="imageId != null">
                 #{imageId,jdbcType=VARCHAR},
             </if>
-                    <if test="remark != null" >
+            <if test="remark != null">
                 #{remark,jdbcType=VARCHAR},
             </if>
-                </trim>
+        </trim>
     </insert>
-    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.OrderRepairDetail" >
+    <update id="updateByPrimaryKeySelective" parameterType="com.izouma.awesomeadmin.model.OrderRepairDetail">
         update order_repair_detail
-        <set >
-                    <if test="id != null" >
-               id= #{id,jdbcType=INTEGER},
+        <set>
+            <if test="id != null">
+                id= #{id,jdbcType=INTEGER},
             </if>
-                     <if test="delFlag != null" >
-               del_flag= #{delFlag,jdbcType=CHAR},
+            <if test="delFlag != null">
+                del_flag= #{delFlag,jdbcType=CHAR},
             </if>
-                     <if test="updateTime != null" >
-               update_time= #{updateTime,jdbcType=TIMESTAMP},
+            <if test="updateTime != null">
+                update_time= #{updateTime,jdbcType=TIMESTAMP},
             </if>
-                     <if test="updateUser != null" >
-               update_user= #{updateUser,jdbcType=VARCHAR},
+            <if test="updateUser != null">
+                update_user= #{updateUser,jdbcType=VARCHAR},
             </if>
-                     <if test="createTime != null" >
-               create_time= #{createTime,jdbcType=TIMESTAMP},
+            <if test="createTime != null">
+                create_time= #{createTime,jdbcType=TIMESTAMP},
             </if>
-                     <if test="createUser != null" >
-               create_user= #{createUser,jdbcType=VARCHAR},
+            <if test="createUser != null">
+                create_user= #{createUser,jdbcType=VARCHAR},
             </if>
-                     <if test="repairId != null" >
-               repair_id= #{repairId,jdbcType=VARCHAR},
+            <if test="repairId != null">
+                repair_id= #{repairId,jdbcType=VARCHAR},
             </if>
-                     <if test="imageId != null" >
-               image_id= #{imageId,jdbcType=VARCHAR},
+            <if test="imageId != null">
+                image_id= #{imageId,jdbcType=VARCHAR},
             </if>
-                     <if test="remark != null" >
-               remark= #{remark,jdbcType=VARCHAR},
+            <if test="remark != null">
+                remark= #{remark,jdbcType=VARCHAR},
             </if>
-                 </set>
+        </set>
         where id = #{id,jdbcType=INTEGER}
     </update>
-    <select id="queryOrderRepairDetailByPage" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.OrderRepairDetail">
-        select <include refid="Base_Column_List"/> from order_repair_detail
+    <select id="queryOrderRepairDetailByPage" parameterType="java.util.Map"
+            resultType="com.izouma.awesomeadmin.model.OrderRepairDetail">
+        select
+        <include refid="Base_Column_List"/>
+        from order_repair_detail
         <where>
             and del_flag = 'N'
-                    <if test="record.id != null and !&quot;&quot;.equals(record.id)">
-                and  id = #{record.id}
+            <if test="record.id != null and !&quot;&quot;.equals(record.id)">
+                and id = #{record.id}
+            </if>
+            <if test="record.delFlag != null and !&quot;&quot;.equals(record.delFlag)">
+                and del_flag = #{record.delFlag}
             </if>
-                     <if test="record.delFlag != null and !&quot;&quot;.equals(record.delFlag)">
-                and  del_flag = #{record.delFlag}
+            <if test="record.updateTime != null and !&quot;&quot;.equals(record.updateTime)">
+                and update_time = #{record.updateTime}
             </if>
-                     <if test="record.updateTime != null and !&quot;&quot;.equals(record.updateTime)">
-                and  update_time = #{record.updateTime}
+            <if test="record.updateUser != null and !&quot;&quot;.equals(record.updateUser)">
+                and update_user = #{record.updateUser}
             </if>
-                     <if test="record.updateUser != null and !&quot;&quot;.equals(record.updateUser)">
-                and  update_user = #{record.updateUser}
+            <if test="record.createTime != null and !&quot;&quot;.equals(record.createTime)">
+                and create_time = #{record.createTime}
             </if>
-                     <if test="record.createTime != null and !&quot;&quot;.equals(record.createTime)">
-                and  create_time = #{record.createTime}
+            <if test="record.createUser != null and !&quot;&quot;.equals(record.createUser)">
+                and create_user = #{record.createUser}
             </if>
-                     <if test="record.createUser != null and !&quot;&quot;.equals(record.createUser)">
-                and  create_user = #{record.createUser}
+            <if test="record.repairId != null and !&quot;&quot;.equals(record.repairId)">
+                and repair_id = #{record.repairId}
             </if>
-                     <if test="record.repairId != null and !&quot;&quot;.equals(record.repairId)">
-                and  repair_id = #{record.repairId}
+            <if test="record.imageId != null and !&quot;&quot;.equals(record.imageId)">
+                and image_id = #{record.imageId}
             </if>
-                     <if test="record.imageId != null and !&quot;&quot;.equals(record.imageId)">
-                and  image_id = #{record.imageId}
+            <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
+                and remark = #{record.remark}
             </if>
-                     <if test="record.remark != null and !&quot;&quot;.equals(record.remark)">
-                and  remark = #{record.remark}
+            <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR">
+                    OR repair_id LIKE concat('%',#{record.searchKey},'%')
+                    OR image_id LIKE concat('%',#{record.searchKey},'%')
+                    OR remark LIKE concat('%',#{record.searchKey},'%')
+                </trim>
             </if>
-                  <if test="record.searchKey != null and !&quot;&quot;.equals(record.searchKey)">
-             <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                    OR  repair_id LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  image_id LIKE concat('%',#{record.searchKey},'%')
-                                                                                                    OR  remark LIKE concat('%',#{record.searchKey},'%')
-                                                             </trim>
-         </if>
 
             <if test="record.advancedQuery != null and !&quot;&quot;.equals(record.advancedQuery)">
                 <foreach item="item" index="index" collection="record.advancedQuery.split('_;')">
@@ -229,78 +233,81 @@
         </if>
         id desc
     </select>
-    <select id="queryAllOrderRepairDetail" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.OrderRepairDetail">
-        select <include refid="Base_Column_List"/> from order_repair_detail
+    <select id="queryAllOrderRepairDetail" parameterType="java.util.Map"
+            resultType="com.izouma.awesomeadmin.model.OrderRepairDetail">
+        select
+        <include refid="Base_Column_List"/>
+        from order_repair_detail
         <where>
             and del_flag = 'N'
-                    <if test="id != null and !&quot;&quot;.equals(id)">
-                and  id = #{id}
+            <if test="id != null and !&quot;&quot;.equals(id)">
+                and id = #{id}
             </if>
-                    <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
-                and  del_flag = #{delFlag}
+            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+                and del_flag = #{delFlag}
             </if>
-                    <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
-                and  update_time = #{updateTime}
+            <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
+                and update_time = #{updateTime}
             </if>
-                    <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
-                and  update_user = #{updateUser}
+            <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
+                and update_user = #{updateUser}
             </if>
-                    <if test="createTime != null and !&quot;&quot;.equals(createTime)">
-                and  create_time = #{createTime}
+            <if test="createTime != null and !&quot;&quot;.equals(createTime)">
+                and create_time = #{createTime}
             </if>
-                    <if test="createUser != null and !&quot;&quot;.equals(createUser)">
-                and  create_user = #{createUser}
+            <if test="createUser != null and !&quot;&quot;.equals(createUser)">
+                and create_user = #{createUser}
             </if>
-                    <if test="repairId != null and !&quot;&quot;.equals(repairId)">
-                and  repair_id = #{repairId}
+            <if test="repairId != null and !&quot;&quot;.equals(repairId)">
+                and repair_id = #{repairId}
             </if>
-                    <if test="imageId != null and !&quot;&quot;.equals(imageId)">
-                and  image_id = #{imageId}
+            <if test="imageId != null and !&quot;&quot;.equals(imageId)">
+                and image_id = #{imageId}
             </if>
-                    <if test="remark != null and !&quot;&quot;.equals(remark)">
-                and  remark = #{remark}
+            <if test="remark != null and !&quot;&quot;.equals(remark)">
+                and remark = #{remark}
             </if>
-                    <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
-                <trim prefix="and (" suffix=")" prefixOverrides="OR" >
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                OR  repair_id LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  image_id LIKE concat('%',#{searchKey},'%')
-                                                                                                                                                        OR  remark LIKE concat('%',#{searchKey},'%')
-                                                                                        </trim>
+            <if test="searchKey != null and !&quot;&quot;.equals(searchKey)">
+                <trim prefix="and (" suffix=")" prefixOverrides="OR">
+                    OR repair_id LIKE concat('%',#{searchKey},'%')
+                    OR image_id LIKE concat('%',#{searchKey},'%')
+                    OR remark LIKE concat('%',#{searchKey},'%')
+                </trim>
             </if>
-<if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
-    <foreach item="item" index="index" collection="advancedQuery.split('_;')">
-        <choose>
-            <when test="item.indexOf('like') != -1">
-                <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                    <if test="detailIndex == 3">
-                        concat('%',#{itemDetail},'%')
-                    </if>
+            <if test="advancedQuery != null and !&quot;&quot;.equals(advancedQuery)">
+                <foreach item="item" index="index" collection="advancedQuery.split('_;')">
+                    <choose>
+                        <when test="item.indexOf('like') != -1">
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    concat('%',#{itemDetail},'%')
+                                </if>
 
-                    <if test="detailIndex &lt; 3">
-                        ${itemDetail}
-                    </if>
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
 
-                </foreach>
-            </when>
-            <otherwise>
-                <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
-                    <if test="detailIndex == 3">
-                        #{itemDetail}
-                    </if>
-
-                    <if test="detailIndex &lt; 3">
-                        ${itemDetail}
-                    </if>
+                            </foreach>
+                        </when>
+                        <otherwise>
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    #{itemDetail}
+                                </if>
 
-                </foreach>
-            </otherwise>
-        </choose>
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
 
+                            </foreach>
+                        </otherwise>
+                    </choose>
 
-    </foreach>
 
+                </foreach>
 
-</if>
+
+            </if>
         </where>
         order by
 
@@ -319,38 +326,41 @@
 
         id desc
     </select>
-    <select id="queryOrderRepairDetail" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.OrderRepairDetail">
-        select <include refid="Base_Column_List"/> from order_repair_detail
+    <select id="queryOrderRepairDetail" parameterType="java.util.Map"
+            resultType="com.izouma.awesomeadmin.model.OrderRepairDetail">
+        select
+        <include refid="Base_Column_List"/>
+        from order_repair_detail
         <where>
             and del_flag = 'N'
-                    <if test="id != null and !&quot;&quot;.equals(id)">
+            <if test="id != null and !&quot;&quot;.equals(id)">
                 and id = #{id}
             </if>
-                     <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
                 and del_flag = #{delFlag}
             </if>
-                     <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
+            <if test="updateTime != null and !&quot;&quot;.equals(updateTime)">
                 and update_time = #{updateTime}
             </if>
-                     <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
+            <if test="updateUser != null and !&quot;&quot;.equals(updateUser)">
                 and update_user = #{updateUser}
             </if>
-                     <if test="createTime != null and !&quot;&quot;.equals(createTime)">
+            <if test="createTime != null and !&quot;&quot;.equals(createTime)">
                 and create_time = #{createTime}
             </if>
-                     <if test="createUser != null and !&quot;&quot;.equals(createUser)">
+            <if test="createUser != null and !&quot;&quot;.equals(createUser)">
                 and create_user = #{createUser}
             </if>
-                     <if test="repairId != null and !&quot;&quot;.equals(repairId)">
+            <if test="repairId != null and !&quot;&quot;.equals(repairId)">
                 and repair_id = #{repairId}
             </if>
-                     <if test="imageId != null and !&quot;&quot;.equals(imageId)">
+            <if test="imageId != null and !&quot;&quot;.equals(imageId)">
                 and image_id = #{imageId}
             </if>
-                     <if test="remark != null and !&quot;&quot;.equals(remark)">
+            <if test="remark != null and !&quot;&quot;.equals(remark)">
                 and remark = #{remark}
             </if>
-         
+
         </where>
         LIMIT 1
     </select>
@@ -361,11 +371,25 @@
         </where>
     </update>
     <select id="query" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.OrderRepairDetail">
-        select <include refid="Base_Column_List"/> from order_repair_detail
+        select
+        <include refid="Base_Column_List"/>
+        from order_repair_detail
         <where>
             and del_flag = 'N'
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            </where>
+        </where>
         order by id desc
     </select>
+    <select id="queryAllOrderRepairDetailExportRemark" parameterType="java.util.Map"
+            resultType="com.izouma.awesomeadmin.model.OrderRepairDetail">
+        SELECT
+            order_repair_detail.*, order_image.image_name
+        FROM
+            order_repair_detail
+        LEFT JOIN order_image ON order_image.del_flag = 'N'
+        AND order_repair_detail.image_id = order_image.id
+        WHERE
+            order_repair_detail.del_flag = 'N'
+        AND repair_id = #{repairId}
+    </select>
 </mapper>
 

src/main/java/com/izouma/awesomeadmin/model/OrderRepairDetail.java

@@ -1,13 +1,14 @@
 package com.izouma.awesomeadmin.model;
 
 import java.util.*;
+
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 
 @JsonAutoDetect
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class OrderRepairDetail{
+public class OrderRepairDetail {
     private Integer id;
     private String delFlag;
     private Date updateTime;
@@ -18,105 +19,122 @@ public class OrderRepairDetail{
     private String imageId;
     private String remark;
 
-private String searchKey;
+    private String imageName;
+
+    private String searchKey;
 
-/**
-* and,test_name,like,value;or,remark,=,123
-*/
-private String advancedQuery;
+    /**
+     * and,test_name,like,value;or,remark,=,123
+     */
+    private String advancedQuery;
 
-/**
-* column_name_,desc_;column_name_,asc
-*/
-private String orderByStr;
+    /**
+     * column_name_,desc_;column_name_,asc
+     */
+    private String orderByStr;
 
-    public Integer getId(){
+    public Integer getId() {
         return this.id;
     }
 
-    public void setId(Integer id){
+    public void setId(Integer id) {
         this.id = id;
     }
-    public String getDelFlag(){
+
+    public String getDelFlag() {
         return this.delFlag;
     }
 
-    public void setDelFlag(String delFlag){
+    public void setDelFlag(String delFlag) {
         this.delFlag = delFlag;
     }
-    public Date getUpdateTime(){
+
+    public Date getUpdateTime() {
         return this.updateTime;
     }
 
-    public void setUpdateTime(Date updateTime){
+    public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
-    public String getUpdateUser(){
+
+    public String getUpdateUser() {
         return this.updateUser;
     }
 
-    public void setUpdateUser(String updateUser){
+    public void setUpdateUser(String updateUser) {
         this.updateUser = updateUser;
     }
-    public Date getCreateTime(){
+
+    public Date getCreateTime() {
         return this.createTime;
     }
 
-    public void setCreateTime(Date createTime){
+    public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
-    public String getCreateUser(){
+
+    public String getCreateUser() {
         return this.createUser;
     }
 
-    public void setCreateUser(String createUser){
+    public void setCreateUser(String createUser) {
         this.createUser = createUser;
     }
-    public String getRepairId(){
+
+    public String getRepairId() {
         return this.repairId;
     }
 
-    public void setRepairId(String repairId){
+    public void setRepairId(String repairId) {
         this.repairId = repairId;
     }
-    public String getImageId(){
+
+    public String getImageId() {
         return this.imageId;
     }
 
-    public void setImageId(String imageId){
+    public void setImageId(String imageId) {
         this.imageId = imageId;
     }
-    public String getRemark(){
+
+    public String getRemark() {
         return this.remark;
     }
 
-    public void setRemark(String remark){
+    public void setRemark(String remark) {
         this.remark = remark;
     }
 
-public String getSearchKey() {
-    return searchKey;
-}
+    public String getSearchKey() {
+        return searchKey;
+    }
 
-public void setSearchKey(String searchKey) {
-    this.searchKey = searchKey;
-}
+    public void setSearchKey(String searchKey) {
+        this.searchKey = searchKey;
+    }
 
-public String getAdvancedQuery() {
-    return advancedQuery;
-}
+    public String getAdvancedQuery() {
+        return advancedQuery;
+    }
 
-public void setAdvancedQuery(String advancedQuery) {
-    this.advancedQuery = advancedQuery;
-}
+    public void setAdvancedQuery(String advancedQuery) {
+        this.advancedQuery = advancedQuery;
+    }
 
-public String getOrderByStr() {
-    return orderByStr;
-}
+    public String getOrderByStr() {
+        return orderByStr;
+    }
 
-public void setOrderByStr(String orderByStr) {
-    this.orderByStr = orderByStr;
-}
+    public void setOrderByStr(String orderByStr) {
+        this.orderByStr = orderByStr;
+    }
 
+    public String getImageName() {
+        return imageName;
+    }
+
+    public void setImageName(String imageName) {
+        this.imageName = imageName;
+    }
 }
 

src/main/java/com/izouma/awesomeadmin/service/OrderRepairDetailService.java

@@ -23,5 +23,7 @@ public interface OrderRepairDetailService{
     boolean deleteOrderRepairDetail(String id);
 
     boolean updateOrderRepairDetail(OrderRepairDetail record);
+
+    List<OrderRepairDetail> getOrderRepairDetailExportRemark(OrderRepairDetail record);
 }
 

src/main/java/com/izouma/awesomeadmin/service/impl/OrderRepairDetailServiceImpl.java

@@ -34,6 +34,20 @@ public class OrderRepairDetailServiceImpl implements OrderRepairDetailService{
 
         return null;
     }
+
+    @Override
+    public List<OrderRepairDetail> getOrderRepairDetailExportRemark(OrderRepairDetail record) {
+
+        logger.info("getOrderRepairDetailExportRemark");
+        try {
+
+        return orderRepairDetailMapper.queryAllOrderRepairDetailExportRemark(record);
+        } catch (Exception e) {
+        logger.error("getOrderRepairDetailExportRemark", e);
+        }
+
+        return null;
+    }
     @Override
     public List<OrderRepairDetail> getOrderRepairDetailByPage(Page page, OrderRepairDetail record) {
 

src/main/java/com/izouma/awesomeadmin/web/OrderRepairDetailController.java

@@ -18,8 +18,8 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 /**
-*  controller类
-*/
+ * controller类
+ */
 @Controller
 @RequestMapping("/orderRepairDetail")
 public class OrderRepairDetailController {
@@ -28,8 +28,8 @@ public class OrderRepairDetailController {
     private OrderRepairDetailService orderRepairDetailService;
 
     /**
-    * <p>获取全部记录。</p>
-    */
+     * <p>获取全部记录。</p>
+     */
     @RequiresAuthentication
     @RequestMapping(value = "/all", method = RequestMethod.GET)
     @ResponseBody
@@ -39,8 +39,8 @@ public class OrderRepairDetailController {
     }
 
     /**
-    * <p>根据Id。</p>
-    */
+     * <p>根据Id。</p>
+     */
     @RequestMapping(value = "/getOrderRepairDetail", method = RequestMethod.GET)
     @ResponseBody
     public Result getOrderRepairDetail(@RequestParam(required = false, value = "id") String id) {
@@ -49,8 +49,8 @@ public class OrderRepairDetailController {
     }
 
     /**
-    * <p>根据条件获取。</p>
-    */
+     * <p>根据条件获取。</p>
+     */
     @RequestMapping(value = "/getOne", method = RequestMethod.GET)
     @ResponseBody
     public Result getOne(OrderRepairDetail record) {
@@ -60,14 +60,14 @@ public class OrderRepairDetailController {
 
 
     /**
-    * <p>分页查询。</p>
-    */
+     * <p>分页查询。</p>
+     */
     @RequestMapping(value = "/page", method = RequestMethod.GET)
     @ResponseBody
     public Result page(Page page, OrderRepairDetail record) {
         Map<String, Object> result = new HashMap<>();
 
-        List<OrderRepairDetail> pp =orderRepairDetailService.getOrderRepairDetailByPage(page, record);
+        List<OrderRepairDetail> pp = orderRepairDetailService.getOrderRepairDetailByPage(page, record);
 
         result.put(AppConstant.PAGE, page);
         result.put("pp", pp);
@@ -76,85 +76,124 @@ public class OrderRepairDetailController {
 
 
     /**
-    * <p>保存。</p>
-    */
+     * <p>保存。</p>
+     */
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ResponseBody
     public Result save(OrderRepairDetail record) {
         boolean num = orderRepairDetailService.createOrderRepairDetail(record);
         if (num) {
-        return new Result(true, record.getId());
+            return new Result(true, record.getId());
         }
         return new Result(false, "保存异常");
     }
 
     /**
-    * <p>更新信息。</p>
-    */
+     * <p>更新信息。</p>
+     */
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
     public Result updateOrderRepairDetail(OrderRepairDetail record) {
         boolean num = orderRepairDetailService.updateOrderRepairDetail(record);
         if (num) {
-        return new Result(true, "保存成功");
+            return new Result(true, "保存成功");
         }
         return new Result(false, "保存异常");
     }
 
     /**
-    * <p>删除。</p>
-    */
+     * <p>删除。</p>
+     */
     @RequestMapping(value = "/del", method = RequestMethod.POST)
     @ResponseBody
     public Result deleteOrderRepairDetail(@RequestParam(required = true, value = "id") String id) {
 
         boolean num = orderRepairDetailService.deleteOrderRepairDetail(id);
         if (num) {
-        return new Result(true, "删除成功");
+            return new Result(true, "删除成功");
         }
         return new Result(false, "删除异常");
     }
 
     /**
-    * 导出Excel
-    * @param request
-    * @param response
-    * @param record
-    * @throws Exception
-    */
+     * 导出Excel
+     *
+     * @param request
+     * @param response
+     * @param record
+     * @throws Exception
+     */
     @RequestMapping(value = "/exportExcel", method = RequestMethod.GET)
     @ResponseBody
     public void exportExcel(HttpServletRequest request, HttpServletResponse response, OrderRepairDetail record) throws Exception {
 
-    List<OrderRepairDetail> orderRepairDetails = orderRepairDetailService.getOrderRepairDetailList(record);
+        List<OrderRepairDetail> orderRepairDetails = orderRepairDetailService.getOrderRepairDetailList(record);
 
 
         String sheetName = "order_repair_detail";
         String titleName = "订单返修详情数据表";
         String fileName = "订单返修详情表";
         int columnNumber = 9;
-        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20 };
-        String[] columnName = {  "" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "返修ID" ,   "图片ID" ,   "备注"  };
+        int[] columnWidth = {20, 20, 20, 20, 20, 20, 20, 20, 20};
+        String[] columnName = {"", "删除标识", "更新时间", "更新人", "创建时间", "创建人", "返修ID", "图片ID", "备注"};
         String[][] dataList = new String[orderRepairDetails.size()][9];
 
         for (int i = 0; i < orderRepairDetails.size(); i++) {
 
-                        dataList[i][0] = String.valueOf(orderRepairDetails.get(i).getId());
-                        dataList[i][1] = String.valueOf(orderRepairDetails.get(i).getDelFlag());
-                        dataList[i][2] = String.valueOf(orderRepairDetails.get(i).getUpdateTime());
-                        dataList[i][3] = String.valueOf(orderRepairDetails.get(i).getUpdateUser());
-                        dataList[i][4] = String.valueOf(orderRepairDetails.get(i).getCreateTime());
-                        dataList[i][5] = String.valueOf(orderRepairDetails.get(i).getCreateUser());
-                        dataList[i][6] = String.valueOf(orderRepairDetails.get(i).getRepairId());
-                        dataList[i][7] = String.valueOf(orderRepairDetails.get(i).getImageId());
-                        dataList[i][8] = String.valueOf(orderRepairDetails.get(i).getRemark());
-                    }
+            dataList[i][0] = String.valueOf(orderRepairDetails.get(i).getId());
+            dataList[i][1] = String.valueOf(orderRepairDetails.get(i).getDelFlag());
+            dataList[i][2] = String.valueOf(orderRepairDetails.get(i).getUpdateTime());
+            dataList[i][3] = String.valueOf(orderRepairDetails.get(i).getUpdateUser());
+            dataList[i][4] = String.valueOf(orderRepairDetails.get(i).getCreateTime());
+            dataList[i][5] = String.valueOf(orderRepairDetails.get(i).getCreateUser());
+            dataList[i][6] = String.valueOf(orderRepairDetails.get(i).getRepairId());
+            dataList[i][7] = String.valueOf(orderRepairDetails.get(i).getImageId());
+            dataList[i][8] = String.valueOf(orderRepairDetails.get(i).getRemark());
+        }
 
 
         ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
-        columnNumber, columnWidth, columnName, dataList, response);
+                columnNumber, columnWidth, columnName, dataList, response);
+
+
+    }
+
+
+    /**
+     * 导出备注Excel
+     *
+     * @param request
+     * @param response
+     * @param record
+     * @throws Exception
+     */
+    @RequestMapping(value = "/exportRemark", method = RequestMethod.GET)
+    @ResponseBody
+    public void exportRemark(HttpServletRequest request, HttpServletResponse response, OrderRepairDetail record) throws Exception {
+
+        List<OrderRepairDetail> orderRepairDetails = orderRepairDetailService.getOrderRepairDetailExportRemark(record);
+
 
+        String sheetName = "返修备注";
+        String titleName = "订单返修详情数据表";
+        String fileName = "订单返修详情表";
+        int columnNumber = 2;
+        int[] columnWidth = {30, 30};
+        String[] columnName = {"图片名称", "备注"};
+        String[][] dataList = new String[orderRepairDetails.size()][2];
 
+        for (int i = 0; i < orderRepairDetails.size(); i++) {
+
+            dataList[i][0] = String.valueOf(orderRepairDetails.get(i).getImageName());
+            dataList[i][1] = String.valueOf(orderRepairDetails.get(i).getRemark());
         }
+
+
+        ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
+                columnNumber, columnWidth, columnName, dataList, response);
+
+
     }
 
+}
+