ソースを参照

feat(task-order): 添加设备类型字段支持

- 在 TaskOrderPageReqVO 中新增 equipMainType 查询参数
- 在 TaskOrderRespVO 中新增 equipMainType 响应字段
- 在 TaskOrderDO 数据对象中新增 equipMainType 属性
- 在 TaskOrderMapper 查询条件中添加 equipMainType 过滤支持
xuzhancheng 1 週間 前
コミット
4925363d63

+ 5 - 0
tz-module-pressure/tz-module-pressure-biz/src/main/java/cn/start/tz/module/pressure/controller/admin/taskorder/vo/TaskOrderPageReqVO.java

@@ -466,4 +466,9 @@ public class TaskOrderPageReqVO extends PageParam {
     private String templateId;
 
     private Boolean showPrepare;
+
+    /**
+     * 设备类型
+     */
+    private Integer equipMainType;
 }

+ 3 - 0
tz-module-pressure/tz-module-pressure-biz/src/main/java/cn/start/tz/module/pressure/controller/admin/taskorder/vo/TaskOrderRespVO.java

@@ -79,6 +79,9 @@ public class TaskOrderRespVO  implements Serializable {
     @Schema(description = "设备类型", example = "1")
     private Integer equipType;
 
+    @Schema(description = "设备类型", example = "1")
+    private Integer equipMainType;
+
     @Schema(description = "设备数量", example = "1")
     private Integer equipNum;
 

+ 5 - 0
tz-module-pressure/tz-module-pressure-biz/src/main/java/cn/start/tz/module/pressure/dal/dataobject/taskorder/TaskOrderDO.java

@@ -350,4 +350,9 @@ public class TaskOrderDO extends BaseDO {
      * 旧系统任务单受理日期
      */
     private LocalDate inputDate;
+
+    /**
+     * 设备类型
+     */
+    private Integer equipMainType;
 }

+ 1 - 0
tz-module-pressure/tz-module-pressure-biz/src/main/java/cn/start/tz/module/pressure/dal/mysql/taskorder/TaskOrderMapper.java

@@ -103,6 +103,7 @@ public interface TaskOrderMapper extends BaseMapperX<TaskOrderDO> {
                  .eqIfPresent(TaskOrderDO::getUseUnitId, reqVO.getUseUnitId())
                  .eqIfPresent(TaskOrderDO::getSocialCreditCode, reqVO.getSocialCreditCode())
                  .eqIfPresent(TaskOrderDO::getPayerContact, reqVO.getPayerContact())
+                 .eqIfPresent(TaskOrderDO::getEquipMainType, reqVO.getEquipMainType())
                  .orderByDesc(TaskOrderDO::getCreateTime);
 
          if (CollUtil.isNotEmpty(reqVO.getInspectorIds())) {