Merge remote-tracking branch 'origin/master'

bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/controller/RepairController.java

@@ -6,12 +6,10 @@ import com.bonus.common.core.web.controller.BaseController;
 import com.bonus.common.core.web.domain.AjaxResult;
 import com.bonus.common.core.web.page.TableDataInfo;
 import com.bonus.common.security.annotation.RequiresPermissions;
-import com.bonus.material.repair.domain.RepairApplyRecord;
+import com.bonus.material.repair.domain.*;
-import com.bonus.material.repair.domain.RepairPartDetails;
-import com.bonus.material.repair.domain.RepairTask;
-import com.bonus.material.repair.domain.RepairTaskDetails;
 import com.bonus.material.repair.domain.vo.RepairDeviceSummaryVo;
 import com.bonus.material.repair.domain.vo.RepairDeviceVO;
+import com.bonus.material.repair.domain.vo.RepairInputDetailsVo;
 import com.bonus.material.repair.service.RepairService;
 import com.bonus.system.api.domain.SysUser;
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -185,5 +183,12 @@ public class RepairController extends BaseController {
         util.exportExcel(response, list, "维修任务列表");
     }
 
-
+    @ApiOperation(value = "获取修试后入库列表")
+    @GetMapping("getRepairedList")
+    @RequiresPermissions("warehousing:repair:list")
+    public TableDataInfo getRepairedList(RepairInputDetails dto){
+        startPage();
+        List<RepairInputDetailsVo> list = service.getRepairedList(dto);
+        return getDataTable(list);
+    }
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/domain/vo/RepairInputDetailsVo.java

@@ -0,0 +1,34 @@
+package com.bonus.material.repair.domain.vo;
+
+import lombok.Data;
+
+/**
+ * @author 10488
+ * 修试入库-Vo
+ */
+@Data
+public class RepairInputDetailsVo {
+
+    private int id;
+
+    /** 维修单号*/
+    private String repairCode;
+
+    /** 工器具类型*/
+    private String maTypeName;
+
+    /** 维修人员*/
+    private String wxName;
+
+    /** 维修时间*/
+    private String wxTime;
+
+    /** 状态*/
+    private String taskStatus;
+
+    /** 工程 */
+    private String projectName;
+
+    /** 单位 */
+    private String unitName;
+}

bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/mapper/RepairMapper.java

@@ -1,11 +1,9 @@
 package com.bonus.material.repair.mapper;
 
-import com.bonus.material.repair.domain.RepairApplyRecord;
+import com.bonus.material.repair.domain.*;
-import com.bonus.material.repair.domain.RepairPartDetails;
-import com.bonus.material.repair.domain.RepairTask;
-import com.bonus.material.repair.domain.RepairTaskDetails;
 import com.bonus.material.repair.domain.vo.RepairDeviceListVo;
 import com.bonus.material.repair.domain.vo.RepairDeviceVO;
+import com.bonus.material.repair.domain.vo.RepairInputDetailsVo;
 import com.bonus.system.api.domain.SysUser;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -158,4 +156,7 @@ public interface RepairMapper {
      * @param partId 配件id
      */
     BigDecimal selectPartPrice(Long partId);
+
+
+    List<RepairInputDetailsVo> getRepairedList(RepairInputDetails dto);
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/RepairService.java

@@ -3,11 +3,13 @@ package com.bonus.material.repair.service;
 
 import com.bonus.common.core.web.domain.AjaxResult;
 import com.bonus.material.repair.domain.RepairApplyRecord;
+import com.bonus.material.repair.domain.RepairInputDetails;
 import com.bonus.material.repair.domain.RepairTask;
 import com.bonus.material.repair.domain.RepairTaskDetails;
 import com.bonus.material.repair.domain.vo.RepairDeviceListVo;
 import com.bonus.material.repair.domain.vo.RepairDeviceSummaryVo;
 import com.bonus.material.repair.domain.vo.RepairDeviceVO;
+import com.bonus.material.repair.domain.vo.RepairInputDetailsVo;
 import com.bonus.system.api.domain.SysUser;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
@@ -79,4 +81,6 @@ public interface RepairService {
      * 导出维修列表
      */
     List<RepairTask> exportRepairTaskList(RepairTask bean);
+
+    List<RepairInputDetailsVo> getRepairedList(RepairInputDetails dto);
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairServiceImpl.java

@@ -15,6 +15,7 @@ import com.bonus.material.basic.mapper.BmFileInfoMapper;
 import com.bonus.material.repair.domain.*;
 import com.bonus.material.repair.domain.vo.RepairDeviceSummaryVo;
 import com.bonus.material.repair.domain.vo.RepairDeviceVO;
+import com.bonus.material.repair.domain.vo.RepairInputDetailsVo;
 import com.bonus.material.repair.domain.vo.RepairTicketVo;
 import com.bonus.material.repair.mapper.RepairAuditDetailsMapper;
 import com.bonus.material.repair.mapper.RepairMapper;
@@ -847,4 +848,8 @@ public class RepairServiceImpl implements RepairService {
         return repairMapper.selectUserList();
     }
 
+    @Override
+    public List<RepairInputDetailsVo> getRepairedList(RepairInputDetails dto) {
+        return repairMapper.getRepairedList(dto);
+    }
 }

bonus-modules/bonus-material/src/main/resources/mapper/material/repair/RepairMapper.xml

@@ -398,5 +398,59 @@
         select ifnull(buy_price,0) from ma_part_type where pa_id = #{partId}
     </select>
 
-
+    <!--获取修试后入库列表-->
+    <select id="getRepairedList" resultType="com.bonus.material.repair.domain.vo.RepairInputDetailsVo">
+        SELECT b.id,
+        b.repairCode,
+        b.maTypeName,
+        b.projectName,
+        b.unitName,
+        b.wxName,
+        b.wxTime,
+        b.taskStatus
+        FROM (
+        SELECT ANY_VALUE(rid.task_id) AS id,
+        ANY_VALUE(tt.`code`) AS repairCode,
+        ANY_VALUE(GROUP_CONCAT(DISTINCT a.typeName2)) AS maTypeName,
+        ANY_VALUE(GROUP_CONCAT(DISTINCT a.typeId2)) AS typeId2,
+        bpl.lot_name projectName,
+        bui.unit_name unitName,
+        ANY_VALUE(us.user_name) AS wxName,
+        ANY_VALUE(tt.create_time) AS wxTime,
+        ANY_VALUE(IFNULL(sd.`name`,'入库进行中')) AS taskStatus
+        FROM repair_input_details rid
+        LEFT JOIN repair_apply_details rad on rid.repair_id=rad.id
+        LEFT JOIN sys_user us on us.user_id=rad.repairer
+        LEFT JOIN tm_task tt ON rid.task_id = tt.task_id
+        LEFT JOIN tm_task_agreement tta ON tt.task_id = tta.task_id
+        LEFT JOIN bm_agreement_info bai ON tta.agreement_id = bai.agreement_id
+        LEFT JOIN bm_project_lot bpl ON bai.project_id = bpl.lot_id
+        LEFT JOIN bm_unit_info bui ON bai.unit_id = bui.unit_id
+        LEFT JOIN sys_dic sd ON tt.task_status = sd.id
+        LEFT JOIN tm_task tt2 ON rad.task_id = tt2.task_id
+        LEFT JOIN (
+        SELECT mt.type_id AS typeId,mt.type_name AS typeName,mt.manage_type,mt2.type_id AS typeId2,mt2.type_name AS typeName2
+        FROM ma_type mt
+        LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3'
+        LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2'
+        WHERE mt.`level` = '4'
+        )a ON rid.type_id = a.typeId
+        GROUP BY rid.task_id
+        ORDER BY tt.create_time DESC
+        ) b
+        <where>
+            <if test="deviceTypeId!=null and deviceTypeId!=''">
+                b.typeId2 = #{deviceTypeId}
+            </if>
+            <if test="wxTime!=null and wxTime!=''">
+                AND b.wxTime BETWEEN CONCAT(#{wxTime},' 00:00:00') AND CONCAT(#{wxTime},' 23:59:59')
+            </if>
+            <if test="keyWord!=null and keyWord!=''">
+                AND (
+                INSTR(b.repairCode,#{keyWord}) > 0 OR
+                INSTR(b.wxName,#{keyWord}) > 0
+                )
+            </if>
+        </where>
+    </select>
 </mapper>