BUG修改

src/main/java/com/bonus/gzgqj/business/bases/entity/ProjectInfoVo.java

@@ -17,22 +17,26 @@ public class ProjectInfoVo {
      * 工程id
      */
     private String proId;
-    /**
-     * 领用单数量
-     */
-    @Excel(name = "领料单数量", width = 10.0, orderNum = "3")
-    private String lydNum;
+
     /**
      * 工程名称
      */
     @Excel(name = "工程名称", width = 10.0, orderNum = "1")
     private String proName;
 
-    private String proStatus;
+    @Excel(name = "状态", width = 10.0, orderNum = "2")
+    private String proStatus="-";
     /**
      * 维修单数量
      */
+    @Excel(name = "维修单数量", width = 10.0, orderNum = "2")
     private int wxdNum;
+
+    /**
+     * 领用单数量
+     */
+    @Excel(name = "领料单数量", width = 10.0, orderNum = "3")
+    private String lydNum;
     /**
      * 领用单数量
      */

src/main/resources/mappers/bases/PartApplyMapper.xml

@@ -30,10 +30,9 @@
         <where>
             <if test="keyWord!=null and keyWord!=''">
                 and (
-                tpa.code like('%',#{keyWord},'%') or
-                tpa.user_name like('%',#{keyWord},'%') or
-                tpa.remark like('%',#{keyWord},'%')
-
+                tpa.code like concat('%',#{keyWord},'%') or
+                tpa.user_name like concat('%',#{keyWord},'%') or
+                tpa.remark like concat('%',#{keyWord},'%')
                 )
             </if>
             <if test="startDay!=null and startDay!='' and endDay!=null and endDay!='' ">

src/main/resources/mappers/bases/PartBackMapper.xml

@@ -11,9 +11,9 @@
         <where>
             <if test="keyWord!=null and keyWord!=''">
                 and (
-                tpb.code like('%',#{keyWord},'%') or
-                tpb.user_name like('%',#{keyWord},'%') or
-                tpb.remark like('%',#{keyWord},'%')
+                tpb.code like  concat('%',#{keyWord},'%') or
+                tpb.user_name like  concat('%',#{keyWord},'%') or
+                tpb.remark like concat('%',#{keyWord},'%')
                 )
             </if>
             <if test="startDay!=null and startDay!='' and endDay!=null and endDay!='' ">

src/main/resources/mappers/bases/PartInputMapper.xml

@@ -31,7 +31,7 @@
 
     <update id="uploadDetails">
             update t_part_put_details  set part_price=#{partPrice}, vender_id=#{vendId},
-             total_price=#{totalPrice},vender_name=#{vendName}
+             total_price=#{totalPrice},vender_name=#{vendName},remark=#{remark}
              where id=#{id}
     </update>
     <update id="updateInputData">