后台代码提交

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckInfoController.java

@@ -76,9 +76,9 @@ public class PurchaseCheckInfoController extends BaseController
     @ApiOperation("获取新购验收任务详细信息")
     @GetMapping(value = "/getDetails")
     public AjaxResult getInfo(@RequestParam(required = false) Long taskId,
-                              @RequestParam(required = false) String keyword)
+                              @RequestParam(required = false) String keyWord)
     {
-        return success(purchaseCheckInfoService.selectPurchaseCheckInfoByTaskId(taskId,keyword));
+        return success(purchaseCheckInfoService.selectPurchaseCheckInfoByTaskId(taskId,keyWord));
     }
 
     /**

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseCheckInfo.java

@@ -52,6 +52,14 @@ public class PurchaseCheckInfo extends BaseEntity
     @ApiModelProperty(value = "采购状态")
     private String purchasingStatus;
 
+    public String getKeyWord() {
+        return keyWord;
+    }
+
+    public void setKeyWord(String keyWord) {
+        this.keyWord = keyWord;
+    }
+
     // 采购状态
     @ApiModelProperty(value = "采购机具设备")
     private String purchasingTypeName;
@@ -64,6 +72,7 @@ public class PurchaseCheckInfo extends BaseEntity
      */
     @ApiModelProperty(value="任务状态(数据字典)")
     private Integer taskStatus;
+    private String keyWord;
 
     public Long getId() {
         return id;

sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckDetailsMapper.xml

@@ -44,7 +44,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join tm_task tk on pcd.task_id = tk.task_id
         <where>
             <if test="taskId != null "> and pcd.task_id = #{taskId}</if>
-            <if test="keyWord != null and keyWord != ''">(mt.type_name like concat('%',#{keyWord},'%') or mt1.type_name like concat('%',#{keyWord})</if>
+            <if test="keyWord != null and keyWord != ''">and (mt.type_name like concat('%',#{keyWord},'%')
+                or mt1.type_name like concat('%',#{keyWord}) or msi.supplier like concat('%',#{keyWord}))</if>
             <if test="typeId != null "> and pcd.type_id = #{typeId}</if>
             <if test="purchasePrice != null  and purchasePrice != ''"> and pcd.purchase_price = #{purchasePrice}</if>
             <if test="purchaseNum != null "> and pcd.purchase_num = #{purchaseNum}</if>

sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml

@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join (select id,name from sys_dic where p_id = 23) dict on tk.task_status = dict.id
         left join sys_user su on pci.purchaser = su.user_id
         where task_type = 23
-        <if test="purchaseTime != null  and purchaseTime != ''"> and tk.code = #{code}</if>
+        <if test="keyWord != null  and keyWord != ''"> and tk.code like concat('%',#{keyWord},'%')</if>
         <if test="purchaseTime != null  and purchaseTime != ''"> and pci.purchase_time = #{purchaseTime}</if>
         <if test="arrivalTime != null  and arrivalTime != ''"> and pci.arrival_time = #{arrivalTime}</if>
         <if test="purchaser != null "> and pci.purchaser = #{purchaser}</if>
@@ -151,7 +151,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join (select id,name from sys_dic where p_id = 50) dict on tk.task_status = dict.id
         left join sys_user su on pci.purchaser = su.user_id
         where task_type = 23 and tk.task_status in (26,28)
-        <if test="purchaseTime != null  and purchaseTime != ''"> and tk.code = #{code}</if>
+        <if test="keyWord != null  and keyWord != ''"> and tk.code like concat('%',#{keyWord},'%')</if>
         <if test="purchaseTime != null  and purchaseTime != ''"> and pci.purchase_time = #{purchaseTime}</if>
         <if test="arrivalTime != null  and arrivalTime != ''"> and pci.arrival_time = #{arrivalTime}</if>
         <if test="purchaser != null "> and pci.purchaser = #{purchaser}</if>

sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml

@@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where pcd.task_id = #{taskId}
         and mt.manage_type = '0'
         <if test="typeId != null "> and pmi.type_id = #{typeId}</if>
-        <if test="keyWord != null and keyWord != ''">(mt.type_name like concat('%',#{keyWord},'%') or mt1.type_name like concat('%',#{keyWord})</if>
+        <if test="keyWord != null and keyWord != ''">and (mt.type_name like concat('%',#{keyWord},'%') or mt1.type_name like concat('%',#{keyWord},'%'))</if>
         <if test="typeName != null  and typeName != ''"> and mt1.type_name = #{typeName}</if>
         <if test="specificationType != null  and specificationType != ''"> and mt.type_name = #{specificationType}</if>
         <if test="codeType != null  and codeType != ''"> and pmi.code_type = #{codeType}</if>

sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml

@@ -36,6 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                      left join ma_type mt1 on mt.parent_id = mt1.type_id
                      left join ma_machine mma on rad.ma_id= mma.ma_id
         where rad.task_id = #{taskId}
+        order by rad.create_time desc
     </select>
     
     <select id="selectRepairAuditDetailsById" parameterType="Long" resultMap="RepairAuditDetailsResult">