1

src/main/java/com/fdkankan/sale/controller/DataCountController.java

@@ -0,0 +1,29 @@
+package com.fdkankan.sale.controller;
+
+import com.fdkankan.sale.common.ResultData;
+import com.fdkankan.sale.service.impl.DataCountService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/sale/dataCount")
+public class DataCountController {
+
+    @Autowired
+    DataCountService dataCountService;
+
+    /**
+     * 工单趋势统计
+     */
+    @GetMapping("/repairAddTrend")
+    public ResultData repairAddTrend(@RequestParam(required = false) Integer cameraType,
+                                     @RequestParam(required = false) Integer dateType,
+                                     @RequestParam(required = false) String startTime,
+                                     @RequestParam(required = false) String endTime){
+
+        return ResultData.ok();
+    }
+}

src/main/java/com/fdkankan/sale/mapper/IFaultMapper.java

@@ -3,6 +3,9 @@ package com.fdkankan.sale.mapper;
 import com.fdkankan.sale.entity.Fault;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface IFaultMapper extends BaseMapper<Fault> {
 
+    List<Fault> getByRepairId(@Param("repairId") String repairId);
 }

src/main/java/com/fdkankan/sale/service/IFaultService.java

@@ -3,6 +3,8 @@ package com.fdkankan.sale.service;
 import com.fdkankan.sale.entity.Fault;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IFaultService extends IService<Fault> {
 
+    List<Fault> getByRepairId(String repairId);
 }

src/main/java/com/fdkankan/sale/service/IRepairFaultService.java

@@ -1,5 +1,6 @@
 package com.fdkankan.sale.service;
 
+import com.fdkankan.sale.entity.Fault;
 import com.fdkankan.sale.entity.RepairFault;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -18,4 +19,5 @@ public interface IRepairFaultService extends IService<RepairFault> {
     void delByRepairId(String repairId);
 
     List<RepairFault> getByFaultId(Integer faultId);
+
 }

src/main/java/com/fdkankan/sale/service/impl/DataCountService.java

@@ -0,0 +1,7 @@
+package com.fdkankan.sale.service.impl;
+
+import org.springframework.stereotype.Service;
+
+@Service
+public class DataCountService {
+}

src/main/java/com/fdkankan/sale/service/impl/FaultServiceImpl.java

@@ -6,6 +6,8 @@ import com.fdkankan.sale.service.IFaultService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +19,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class FaultServiceImpl extends ServiceImpl<IFaultMapper, Fault> implements IFaultService {
 
+    @Override
+    public List<Fault> getByRepairId(String repairId) {
+        return this.getBaseMapper().getByRepairId(repairId);
+    }
 }

src/main/java/com/fdkankan/sale/service/impl/RepairFaultServiceImpl.java

@@ -1,6 +1,7 @@
 package com.fdkankan.sale.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.sale.entity.Fault;
 import com.fdkankan.sale.entity.RepairFault;
 import com.fdkankan.sale.mapper.IRepairFaultMapper;
 import com.fdkankan.sale.service.IRepairFaultService;
@@ -33,4 +34,6 @@ public class RepairFaultServiceImpl extends ServiceImpl<IRepairFaultMapper, Repa
         wrapper.eq(RepairFault::getFaultId,faultId);
         return this.list(wrapper);
     }
+
+
 }

src/main/java/com/fdkankan/sale/service/impl/RepairInfoService.java

@@ -37,6 +37,8 @@ public class RepairInfoService {
     IRepairTestService repairTestService;
     @Autowired
     IRepairCommentService repairCommentService;
+    @Autowired
+    IFaultService faultService;
 
 
     public Object getDetailsByRepairId(String repairId) {
@@ -55,6 +57,7 @@ public class RepairInfoService {
         RepairRegisterVo repairRegisterVo = repairRegisterService.getVoByRepairId(repairId);
         RepairTestVo repairTestVo = repairTestService.getVoByRepairId(repairId);
         RepairComment comment = repairCommentService.getByRepairId(repairId);
+        List<Fault> faultList = faultService.getByRepairId(repairId);
 
         detailVo.setCustomer(customer);
         detailVo.setCustomerAddress(customerAddress);
@@ -65,6 +68,7 @@ public class RepairInfoService {
         detailVo.setRepairRegisterVo(repairRegisterVo);
         detailVo.setRepairTestVo(repairTestVo);
         detailVo.setRepairComment(comment);
+        detailVo.setFaultList(faultList);
 
         return detailVo;
     }

src/main/java/com/fdkankan/sale/service/impl/RepairPersonnelService.java

@@ -81,6 +81,10 @@ public class RepairPersonnelService {
 
 
     public void checkRegister(CheckRegisterParam param, Long userId) {
+        if(StringUtils.isBlank(param.getRepairId()) || StringUtils.isBlank(param.getCheckResult())
+                || param.getFaultIds() ==null || param.getFaultIds().size() <=0){
+            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+        }
         Repair repair = repairService.getById(param.getRepairId());
         if(repair == null){
             throw new BusinessException(ResultCode.REPAIR_NOT_EXITS);
@@ -126,6 +130,7 @@ public class RepairPersonnelService {
 
         }
         repairFaultService.delByRepairId(repair.getRepairId());
+
         for (Integer faultId : param.getFaultIds()) {
             RepairFault fault = new RepairFault();
             fault.setRepairId(repair.getRepairId());

src/main/java/com/fdkankan/sale/vo/response/RepairDetailVo.java

@@ -27,5 +27,7 @@ public class RepairDetailVo {
 
     private RepairComment repairComment;
 
+    private  List<Fault> faultList;
+
 
 }

src/main/resources/mapper/sale/FaultMapper.xml

@@ -2,4 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fdkankan.sale.mapper.IFaultMapper">
 
+    <select id="getByRepairId" resultType="com.fdkankan.sale.entity.Fault">
+        select * from t_fault f left join t_repair_fault rf on f.fault_id = rf.fault_id
+        where f.rec_status = 'A' and rf.repair_id =#{repairId}
+    </select>
 </mapper>

src/main/resources/mapper/sale/RepairMapper.xml

@@ -49,8 +49,8 @@
         <if test="param.cameraSnCode != null and param.cameraSnCode != ''">
             and r.camera_sn_code like  concat ('%',#{param.cameraSnCode},'%')
         </if>
-        <if test="param.repaiManId != null">
-            and o.repair_man_id = #{param.repaiManId}
+        <if test="param.repairManId != null">
+            and o.repair_man_id = #{param.repairManId}
         </if>
         order by r.create_time desc
     </select>