更新报表

mes/src/main/java/com/ximai/mes/report/request/FeedbackRequest.java

@@ -104,9 +104,13 @@ public class FeedbackRequest {
 
 
 
-    @ApiModelProperty("报工人员")
+    @ApiModelProperty("报工人员名称")
     private String userName;
 
+
+    @ApiModelProperty("报工人员昵称")
+    private String nickName;
+
     @ApiModelProperty("报工开始")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date startDate;

mes/src/main/resources/mapper/pro/ProFeedbackMapper.xml

@@ -212,7 +212,8 @@
             <if test=" workshopId != null">and workstation.workshop_Id = #{workshopId}</if>
             <if test=" workstationId != null">and workstation.workstation_id = #{workstationId} </if>
             <if test=" workunitId != null">and  workunit.workunit_id =  #{workunitId}</if>
-            <if test=" userName != null and userName  != '' ">and  f.user_Name like  '%${userName}%'</if>
+            <if test="userName != null  and userName != ''">and f.user_name like concat('%', #{userName}, '%')</if>
+            <if test=" nickName != null and nickName  != '' ">and  f.nick_Name like  '%${nickName}%'</if>
             <if test=" startDate != null and endDate  != null">and  feedback_time BETWEEN #{startDate} AND #{endDate}</if>
             <if test=" abnormal_id != null">and  f.abnormal_id = #{abnormalId}</if>
 
@@ -258,7 +259,8 @@
             <if test=" workshopId != null">and workstation.workshop_Id = #{workshopId}</if>
             <if test=" workstationId != null">and workstation.workstation_id = #{workstationId} </if>
             <if test=" workunitId != null">and  workunit.workunit_id =  #{workunitId}</if>
-            <if test=" userName != null and userName  != '' ">and  f.user_Name like  '%${userName}%'</if>
+            <if test="userName != null  and userName != ''">and f.user_name like concat('%', #{userName}, '%')</if>
+            <if test=" nickName != null and nickName  != '' ">and  f.nick_Name like  '%${nickName}%'</if>
             <if test=" startDate != null and endDate  != null">and  feedback_time BETWEEN #{startDate} AND #{endDate}</if>
             <if test=" abnormal_id != null">and  f.abnormal_id = #{abnormalId}</if>
 
@@ -307,7 +309,8 @@
             <if test=" workshopId != null">and workstation.workshop_Id = #{workshopId}</if>
             <if test=" workstationId != null">and workstation.workstation_id = #{workstationId} </if>
             <if test=" workunitId != null">and  workunit.workunit_id =  #{workunitId}</if>
-            <if test=" userName != null and userName  != '' ">and  f.user_Name like  '%${userName}%'</if>
+            <if test="userName != null  and userName != ''">and f.user_name like concat('%', #{userName}, '%')</if>
+            <if test=" nickName != null and nickName  != '' ">and  f.nick_Name like  '%${nickName}%'</if>
             <if test=" startDate != null and endDate  != null">and  feedback_time BETWEEN #{startDate} AND #{endDate}</if>
             <if test=" abnormal_id != null">and  f.abnormal_id = #{abnormalId}</if>
 
@@ -351,7 +354,8 @@
             <if test=" workshopId != null">and workstation.workshop_Id = #{workshopId}</if>
             <if test=" workstationId != null">and workstation.workstation_id = #{workstationId} </if>
             <if test=" workunitId != null">and  workunit.workunit_id =  #{workunitId}</if>
-            <if test=" userName != null and userName  != '' ">and  f.user_Name like  '%${userName}%'</if>
+            <if test="userName != null  and userName != ''">and f.user_name like concat('%', #{userName}, '%')</if>
+            <if test=" nickName != null and nickName  != '' ">and  f.nick_Name like  '%${nickName}%'</if>
             <if test=" startDate != null and endDate  != null">and  feedback_time BETWEEN #{startDate} AND #{endDate}</if>
             <if test=" abnormal_id != null">and  f.abnormal_id = #{abnormalId}</if>
 
@@ -395,7 +399,8 @@
             <if test=" workshopId != null">and workstation.workshop_Id = #{workshopId}</if>
             <if test=" workstationId != null">and workstation.workstation_id = #{workstationId} </if>
             <if test=" workunitId != null">and  workunit.workunit_id =  #{workunitId}</if>
-            <if test=" userName != null and userName  != '' ">and  f.user_Name like  '%${userName}%'</if>
+            <if test="userName != null  and userName != ''">and f.user_name like concat('%', #{userName}, '%')</if>
+            <if test=" nickName != null and nickName  != '' ">and  f.nick_Name like  '%${nickName}%'</if>
             <if test=" startDate != null and endDate  != null">and  feedback_time BETWEEN #{startDate} AND #{endDate}</if>
             <if test=" abnormal_id != null">and  f.abnormal_id = #{abnormalId}</if>
 
@@ -439,7 +444,8 @@
             <if test=" workshopId != null">and workstation.workshop_Id = #{workshopId}</if>
             <if test=" workstationId != null">and workstation.workstation_id = #{workstationId} </if>
             <if test=" workunitId != null">and  workunit.workunit_id =  #{workunitId}</if>
-            <if test=" userName != null and userName  != '' ">and  f.user_Name like  '%${userName}%'</if>
+            <if test="userName != null  and userName != ''">and f.user_name like concat('%', #{userName}, '%')</if>
+            <if test=" nickName != null and nickName  != '' ">and  f.nick_Name like  '%${nickName}%'</if>
             <if test=" startDate != null and endDate  != null">and  feedback_time BETWEEN #{startDate} AND #{endDate}</if>
             <if test=" abnormal_id != null">and  f.abnormal_id = #{abnormalId}</if>
 
@@ -483,7 +489,8 @@
             <if test=" workshopId != null">and workstation.workshop_Id = #{workshopId}</if>
             <if test=" workstationId != null">and workstation.workstation_id = #{workstationId} </if>
             <if test=" workunitId != null">and  workunit.workunit_id =  #{workunitId}</if>
-            <if test=" userName != null and userName  != '' ">and  f.user_Name like  '%${userName}%'</if>
+            <if test="userName != null  and userName != ''">and f.user_name like concat('%', #{userName}, '%')</if>
+            <if test=" nickName != null and nickName  != '' ">and  f.nick_Name like  '%${nickName}%'</if>
             <if test=" startDate != null and endDate  != null">and  feedback_time BETWEEN #{startDate} AND #{endDate}</if>
             <if test=" abnormal_id != null">and  f.abnormal_id = #{abnormalId}</if>
 
@@ -542,7 +549,8 @@
             <if test=" workshopId != null">and workstation.workshop_Id = #{workshopId}</if>
             <if test=" workstationId != null">and workstation.workstation_id = #{workstationId} </if>
             <if test=" workunitId != null">and  workunit.workunit_id =  #{workunitId}</if>
-            <if test=" userName != null and userName  != '' ">and  f.user_Name like  '%${userName}%'</if>
+            <if test="userName != null  and userName != ''">and f.user_name like concat('%', #{userName}, '%')</if>
+            <if test=" nickName != null and nickName  != '' ">and  f.nick_Name like  '%${nickName}%'</if>
             <if test=" startDate != null and endDate  != null">and  feedback_time BETWEEN #{startDate} AND #{endDate}</if>
             <if test=" abnormal_id != null">and  f.abnormal_id = #{abnormalId}</if>