diff --git a/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/ErrorCodeConstants.java b/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/ErrorCodeConstants.java index 0aab17b9..be30e05d 100644 --- a/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/ErrorCodeConstants.java +++ b/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/ErrorCodeConstants.java @@ -33,6 +33,7 @@ public interface ErrorCodeConstants { ErrorCode DICTIONARY_BUSINESS_DATA_MORE_THAN_ONE = new ErrorCode(1_032_001_000, "业务参数字典[数据]key重名，请联系管理员处理！"); ErrorCode DICTIONARY_BUSINESS_CATEGORY_MORE_THAN_ONE = new ErrorCode(1_032_001_000, "业务参数字典[分类]key重名，请联系管理员处理！"); ErrorCode DICTIONARY_BUSINESS_CLASSIFY_DUPLICATE = new ErrorCode(1_032_001_000, "分类名称重复，请重新输入"); + ErrorCode DATA_OPINION_NOT_EXISTS = new ErrorCode(1_032_001_000, "审批意见不存在"); /*==============================config 配置模块 1_032_050_000 ~ 1_032_099_999 ===============================*/ ErrorCode CONFIG_REPORT_TEMPLATE_NOT_EXISTS = new ErrorCode(1_032_050_000, "报表模版配置不存在"); diff --git a/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsBpmConstant.java b/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsBpmConstant.java index d22931bc..4e2cedee 100644 --- a/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsBpmConstant.java +++ b/zt-module-qms/zt-module-qms-api/src/main/java/com/zt/plat/module/qms/enums/QmsBpmConstant.java @@ -11,12 +11,14 @@ public class QmsBpmConstant { * 流程回调时使用的ActivityId Key * */ public static final String BPM_CALLBACK_ACTIVITY_ID = "bpmCallbackActivityId"; + public static final String BPM_CALLBACK_ACTIVITY_NAME = "bpmCallbackActivityName"; public static final String BPM_FIELD_EXTENSIONS = "bpmFieldExtensions"; public static final String BPM_FIRST_ACTIVITY_FLAG = "firstActivityFlag"; public static final String BPM_LAST_ACTIVITY_FLAG = "lastActivityFlag"; public static final String BPM_REJECT_TO_FIRST_FLAG = "rejectToFirstActivity"; public static final String BPM_CUR_ACTIVITY_INS_ID = "currentActivityInsId"; //当前活动实例id - public static final String BPM_PROCESS_INS_ID = "processInstanceId"; //当前活动实例id + + public static final String BPM_PROCESS_INS_ID = "processInstanceId"; //流程实例ID //驳回标记前缀 public static final String BPM_CALLBACK_RETURN_FLAG_PREFIX_KEY = "RETURN_FLAG_"; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/controller/admin/DataOpinionController.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/controller/admin/DataOpinionController.java new file mode 100644 index 00000000..5d774e4a --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/controller/admin/DataOpinionController.java @@ -0,0 +1,112 @@ +package com.zt.plat.module.qms.common.data.controller.admin; + +import com.zt.plat.module.qms.common.data.controller.vo.DataOpinionPageReqVO; +import com.zt.plat.module.qms.common.data.controller.vo.DataOpinionRespVO; +import com.zt.plat.module.qms.common.data.controller.vo.DataOpinionSaveReqVO; +import org.springframework.web.bind.annotation.*; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +import com.zt.plat.framework.business.interceptor.BusinessControllerMarker; +import com.zt.plat.framework.business.annotation.FileUploadController; +import com.zt.plat.framework.business.controller.AbstractFileUploadController; + +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Operation; + +import jakarta.validation.*; +import jakarta.servlet.http.*; +import java.util.*; +import java.io.IOException; + +import com.zt.plat.framework.common.pojo.vo.BatchDeleteReqVO; +import com.zt.plat.framework.common.pojo.PageParam; +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.framework.common.pojo.CommonResult; +import com.zt.plat.framework.common.util.object.BeanUtils; +import static com.zt.plat.framework.common.pojo.CommonResult.success; + +import com.zt.plat.framework.excel.core.util.ExcelUtils; + +import com.zt.plat.framework.apilog.core.annotation.ApiAccessLog; +import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.*; + +import com.zt.plat.module.qms.common.data.dal.dataobject.DataOpinionDO; +import com.zt.plat.module.qms.common.data.service.DataOpinionService; + +@Tag(name = "管理后台 - 审批意见") +@RestController +@RequestMapping("/qms/data-opinion") +@Validated +@FileUploadController(source = "qms.dataopinion") +public class DataOpinionController extends AbstractFileUploadController implements BusinessControllerMarker{ + + static { + FileUploadController annotation = DataOpinionController.class.getAnnotation(FileUploadController.class); + if (annotation != null) { + setFileUploadInfo(annotation); + } + } + + @Resource + private DataOpinionService dataOpinionService; + + @PostMapping("/create") + @Operation(summary = "创建审批意见") + public CommonResult createDataOpinion(@Valid @RequestBody DataOpinionSaveReqVO createReqVO) { + return success(dataOpinionService.createDataOpinion(createReqVO)); + } + + @PutMapping("/update") + @Operation(summary = "更新审批意见") + public CommonResult updateDataOpinion(@Valid @RequestBody DataOpinionSaveReqVO updateReqVO) { + dataOpinionService.updateDataOpinion(updateReqVO); + return success(true); + } + + @DeleteMapping("/delete") + @Operation(summary = "删除审批意见") + @Parameter(name = "id", description = "编号", required = true) + public CommonResult deleteDataOpinion(@RequestParam("id") Long id) { + dataOpinionService.deleteDataOpinion(id); + return success(true); + } + + @DeleteMapping("/delete-list") + @Parameter(name = "ids", description = "编号", required = true) + @Operation(summary = "批量删除审批意见") + @PreAuthorize("@ss.hasPermission('qms:data-opinion:delete')") + public CommonResult deleteDataOpinionList(@RequestBody BatchDeleteReqVO req) { + dataOpinionService.deleteDataOpinionListByIds(req.getIds()); + return success(true); + } + + @GetMapping("/get") + @Operation(summary = "获得审批意见") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + public CommonResult getDataOpinion(@RequestParam("id") Long id) { + DataOpinionDO dataOpinion = dataOpinionService.getDataOpinion(id); + return success(BeanUtils.toBean(dataOpinion, DataOpinionRespVO.class)); + } + + @GetMapping("/page") + @Operation(summary = "获得审批意见分页") + public CommonResult> getDataOpinionPage(@Valid DataOpinionPageReqVO pageReqVO) { + PageResult pageResult = dataOpinionService.getDataOpinionPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, DataOpinionRespVO.class)); + } + + @GetMapping("/export-excel") + @Operation(summary = "导出审批意见 Excel") + @PreAuthorize("@ss.hasPermission('qms:data-opinion:export')") + @ApiAccessLog(operateType = EXPORT) + public void exportDataOpinionExcel(@Valid DataOpinionPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { + pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); + List list = dataOpinionService.getDataOpinionPage(pageReqVO).getList(); + // 导出 Excel + ExcelUtils.write(response, "审批意见.xls", "数据", DataOpinionRespVO.class, BeanUtils.toBean(list, DataOpinionRespVO.class)); + } + +} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/controller/vo/DataOpinionPageReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/controller/vo/DataOpinionPageReqVO.java new file mode 100644 index 00000000..f5f79254 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/controller/vo/DataOpinionPageReqVO.java @@ -0,0 +1,70 @@ +package com.zt.plat.module.qms.common.data.controller.vo; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.*; +import io.swagger.v3.oas.annotations.media.Schema; +import com.zt.plat.framework.common.pojo.PageParam; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; + +@Schema(description = "管理后台 - 审批意见分页 Request VO") +@Data +public class DataOpinionPageReqVO extends PageParam { + + @Schema(description = "业务数据ID", example = "4483") + private Long businessId; + + @Schema(description = "流程实例ID", example = "28150") + private String flowInstanceId; + + @Schema(description = "流程活动code") + private String nodeKey; + + @Schema(description = "流程活动名", example = "王五") + private String nodeName; + + @Schema(description = "自定义key") + private String customKey; + + @Schema(description = "审批人ID", example = "23093") + private Long opinionUserId; + + @Schema(description = "审批人姓名", example = "赵六") + private String opinionUserName; + + @Schema(description = "审批人部门ID", example = "2389") + private Long opinionDepartmentId; + + @Schema(description = "审批人部门名", example = "赵六") + private String opinionDepartmentName; + + @Schema(description = "审批时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] opinionTime; + + @Schema(description = "意见内容") + private String opinionContent; + + @Schema(description = "签名id", example = "29049") + private Long opinionSignatureId; + + @Schema(description = "禁用状态,0-启用；1-禁用") + private String cancelFlag; + + @Schema(description = "所属部门") + private String systemDepartmentCode; + + @Schema(description = "排序号") + private Integer sortNo; + + @Schema(description = "备注") + private String remark; + + @Schema(description = "创建时间") + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) + private LocalDateTime[] createTime; + + +} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/controller/vo/DataOpinionRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/controller/vo/DataOpinionRespVO.java new file mode 100644 index 00000000..c79f8413 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/controller/vo/DataOpinionRespVO.java @@ -0,0 +1,86 @@ +package com.zt.plat.module.qms.common.data.controller.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; + +import java.time.LocalDateTime; +import com.alibaba.excel.annotation.*; + +@Schema(description = "管理后台 - 审批意见 Response VO") +@Data +@ExcelIgnoreUnannotated +public class DataOpinionRespVO { + + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "18610") + @ExcelProperty("主键") + private Long id; + + @Schema(description = "业务数据ID", example = "4483") + @ExcelProperty("业务数据ID") + private Long businessId; + + @Schema(description = "流程实例ID", example = "28150") + @ExcelProperty("流程实例ID") + private String flowInstanceId; + + @Schema(description = "流程活动code") + @ExcelProperty("流程活动code") + private String nodeKey; + + @Schema(description = "流程活动名", example = "王五") + @ExcelProperty("流程活动名") + private String nodeName; + + @Schema(description = "自定义key") + @ExcelProperty("自定义key") + private String customKey; + + @Schema(description = "审批人ID", example = "23093") + @ExcelProperty("审批人ID") + private Long opinionUserId; + + @Schema(description = "审批人姓名", example = "赵六") + @ExcelProperty("审批人姓名") + private String opinionUserName; + + @Schema(description = "审批人部门ID", example = "2389") + @ExcelProperty("审批人部门ID") + private Long opinionDepartmentId; + + @Schema(description = "审批人部门名", example = "赵六") + @ExcelProperty("审批人部门名") + private String opinionDepartmentName; + + @Schema(description = "审批时间") + @ExcelProperty("审批时间") + private LocalDateTime opinionTime; + + @Schema(description = "意见内容") + @ExcelProperty("意见内容") + private String opinionContent; + + @Schema(description = "签名id", example = "29049") + @ExcelProperty("签名id") + private Long opinionSignatureId; + + @Schema(description = "禁用状态,0-启用；1-禁用", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("禁用状态,0-启用；1-禁用") + private String cancelFlag; + + @Schema(description = "所属部门") + @ExcelProperty("所属部门") + private String systemDepartmentCode; + + @Schema(description = "排序号") + @ExcelProperty("排序号") + private Integer sortNo; + + @Schema(description = "备注") + @ExcelProperty("备注") + private String remark; + + @Schema(description = "创建时间") + @ExcelProperty("创建时间") + private LocalDateTime createTime; + +} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/controller/vo/DataOpinionSaveReqVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/controller/vo/DataOpinionSaveReqVO.java new file mode 100644 index 00000000..8e3a1001 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/controller/vo/DataOpinionSaveReqVO.java @@ -0,0 +1,63 @@ +package com.zt.plat.module.qms.common.data.controller.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; +import lombok.*; + +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - 审批意见新增/修改 Request VO") +@Data +public class DataOpinionSaveReqVO { + + @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "18610") + private Long id; + + @Schema(description = "业务数据ID", example = "4483") + private Long businessId; + + @Schema(description = "流程实例ID", example = "28150") + private String flowInstanceId; + + @Schema(description = "流程活动code") + private String nodeKey; + + @Schema(description = "流程活动名", example = "王五") + private String nodeName; + + @Schema(description = "自定义key") + private String customKey; + + @Schema(description = "审批人ID", example = "23093") + private Long opinionUserId; + + @Schema(description = "审批人姓名", example = "赵六") + private String opinionUserName; + + @Schema(description = "审批人部门ID", example = "2389") + private Long opinionDepartmentId; + + @Schema(description = "审批人部门名", example = "赵六") + private String opinionDepartmentName; + + @Schema(description = "审批时间") + private LocalDateTime opinionTime; + + @Schema(description = "意见内容") + private String opinionContent; + + @Schema(description = "签名id", example = "29049") + private Long opinionSignatureId; + + @Schema(description = "禁用状态,0-启用；1-禁用", requiredMode = Schema.RequiredMode.REQUIRED) + private String cancelFlag; + + @Schema(description = "所属部门") + private String systemDepartmentCode; + + @Schema(description = "排序号") + private Integer sortNo; + + @Schema(description = "备注") + private String remark; +} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/dal/dataobject/DataOpinionDO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/dal/dataobject/DataOpinionDO.java new file mode 100644 index 00000000..d6c5d612 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/dal/dataobject/DataOpinionDO.java @@ -0,0 +1,115 @@ +package com.zt.plat.module.qms.common.data.dal.dataobject; + +import lombok.*; +import com.baomidou.mybatisplus.annotation.*; +import com.zt.plat.framework.mybatis.core.dataobject.BusinessBaseDO; + +import java.time.LocalDateTime; + +/** +* 审批意见 DO +* +* @author 后台管理 +*/ +@TableName("t_dat_onn") +@KeySequence("t_dat_onn_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。 +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +/** +* 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO +*/ +public class DataOpinionDO extends BusinessBaseDO { + + + + /** + * 主键 + */ + @TableId(type = IdType.ASSIGN_ID) + private Long id; + /** + * 业务数据ID + */ + @TableField("BSN_ID") + private Long businessId; + /** + * 流程实例ID + */ + @TableField("FLW_INSC_ID") + private String flowInstanceId; + /** + * 流程活动code + */ + @TableField("NDE_KY") + private String nodeKey; + /** + * 流程活动名 + */ + @TableField("NDE_NAME") + private String nodeName; + /** + * 自定义key + */ + @TableField("CST_KY") + private String customKey; + /** + * 审批人ID + */ + @TableField("ONN_USER_ID") + private Long opinionUserId; + /** + * 审批人姓名 + */ + @TableField("ONN_USER_NAME") + private String opinionUserName; + /** + * 审批人部门ID + */ + @TableField("ONN_DEPT_ID") + private Long opinionDepartmentId; + /** + * 审批人部门名 + */ + @TableField("ONN_DEPT_NAME") + private String opinionDepartmentName; + /** + * 审批时间 + */ + @TableField("ONN_TM") + private LocalDateTime opinionTime; + /** + * 意见内容 + */ + @TableField("ONN_CNTT") + private String opinionContent; + /** + * 签名id + */ + @TableField("ONN_SIG_ID") + private Long opinionSignatureId; + /** + * 禁用状态,0-启用；1-禁用 + */ + @TableField("CNL_FLG") + private String cancelFlag; + /** + * 所属部门 + */ + @TableField("SYS_DEPT_CD") + private String systemDepartmentCode; + /** + * 排序号 + */ + @TableField("SRT_NO") + private Integer sortNo; + /** + * 备注 + */ + @TableField("RMK") + private String remark; + +} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/dal/mapper/DataOpinionMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/dal/mapper/DataOpinionMapper.java new file mode 100644 index 00000000..072736cd --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/dal/mapper/DataOpinionMapper.java @@ -0,0 +1,40 @@ +package com.zt.plat.module.qms.common.data.dal.mapper; + +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX; +import com.zt.plat.module.qms.common.data.controller.vo.DataOpinionPageReqVO; +import com.zt.plat.module.qms.common.data.dal.dataobject.DataOpinionDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * 审批意见 Mapper + * + * @author 后台管理 + */ +@Mapper +public interface DataOpinionMapper extends BaseMapperX { + + default PageResult selectPage(DataOpinionPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(DataOpinionDO::getBusinessId, reqVO.getBusinessId()) + .eqIfPresent(DataOpinionDO::getFlowInstanceId, reqVO.getFlowInstanceId()) + .eqIfPresent(DataOpinionDO::getNodeKey, reqVO.getNodeKey()) + .likeIfPresent(DataOpinionDO::getNodeName, reqVO.getNodeName()) + .eqIfPresent(DataOpinionDO::getCustomKey, reqVO.getCustomKey()) + .eqIfPresent(DataOpinionDO::getOpinionUserId, reqVO.getOpinionUserId()) + .likeIfPresent(DataOpinionDO::getOpinionUserName, reqVO.getOpinionUserName()) + .eqIfPresent(DataOpinionDO::getOpinionDepartmentId, reqVO.getOpinionDepartmentId()) + .likeIfPresent(DataOpinionDO::getOpinionDepartmentName, reqVO.getOpinionDepartmentName()) + .betweenIfPresent(DataOpinionDO::getOpinionTime, reqVO.getOpinionTime()) + .eqIfPresent(DataOpinionDO::getOpinionContent, reqVO.getOpinionContent()) + .eqIfPresent(DataOpinionDO::getOpinionSignatureId, reqVO.getOpinionSignatureId()) + .eqIfPresent(DataOpinionDO::getCancelFlag, reqVO.getCancelFlag()) + .eqIfPresent(DataOpinionDO::getSystemDepartmentCode, reqVO.getSystemDepartmentCode()) + .eqIfPresent(DataOpinionDO::getSortNo, reqVO.getSortNo()) + .eqIfPresent(DataOpinionDO::getRemark, reqVO.getRemark()) + .betweenIfPresent(DataOpinionDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(DataOpinionDO::getId)); + } + +} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/service/DataOpinionService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/service/DataOpinionService.java new file mode 100644 index 00000000..7cfd7631 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/service/DataOpinionService.java @@ -0,0 +1,71 @@ +package com.zt.plat.module.qms.common.data.service; + +import java.util.*; + +import com.alibaba.fastjson.JSONObject; +import com.zt.plat.module.qms.common.data.controller.vo.DataOpinionPageReqVO; +import com.zt.plat.module.qms.common.data.controller.vo.DataOpinionRespVO; +import com.zt.plat.module.qms.common.data.controller.vo.DataOpinionSaveReqVO; +import com.zt.plat.module.qms.resource.device.dal.dataobject.DeviceApplyDO; +import jakarta.validation.*; +import com.zt.plat.module.qms.common.data.dal.dataobject.DataOpinionDO; +import com.zt.plat.framework.common.pojo.PageResult; + +/** + * 审批意见 Service 接口 + * + * @author 后台管理 + */ +public interface DataOpinionService { + + + void disableOpinionsByBusId(Long busId); + + void saveOpinionByWfCallback(DeviceApplyDO entity, String activityId, String activityName, JSONObject taskVariables); + + /** + * 创建审批意见 + * + * @param createReqVO 创建信息 + * @return 编号 + */ + DataOpinionRespVO createDataOpinion(@Valid DataOpinionSaveReqVO createReqVO); + + /** + * 更新审批意见 + * + * @param updateReqVO 更新信息 + */ + void updateDataOpinion(@Valid DataOpinionSaveReqVO updateReqVO); + + /** + * 删除审批意见 + * + * @param id 编号 + */ + void deleteDataOpinion(Long id); + + /** + * 批量删除审批意见 + * + * @param ids 编号 + */ + void deleteDataOpinionListByIds(List ids); + + /** + * 获得审批意见 + * + * @param id 编号 + * @return 审批意见 + */ + DataOpinionDO getDataOpinion(Long id); + + /** + * 获得审批意见分页 + * + * @param pageReqVO 分页查询 + * @return 审批意见分页 + */ + PageResult getDataOpinionPage(DataOpinionPageReqVO pageReqVO); + +} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/service/DataOpinionServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/service/DataOpinionServiceImpl.java new file mode 100644 index 00000000..66fee0a3 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/common/data/service/DataOpinionServiceImpl.java @@ -0,0 +1,146 @@ +package com.zt.plat.module.qms.common.data.service; + +import cn.hutool.core.collection.CollUtil; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.zt.plat.framework.security.core.LoginUser; +import com.zt.plat.framework.security.core.util.SecurityFrameworkUtils; +import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigUserSignatureDO; +import com.zt.plat.module.qms.business.config.service.ConfigUserSignatureService; +import com.zt.plat.module.qms.common.data.controller.vo.DataOpinionPageReqVO; +import com.zt.plat.module.qms.common.data.controller.vo.DataOpinionRespVO; +import com.zt.plat.module.qms.common.data.controller.vo.DataOpinionSaveReqVO; +import com.zt.plat.module.qms.enums.QmsBpmConstant; +import com.zt.plat.module.qms.resource.device.dal.dataobject.DeviceApplyDO; +import org.springframework.stereotype.Service; +import jakarta.annotation.Resource; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.validation.annotation.Validated; + +import java.time.LocalDateTime; +import java.util.*; + +import com.zt.plat.module.qms.common.data.dal.dataobject.DataOpinionDO; +import com.zt.plat.framework.common.pojo.PageResult; +import com.zt.plat.framework.common.util.object.BeanUtils; + +import com.zt.plat.module.qms.common.data.dal.mapper.DataOpinionMapper; + +import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList; +import static com.zt.plat.module.qms.enums.ErrorCodeConstants.DATA_OPINION_NOT_EXISTS; + +/** + * 审批意见 Service 实现类 + * + * @author 后台管理 + */ +@Service +@Validated +public class DataOpinionServiceImpl implements DataOpinionService { + + @Resource private DataOpinionMapper dataOpinionMapper; + + @Resource private ConfigUserSignatureService configUserSignatureService; + + /* + * 作废意见。流程退回时触发 + * todo 考虑节点排序，退回时只作废退回节点之后的意见 + * */ + @Override + @Transactional(rollbackFor = Exception.class) + public void disableOpinionsByBusId(Long busId) { + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("busId", busId); + updateWrapper.set("cancelFlag", "1"); + dataOpinionMapper.update(updateWrapper); + } + + /* + * 流程回调后创建意见*/ + @Override + @Transactional(rollbackFor = Exception.class) + public void saveOpinionByWfCallback(DeviceApplyDO entity, String activityId, String activityName, JSONObject taskVariables) { + String opinionContent = taskVariables.getString(QmsBpmConstant.TASK_VARIABLE_REASON); + LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); + String userName = SecurityFrameworkUtils.getLoginUserNickname(); + + Long userId = loginUser.getId(); + Long deptId = loginUser.getVisitDeptId(); + String deptName = loginUser.getVisitDeptName(); + ConfigUserSignatureDO configUserSignatureDO = configUserSignatureService.getByUserId(userId); + DataOpinionDO opinion = new DataOpinionDO(); + opinion.setBusinessId(entity.getId()); + opinion.setFlowInstanceId(entity.getFlowInstanceId()); + opinion.setNodeKey(activityId); + opinion.setNodeName(activityName); + opinion.setOpinionUserId(userId); + opinion.setOpinionUserName(userName); + opinion.setOpinionDepartmentId(deptId); + opinion.setOpinionDepartmentName(deptName); + opinion.setOpinionTime(LocalDateTime.now()); + opinion.setOpinionContent(opinionContent); + opinion.setSortNo(0); + if(configUserSignatureDO != null) + opinion.setOpinionSignatureId(configUserSignatureDO.getId()); + dataOpinionMapper.insert(opinion); + } + + @Override + public DataOpinionRespVO createDataOpinion(DataOpinionSaveReqVO createReqVO) { + // 插入 + DataOpinionDO dataOpinion = BeanUtils.toBean(createReqVO, DataOpinionDO.class); + dataOpinionMapper.insert(dataOpinion); + // 返回 + return BeanUtils.toBean(dataOpinion, DataOpinionRespVO.class); + } + + @Override + public void updateDataOpinion(DataOpinionSaveReqVO updateReqVO) { + // 校验存在 + validateDataOpinionExists(updateReqVO.getId()); + // 更新 + DataOpinionDO updateObj = BeanUtils.toBean(updateReqVO, DataOpinionDO.class); + dataOpinionMapper.updateById(updateObj); + } + + @Override + public void deleteDataOpinion(Long id) { + // 校验存在 + validateDataOpinionExists(id); + // 删除 + dataOpinionMapper.deleteById(id); + } + + @Override + public void deleteDataOpinionListByIds(List ids) { + // 校验存在 + validateDataOpinionExists(ids); + // 删除 + dataOpinionMapper.deleteByIds(ids); + } + + private void validateDataOpinionExists(List ids) { + List list = dataOpinionMapper.selectByIds(ids); + if (CollUtil.isEmpty(list) || list.size() != ids.size()) { + throw exception(DATA_OPINION_NOT_EXISTS); + } + } + + private void validateDataOpinionExists(Long id) { + if (dataOpinionMapper.selectById(id) == null) { + throw exception(DATA_OPINION_NOT_EXISTS); + } + } + + @Override + public DataOpinionDO getDataOpinion(Long id) { + return dataOpinionMapper.selectById(id); + } + + @Override + public PageResult getDataOpinionPage(DataOpinionPageReqVO pageReqVO) { + return dataOpinionMapper.selectPage(pageReqVO); + } + +} \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceApplyService.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceApplyService.java index 50d16b17..5eee5325 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceApplyService.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceApplyService.java @@ -39,6 +39,9 @@ public interface DeviceApplyService { CommonResult submitDeviceApply(DeviceApplySaveReqVO param); + //更新设备状态 + void updateDeviceStateByApply(DeviceApplyDO entity); + /** * 更新设备通用流程,验收、降级、停用、报废、还原、启用 * @@ -77,4 +80,6 @@ public interface DeviceApplyService { */ PageResult getDeviceApplyPage(DeviceApplyPageReqVO pageReqVO); + + } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceApplyServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceApplyServiceImpl.java index 65c96b05..fea860e7 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceApplyServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceApplyServiceImpl.java @@ -12,12 +12,11 @@ import com.zt.plat.module.bpm.api.task.BpmProcessInstanceApi; import com.zt.plat.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO; import com.zt.plat.module.qms.api.task.BMPCallbackInterface; import com.zt.plat.module.qms.api.task.dto.QmsBpmDTO; -import com.zt.plat.module.qms.business.reportdoc.controller.vo.ReportDocumentMainRespVO; -import com.zt.plat.module.qms.business.reportdoc.dal.dataobject.ReportDocumentMainDO; import com.zt.plat.module.qms.common.data.dal.dataobject.DataCollectionDO; import com.zt.plat.module.qms.common.data.dal.dataobject.DataTemplateDO; import com.zt.plat.module.qms.common.data.service.DataCollectionService; import com.zt.plat.module.qms.common.data.service.DataKeyCheckService; +import com.zt.plat.module.qms.common.data.service.DataOpinionService; import com.zt.plat.module.qms.common.data.service.DataTemplateService; import com.zt.plat.module.qms.enums.QmsBpmConstant; import com.zt.plat.module.qms.enums.QmsCommonConstant; @@ -36,7 +35,6 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.ObjectUtils; import org.springframework.validation.annotation.Validated; -import java.io.IOException; import java.text.SimpleDateFormat; import java.util.*; @@ -48,7 +46,6 @@ import com.zt.plat.module.qms.resource.device.dal.mapper.DeviceApplyMapper; import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.zt.plat.framework.common.exception.util.ServiceExceptionUtil.exception0; -import static com.zt.plat.framework.common.util.collection.CollectionUtils.convertList; import static com.zt.plat.module.qms.enums.ErrorCodeConstants.*; import static com.zt.plat.module.qms.enums.QmsBpmConstant.BPM_CALLBACK_BEAN_NAME; @@ -70,6 +67,8 @@ public class DeviceApplyServiceImpl implements DeviceApplyService, BMPCallbackIn @Resource private DataTemplateService dataTemplateService; @Resource private BpmProcessInstanceApi bpmProcessInstanceApi; @Resource private DataKeyCheckService dataKeyCheckService; + @Resource private DataOpinionService dataOpinionService; + @Override public DeviceApplyRespVO createDeviceApply(DeviceApplySaveReqVO createReqVO) { @@ -223,7 +222,6 @@ public class DeviceApplyServiceImpl implements DeviceApplyService, BMPCallbackIn String businessCode = entity.getBusinessCode(); DeviceConfigFlowDO flow = deviceConfigFlowService.getByBusinessType(businessCode); - formData.put("mainId", id); formData.put("applyUser", nickName); formData.put("applyUserId", loginUser.getId()); @@ -302,8 +300,11 @@ public class DeviceApplyServiceImpl implements DeviceApplyService, BMPCallbackIn public CommonResult callback(QmsBpmDTO reqDTO) { log.error("流程回调：{}", JSONObject.toJSONString(reqDTO)); JSONObject variables = reqDTO.getVariables(); + JSONObject taskVariables = variables.getJSONObject("taskVariables"); String processInsId = variables.getString(QmsBpmConstant.BPM_PROCESS_INS_ID); String currentActivityInsId = variables.getString(QmsBpmConstant.BPM_CUR_ACTIVITY_INS_ID); + String currentActivityId = variables.getString(QmsBpmConstant.BPM_CALLBACK_ACTIVITY_ID); + String currentActivityName = variables.getString(QmsBpmConstant.BPM_CALLBACK_ACTIVITY_NAME); String returnFlag = variables.getString(QmsBpmConstant.BPM_REJECT_TO_FIRST_FLAG); //退回标识。在任务监听中设置 //同一个节点实例只触发一次 String checkKey = currentActivityInsId; @@ -326,7 +327,6 @@ public class DeviceApplyServiceImpl implements DeviceApplyService, BMPCallbackIn fieldExtensions = variables.getJSONArray(QmsBpmConstant.BPM_FIELD_EXTENSIONS); } DeviceApplyDO entity = getDeviceApply(Long.valueOf(mainId)); - String currentActivityId = variables.getString(QmsBpmConstant.BPM_CALLBACK_ACTIVITY_ID); //判断是否最后一个节点 String lastActivityFlag = "0"; @@ -346,20 +346,31 @@ public class DeviceApplyServiceImpl implements DeviceApplyService, BMPCallbackIn if(("1").equals(returnFlag)){ //驳回。流程需要配置退回到发起节点 entity.setBusinessStatus(QmsCommonConstant.REJECTED); + dataOpinionService.disableOpinionsByBusId(entity.getId()); }else if("4".equals(PROCESS_STATUS)){ //作废 entity.setBusinessStatus(QmsCommonConstant.VOID); }else if("1".equals(PROCESS_STATUS)){ //通过 // assembleSignature(currentActivityId, entity); + dataOpinionService.saveOpinionByWfCallback(entity, currentActivityId, currentActivityName, taskVariables); if("1".equals(firstActivityFlag)) entity.setBusinessStatus(QmsCommonConstant.IN_PROGRESS); //驳回后重新提交 - if("1".equals(lastActivityFlag)) + if("1".equals(lastActivityFlag)){ entity.setBusinessStatus(QmsCommonConstant.COMPLETED); //结束审批 + updateDeviceStateByApply(entity); + } } deviceApplyMapper.updateById(entity); //更新设备状态 + + JSONObject ret = new JSONObject(); + return CommonResult.success(ret); + } + + @Override + public void updateDeviceStateByApply(DeviceApplyDO entity){ List deviceList = new ArrayList<>(); List detailList = deviceApplyDetailService.selectListByApplyId(entity.getId()); String bizType = entity.getBusinessCode(); @@ -407,7 +418,6 @@ public class DeviceApplyServiceImpl implements DeviceApplyService, BMPCallbackIn deviceList.add(device); } deviceInfomationService.updateBatch(deviceList); - JSONObject ret = new JSONObject(); - return CommonResult.success(ret); } + } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/common/data/dal/mapper/DataOpinionMapper.xml b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/common/data/dal/mapper/DataOpinionMapper.xml new file mode 100644 index 00000000..79960a78 --- /dev/null +++ b/zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/common/data/dal/mapper/DataOpinionMapper.xml @@ -0,0 +1,12 @@ + + + + + + + \ No newline at end of file