优化排班表

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/equipboilerscheduling/vo/BoilerCalendarItemRespVO.java

@@ -47,4 +47,16 @@ public class BoilerCalendarItemRespVO {
 
     @Schema(description = "状态, 100 已排期 200 待约检 300 已受理 400 已作废")
     private Integer status;
+
+    @Schema(description = "约检id")
+    private String appointmentId;
+
+    @Schema(description = "受理id")
+    private String acceptOrderId;
+
+    @Schema(description = "约检状态")
+    private Integer acceptStatus;
+
+    @Schema(description = "任务状态")
+    private Integer taskStatus;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/equipboilerscheduling/vo/BoilerCalendarReqVO.java

@@ -22,4 +22,9 @@ public class BoilerCalendarReqVO {
 
     private String userId ;
 
+    @Schema(description = "检验类型")
+    private String checkType;
+
+    @Schema(description = "单位名称")
+    private String unitName;
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/boilertaskorder/BoilerTaskOrderServiceImpl.java

@@ -2887,6 +2887,7 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
         taskOrderDO.setCheckDate(acceptOrderDO.getAppointmentDate());
         taskOrderDO.setAcceptOrderId(acceptOrderDO.getId());
         taskOrderDO.setEquipMainType(200); //200锅炉
+        taskOrderDO.setEquipNum(acceptOrderItemDOS.size()); //200锅炉
         BigDecimal actualAmount = acceptOrderDO.getShouldAmount().add(acceptOrderDO.getServiceAmount());
         taskOrderDO.setActualAmount(actualAmount);
         //获取约检确认单计划id

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/equipboilerscheduling/EquipBoilerSchedulingServiceImpl.java

@@ -6,6 +6,8 @@ import cn.start.tz.framework.common.pojo.CommonResult;
 import cn.start.tz.framework.ip.core.Area;
 import cn.start.tz.framework.ip.core.utils.AreaUtils;
 import cn.start.tz.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.start.tz.module.pressure.enums.AcceptOrderStatusEnum;
+import cn.start.tz.module.pressure.enums.TaskOrderStatusEnum;
 import cn.start.tz.module.pressure2.controller.admin.appointmentconfirmorder.vo.AppointmentSubmitVO;
 import cn.start.tz.module.pressure2.controller.admin.appointmentconfirmorder.vo.SubmitTeamItemVO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilerappointmentconfirmorderitem.BoilerAppointmentConfirmOrderItemDO;
@@ -368,6 +370,18 @@ public class EquipBoilerSchedulingServiceImpl extends ServiceImpl<EquipBoilerSch
 
             // 默认 已排期
             item.setStatus(100);
+
+            if (org.apache.commons.lang3.StringUtils.isNotBlank(item.getAppointmentId())) {
+                item.setStatus(200);
+            }
+
+            if (org.apache.commons.lang3.StringUtils.isNotBlank(item.getAcceptOrderId())) {
+                item.setStatus(300);
+            }
+
+            if ((item.getAcceptStatus() != null && item.getAcceptStatus() == AcceptOrderStatusEnum.CANCEL.getStatus().intValue()) || (item.getTaskStatus() != null && item.getTaskStatus() == TaskOrderStatusEnum.CANCEL.getStatus().intValue())) {
+                item.setStatus(400);
+            }
         });
 
         map.forEach((key,values)->{

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/equippipescheduling/EquipPipeSchedulingServiceImpl.java

@@ -10,6 +10,9 @@ import cn.start.tz.framework.mybatis.core.query.LambdaQueryWrapperX;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.stream.Collectors;
+
+import cn.start.tz.module.pressure.enums.AcceptOrderStatusEnum;
+import cn.start.tz.module.pressure.enums.TaskOrderStatusEnum;
 import cn.start.tz.module.pressure2.controller.admin.appointmentconfirmorder.vo.AppointmentSubmitVO;
 import cn.start.tz.module.pressure2.controller.admin.appointmentconfirmorder.vo.PipeAppointmentSubmitVO;
 import cn.start.tz.module.pressure2.controller.admin.appointmentconfirmorder.vo.SubmitTeamItemVO;
@@ -469,9 +472,20 @@ public class EquipPipeSchedulingServiceImpl extends ServiceImpl<EquipPipeSchedul
         boilerCalendarItemRespVOS.forEach(item->{
             item.setEquipDistrictName(AreaUtils.getAreaName(item.getEquipDistrict()));
             item.setEquipStreetName(AreaUtils.getAreaName(item.getEquipStreet()));
-
             // 默认 已排期
             item.setStatus(100);
+
+            if (org.apache.commons.lang3.StringUtils.isNotBlank(item.getAppointmentId())) {
+                item.setStatus(200);
+            }
+
+            if (org.apache.commons.lang3.StringUtils.isNotBlank(item.getAcceptOrderId())) {
+                item.setStatus(300);
+            }
+
+            if ((item.getAcceptStatus() != null && item.getAcceptStatus() == AcceptOrderStatusEnum.CANCEL.getStatus().intValue()) || (item.getTaskStatus() != null && item.getTaskStatus() == TaskOrderStatusEnum.CANCEL.getStatus().intValue())) {
+                item.setStatus(400);
+            }
         });
 
         map.forEach((key,values)->{

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/pipetaskorder/PipeTaskOrderServiceImpl.java

@@ -2132,6 +2132,7 @@ public class PipeTaskOrderServiceImpl extends ServiceImpl<PipeTaskOrderMapper, P
         taskOrderDO.setCheckDate(acceptOrderDO.getAppointmentDate());
         taskOrderDO.setAcceptOrderId(acceptOrderDO.getId());
         taskOrderDO.setEquipMainType(300); //300管道
+        taskOrderDO.setEquipNum(acceptOrderItemDOS.size()); //300管道
         //获取约检确认单计划id
         AppointmentConfirmOrderDO appointmentConfirmOrderDO = appointmentConfirmOrderMapper.selectById(acceptOrderDO.getAppointmentId());
         if (ObjectUtil.isNotEmpty(appointmentConfirmOrderDO)) {

tz-module-pressure2/tz-module-pressure2-biz/src/main/resources/mapper/equippipescheduling/EquipPipeSchedulingMapper.xml

@@ -549,6 +549,14 @@
             <if test="relateDepartment != null and relateDepartment != ''">
                 and b.RELATION_DEPT = #{relateDepartment}
             </if>
+
+            <if test="checkType != null and checkType!='' ">
+                and a.type = #{checkType}
+            </if>
+
+            <if test="unitName != null and unitName!='' ">
+                and a.UNIT_NAME = #{unitName}
+            </if>
         </where>
         group by b.unit_code,a.plan_date,a.type,a.ID
         order by b.unit_code