修改工单类型bug

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/ServiceWorkOrdersTypeVo.java

@@ -39,6 +39,12 @@ public class ServiceWorkOrdersTypeVo implements Serializable {
     @ExcelProperty(value = "工单类型编号")
     private String orderTypeNo;
 
+    /**
+     * 工单数量
+     */
+    @ExcelProperty(value = "工单数量")
+    private Integer orderQuantity;
+
     /**
      * 工单类型名称
      */

ruoyi-modules/Property/src/main/java/org/dromara/property/domain/vo/cleanOrderVo/CleanOrderVo.java

@@ -155,10 +155,4 @@ public class CleanOrderVo implements Serializable {
     private List<Clean> cleanList;
 
     private List<CleanRelation> relationList;
-    private List<CleanOrderRecordVo> recordVoList;
-
-
-
-
-
 }

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServiceWorkOrdersTypeServiceImpl.java

@@ -14,9 +14,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.dromara.property.domain.ServiceWorkOrders;
 import org.dromara.property.domain.ServiceWorkOrdersType;
 import org.dromara.property.domain.bo.ServiceWorkOrdersTypeBo;
 import org.dromara.property.domain.vo.ServiceWorkOrdersTypeVo;
+import org.dromara.property.mapper.ServiceWorkOrdersMapper;
 import org.dromara.property.mapper.ServiceWorkOrdersTypeMapper;
 import org.dromara.property.service.IServiceWorkOrdersTypeService;
 import org.dromara.system.api.RemoteDeptService;
@@ -41,9 +43,11 @@ import java.util.Collection;
 public class ServiceWorkOrdersTypeServiceImpl implements IServiceWorkOrdersTypeService {
 
     private final ServiceWorkOrdersTypeMapper baseMapper;
+    private final ServiceWorkOrdersMapper serviceWorkOrdersMapper;
 
     @DubboReference
     private RemoteDeptService remoteDeptService;
+
     /**
      * 查询【工单类型】
      *
@@ -52,10 +56,18 @@ public class ServiceWorkOrdersTypeServiceImpl implements IServiceWorkOrdersTypeS
      */
     @Override
     public ServiceWorkOrdersTypeVo queryById(Long id) {
-        ServiceWorkOrdersTypeVo serviceWorkOrdersTypeVo=  baseMapper.selectVoById(id);
+        ServiceWorkOrdersTypeVo serviceWorkOrdersTypeVo = baseMapper.selectVoById(id);
-        Long deptId = serviceWorkOrdersTypeVo.getDeptId();
+        if (ObjectUtil.isNotEmpty(serviceWorkOrdersTypeVo)) {
-        RemoteDeptVo remoteDeptVo = remoteDeptService.selectDeptVoById(deptId);
+            Long deptId = serviceWorkOrdersTypeVo.getDeptId();
-        serviceWorkOrdersTypeVo.setDeptName(remoteDeptVo.getDeptName());
+            RemoteDeptVo remoteDeptVo = remoteDeptService.selectDeptVoById(deptId);
+            serviceWorkOrdersTypeVo.setDeptName(remoteDeptVo.getDeptName());
+            //查询工单数量
+            List<ServiceWorkOrders> serviceWorkOrdersList = serviceWorkOrdersMapper.selectList(
+                new LambdaQueryWrapper<ServiceWorkOrders>()
+                    .eq(ServiceWorkOrders::getType, id)
+            );
+            serviceWorkOrdersTypeVo.setOrderQuantity(serviceWorkOrdersList.size());
+        }
         return serviceWorkOrdersTypeVo;
     }
 
@@ -87,7 +99,7 @@ public class ServiceWorkOrdersTypeServiceImpl implements IServiceWorkOrdersTypeS
     @Override
     public List<ServiceWorkOrdersTypeVo> queryList(ServiceWorkOrdersTypeBo bo) {
         LambdaQueryWrapper<ServiceWorkOrdersType> lqw = buildQueryWrapper(bo);
-        List<ServiceWorkOrdersTypeVo>  serviceWorkOrdersTypeVoList= baseMapper.selectVoList(lqw);
+        List<ServiceWorkOrdersTypeVo> serviceWorkOrdersTypeVoList = baseMapper.selectVoList(lqw);
         serviceWorkOrdersTypeVoList.stream().forEach(vo -> {
             Long deptId = vo.getDeptId();
             RemoteDeptVo remoteDeptVo = remoteDeptService.selectDeptVoById(deptId);
@@ -107,7 +119,7 @@ public class ServiceWorkOrdersTypeServiceImpl implements IServiceWorkOrdersTypeS
         lqw.eq(StringUtils.isNotBlank(bo.getSearchValue()), ServiceWorkOrdersType::getSearchValue, bo.getSearchValue());
         lqw.eq(ObjectUtil.isNotEmpty(bo.getParentId()), ServiceWorkOrdersType::getParentId, bo.getParentId());
         lqw.isNull(bo.getFilterSubNodes() != null && bo.getFilterSubNodes(), ServiceWorkOrdersType::getParentId);
-        lqw.ne(bo.getExcludeId()!=null,ServiceWorkOrdersType::getId,bo.getExcludeId());
+        lqw.ne(bo.getExcludeId() != null, ServiceWorkOrdersType::getId, bo.getExcludeId());
         return lqw;
     }
 
@@ -204,7 +216,8 @@ public class ServiceWorkOrdersTypeServiceImpl implements IServiceWorkOrdersTypeS
         return tree;
     }
 
-     //APP端
+    //APP端
+
     /**
      * 查询【工单类型】树结构
      *

ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/cleanOrderImpl/CleanOrderServiceImpl.java

@@ -95,27 +95,7 @@ public class CleanOrderServiceImpl implements ICleanOrderService {
         CleanOrderVo cleanOrderVo = MapstructUtils.convert(cleanOrder, CleanOrderVo.class);
         cleanOrderVo.setCleanList(cleanList);
         cleanOrderVo.setRelationList(cleanRelationList);
-//        //查询订单记录
-//        List<CleanOrderRecordVo> cleanOrderRecordVos = cleanOrderRecordMapper.selectVoList(Wrappers.<CleanOrderRecord>lambdaQuery().eq(CleanOrderRecord::getCleanOrderId, id));
-//        if(CollUtil.isNotEmpty(cleanOrderRecordVos)){
-//            cleanOrderRecordVos.stream().forEach(item -> {
-//                //查询指派人名称
-//                if(ObjectUtil.isNotEmpty(item.getHandler())){
-//                    RemoteUserVo userInfo = remoteUserService.getUserInfoById(item.getHandler());
-//                    item.setHandlerText(userInfo.getNickName());
-//                }
-//                //查询发起人名称
-//                if(ObjectUtil.isNotEmpty(item.getInitiatorPeople())){
-//                    RemoteUserVo userInfo = remoteUserService.getUserInfoById(item.getInitiatorPeople());
-//                    item.setInitiatorPeopleText(userInfo.getNickName());
-//                }
-//
-//            });
-//            cleanOrderVo.setRecordVoList(cleanOrderRecordVos);
-//        }
-
         return cleanOrderVo;
-
     }
 
     /**
@@ -256,20 +236,7 @@ public class CleanOrderServiceImpl implements ICleanOrderService {
     /**
      * 保存后的数据校验
      */
-    private void validEntityBeforeSave(CleanOrderBo bo) {
+    private void validEntityBeforeSave(CleanOrderBo bo) {}
-        //当前登录用户
-        Long userId = LoginHelper.getUserId();
-        //TODO 做一些数据校验,如唯一约束
-        cleanOrderRecordMapper.insert(
-        new CleanOrderRecord()
-            .setCleanOrderId(bo.getId())
-            .setStatus("1")
-            .setIsSign("1")
-            .setInitiatorPeople(userId)
-            .setServiceEvaluaText(bo.getServiceEvaluaText())
-            .setIsAbnormal("1")
-        );
-    }
 
     /**
      * 校验并批量删除保洁订单信息