From abeee55b83f81aaf0fa3b5c806e7a128ebeb4f9f Mon Sep 17 00:00:00 2001 From: mashuai Date: Wed, 8 Jan 2025 18:17:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ArchivesController.java | 26 ++++++++++++ .../archives/domain/ElcSignatureInfo.java | 23 +++++++++++ .../archives/mapper/ArchivesMapper.java | 15 +++++++ .../archives/service/ArchivesService.java | 15 +++++++ .../service/impl/ArchivesServiceImpl.java | 41 ++++++++++++++++++- .../impl/RepairInputDetailsServiceImpl.java | 2 +- .../material/Archives/ArchivesMapper.xml | 18 +++++++- 7 files changed, 136 insertions(+), 4 deletions(-) create mode 100644 bonus-modules/bonus-material/src/main/java/com/bonus/material/archives/domain/ElcSignatureInfo.java diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/archives/controller/ArchivesController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/archives/controller/ArchivesController.java index d5686af4..1186a27f 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/archives/controller/ArchivesController.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/archives/controller/ArchivesController.java @@ -5,6 +5,7 @@ import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.material.archives.domain.ArchivesDetails; import com.bonus.material.archives.domain.ArchivesInfo; import com.bonus.material.archives.domain.ArchivesVo; +import com.bonus.material.archives.domain.ElcSignatureInfo; import com.bonus.material.archives.service.ArchivesService; import com.bonus.material.common.annotation.PreventRepeatSubmit; import io.swagger.annotations.Api; @@ -99,6 +100,31 @@ public class ArchivesController extends BaseController { return archivesService.edit(archiveInfo); } + /** + * 电子签名 查询用户表信息 + * @param info + * @return + */ + @ApiOperation(value = "电子签名 查询用户表信息") + @GetMapping("/getSign") + public AjaxResult getSign(ElcSignatureInfo info) + { + return archivesService.getSign(info); + } + + /** + * 修改电子签名 修改用户表信息 + * @param info + * @return + */ + @ApiOperation(value = "电子签名 修改用户表信息") + //@PreventRepeatSubmit + @PostMapping("/updateSign") + public AjaxResult updateSign(@RequestBody ElcSignatureInfo info) + { + return archivesService.updateSign(info); + } + /** * 修改电子档案右侧详情 * @param archivesDetails diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/archives/domain/ElcSignatureInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/archives/domain/ElcSignatureInfo.java new file mode 100644 index 00000000..f6e6ad6b --- /dev/null +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/archives/domain/ElcSignatureInfo.java @@ -0,0 +1,23 @@ +package com.bonus.material.archives.domain; + +import com.bonus.system.api.domain.SysUser; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 电子签名信息 + * @Author ma_sh + * @create 2025/1/8 15:22 + */ +@Data +public class ElcSignatureInfo extends SysUser { + + /** + * 签名地址 + */ + @ApiModelProperty(value = "签名地址") + private String signUrl; + + @ApiModelProperty(value = "签名类型 手写0 和 图片上传1") + private String signType; +} diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/archives/mapper/ArchivesMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/archives/mapper/ArchivesMapper.java index e2be8ae7..eb3f7e36 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/archives/mapper/ArchivesMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/archives/mapper/ArchivesMapper.java @@ -3,6 +3,7 @@ package com.bonus.material.archives.mapper; import com.bonus.common.biz.domain.TreeNode; import com.bonus.material.archives.domain.ArchivesDetails; import com.bonus.material.archives.domain.ArchivesInfo; +import com.bonus.material.archives.domain.ElcSignatureInfo; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -103,4 +104,18 @@ public interface ArchivesMapper { * @return */ ArchivesDetails selectDetailsUpdateName(ArchivesDetails archivesDetails); + + /** + * 修改电子档案右侧详情 + * @param info + * @return + */ + int updateSign(ElcSignatureInfo info); + + /** + * 查询电子档案右侧详情 + * @param info + * @return + */ + ElcSignatureInfo getSign(ElcSignatureInfo info); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/archives/service/ArchivesService.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/archives/service/ArchivesService.java index 1476354f..ece8a043 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/archives/service/ArchivesService.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/archives/service/ArchivesService.java @@ -4,6 +4,7 @@ import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.material.archives.domain.ArchivesDetails; import com.bonus.material.archives.domain.ArchivesInfo; import com.bonus.material.archives.domain.ArchivesVo; +import com.bonus.material.archives.domain.ElcSignatureInfo; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -81,4 +82,18 @@ public interface ArchivesService { * @return */ void download(ArchivesVo archivesVo, HttpServletRequest request, HttpServletResponse response); + + /** + * 更新电子档案电子签名 + * @param info + * @return + */ + AjaxResult updateSign(ElcSignatureInfo info); + + /** + * 获取电子档案电子签名 + * @param info + * @return + */ + AjaxResult getSign(ElcSignatureInfo info); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/archives/service/impl/ArchivesServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/archives/service/impl/ArchivesServiceImpl.java index 51245164..76ff3d16 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/archives/service/impl/ArchivesServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/archives/service/impl/ArchivesServiceImpl.java @@ -13,9 +13,9 @@ import com.bonus.common.security.utils.SecurityUtils; import com.bonus.material.archives.domain.ArchivesDetails; import com.bonus.material.archives.domain.ArchivesInfo; import com.bonus.material.archives.domain.ArchivesVo; +import com.bonus.material.archives.domain.ElcSignatureInfo; import com.bonus.material.archives.mapper.ArchivesMapper; import com.bonus.material.archives.service.ArchivesService; -import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; @@ -28,7 +28,6 @@ import java.io.*; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import java.sql.SQLException; import java.util.ArrayList; import java.util.List; @@ -291,6 +290,44 @@ public class ArchivesServiceImpl implements ArchivesService { } } + /** + * 电子签名 修改用户表信息 + * @param info + * @return + */ + @Override + public AjaxResult updateSign(ElcSignatureInfo info) { + if (info == null || info.getSignUrl() == null) { + return AjaxResult.error(HttpCodeEnum.TO_PARAM_NULL.getCode(), HttpCodeEnum.TO_PARAM_NULL.getMsg()); + } + Long userId = SecurityUtils.getUserId(); + if (userId == null) { + return AjaxResult.error("无法获取到当前用户信息，请联系管理员！"); + } + info.setUserId(userId); + int result = archivesMapper.updateSign(info); + if (result > 0) { + return AjaxResult.success(HttpCodeEnum.SUCCESS.getMsg(), result); + } + return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), HttpCodeEnum.FAIL.getMsg()); + } + + /** + * 获取电子签名 修改用户表信息 + * @param info + * @return + */ + @Override + public AjaxResult getSign(ElcSignatureInfo info) { + Long userId = SecurityUtils.getUserId(); + if (userId == null) { + return AjaxResult.error("无法获取到当前用户信息，请联系管理员！"); + } + info.setUserId(userId); + ElcSignatureInfo elcSignatureInfo = archivesMapper.getSign(info); + return AjaxResult.success(elcSignatureInfo); + } + /** * 从档案详情中提取文件信息 * @param detailsList diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairInputDetailsServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairInputDetailsServiceImpl.java index bf529334..2061c7b4 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairInputDetailsServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/repair/service/impl/RepairInputDetailsServiceImpl.java @@ -354,7 +354,7 @@ public class RepairInputDetailsServiceImpl implements IRepairInputDetailsService // 入库数量不能大于预入库数量 if (repairInputDetails.getRejectNum() != null && repairInputDetails.getPendingInputNum() != null) { if (repairInputDetails.getRejectNum().compareTo(repairInputDetails.getPendingInputNum()) > 0) { - throw new ServiceException("驳回数量不能大于预入库数量"); + throw new ServiceException("驳回数量不能大于待入库数量"); } } //根据任务id查询退料id diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/Archives/ArchivesMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/Archives/ArchivesMapper.xml index 9ae4c9c7..bf786dbe 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/Archives/ArchivesMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/Archives/ArchivesMapper.xml @@ -120,7 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_by as createBy, create_time as createTime, update_by as updateBy, - update_timeas updateTime + update_time as updateTime FROM archives_record_details WHERE @@ -155,6 +155,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + insert into archives_record_info @@ -234,6 +243,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where details_id = #{detailsId} + + update sys_user + set sign_url = #{signUrl}, + sign_type = #{signType} + where user_id = #{userId} + + update archives_record_info set del_flag = '1'