默认校核人

tz-module-pressure2/tz-module-pressure2-api/src/main/java/cn/start/tz/module/pressure2/enums/ErrorCodeConstants.java

@@ -211,4 +211,6 @@ public interface ErrorCodeConstants{
 
     ErrorCode USER_WALL_THICKNESS_TEMPLATE_NOT_EXISTS = new ErrorCode(5019, "检验性质类型关联报告模版不存在");
     ErrorCode USER_TEMPLATE_LIBRARY_NOT_EXISTS = new ErrorCode(5020, "用户操作指导书模板库不存在");
+
+    ErrorCode DEFAULT_APPROVAL_NOT_EXISTS = new ErrorCode(5021, "默认审批配置不存在");
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/boilertaskorder/vo/OrderItemReportApproveBatchVO.java

@@ -12,4 +12,7 @@ public class OrderItemReportApproveBatchVO {
     @Schema(description = "批量ids")
     private List<String> ids;
 
+    @Schema(description = "id")
+    private String id;
+
 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/defaultapproval/DefaultApprovalController.java

@@ -0,0 +1,69 @@
+package cn.start.tz.module.pressure2.controller.admin.defaultapproval;
+
+import cn.start.tz.framework.common.pojo.CommonResult;
+import cn.start.tz.framework.common.pojo.PageResult;
+import cn.start.tz.module.pressure2.controller.admin.defaultapproval.vo.DefaultApprovalPageReqVO;
+import cn.start.tz.module.pressure2.controller.admin.defaultapproval.vo.DefaultApprovalRespVO;
+import cn.start.tz.module.pressure2.controller.admin.defaultapproval.vo.DefaultApprovalSaveReqVO;
+import cn.start.tz.module.pressure2.dal.dataobject.defaultapproval.DefaultApprovalDO;
+import cn.start.tz.module.pressure2.service.defaultapproval.DefaultApprovalService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import static cn.start.tz.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - 承压2默认审批配置")
+@RestController
+@RequestMapping("/pressure2/default-approval")
+@Validated
+public class DefaultApprovalController {
+
+    @Resource
+    private DefaultApprovalService defaultApprovalService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建默认审批配置")
+    public CommonResult<String> createDefaultApproval(@Valid @RequestBody DefaultApprovalSaveReqVO createReqVO) {
+        return success(defaultApprovalService.createDefaultApproval(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新默认审批配置")
+    public CommonResult<Boolean> updateDefaultApproval(@Valid @RequestBody DefaultApprovalSaveReqVO updateReqVO) {
+        defaultApprovalService.updateDefaultApproval(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除默认审批配置")
+    @Parameter(name = "id", description = "编号", required = true)
+    public CommonResult<Boolean> deleteDefaultApproval(@RequestParam("id") String id) {
+        defaultApprovalService.deleteDefaultApproval(id);
+        return success(true);
+    }
+
+    @PostMapping("/save")
+    @Operation(summary = "保存当前用户的默认审批配置（存在则更新，不存在则创建）")
+    public CommonResult<Boolean> saveDefaultApproval(@Valid @RequestBody DefaultApprovalSaveReqVO saveReqVO) {
+        defaultApprovalService.saveDefaultApproval(saveReqVO);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获取当前用户的默认审批配置")
+    public CommonResult<DefaultApprovalRespVO> getDefaultApproval() {
+        return success(defaultApprovalService.getDefaultApproval());
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得默认审批配置分页")
+    public CommonResult<PageResult<DefaultApprovalDO>> getDefaultApprovalPage(@Valid DefaultApprovalPageReqVO pageReqVO) {
+        return success(defaultApprovalService.getDefaultApprovalPage(pageReqVO));
+    }
+
+}

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/defaultapproval/vo/DefaultApprovalPageReqVO.java

@@ -0,0 +1,30 @@
+package cn.start.tz.module.pressure2.controller.admin.defaultapproval.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import cn.start.tz.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static cn.start.tz.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 承压2默认审批配置分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class DefaultApprovalPageReqVO extends PageParam {
+
+    @Schema(description = "用户id", example = "1024")
+    private String userId;
+
+    @Schema(description = "校核人id", example = "1024")
+    private String recheckId;
+
+    @Schema(description = "审核人工号", example = "A001")
+    private String approveEmployeeNo;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/defaultapproval/vo/DefaultApprovalRespVO.java

@@ -0,0 +1,34 @@
+package cn.start.tz.module.pressure2.controller.admin.defaultapproval.vo;
+
+import cn.start.tz.module.system.api.user.dto.AdminUserRespDTO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 承压2默认审批配置 Response VO")
+@Data
+public class DefaultApprovalRespVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    private String id;
+
+    @Schema(description = "用户id", example = "1024")
+    private String userId;
+
+    @Schema(description = "校核人id", example = "1024")
+    private String recheckId;
+
+    @Schema(description = "审核人工号", example = "A001")
+    private String approveEmployeeNo;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    private LocalDateTime createTime;
+
+    @Schema(description = "校核人信息")
+    private AdminUserRespDTO recheckUser;
+
+    @Schema(description = "审核人信息")
+    private AdminUserRespDTO approveUser;
+
+}

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/controller/admin/defaultapproval/vo/DefaultApprovalSaveReqVO.java

@@ -0,0 +1,19 @@
+package cn.start.tz.module.pressure2.controller.admin.defaultapproval.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "管理后台 - 承压2默认审批配置新增/修改 Request VO")
+@Data
+public class DefaultApprovalSaveReqVO {
+
+    @Schema(description = "主键", example = "1024")
+    private String id;
+
+    @Schema(description = "校核人id", example = "1024")
+    private String recheckId;
+
+    @Schema(description = "审核人工号", example = "A001")
+    private String approveEmployeeNo;
+
+}

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/dataobject/defaultapproval/DefaultApprovalDO.java

@@ -0,0 +1,41 @@
+package cn.start.tz.module.pressure2.dal.dataobject.defaultapproval;
+
+import com.baomidou.mybatisplus.annotation.*;
+import cn.start.tz.framework.mybatis.core.dataobject.BaseDO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
+/**
+ * 承压2默认审批配置 DO
+ *
+ * @author 特种管理员
+ */
+@TableName("pressure2_default_approval")
+@KeySequence("pressure2_default_approval_seq")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class DefaultApprovalDO extends BaseDO {
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.ASSIGN_UUID)
+    private String id;
+    /**
+     * 用户id
+     */
+    private String userId;
+    /**
+     * 校核人id
+     */
+    private String recheckId;
+    /**
+     * 审核人工号
+     */
+    private String approveEmployeeNo;
+
+}

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/dal/mysql/defaultapproval/DefaultApprovalMapper.java

@@ -0,0 +1,27 @@
+package cn.start.tz.module.pressure2.dal.mysql.defaultapproval;
+
+import cn.start.tz.framework.common.pojo.PageResult;
+import cn.start.tz.framework.mybatis.core.mapper.BaseMapperX;
+import cn.start.tz.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.start.tz.module.pressure2.controller.admin.defaultapproval.vo.DefaultApprovalPageReqVO;
+import cn.start.tz.module.pressure2.dal.dataobject.defaultapproval.DefaultApprovalDO;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 承压2默认审批配置 Mapper
+ *
+ * @author 特种管理员
+ */
+@Mapper
+public interface DefaultApprovalMapper extends BaseMapperX<DefaultApprovalDO> {
+
+    default PageResult<DefaultApprovalDO> selectPage(DefaultApprovalPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<DefaultApprovalDO>()
+                .eqIfPresent(DefaultApprovalDO::getUserId, reqVO.getUserId())
+                .eqIfPresent(DefaultApprovalDO::getRecheckId, reqVO.getRecheckId())
+                .eqIfPresent(DefaultApprovalDO::getApproveEmployeeNo, reqVO.getApproveEmployeeNo())
+                .betweenIfPresent(DefaultApprovalDO::getCreateTime, reqVO.getCreateTime())
+                .orderByDesc(DefaultApprovalDO::getCreateTime));
+    }
+
+}

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

@@ -1559,19 +1559,30 @@ public class BoilerTaskOrderServiceImpl extends ServiceImpl<BoilerTaskOrderMappe
 
     @Override
     public Boolean batchRecheckApprove(OrderItemReportApproveBatchVO orderItemReportApproveBatchVO) {
-
-        BoilerTaskOrderItemRecheckDO taskOrderItemRecheckDO = taskOrderItemRecheckMapper.selectOne(new LambdaQueryWrapperX<BoilerTaskOrderItemRecheckDO>().
-                eq(BoilerTaskOrderItemRecheckDO::getReportId, orderItemReportApproveBatchVO.getIds().get(0)));
+        BoilerTaskOrderItemRecheckDO taskOrderItemRecheckDO = null;
         List<BoilerTaskOrderItemRecheckDO> taskOrderItemRecheckDOS = new ArrayList<>();
+        if (!CollUtil.isEmpty(orderItemReportApproveBatchVO.getIds())) {
+            taskOrderItemRecheckDO = taskOrderItemRecheckMapper.selectOne(new LambdaQueryWrapperX<BoilerTaskOrderItemRecheckDO>().
+                    eq(BoilerTaskOrderItemRecheckDO::getReportId, orderItemReportApproveBatchVO.getIds().get(0)));
+
+            if (taskOrderItemRecheckDO != null) {
+                taskOrderItemRecheckDOS = taskOrderItemRecheckMapper.selectList(BoilerTaskOrderItemRecheckDO::getMainReportId, taskOrderItemRecheckDO.getMainReportId());
+            }
 
-        if (taskOrderItemRecheckDO != null) {
-            taskOrderItemRecheckDOS = taskOrderItemRecheckMapper.selectList(BoilerTaskOrderItemRecheckDO::getMainReportId, taskOrderItemRecheckDO.getMainReportId());
+            for (String id : orderItemReportApproveBatchVO.getIds()) {
+                BoilerTaskOrderAuditSingleVO approve = new BoilerTaskOrderAuditSingleVO();
+                approve.setId(id);
+                recheckOrderItemApprove(approve);
+            }
         }
+        if (orderItemReportApproveBatchVO.getId() != null) {
+            taskOrderItemRecheckDO = taskOrderItemRecheckMapper.selectOne(new LambdaQueryWrapperX<BoilerTaskOrderItemRecheckDO>().
+                    eq(BoilerTaskOrderItemRecheckDO::getReportId, orderItemReportApproveBatchVO.getId()));
 
-        for (String id : orderItemReportApproveBatchVO.getIds()) {
-            BoilerTaskOrderAuditSingleVO approve = new BoilerTaskOrderAuditSingleVO();
-            approve.setId(id);
-            recheckOrderItemApprove(approve);
+            if (taskOrderItemRecheckDO != null) {
+                taskOrderItemRecheckDOS = taskOrderItemRecheckMapper.selectList(BoilerTaskOrderItemRecheckDO::getMainReportId, taskOrderItemRecheckDO.getMainReportId());
+            }
+            recheckOrderItemApprove(new BoilerTaskOrderAuditSingleVO().setId(orderItemReportApproveBatchVO.getId()));
         }
 
         if (taskOrderItemRecheckDO == null || taskOrderItemRecheckDOS.isEmpty()) {

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/defaultapproval/DefaultApprovalService.java

@@ -0,0 +1,47 @@
+package cn.start.tz.module.pressure2.service.defaultapproval;
+
+import cn.start.tz.framework.common.pojo.PageResult;
+import cn.start.tz.module.pressure2.controller.admin.defaultapproval.vo.DefaultApprovalPageReqVO;
+import cn.start.tz.module.pressure2.controller.admin.defaultapproval.vo.DefaultApprovalRespVO;
+import cn.start.tz.module.pressure2.controller.admin.defaultapproval.vo.DefaultApprovalSaveReqVO;
+import cn.start.tz.module.pressure2.dal.dataobject.defaultapproval.DefaultApprovalDO;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * 承压2默认审批配置 Service 接口
+ *
+ * @author 特种管理员
+ */
+public interface DefaultApprovalService extends IService<DefaultApprovalDO> {
+
+    /**
+     * 创建默认审批配置
+     */
+    String createDefaultApproval(DefaultApprovalSaveReqVO createReqVO);
+
+    /**
+     * 更新默认审批配置
+     */
+    void updateDefaultApproval(DefaultApprovalSaveReqVO updateReqVO);
+
+    /**
+     * 删除默认审批配置
+     */
+    void deleteDefaultApproval(String id);
+
+    /**
+     * 获取当前用户的默认审批配置
+     */
+    DefaultApprovalRespVO getDefaultApproval();
+
+    /**
+     * 保存当前用户的默认审批配置（存在则更新，不存在则创建）
+     */
+    void saveDefaultApproval(DefaultApprovalSaveReqVO saveReqVO);
+
+    /**
+     * 获得默认审批配置分页
+     */
+    PageResult<DefaultApprovalDO> getDefaultApprovalPage(DefaultApprovalPageReqVO pageReqVO);
+
+}

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/defaultapproval/DefaultApprovalServiceImpl.java

@@ -0,0 +1,117 @@
+package cn.start.tz.module.pressure2.service.defaultapproval;
+
+import cn.start.tz.framework.common.pojo.PageResult;
+import cn.start.tz.framework.common.util.object.BeanUtils;
+import cn.start.tz.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.start.tz.module.pressure2.controller.admin.defaultapproval.vo.DefaultApprovalPageReqVO;
+import cn.start.tz.module.pressure2.controller.admin.defaultapproval.vo.DefaultApprovalRespVO;
+import cn.start.tz.module.pressure2.controller.admin.defaultapproval.vo.DefaultApprovalSaveReqVO;
+import cn.start.tz.module.pressure2.dal.dataobject.defaultapproval.DefaultApprovalDO;
+import cn.start.tz.module.pressure2.dal.mysql.defaultapproval.DefaultApprovalMapper;
+import cn.start.tz.module.system.api.user.AdminUserApi;
+import cn.start.tz.module.system.api.user.dto.AdminUserRespDTO;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.*;
+
+import static cn.start.tz.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.start.tz.framework.web.core.util.WebFrameworkUtils.getLoginUserId;
+import static cn.start.tz.module.pressure2.enums.ErrorCodeConstants.DEFAULT_APPROVAL_NOT_EXISTS;
+
+/**
+ * 承压2默认审批配置 Service 实现类
+ *
+ * @author 特种管理员
+ */
+@Service
+@Validated
+public class DefaultApprovalServiceImpl extends ServiceImpl<DefaultApprovalMapper, DefaultApprovalDO> implements DefaultApprovalService {
+
+    @Resource
+    private DefaultApprovalMapper defaultApprovalMapper;
+
+    @Resource
+    private AdminUserApi adminUserApi;
+
+    @Override
+    public String createDefaultApproval(DefaultApprovalSaveReqVO createReqVO) {
+        DefaultApprovalDO defaultApproval = BeanUtils.toBean(createReqVO, DefaultApprovalDO.class);
+        defaultApproval.setUserId(getLoginUserId());
+        defaultApprovalMapper.insert(defaultApproval);
+        return defaultApproval.getId();
+    }
+
+    @Override
+    public void updateDefaultApproval(DefaultApprovalSaveReqVO updateReqVO) {
+        // 校验存在
+        validateDefaultApprovalExists(updateReqVO.getId());
+        // 更新
+        DefaultApprovalDO updateObj = BeanUtils.toBean(updateReqVO, DefaultApprovalDO.class);
+        defaultApprovalMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteDefaultApproval(String id) {
+        // 校验存在
+        validateDefaultApprovalExists(id);
+        // 删除
+        defaultApprovalMapper.deleteById(id);
+    }
+
+    @Override
+    public void saveDefaultApproval(DefaultApprovalSaveReqVO saveReqVO) {
+        String userId = getLoginUserId();
+        DefaultApprovalDO existing = defaultApprovalMapper.selectOne(
+                new LambdaQueryWrapperX<DefaultApprovalDO>().eq(DefaultApprovalDO::getUserId, userId));
+        if (existing != null) {
+            // 更新
+            existing.setRecheckId(saveReqVO.getRecheckId());
+            existing.setApproveEmployeeNo(saveReqVO.getApproveEmployeeNo());
+            defaultApprovalMapper.updateById(existing);
+        } else {
+            // 创建
+            DefaultApprovalDO defaultApproval = BeanUtils.toBean(saveReqVO, DefaultApprovalDO.class);
+            defaultApproval.setUserId(userId);
+            defaultApprovalMapper.insert(defaultApproval);
+        }
+    }
+
+    @Override
+    public DefaultApprovalRespVO getDefaultApproval() {
+        String userId = getLoginUserId();
+        DefaultApprovalDO defaultApproval = defaultApprovalMapper.selectOne(
+                new LambdaQueryWrapperX<DefaultApprovalDO>().eq(DefaultApprovalDO::getUserId, userId));
+        if (defaultApproval == null) {
+            return null;
+        }
+        DefaultApprovalRespVO respVO = BeanUtils.toBean(defaultApproval, DefaultApprovalRespVO.class);
+        // 补全校核人信息（按id查询）
+        if (defaultApproval.getRecheckId() != null) {
+            List<String> userIds = new ArrayList<>();
+            userIds.add(defaultApproval.getRecheckId());
+            Map<String, AdminUserRespDTO> userMap = adminUserApi.getUserMap(userIds);
+            respVO.setRecheckUser(userMap.get(defaultApproval.getRecheckId()));
+        }
+        // 补全审核人信息（按工号查询）
+        if (defaultApproval.getApproveEmployeeNo() != null) {
+            AdminUserRespDTO approveUser = adminUserApi.getUserByEmployeeNo(defaultApproval.getApproveEmployeeNo()).getCheckedData();
+            respVO.setApproveUser(approveUser);
+        }
+        return respVO;
+    }
+
+    @Override
+    public PageResult<DefaultApprovalDO> getDefaultApprovalPage(DefaultApprovalPageReqVO pageReqVO) {
+        return defaultApprovalMapper.selectPage(pageReqVO);
+    }
+
+    private void validateDefaultApprovalExists(String id) {
+        if (defaultApprovalMapper.selectById(id) == null) {
+            throw exception(DEFAULT_APPROVAL_NOT_EXISTS);
+        }
+    }
+
+}