diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java index 64ecdaf7..5fe7e31f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java @@ -77,9 +77,9 @@ public class RepairController extends BaseController { } /** - * 获取维修任务物资设备列表 + * 获取维修任务物资设备列表--不分页 */ - @ApiOperation(value = "获取维修物资设备列表") + @ApiOperation(value = "获取维修物资设备列表---分页") @GetMapping("/getRepairMaTypeList") @RequiresPermissions("repair:manage:preview") public TableDataInfo getRepairMaTypeList(RepairTaskDetails bean) { @@ -91,7 +91,7 @@ public class RepairController extends BaseController { /** * 获取维修任务机具列表 */ - @ApiOperation(value = "获取维修任务机具列表") + @ApiOperation(value = "获取维修物资设备列表---不分页") @GetMapping("/getAppRepairMaTypeList") public AjaxResult getAppRepairMaTypeList(RepairTaskDetails bean) { List list = service.getRepairMaTypeList(bean); 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 d1858f84..98a460f8 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 @@ -51,6 +51,12 @@ public class RepairAuditDetails extends BaseEntity { @ApiModelProperty(value = "规格ID") private Long typeId; + @ApiModelProperty(value = "规格型号") + private String specificationType; + + @ApiModelProperty(value = "机具类型名称") + private String machineTypeName; + /** 维修总量 */ @Excel(name = "维修总量") @ApiModelProperty(value = "维修总量") diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTask.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTask.java index bed292e1..6155f031 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTask.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTask.java @@ -147,4 +147,6 @@ public class RepairTask { @ApiModelProperty(value = "导出选中列表") private List dataCondition; + @ApiModelProperty(value = "备注") + private String remark; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTaskDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTaskDetails.java index 4fcf5db4..49aef973 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTaskDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/RepairTaskDetails.java @@ -18,6 +18,7 @@ public class RepairTaskDetails extends BaseEntity { */ @ApiModelProperty(value = "id") private Long id; + /** * 任务ID */ @@ -38,6 +39,13 @@ public class RepairTaskDetails extends BaseEntity { */ @ApiModelProperty(value = "规格型号") private String type; + + @ApiModelProperty(value = "物资单位") + private String unitName; + + @ApiModelProperty(value = "管理模式") + private Integer manageType; + /** * 编码 */ @@ -73,5 +81,12 @@ public class RepairTaskDetails extends BaseEntity { @ApiModelProperty(value = "组织id") private Long companyId; + @ApiModelProperty(value = "退料id") private Long backId; + + @ApiModelProperty(value = "维修人员") + private String repairer; + + @ApiModelProperty(value = "关键字") + private String keyword; } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairAuditDetailsMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairAuditDetailsMapper.java index 9e12add8..77313a48 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairAuditDetailsMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairAuditDetailsMapper.java @@ -9,6 +9,7 @@ import com.bonus.material.repair.domain.RepairRecord; import com.bonus.material.repair.domain.RepairTaskDetails; import com.bonus.material.repair.domain.vo.RepairAuditDetailsVO; import com.bonus.material.repair.domain.vo.ScrapApplyDetailsVO; +import org.apache.ibatis.annotations.Param; /** * 修试审核详细Mapper接口 @@ -88,7 +89,7 @@ public interface RepairAuditDetailsMapper { * 根据taskIds批量查询规格名称---批量 * @param taskIds 任务id集合 */ - Map selectTypeNamesByTaskIds(List taskIds); + Map selectTypeNamesByTaskIds(@Param("taskIds") List taskIds); List selectRepairAuditDetailsByTaskId(Long taskId); diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java index b053ea5a..1e47370a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairAuditDetailsServiceImpl.java @@ -23,7 +23,7 @@ import com.bonus.material.task.domain.TmTaskAgreement; import com.bonus.material.task.mapper.TmTaskAgreementMapper; import com.bonus.material.task.mapper.TmTaskMapper; import com.bonus.material.task.domain.TmTask; -import org.jetbrains.annotations.NotNull; +import javax.validation.constraints.NotNull; import org.springframework.stereotype.Service; import com.bonus.material.repair.mapper.RepairAuditDetailsMapper; import com.bonus.material.repair.service.IRepairAuditDetailsService; @@ -103,9 +103,9 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService List repairQuestList = repairAuditDetailsMapper.selectRepairQuestList(repairAuditDetails); // 通过流过滤掉空对象 并转换为 List集合 List taskIds = repairQuestList.stream() - .filter(Objects::nonNull) // 过滤掉空的 ScrapApplyDetailsVO 对象 + .filter(Objects::nonNull) .map(ScrapApplyDetailsVO::getTaskId) - .filter(Objects::nonNull) // 过滤掉空的 taskId + .filter(Objects::nonNull) .distinct() .collect(Collectors.toList()); @@ -113,16 +113,17 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService Map typeNameMap = repairAuditDetailsMapper.selectTypeNamesByTaskIds(taskIds); // 设置 itemType - for (ScrapApplyDetailsVO scrapApplyDetailsVO : repairQuestList) { - Long taskId = scrapApplyDetailsVO.getTaskId(); - if (taskId != null) { - String typeName = typeNameMap.get(taskId); - if (typeName != null) { - scrapApplyDetailsVO.setItemType(typeName); + if (CollectionUtil.isNotEmpty(typeNameMap)) { + for (ScrapApplyDetailsVO scrapApplyDetailsVO : repairQuestList) { + Long taskId = scrapApplyDetailsVO.getTaskId(); + if (taskId != null) { + String typeName = typeNameMap.get(taskId); + if (typeName != null) { + scrapApplyDetailsVO.setItemType(typeName); + } } } } - return repairQuestList; } catch (Exception e) { // 异常处理 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 bd1a108e..111a8241 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 @@ -9,6 +9,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -31,21 +33,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT - rd.task_id, - tt.CODE AS repairCode, - bui.unit_name AS backUnit, - bpi.lot_name AS backPro, - su.nick_name AS createName, - tt.create_time AS createTime, - bai.CODE AS backCode, - sd.name AS repairStatus, - tt.task_status AS repairStatusCode, - tt.company_id AS companyId, - GROUP_CONCAT(DISTINCT mt2.type_name) as type + rd.task_id as taskId, + rd.repairer, + tt.CODE AS repairCode, + tt.create_time AS createTime, + tt.task_status AS repairStatusCode, + tt.company_id AS companyId, + tt.remark, + bui.unit_name AS backUnit, + bpi.pro_name AS backPro, + su.nick_name AS createName, + bai.CODE AS backCode, + GROUP_CONCAT(DISTINCT mt2.type_name) as type FROM - repair_apply_details rd + repair_apply_details rd LEFT JOIN ma_type mt on rd.type_id = mt.type_id LEFT JOIN ma_type mt2 on mt.parent_id = mt2.type_id LEFT JOIN tm_task tt on rd.task_id = tt.task_id LEFT JOIN back_apply_info bai ON rd.back_id = bai.id - LEFT JOIN tm_task_agreement tta ON bai.task_id = tta.task_id + LEFT JOIN tm_task_agreement tta ON rd.task_id = tta.task_id LEFT JOIN bm_agreement_info bai2 ON tta.agreement_id = bai2.agreement_id - LEFT JOIN bm_unit_info bui ON bai2.unit_id = bui.unit_id - LEFT JOIN bm_project_lot bpi ON bai2.project_id = bpi.lot_id and bpi.status = '0' and bpi.del_flag = '0' + LEFT JOIN bm_unit bui ON bai2.unit_id = bui.unit_id + LEFT JOIN bm_project bpi ON bai2.project_id = bpi.pro_id and bpi.del_flag = '0' left join sys_user su on rd.create_by = su.user_id - left join sys_dic sd on sd.id = tt.task_status - where 1=1 - - AND (locate(#{keyword}, su.nick_name) > 0 + + + AND (locate(#{keyword}, su.nick_name) > 0 or locate(#{keyword}, tt.CODE) > 0) - - - AND bui.unit_id = #{backUnit} - - - AND bpi.lot_id = #{backPro} - - - AND mt2.type_id = #{type} - - - AND locate(#{backCode}, bai.CODE) > 0 - - - AND tt.task_status = #{repairStatus} - - - AND tt.create_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59') - - GROUP BY rd.task_id,bui.unit_name,bpi.lot_name,bai.code,su.nick_name + + + AND bui.unit_id = #{backUnit} + + + AND bpi.pro_id = #{backPro} + + + AND mt2.type_id = #{type} + + + AND locate(#{backCode}, bai.CODE) > 0 + + + AND tt.task_status = #{repairStatus} + + + AND tt.create_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59') + + + GROUP BY rd.task_id,bui.unit_name,bpi.pro_name,bai.code,su.nick_name order by tt.create_time desc @@ -139,7 +140,6 @@ su.nick_name AS createName, tt.create_time AS createTime, bai.CODE AS backCode, - sd.NAME AS repairStatus, tt.task_status AS repairStatusCode, tt.company_id AS companyId, mt2.type_name AS type, @@ -157,13 +157,12 @@ LEFT JOIN ma_type mt2 ON mt.parent_id = mt2.type_id LEFT JOIN tm_task tt ON rd.task_id = tt.task_id LEFT JOIN back_apply_info bai ON rd.back_id = bai.id - LEFT JOIN tm_task_agreement tta ON bai.task_id = tta.task_id + LEFT JOIN tm_task_agreement tta ON rd.task_id = tta.task_id LEFT JOIN bm_agreement_info bai2 ON tta.agreement_id = bai2.agreement_id LEFT JOIN bm_unit_info bui ON bai2.unit_id = bui.unit_id LEFT JOIN bm_project_lot bpi ON bai2.project_id = bpi.lot_id AND bpi.STATUS = '0' AND bpi.del_flag = '0' LEFT JOIN sys_user su ON rd.create_by = su.user_id left join sys_user su2 on rd.repairer = su2.user_id - LEFT JOIN sys_dic sd ON sd.id = tt.task_status LEFT JOIN ma_machine mm ON mm.ma_id = rd.ma_id where 1=1 @@ -205,6 +204,8 @@ rad.ma_id as maId, mt2.type_name as typeName, mt.type_name as type, + mt.unit_name as unitName, + mt.manage_type as manageType, mm.ma_code as code, rad.repair_num as repairNum, rad.repaired_num as repairedNum,