工单完成情况调整

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/stat/IotReportOrderController.java

@@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.module.pms.controller.admin.maintain.vo.IotMaintainPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.stat.vo.AllOrderResp;
 import cn.iocoder.yudao.module.pms.controller.admin.stat.vo.OrderVo;
 import cn.iocoder.yudao.module.pms.dal.dataobject.iotopeationfill.IotOpeationFillDO;
 import cn.iocoder.yudao.module.pms.dal.mysql.inspect.IotInspectOrderDeviceMapper;
@@ -19,6 +20,7 @@ import com.google.common.collect.ImmutableMap;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;
+import org.apache.xmlbeans.impl.xb.xsdschema.All;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -52,16 +54,16 @@ public class IotReportOrderController {
     @Operation(summary = "各工单状态数量统计")
     @GetMapping("/number")
     public CommonResult<ImmutableMap> getOrderStat(@Valid IotMaintainPageReqVO pageReqVO) {
-        List<OrderVo> maintains = iotMaintainMapper.selectStatusNumber(pageReqVO);
-        List<OrderVo> inspects = iotInspectOrderMapper.selectStatusNumber(pageReqVO);
-        List<OrderVo> operations = iotOpeationFillMapper.selectStatusNumber(pageReqVO);
+        List<AllOrderResp> maintains = iotMaintainMapper.selectStatusNumber(pageReqVO);
+        List<AllOrderResp> inspects = iotInspectOrderMapper.selectStatusNumber(pageReqVO);
+        List<AllOrderResp> operations = iotOpeationFillMapper.selectStatusNumber(pageReqVO);
         return CommonResult.success(ImmutableMap.of("wx", maintains, "xj", inspects, "yx", operations));
     }
 
 
     @Operation(summary = "各工单统计")
     @GetMapping("/page")
-    public CommonResult<PageResult<OrderVo>> getOrderPage(@Valid IotMaintainPageReqVO pageReqVO) {
+    public CommonResult<PageResult<AllOrderResp>> getOrderPage(@Valid IotMaintainPageReqVO pageReqVO) {
         Set<Long> ids;
         if (Objects.isNull(pageReqVO.getDeptId())){
             Long loginUserDeptId = SecurityFrameworkUtils.getLoginUserDeptId();
@@ -72,9 +74,9 @@ public class IotReportOrderController {
             ids.add(pageReqVO.getDeptId());
         }
         pageReqVO.setDeptIds(ids);
-        IPage<OrderVo> allOrder = iotMaintainMapper.getAllOrder(new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()), pageReqVO);
-        PageResult<OrderVo> result = new PageResult<>(allOrder.getRecords(), allOrder.getTotal());
-        List<OrderVo> collect = result.getList().stream().map(e -> {
+        IPage<AllOrderResp> allOrder = iotMaintainMapper.getAllOrder(new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()), pageReqVO);
+        PageResult<AllOrderResp> result = new PageResult<>(allOrder.getRecords(), allOrder.getTotal());
+        List<AllOrderResp> collect = result.getList().stream().map(e -> {
             if ("巡检工单".equals(e.getType())){
                 String deviceInfo = iotInspectOrderDeviceMapper.getDeviceInfo(e.getId());
                 e.setDevice(deviceInfo);

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/stat/vo/AllOrderResp.java

@@ -0,0 +1,20 @@
+package cn.iocoder.yudao.module.pms.controller.admin.stat.vo;
+
+import lombok.Data;
+
+@Data
+public class AllOrderResp {
+    private Long id;
+    private String title;
+    private String status;
+    private String person;
+    private String type;
+    private String createTime;
+    private String company;
+    private String project;
+    private String deviceInfo;
+    private Long deptId;
+    private String deptName;
+    private String device;
+    private Long num;
+}

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/stat/vo/OrderVo.java

@@ -20,6 +20,5 @@ public class OrderVo extends PageParam {
     private String deviceInfo;
     private Long deptId;
     private String deptName;
-    private String device;
     private Long num;
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/inspect/IotInspectOrderMapper.java

@@ -5,6 +5,7 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.pms.controller.admin.inspect.order.vo.IotInspectOrderPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.maintain.vo.IotMaintainPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.stat.vo.AllOrderResp;
 import cn.iocoder.yudao.module.pms.controller.admin.stat.vo.OrderVo;
 import cn.iocoder.yudao.module.pms.controller.admin.vo.IotDevicePageReqVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectOrderDO;
@@ -82,5 +83,5 @@ public interface IotInspectOrderMapper extends BaseMapperX<IotInspectOrderDO> {
         );
     }
 
-    List<OrderVo> selectStatusNumber(@Param("reqVO") IotMaintainPageReqVO reqVO);
+    List<AllOrderResp> selectStatusNumber(@Param("reqVO") IotMaintainPageReqVO reqVO);
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/iotopeationfill/IotOpeationFillMapper.java

@@ -7,6 +7,7 @@ import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmodeltemplateattrs.vo.IotModelTemplateAttrsRespVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotopeationfill.vo.*;
 import cn.iocoder.yudao.module.pms.controller.admin.maintain.vo.IotMaintainPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.stat.vo.AllOrderResp;
 import cn.iocoder.yudao.module.pms.controller.admin.stat.vo.OrderVo;
 import cn.iocoder.yudao.module.pms.controller.admin.vo.DeviceVO;
 import cn.iocoder.yudao.module.pms.controller.admin.vo.IotDeviceRespVO;
@@ -339,5 +340,5 @@ public interface IotOpeationFillMapper extends BaseMapperX<IotOpeationFillDO> {
     IotDeviceRunLogDO getUserId(IotDeviceRunLogDO runLogDO);
 
     @TenantIgnore
-    List<OrderVo> selectStatusNumber(@Param("reqVO") IotMaintainPageReqVO reqVO);
+    List<AllOrderResp> selectStatusNumber(@Param("reqVO") IotMaintainPageReqVO reqVO);
 }

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/maintain/IotMaintainMapper.java

@@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.pms.controller.admin.inspect.item.vo.IotInspectItemPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.iotmainworkorder.vo.IotMainWorkOrderPageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.maintain.vo.IotMaintainPageReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.stat.vo.AllOrderResp;
 import cn.iocoder.yudao.module.pms.controller.admin.stat.vo.OrderVo;
 import cn.iocoder.yudao.module.pms.controller.admin.stat.vo.ReportCost;
 import cn.iocoder.yudao.module.pms.controller.admin.vo.IotDeviceRespVO;
@@ -94,6 +95,6 @@ public interface IotMaintainMapper extends BaseMapperX<IotMaintainDO> {
                 .betweenIfPresent(IotMaintainDO::getCreateTime, reqVO.getCreateTime()).inIfPresent(IotMaintainDO::getDeptId, ids));
     }
 
-    List<OrderVo> selectStatusNumber(@Param("reqVO") IotMaintainPageReqVO reqVO);
-    IPage<OrderVo> getAllOrder(IPage<IotMaintainPageReqVO> page, @Param("reqVO") IotMaintainPageReqVO reqVO);
+    List<AllOrderResp> selectStatusNumber(@Param("reqVO") IotMaintainPageReqVO reqVO);
+    IPage<AllOrderResp> getAllOrder(IPage<IotMaintainPageReqVO> page, @Param("reqVO") IotMaintainPageReqVO reqVO);
 }

yudao-module-pms/yudao-module-pms-biz/src/main/resources/mapper/static/IotInspectOrderMapper.xml

@@ -9,7 +9,7 @@
         文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
      -->
     <select id="selectStatusNumber" parameterType="cn.iocoder.yudao.module.pms.controller.admin.maintain.vo.IotMaintainPageReqVO"
-            resultType="cn.iocoder.yudao.module.pms.controller.admin.stat.vo.OrderVo">
+            resultType="cn.iocoder.yudao.module.pms.controller.admin.stat.vo.AllOrderResp">
         select status,count(status) as num from rq_iot_inspect_order a
         <where>
             <if test="reqVO.createTime[0] != null">

yudao-module-pms/yudao-module-pms-biz/src/main/resources/mapper/static/IotMaintainMapper.xml

@@ -100,7 +100,7 @@
     </select>
 
     <select id="selectStatusNumber" parameterType="cn.iocoder.yudao.module.pms.controller.admin.maintain.vo.IotMaintainPageReqVO"
-            resultType="cn.iocoder.yudao.module.pms.controller.admin.stat.vo.OrderVo">
+            resultType="cn.iocoder.yudao.module.pms.controller.admin.stat.vo.AllOrderResp">
         select status,count(status) as num from rq_iot_maintain a
         <where>
             <if test="reqVO.createTime[0] != null">
@@ -120,7 +120,7 @@
         group by status
     </select>
     <select id="getAllOrder" parameterType="cn.iocoder.yudao.module.pms.controller.admin.maintain.vo.IotMaintainPageReqVO"
-            resultType="cn.iocoder.yudao.module.pms.controller.admin.stat.vo.OrderVo">
+            resultType="cn.iocoder.yudao.module.pms.controller.admin.stat.vo.AllOrderResp">
 select * from (
         select a.id,'维修工单' as type, a.create_time as createTime,
         CASE

yudao-module-pms/yudao-module-pms-biz/src/main/resources/mapper/static/IotOpeationFillMapper.xml

@@ -1611,7 +1611,7 @@
     </select>
 
     <select id="selectStatusNumber" parameterType="cn.iocoder.yudao.module.pms.controller.admin.maintain.vo.IotMaintainPageReqVO"
-            resultType="cn.iocoder.yudao.module.pms.controller.admin.stat.vo.OrderVo">
+            resultType="cn.iocoder.yudao.module.pms.controller.admin.stat.vo.AllOrderResp">
         select order_status as status,count(order_status) as num from rq_iot_opeation_fill_order a
         <where>
             <if test="reqVO.createTime[0] != null">