修饰管理代码提交

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

@@ -5,6 +5,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
 import com.bonus.sgzb.material.domain.RepairAuditDetails;
+import com.bonus.sgzb.material.domain.RepairPart;
 import com.bonus.sgzb.material.domain.RepairRecord;
 import com.bonus.sgzb.material.service.IRepairAuditDetailsService;
 import com.bonus.sgzb.material.vo.RepairAuditDetailsVO;
@@ -101,6 +102,18 @@ public class RepairAuditDetailsController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 查看配件记录
+     */
+    @ApiOperation("查看配件记录")
+    @GetMapping("/getPartRecord")
+    public TableDataInfo getPartRecord(RepairAuditDetails repairAuditDetails)
+    {
+        startPage();
+        List<RepairPart> list = repairAuditDetailsService.getPartRecord(repairAuditDetails);
+        return getDataTable(list);
+    }
+
 
     /**
      * 修饰任务审核

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

@@ -5,6 +5,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
 import com.bonus.sgzb.material.domain.RepairAuditDetails;
+import com.bonus.sgzb.material.domain.RepairRecord;
 import com.bonus.sgzb.material.domain.ScrapApplyDetails;
 import com.bonus.sgzb.material.service.IScrapApplyDetailsService;
 import com.bonus.sgzb.material.vo.ScrapApplyDetailsVO;
@@ -104,4 +105,27 @@ public class ScrapApplyDetailsController extends BaseController
         return toAjax(scrapApplyDetailsService.auditScrap(scrapAudit));
     }
 
+    /**
+     * 查看报废明细
+     */
+    @ApiOperation("查看报废明细")
+    @GetMapping("/getScrapRecord")
+    public TableDataInfo getScrapRecord(ScrapApplyDetails scrapApplyDetails)
+    {
+        startPage();
+        List<RepairRecord> list = scrapApplyDetailsService.getScrapRecord(scrapApplyDetails);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查看报废照片
+     */
+    @ApiOperation("查看报废照片")
+    @GetMapping("/getFileUrl")
+    public AjaxResult getFileUrl(String fileIds)
+    {
+        List<String> list = scrapApplyDetailsService.getFileUrl(fileIds);
+        return AjaxResult.success(list);
+    }
+
 }

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

@@ -85,6 +85,11 @@ public class RepairRecord implements Serializable {
      */
     @ApiModelProperty(value = "返厂id")
     private String supplierId;
+    /**
+     * 返厂名称
+     */
+    @ApiModelProperty(value = "返厂名称")
+    private String supplier;
     /**
      * 配件数量
      */
@@ -114,7 +119,7 @@ public class RepairRecord implements Serializable {
      * 维修人
      */
     @ApiModelProperty(value = "维修人")
-    private Long repairer;
+    private String repairer;
     private String partStrList;
     private Long companyId;
     /**

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/RepairAuditDetailsMapper.java

@@ -1,6 +1,8 @@
 package com.bonus.sgzb.material.mapper;
 
 import com.bonus.sgzb.material.domain.RepairAuditDetails;
+import com.bonus.sgzb.material.domain.RepairPart;
+import com.bonus.sgzb.material.domain.RepairRecord;
 import com.bonus.sgzb.material.domain.RepairTaskDetails;
 import com.bonus.sgzb.material.vo.RepairAuditDetailsVO;
 import com.bonus.sgzb.material.vo.ScrapApplyDetailsVO;
@@ -134,4 +136,10 @@ public interface RepairAuditDetailsMapper
      * @return
      */
     List<RepairAuditDetails> selectnotAuditByTaskId(Long taskId);
+
+    List<RepairRecord> getRepairRecord(RepairAuditDetails repairAuditDetails);
+
+    RepairAuditDetails getRepairId(RepairAuditDetails repairAuditDetails);
+
+    List<RepairPart> getPartRecord(RepairAuditDetails bean);
 }

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ScrapApplyDetailsMapper.java

@@ -2,6 +2,7 @@ package com.bonus.sgzb.material.mapper;
 
 import com.bonus.sgzb.material.domain.BackApplyInfo;
 import com.bonus.sgzb.material.domain.RepairAuditDetails;
+import com.bonus.sgzb.material.domain.RepairRecord;
 import com.bonus.sgzb.material.domain.ScrapApplyDetails;
 import com.bonus.sgzb.material.vo.ScrapApplyDetailsVO;
 import org.apache.ibatis.annotations.Mapper;
@@ -148,4 +149,12 @@ public interface ScrapApplyDetailsMapper
      * @return
      */
     int updateStatus(ScrapApplyDetails bean);
+
+    String getRepairId(ScrapApplyDetails scrapApplyDetails);
+
+    RepairAuditDetails getByRepairId(String repairId);
+
+    List<RepairRecord> getRepairRecord(RepairAuditDetails bean);
+
+    String getFileUrl(String s);
 }

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IRepairAuditDetailsService.java

@@ -1,6 +1,7 @@
 package com.bonus.sgzb.material.service;
 
 import com.bonus.sgzb.material.domain.RepairAuditDetails;
+import com.bonus.sgzb.material.domain.RepairPart;
 import com.bonus.sgzb.material.domain.RepairRecord;
 import com.bonus.sgzb.material.vo.RepairAuditDetailsVO;
 import com.bonus.sgzb.material.vo.ScrapApplyDetailsVO;
@@ -94,5 +95,7 @@ public interface IRepairAuditDetailsService
     List<RepairAuditDetailsVO> exportRepairQuestList(RepairAuditDetails bean);
 
     List<RepairRecord> getRepairRecord(RepairAuditDetails repairAuditDetails);
+
+    List<RepairPart> getPartRecord(RepairAuditDetails repairAuditDetails);
 }
 

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/IScrapApplyDetailsService.java

@@ -1,5 +1,7 @@
 package com.bonus.sgzb.material.service;
 
+import com.bonus.sgzb.material.domain.RepairAuditDetails;
+import com.bonus.sgzb.material.domain.RepairRecord;
 import com.bonus.sgzb.material.domain.ScrapApplyDetails;
 import com.bonus.sgzb.material.vo.ScrapApplyDetailsVO;
 import com.bonus.sgzb.material.vo.ScrapAudit;
@@ -83,4 +85,8 @@ public interface IScrapApplyDetailsService
      * @return
      */
     List<ScrapApplyDetailsVO> exportScrapApplyDetailsList(ScrapApplyDetails bean);
+
+    List<RepairRecord> getScrapRecord(ScrapApplyDetails scrapApplyDetails);
+
+    List<String> getFileUrl(String fileIds);
 }

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java

@@ -138,7 +138,16 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
 
     @Override
     public List<RepairRecord> getRepairRecord(RepairAuditDetails repairAuditDetails) {
-        return null;
+        RepairAuditDetails bean = repairAuditDetailsMapper.getRepairId(repairAuditDetails);
+        List<RepairRecord> list = repairAuditDetailsMapper.getRepairRecord(bean);
+        return list;
+    }
+
+    @Override
+    public List<RepairPart> getPartRecord(RepairAuditDetails repairAuditDetails) {
+        RepairAuditDetails bean = repairAuditDetailsMapper.getRepairId(repairAuditDetails);
+        List<RepairPart> list = repairAuditDetailsMapper.getPartRecord(bean);
+        return list;
     }
 
     /**

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java

@@ -61,6 +61,26 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService {
         return scrapApplyDetailsMapper.exportScrapApplyDetailsList(bean);
     }
 
+    @Override
+    public List<RepairRecord> getScrapRecord(ScrapApplyDetails scrapApplyDetails) {
+        String repairId = scrapApplyDetailsMapper.getRepairId(scrapApplyDetails);
+        RepairAuditDetails bean = scrapApplyDetailsMapper.getByRepairId(repairId);
+        List<RepairRecord> list = scrapApplyDetailsMapper.getRepairRecord(bean);
+        return list;
+    }
+
+    @Override
+    public List<String> getFileUrl(String fileIds) {
+        List<String> fileUrlList = new ArrayList<>();
+        if (fileIds.isEmpty()){
+            for (String s : fileIds.split(",")) {
+                String url = scrapApplyDetailsMapper.getFileUrl(s);
+                fileUrlList.add(url);
+            }
+        }
+        return fileUrlList;
+    }
+
     /**
      * 查询报废任务详细scrap_apply_details列表
      *

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

@@ -390,5 +390,61 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectRepairAuditDetailsVo"/>
         where task_id = #{taskId} and rd.STATUS = '0'
     </select>
+    <select id="getPartRecord" resultType="com.bonus.sgzb.material.domain.RepairPart">
+        select mpt.pa_name as partName,
+        rpd.part_num as partNum,
+        rpd.part_cost as partCost,
+        rpd.part_type as partType,
+        rpd.remark as remark,
+        rpd.repair_content as repairContent
+        from repair_part_details rpd
+        left join ma_part_type mpt on mpt.pa_id = rpd.part_id
+        where 1=1
+        <if test="taskId != null and taskId != ''">
+            and rpd.task_id = #{taskId}
+        </if>
+        <if test="maId != null and maId != ''">
+            and rpd.ma_id = #{maId}
+        </if>
+        <if test="typeId != null and typeId != ''">
+            and rpd.type_id = #{typeId}
+        </if>
+    </select>
+    <select id="getRepairRecord" resultType="com.bonus.sgzb.material.domain.RepairRecord">
+        select repair_num as repairNum,
+               scrap_num as scrapNum,
+               repair_type as repairType,
+               scrap_reason as scrapReason,
+               scrap_type as scrapType,
+               msi.supplier as supplier,
+               part_num as partNum,
+               part_price as partPrice,
+               repair_content as repairContent,
+               part_type as partType,
+               part_name as partName,
+               file_ids as fileIds,
+               su.nick_name as repairer,
+               rar.remark
+        from repair_apply_record rar
+        left join ma_supplier_info msi on msi.supplier_id = rar.supplier_id
+        left join sys_user su on su.user_id = rar.repairer
+        where 1=1
+        <if test="taskId != null and taskId != ''">
+            and rar.task_id = #{taskId}
+        </if>
+        <if test="maId != null and maId != ''">
+            and rar.ma_id = #{maId}
+        </if>
+        <if test="typeId != null and typeId != ''">
+            and rar.type_id = #{typeId}
+        </if>
+    </select>
+    <select id="getRepairId" resultType="com.bonus.sgzb.material.domain.RepairAuditDetails">
+        select task_id as taskId,
+               ma_id as maId,
+               type_id as typeId
+        from repair_apply_details
+        where id = #{repairId}
+    </select>
     
 </mapper>

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

@@ -349,5 +349,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from repair_audit_details
         where id = #{parentId}
     </select>
+    <select id="getRepairId" resultType="java.lang.String">
+        select repair_id
+        from repair_audit_details
+        where id = #{parentId}
+    </select>
+    <select id="getByRepairId" resultType="com.bonus.sgzb.material.domain.RepairAuditDetails">
+        select task_id as taskId,
+               ma_id as maId,
+               type_id as typeId
+        from repair_apply_details
+        where id = #{repairId}
+    </select>
+    <select id="getRepairRecord" resultType="com.bonus.sgzb.material.domain.RepairRecord">
+        select scrap_num as scrapNum,
+        scrap_reason as scrapReason,
+        scrap_type as scrapType,
+        file_ids as fileIds
+        from repair_apply_record rar
+        where repair_type = '3'
+        <if test="taskId != null and taskId != ''">
+            and rar.task_id = #{taskId}
+        </if>
+        <if test="maId != null and maId != ''">
+            and rar.ma_id = #{maId}
+        </if>
+        <if test="typeId != null and typeId != ''">
+            and rar.type_id = #{typeId}
+        </if>
+    </select>
+    <select id="getFileUrl" resultType="java.lang.String">
+        select file_url
+        from sys_file_info
+        where id = #{s}
+    </select>
 
 </mapper>