Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/CrmDeviceRepairController.java

@@ -5,6 +5,7 @@ import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.iot.domain.CrmDeviceRepair;
 import com.usky.iot.service.CrmDeviceRepairService;
+import com.usky.iot.service.vo.CrmDeviceRepairAddVO;
 import com.usky.iot.service.vo.CrmDeviceRepairScoreVO;
 import com.usky.iot.service.vo.CrmDeviceRepairVO;
 import com.usky.iot.service.vo.PhoneVerifyVO;
@@ -13,6 +14,8 @@ import org.springframework.web.bind.annotation.*;
 
 import org.springframework.stereotype.Controller;
 
+import java.util.List;
+
 /**
  * <p>
  * 设备报修记录表 前端控制器
@@ -48,6 +51,18 @@ public class CrmDeviceRepairController {
         return ApiResult.success(crmDeviceRepairService.page(crmDeviceRepairVO));
     }
 
+    /**
+     * 获取项目历史信息
+     *
+     * @param projectName   项目名称
+     * @return
+     */
+    @GetMapping("getAddHistoryInfo")
+    ApiResult<List<CrmDeviceRepairAddVO>> getAddHistoryInfo(@RequestParam(value = "projectName") String projectName){
+        return ApiResult.success(crmDeviceRepairService.getAddHistoryInfo(projectName));
+    }
+
+
     /**
      *
      * @param id

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/CrmDeviceRepairService.java

@@ -3,10 +3,14 @@ package com.usky.iot.service;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.iot.domain.CrmDeviceRepair;
 import com.usky.common.mybatis.core.CrudService;
+import com.usky.iot.service.vo.CrmDeviceRepairAddVO;
 import com.usky.iot.service.vo.CrmDeviceRepairScoreVO;
 import com.usky.iot.service.vo.CrmDeviceRepairVO;
 import com.usky.iot.service.vo.PhoneVerifyVO;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
 
 /**
  * <p>
@@ -22,6 +26,8 @@ public interface CrmDeviceRepairService extends CrudService<CrmDeviceRepair> {
 
     CommonPage<CrmDeviceRepair> page(CrmDeviceRepairVO crmDeviceRepairVO);
 
+    List<CrmDeviceRepairAddVO> getAddHistoryInfo(String projectName);
+
     void remove(Integer id);
 
     void fill(CrmDeviceRepair crmDeviceRepair);

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/CrmDeviceRepairServiceImpl.java

@@ -25,6 +25,7 @@ import com.usky.iot.domain.CrmDeviceRepair;
 import com.usky.iot.mapper.CrmDeviceRepairMapper;
 import com.usky.iot.service.CrmDeviceRepairService;
 import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.iot.service.vo.CrmDeviceRepairAddVO;
 import com.usky.iot.service.vo.CrmDeviceRepairScoreVO;
 import com.usky.iot.service.vo.CrmDeviceRepairVO;
 import com.usky.iot.service.vo.PhoneVerifyVO;
@@ -124,6 +125,29 @@ public class CrmDeviceRepairServiceImpl extends AbstractCrudService<CrmDeviceRep
 
     }
 
+    @Override
+    public List<CrmDeviceRepairAddVO> getAddHistoryInfo(String projectName){
+        List<CrmDeviceRepairAddVO> list = new ArrayList<>();
+        LambdaQueryWrapper<CrmDeviceRepair> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.like(StringUtils.isNotBlank(projectName),CrmDeviceRepair::getProjectName,projectName)
+                .orderByDesc(CrmDeviceRepair::getId);
+        List<CrmDeviceRepair> repairList = this.list(queryWrapper);
+        if(CollectionUtils.isNotEmpty(repairList)){
+            for (int i = 0; i < repairList.size(); i++) {
+                CrmDeviceRepairAddVO addVO = new CrmDeviceRepairAddVO();
+                addVO.setProjectName(repairList.get(i).getProjectName());
+                addVO.setProjectAddress(repairList.get(i).getProjectAddress());
+                addVO.setReflectName(repairList.get(i).getReflectName());
+                addVO.setReflectPhone(repairList.get(i).getReflectPhone());
+                addVO.setRepairContent(repairList.get(i).getRepairContent());
+                addVO.setRepairPicture(repairList.get(i).getRepairPicture());
+                list.add(addVO);
+            }
+        }
+
+        return list;
+    }
+
     @Override
     public void remove(Integer id){
         CrmDeviceRepair one = this.getById(id);

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/vo/CrmDeviceRepairAddVO.java

@@ -0,0 +1,36 @@
+package com.usky.iot.service.vo;
+
+import lombok.Data;
+
+@Data
+public class CrmDeviceRepairAddVO {
+    /**
+     * 项目名称
+     */
+    private String projectName;
+
+    /**
+     * 项目地址
+     */
+    private String projectAddress;
+
+    /**
+     * 报修人
+     */
+    private String reflectName;
+
+    /**
+     * 报修手机号码
+     */
+    private String reflectPhone;
+
+    /**
+     * 报修内容
+     */
+    private String repairContent;
+
+    /**
+     * 报修图片
+     */
+    private String repairPicture;
+}