‘优化调试电子督察单代码逻辑’

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemInspectListController.java

@@ -26,7 +26,7 @@ import java.util.List;
  * @author ZYJ
  * @since 2022-12-29
  */
-@Controller
+@RestController
 @RequestMapping("/demInspect")
 public class DemInspectListController {
     @Autowired
@@ -95,7 +95,7 @@ public class DemInspectListController {
     }
 
     /**
-     * 事件管理-企业版-填报电子督察单
+     * 事件管理-企业版-填报电子督察单处理结果
      * @param inspectCode  督察单编号
      * @param handler    处理人
      * @param handlerPhone  处理人联系电话
@@ -106,7 +106,7 @@ public class DemInspectListController {
      * @param sitePhoto3    现场照片3
      * @return
      */
-    @Log(title = "企业版-处理电子督察单", businessType = BusinessType.UPDATE)
+    @Log(title = "企业版-填报电子督察单处理结果", businessType = BusinessType.UPDATE)
     @PutMapping("updateInspectManage")
     public ApiResult<Void> updateInspectManage(@RequestParam(value = "inspectCode") String inspectCode,
                                                @RequestParam(value = "handler") String handler,

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DemInspectListService.java

@@ -59,7 +59,7 @@ public interface DemInspectListService extends CrudService<DemInspectList> {
     List<InspectHandleVO> inspectInfo(String inspectCode);
 
     /**
-     * 事件管理-企业版-填报电子督察单
+     * 事件管理-企业版-填报电子督察单处理结果
      * @param inspectCode  督察单编号
      * @param handler    处理人
      * @param handlerPhone  处理人联系电话

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemInspectListServiceImpl.java

@@ -57,16 +57,19 @@ public class DemInspectListServiceImpl extends AbstractCrudService<DemInspectLis
     public CommonPage<InspectDetailVO> demInspectList(String inspectCode, String companyName, String deviceCode, Integer handlingStatus, Integer pageNum, Integer pageSize){
         IPage<DemInspectList> page = new Page<>(pageNum, pageSize);
         List<InspectDetailVO> list = new ArrayList<>();
+        List<BaseCompany> companyIdList = new ArrayList<>();
         LambdaQueryWrapper<BaseUserCompany> QueryWrapper = Wrappers.lambdaQuery();
         QueryWrapper.select(BaseUserCompany::getCompanyId)
                 .eq(BaseUserCompany::getUserId, SecurityUtils.getUserId());
         List<BaseUserCompany> comoanyList = baseUserCompanyService.list(QueryWrapper);
 
         LambdaQueryWrapper<BaseCompany> QueryWrapperCompany = Wrappers.lambdaQuery();
-        QueryWrapperCompany.select(BaseCompany::getCompanyId)
-                .eq(BaseCompany::getEnable, 0)
-                .like(StringUtils.isNotBlank(companyName), BaseCompany::getCompanyName, companyName);
-        List<BaseCompany> companyIdList = baseCompanyService.list(QueryWrapperCompany);
+        if(StringUtils.isNotBlank(companyName)){
+            QueryWrapperCompany.select(BaseCompany::getCompanyId)
+                    .eq(BaseCompany::getEnable, 0)
+                    .like(BaseCompany::getCompanyName, companyName);
+            companyIdList = baseCompanyService.list(QueryWrapperCompany);
+        }
 
         if(CollectionUtils.isNotEmpty(comoanyList)){
             List<String> companyList = new ArrayList<>();
@@ -232,7 +235,7 @@ public class DemInspectListServiceImpl extends AbstractCrudService<DemInspectLis
         LambdaQueryWrapper<DemInspectList> QueryWrapper = Wrappers.lambdaQuery();
         QueryWrapper.select(DemInspectList::getHandlingTime, DemInspectList::getDeviceStatus, DemInspectList::getHandler, DemInspectList::getHandlerPhone,
                 DemInspectList::getHandlingContent, DemInspectList::getSitePhoto1, DemInspectList::getSitePhoto2, DemInspectList::getSitePhoto3)
-                .eq(StringUtils.isNotBlank(inspectCode),DemInspectList::getInspectCode, inspectCode);
+                .eq(DemInspectList::getInspectCode, inspectCode);
         List<DemInspectList> list1 = this.list(QueryWrapper);
         if(list1.size() > 0){
             InspectHandleVO inspectHandleVO = new InspectHandleVO();
@@ -253,7 +256,7 @@ public class DemInspectListServiceImpl extends AbstractCrudService<DemInspectLis
     @Override
     public void updateInspectManage(String inspectCode, String handler, String handlerPhone, Integer deviceStatus, String handlingContent, String sitePhoto1, String sitePhoto2, String sitePhoto3){
         LambdaQueryWrapper<DemInspectList> QueryWrapper = Wrappers.lambdaQuery();
-        QueryWrapper.eq(StringUtils.isNotBlank(inspectCode),DemInspectList::getInspectCode, inspectCode);
+        QueryWrapper.eq(DemInspectList::getInspectCode, inspectCode);
         List<DemInspectList> list = this.list(QueryWrapper);
         if(list.size() > 0){
             list.get(0).setHandler(handler);
@@ -264,6 +267,7 @@ public class DemInspectListServiceImpl extends AbstractCrudService<DemInspectLis
             list.get(0).setSitePhoto1(sitePhoto1);
             list.get(0).setSitePhoto2(sitePhoto2);
             list.get(0).setSitePhoto3(sitePhoto3);
+            list.get(0).setHandlingStatus(1);
             this.updateById(list.get(0));
         }
     }