diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java index 147a3670..c7c9a8d8 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairAuditDetailsController.java @@ -55,15 +55,14 @@ public class RepairAuditDetailsController extends BaseController { @RequiresPermissions("service:auditing:list") public TableDataInfo questList(RepairAuditDetails repairAuditDetails) { startPage(); -// Map params = repairAuditDetails.getParams(); - Map params = new HashMap<>(); -// if (params != null && !params.isEmpty()) { -// String beginTime = (String) params.get("beginTime"); -// String endTime = (String) params.get("endTime"); -// params.put("beginTime", beginTime + " 00:00:00"); -// params.put("endTime", endTime + " 23:59:59"); -// repairAuditDetails.setParams(params); -// } + Map params = repairAuditDetails.getParams(); + if (params != null && !params.isEmpty()) { + String beginTime = (String) params.get("beginTime"); + String endTime = (String) params.get("endTime"); + params.put("beginTime", beginTime + " 00:00:00"); + params.put("endTime", endTime + " 23:59:59"); + repairAuditDetails.setParams(params); + } List list = repairAuditDetailsService.selectRepairQuestList(repairAuditDetails); return getDataTable(list); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetails.java index 4db91c34..5e5f3617 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairAuditDetails.java @@ -85,7 +85,18 @@ public class RepairAuditDetails extends BaseEntity { @ApiModelProperty(value = "数据所属组织") private Integer companyId; - /** 关键字 */ + + /**传入参数*/ + @ApiModelProperty(value = "单位id") + private Integer backUnit; + @ApiModelProperty(value = "工程id") + private Integer backPro; + @ApiModelProperty(value = "工机具类型id") + private Integer type; + @ApiModelProperty(value = "维修单号") + private String backCode; @ApiModelProperty(value = "关键字") private String keyword; + @ApiModelProperty(value = "规格型号") + private String typeName; } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml index a2159d6f..abcea1bb 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairAuditDetailsMapper.xml @@ -284,7 +284,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND (locate(#{keyword}, su.nick_name) > 0 or locate(#{keyword}, tk.CODE) > 0 or locate(#{keyword}, bui.unit_name) > 0 - or locate(#{keyword}, bpl.lot_name) > 0) + or locate(#{keyword}, bpl.pro_name) > 0) and bui.unit_id = #{backUnit} @@ -293,7 +293,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and tk.task_status = #{taskStatus} - and bpl.lot_id = #{backPro} + and bpl.pro_id = #{backPro} and mt1.type_id = #{type}