报修单撤回和巡检查询优化

platform-dao/src/main/resources/mapper/fill/FillGatherTaskDetailMapper.xml

@@ -82,6 +82,9 @@
             <if test="status != null">
                 and fill.status = #{status}
             </if>
+            <if test="keyword != null and keyword != ''">
+                and (sb.name like concat(concat('%',#{keyword}),'%') or sb.position_no like concat(concat('%',#{keyword}),'%'))
+            </if>
         </where>
     </select>
 

platform-rest/src/main/java/com/platform/rest/controller/repair/RepairApplicationFormController.java

@@ -341,6 +341,17 @@ public class RepairApplicationFormController {
         return new R<>();
     }
 
+    /**
+     * 报修撤回
+     * @return R
+     */
+    @SysLog("报修撤回")
+    @PutMapping("/repair/delete/{id}")
+    public R abandonRepair(@PathVariable("id") String id) {
+        repairApplicationFormService.abandonRepair(id);
+        return new R<>();
+    }
+
     /**
      * 计划性维修经理审核
      * @param repairCheckDTO 验收单DTO

platform-service/src/main/java/com/platform/service/fill/impl/FillGatherTaskDetailServiceImpl.java

@@ -1,5 +1,6 @@
 package com.platform.service.fill.impl;
 import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.common.util.StringUtils;
 import com.platform.dao.bean.MyPage;
 import com.github.pagehelper.PageHelper;
 import com.platform.dao.vo.query.fill.FillGatherTaskDetailVO;
@@ -38,6 +39,9 @@ public class FillGatherTaskDetailServiceImpl extends BaseServiceImpl<FillGatherT
     @Override
     public AbstractPageResultBean<FillGatherTaskDetailVO> selectPageList(FillGatherTaskDetailDTO record, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
+        if(StringUtils.isNotBlank(record.getKeyword())){
+            record.setKeyword(record.getKeyword().trim());
+        }
         return new MyPage(mapper.selectList(record));
     }
 

platform-service/src/main/java/com/platform/service/repair/RepairApplicationFormService.java

@@ -185,4 +185,9 @@ public interface RepairApplicationFormService extends IBaseService<RepairApplica
     List<RepairApplicationFormVO> selectCountByStatus();
 
     List<RepairApplicationFormVO> getCurrentlyListByDTO(RepairApplicationFormDTO model);
+
+    /**
+     * 报修撤回
+     */
+    void abandonRepair(String id);
 }

platform-service/src/main/java/com/platform/service/repair/impl/RepairApplicationFormServiceImpl.java

@@ -663,6 +663,19 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         return mapper.getCurrentlyList(model);
     }
 
+    @Override
+    public void abandonRepair(String id) {
+        // 根据用户的角色来定
+        RepairApplicationForm form = mapper.selectByPrimaryKey(id);
+        if(!form.getUserId().equals(SecurityUtils.getUserInfo().getUserId())){
+            throw new DeniedException("不是报修单所有人，不能撤回");
+        }
+        if(form.getStatus() != RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue() && form.getStatus() != RepairApplicationFormStatusEnum.RECEIVED.getValue()){
+            throw new DeniedException("非待接单和已接单状态，不能撤回");
+        }
+        mapper.deleteByPrimaryKey(id);
+    }
+
     @Override
     public R getStoreForm(UserInfo userInfo) {
         InStoreFormDTO inStoreFormDTO=new InStoreFormDTO();