From 31efd2cea260830b6bcb6fa09419a1f53defde2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Tue, 13 May 2025 17:16:12 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=8C=E7=BA=A7?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=B7=B2=E7=BB=8F=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AdmissionRequestController.java | 20 ++++++++ .../project/controller/EquipController.java | 18 +++++++ .../com/bonus/project/domain/IndexBean.java | 4 ++ .../mapper/AdmissionRequestMapper.java | 2 + .../com/bonus/project/mapper/EquipMapper.java | 2 + .../service/AdmissionRequestService.java | 7 +++ .../bonus/project/service/EquipService.java | 7 +++ .../impl/AdmissionRequestServiceImpl.java | 10 ++++ .../service/impl/EquipServiceImpl.java | 12 +++++ .../mapper/system/AdmissionRequestMapper.xml | 47 +++++++++++++++++++ .../resources/mapper/system/EquipMapper.xml | 31 ++++++++++++ .../mapper/system/OutsourcingProMapper.xml | 1 + 12 files changed, 161 insertions(+) diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/AdmissionRequestController.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/AdmissionRequestController.java index b9d54a4..afa9c66 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/AdmissionRequestController.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/AdmissionRequestController.java @@ -74,6 +74,26 @@ public class AdmissionRequestController extends BaseController { return getDataTableError(new ArrayList<>()); } + /** + * 特殊工种列表 + * + * @param bean 特殊工种列表 + * @return 特殊工种列表 + */ + @RequiresPermissions("system:listPersonnelInformation:list") + @GetMapping("/listPersonnelInfo") + @SysLog(title = "特殊工种列表", businessType = OperaType.QUERY, logType = 0, module = "人员管理->人员信息列表", details = "查询人员信息列表") + public TableDataInfo listPersonnelInfo(AdmissionRequest bean) { + try { + startPage(); + List list = arService.listPersonnelInfo(bean); + return getDataTable(list); + } catch (Exception e) { + logger.error(e.toString(), e); + } + return getDataTableError(new ArrayList<>()); + } + /** * 获取人员出场列表 * diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/EquipController.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/EquipController.java index 6c47c82..81f02da 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/EquipController.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/EquipController.java @@ -50,6 +50,24 @@ public class EquipController extends BaseController { return getDataTableError(new ArrayList<>()); } + + /** + * 特种设备列表 + */ + @RequiresPermissions("system:equip:list") + @GetMapping("/listEquipment") + @SysLog(title = "特种设备列表", businessType = OperaType.QUERY, logType = 0, module = "工器具管理->列表查询") + public TableDataInfo listEquipment(Equipment bean) { + try { +// startPage(); + List list = service.listEquipment(bean); + return getDataTable1(list); + } catch (Exception e) { + log.error(e.toString(), e); + } + return getDataTableError(new ArrayList<>()); + } + /** * 新增工器具 * diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/IndexBean.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/IndexBean.java index 6c7f68d..694db51 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/IndexBean.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/IndexBean.java @@ -23,4 +23,8 @@ public class IndexBean extends BaseBean implements Serializable { private String specialPersonNum; private String equipNum; private String specialEquipNum; + /** + * 是否外委外包项目 0:工程建设 1：外委外包 + */ + private String isOutsource; } diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/mapper/AdmissionRequestMapper.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/mapper/AdmissionRequestMapper.java index a7a3e8a..e8e2025 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/mapper/AdmissionRequestMapper.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/mapper/AdmissionRequestMapper.java @@ -283,4 +283,6 @@ public interface AdmissionRequestMapper { * @return 结果 */ int updateSysUserInfo(AdmissionRequest bean); + + List listPersonnelInfo(AdmissionRequest bean); } diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/mapper/EquipMapper.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/mapper/EquipMapper.java index bb66595..06e9394 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/mapper/EquipMapper.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/mapper/EquipMapper.java @@ -73,4 +73,6 @@ public interface EquipMapper { * @return 工器具入场审批列表 */ List entryOfUtensilsList(Equipment bean); + + List listEquipment(Equipment bean); } diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/AdmissionRequestService.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/AdmissionRequestService.java index 0886105..60459fe 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/AdmissionRequestService.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/AdmissionRequestService.java @@ -149,4 +149,11 @@ public interface AdmissionRequestService { * @return 是否存在 */ int judgeIsFileComplete(SupervisoryUnit bean); + + /** + *特殊工种列表 + * @param bean + * @return + */ + List listPersonnelInfo(AdmissionRequest bean); } diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/EquipService.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/EquipService.java index 4ef908a..3549080 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/EquipService.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/EquipService.java @@ -54,4 +54,11 @@ public interface EquipService { * @return 工器具入场审批列表 */ List entryOfUtensilsList(Equipment bean); + + /** + * 特种设备列表 + * @param bean + * @return + */ + List listEquipment(Equipment bean); } diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/AdmissionRequestServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/AdmissionRequestServiceImpl.java index 69ff389..dfec4b5 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/AdmissionRequestServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/AdmissionRequestServiceImpl.java @@ -789,6 +789,16 @@ public class AdmissionRequestServiceImpl implements AdmissionRequestService { return arMapper.judgeIsFileComplete(bean); } + /** + *特殊工种列表 + * @param bean + * @return + */ + @Override + public List listPersonnelInfo(AdmissionRequest bean) { + return arMapper.listPersonnelInfo(bean); + } + private static @org.jetbrains.annotations.NotNull SysFileInfo getFileInfo(String classification, String fromType, String informationType, String uuid) { diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/EquipServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/EquipServiceImpl.java index 08046b8..371bc38 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/EquipServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/EquipServiceImpl.java @@ -165,6 +165,18 @@ public class EquipServiceImpl implements EquipService { } return list; } + + /** + * 特种设备列表 + * @param bean + * @return + */ + @Override + public List listEquipment(Equipment bean) { + List list = mapper.listEquipment(bean); + return list; + } + /** * 获取工器具文件列表 * @param bean 工器具bean diff --git a/bonus-modules/bonus-project/src/main/resources/mapper/system/AdmissionRequestMapper.xml b/bonus-modules/bonus-project/src/main/resources/mapper/system/AdmissionRequestMapper.xml index e1f7889..3b7c8d1 100644 --- a/bonus-modules/bonus-project/src/main/resources/mapper/system/AdmissionRequestMapper.xml +++ b/bonus-modules/bonus-project/src/main/resources/mapper/system/AdmissionRequestMapper.xml @@ -567,6 +567,53 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and lpec.pro_id = #{proId} + insert into pt_check_configuration_details( diff --git a/bonus-modules/bonus-project/src/main/resources/mapper/system/EquipMapper.xml b/bonus-modules/bonus-project/src/main/resources/mapper/system/EquipMapper.xml index 724ca22..a099410 100644 --- a/bonus-modules/bonus-project/src/main/resources/mapper/system/EquipMapper.xml +++ b/bonus-modules/bonus-project/src/main/resources/mapper/system/EquipMapper.xml @@ -196,5 +196,36 @@ group by ppt.tools_id + diff --git a/bonus-modules/bonus-project/src/main/resources/mapper/system/OutsourcingProMapper.xml b/bonus-modules/bonus-project/src/main/resources/mapper/system/OutsourcingProMapper.xml index 806188f..1a264a5 100644 --- a/bonus-modules/bonus-project/src/main/resources/mapper/system/OutsourcingProMapper.xml +++ b/bonus-modules/bonus-project/src/main/resources/mapper/system/OutsourcingProMapper.xml @@ -532,6 +532,7 @@ select pro_id as id, pro_name as proName, + is_outsource as isOutsource, if(pro_status = '3','在建中','筹备中') as proStatus from pt_project_info where is_active = '1' and (pro_status = '3' or pro_status = '2') From 8567c3953d2df6b8b917b381bc50e6a73ed17ec6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Thu, 15 May 2025 14:48:38 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E8=A1=9D=E7=AA=81=E8=A7=A3=E6=B1=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/project/service/AdmissionRequestService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/AdmissionRequestService.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/AdmissionRequestService.java index 464adf8..dc5f262 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/AdmissionRequestService.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/AdmissionRequestService.java @@ -149,4 +149,6 @@ public interface AdmissionRequestService { * @return 是否存在 */ List judgeIsFileComplete(SupervisoryUnit bean); + + List listPersonnelInfo(AdmissionRequest bean); } From c74047eebcfb3873d33504380500e078b78f949f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Thu, 15 May 2025 14:49:24 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E8=A1=9D=E7=AA=81=E8=A7=A3=E6=B1=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/project/service/AdmissionRequestService.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/AdmissionRequestService.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/AdmissionRequestService.java index dc5f262..f735fc3 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/AdmissionRequestService.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/AdmissionRequestService.java @@ -150,5 +150,10 @@ public interface AdmissionRequestService { */ List judgeIsFileComplete(SupervisoryUnit bean); + /** + * 特殊工种列表 + * @param bean + * @return + */ List listPersonnelInfo(AdmissionRequest bean); } From cd8c0a32e364c9a5f9041b81e5d2819292d020c0 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Wed, 21 May 2025 14:32:44 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E5=90=8E=E6=96=87=E4=BB=B6=E6=97=A0=E6=B3=95=E6=89=93=E5=BC=80?= =?UTF-8?q?=EF=BC=8C=E4=B8=8B=E8=BD=BD=E5=86=85=E5=AE=B9=E4=B8=BA=E7=A9=BA?= =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CoursewareLibraryController.java | 21 +++-- .../impl/CoursewareLibraryServiceImpl.java | 70 +++++++++++--- .../service/impl/ProjectServiceImpl.java | 93 ++++++++++++------- 3 files changed, 132 insertions(+), 52 deletions(-) diff --git a/bonus-modules/bonus-exam/src/main/java/com/bonus/exam/controller/CoursewareLibraryController.java b/bonus-modules/bonus-exam/src/main/java/com/bonus/exam/controller/CoursewareLibraryController.java index 51bfef2..19be09d 100644 --- a/bonus-modules/bonus-exam/src/main/java/com/bonus/exam/controller/CoursewareLibraryController.java +++ b/bonus-modules/bonus-exam/src/main/java/com/bonus/exam/controller/CoursewareLibraryController.java @@ -93,9 +93,12 @@ public class CoursewareLibraryController { while ((line = bufferedReader.readLine()) != null) { stringBuilder.append(line); } - String str=decord(stringBuilder.toString()); + String str = decord(stringBuilder.toString()); + if (str.startsWith("[") && str.endsWith("]")) { + str = str.substring(1, str.length() - 1); + } String courseId = str.split("&")[0].split("=")[1]; - String fileType =str.split("&")[1].split("=")[1]; + String fileType = str.split("&")[1].split("=")[1]; if (!StaticVariableUtils.ONE.equals(fileType)) { dto.setCoursewareId(Integer.parseInt(courseId)); } @@ -108,16 +111,17 @@ public class CoursewareLibraryController { } } - public String decord(String str){ - try{ - return URLDecoder.decode(str, StandardCharsets.UTF_8.toString()); - }catch (Exception e){ - log.error(e.toString(),e); + public String decord(String str) { + try { + return URLDecoder.decode(str, StandardCharsets.UTF_8.toString()); + } catch (Exception e) { + log.error(e.toString(), e); } - return str; + return str; } + /** * 课件上传 * @@ -146,6 +150,7 @@ public class CoursewareLibraryController { /** * 1.新增题库使用的tree 2.移动使用的tree + * * @param dto * @return AjaxResult * @author cwchen diff --git a/bonus-modules/bonus-exam/src/main/java/com/bonus/exam/service/impl/CoursewareLibraryServiceImpl.java b/bonus-modules/bonus-exam/src/main/java/com/bonus/exam/service/impl/CoursewareLibraryServiceImpl.java index bca9b8c..da23905 100644 --- a/bonus-modules/bonus-exam/src/main/java/com/bonus/exam/service/impl/CoursewareLibraryServiceImpl.java +++ b/bonus-modules/bonus-exam/src/main/java/com/bonus/exam/service/impl/CoursewareLibraryServiceImpl.java @@ -35,6 +35,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.*; import java.net.URLEncoder; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -148,7 +151,7 @@ public class CoursewareLibraryServiceImpl implements CoursewareLibraryService { if (Objects.equals(dto.getFileType(), BusinessConstants.FILE_TYPE)) { // 多个文件下载 CoursewareVo vo = new CoursewareVo(); - String[] split = dto.getCourseId().split("%252C"); + String[] split = dto.getCourseId().split("%2C"); List list = mapper.getSelectFileToDownload(split); downLoadBatchFile(response, list); @@ -217,7 +220,7 @@ public class CoursewareLibraryServiceImpl implements CoursewareLibraryService { String tempTime = "temp_" + System.currentTimeMillis(); String parentSourceFilePath = upload_path + File.separator + "coursewareZip"; if (!new File(parentSourceFilePath).exists()) { - new File(parentSourceFilePath).mkdir(); + new File(parentSourceFilePath).mkdirs(); } String sourceFilePath = parentSourceFilePath + File.separator + tempTime; String zipFilePath = null; @@ -245,13 +248,34 @@ public class CoursewareLibraryServiceImpl implements CoursewareLibraryService { invokeAllTasks(testTaskExecutor,tasks); //对/usr/local/bonus/uploadPath/tempTime文件夹进行压缩 - // Compress files into a zip - String zipFileName = "courseware_" + tempTime + ".zip"; + String zipFileName = tempTime + ".zip"; zipFilePath = parentSourceFilePath + File.separator + zipFileName; - zipFolderContents(sourceFilePath, zipFilePath); - // Set response headers + zipFolder(sourceFilePath, zipFilePath); + File zipFile = new File(zipFilePath); + if (!zipFile.exists() || zipFile.isDirectory()) { + response.sendError(HttpServletResponse.SC_NOT_FOUND, "文件不存在"); + return; + } + response.setCharacterEncoding("utf-8"); + response.setContentType("application/zip"); + response.setHeader("Content-Disposition", "attachment;filename=" + + URLEncoder.encode(zipFileName, "UTF-8")); + response.setContentLength((int) zipFile.length()); + + try (InputStream is = new FileInputStream(zipFile); + OutputStream os = response.getOutputStream()) { + + byte[] buffer = new byte[4096]; + int bytesRead; + while ((bytesRead = is.read(buffer)) != -1) { + os.write(buffer, 0, bytesRead); + } + } +// zipFolderContents(sourceFilePath, zipFilePath); + // Set response headers + /* response.setCharacterEncoding("utf-8"); response.setContentType("application/zip"); response.setHeader("Content-Disposition", "attachment;filename=" .concat(String.valueOf(URLEncoder.encode(zipFileName, "UTF-8")))); @@ -260,19 +284,39 @@ public class CoursewareLibraryServiceImpl implements CoursewareLibraryService { try (ZipOutputStream zos = new ZipOutputStream(response.getOutputStream())) { File sourceFolder = new File(sourceFilePath); compressFolderContents(sourceFolder, zos, ""); - } + }*/ } catch (Exception e) { log.error(e.toString(), e); throw new ServiceException("文件下载异常"); - } finally { - -// FileUtil.deleteFolder(Paths.get(sourceFilePath)); -// if (zipFilePath != null) { -// FileUtil.deleteFolder(Paths.get(zipFilePath)); -// } } } + public static void zipFolder(String sourceFolderPath, String zipFilePath) throws IOException { + Path sourcePath = Paths.get(sourceFolderPath); + if (!Files.exists(sourcePath) || !Files.isDirectory(sourcePath)) { + throw new IllegalArgumentException("源文件夹不存在或不是目录: " + sourceFolderPath); + } + Path zipPath = Paths.get(zipFilePath); + try (ZipOutputStream zos = new ZipOutputStream(Files.newOutputStream(zipPath))) { + Files.walk(sourcePath) + .filter(path -> !Files.isDirectory(path)) // 只处理文件，排除目录本身 + .forEach(path -> { + try { + // 计算相对于源文件夹的相对路径 + Path targetPath = sourcePath.relativize(path); + ZipEntry zipEntry = new ZipEntry(targetPath.toString().replace("\\", "/")); + zos.putNextEntry(zipEntry); + + // 将文件内容写入 ZIP 输出流 + Files.copy(path, zos); + + zos.closeEntry(); + } catch (IOException e) { + System.err.println("无法添加文件到ZIP: " + path + ", 错误信息: " + e.getMessage()); + } + }); + } + } public static boolean zipFolderContents(String sourceFolderPath, String zipFilePath) { try { FileOutputStream fos = new FileOutputStream(zipFilePath); diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ProjectServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ProjectServiceImpl.java index 90b01f3..52b4bc0 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ProjectServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/ProjectServiceImpl.java @@ -84,7 +84,7 @@ public class ProjectServiceImpl implements ProjectService { for (BaseBean bean : list) { //获取处理后的短信内容 String content = getMessage(bean); - // ShortMessageUtils.sendShortMessage(bean.getUuid(), content); + // ShortMessageUtils.sendShortMessage(bean.getUuid(), content); MsgBean b = new MsgBean(); b.setPhone(bean.getUuid()); b.setMsg(content); @@ -103,8 +103,10 @@ public class ProjectServiceImpl implements ProjectService { @Value("${user.url}") private String url; + /** * 短信内容处理 + * * @param bean 实体 * @return 短信内容 */ @@ -112,10 +114,10 @@ public class ProjectServiceImpl implements ProjectService { private String getMessage(BaseBean bean) { String content; if (StaticVariableUtils.ZERO_01.equals(bean.getUserType())) { - content = bean.getProName() + "工程即将开工，请及时上传相关入场文件！浏览器网址："+url+ + content = bean.getProName() + "工程即将开工，请及时上传相关入场文件！浏览器网址：" + url + "；初始账号：" + bean.getUuid() + "，初始密码：" + supervisionPassword; } else { - content = bean.getProName() + "工程即将开工，请及时上传相关入场文件！浏览器网址："+url+ + content = bean.getProName() + "工程即将开工，请及时上传相关入场文件！浏览器网址：" + url + "初始账号：" + bean.getUuid() + "，初始密码：" + contractorPassword; } return content; @@ -159,7 +161,7 @@ public class ProjectServiceImpl implements ProjectService { projectMapper.delConsPersonToPcp(project); projectMapper.delConsPersonToLk(project); - }catch (Exception e){ + } catch (Exception e) { TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); log.error("Failed to delete project due to exception", e); } @@ -178,12 +180,12 @@ public class ProjectServiceImpl implements ProjectService { //设置回滚点 Object savePoint = TransactionAspectSupport.currentTransactionStatus().createSavepoint(); try { - if(StringHelper.isNullOrEmptyString(bean.getJlId())){ - return AjaxResult.error("请先选择监理单位"); - }else { + if (StringHelper.isNullOrEmptyString(bean.getJlId())) { + return AjaxResult.error("请先选择监理单位"); + } else { //对监理人员信息进行赋值 - SupervisoryUnit unit= projectMapper.getSupervisoryUnitById(bean); - if(unit==null){ + SupervisoryUnit unit = projectMapper.getSupervisoryUnitById(bean); + if (unit == null) { return AjaxResult.error("监理单位不存在"); } bean.setJlUuid(unit.getJlUuid()); @@ -206,7 +208,7 @@ public class ProjectServiceImpl implements ProjectService { //查询身份证是否重复 result = projectMapper.checkIsExistIdCard(bean.getDirectorsIdCard()); if (result > 0) { - return AjaxResult.error("总监身份证号码已存在!"); + return AjaxResult.error("总监身份证号码已存在!"); } // 添加监理信息到人员表 AdmissionRequest admissionRequest = new AdmissionRequest(); @@ -217,7 +219,7 @@ public class ProjectServiceImpl implements ProjectService { if (result <= 0) { TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); // 抛出异常触发事务回滚 - return AjaxResult.error("添加总监人员失败!"); + return AjaxResult.error("添加总监人员失败!"); } //向SysUser bean中添加监理人员id SysUser sysUser = new SysUser(); @@ -232,28 +234,29 @@ public class ProjectServiceImpl implements ProjectService { // 新增用户角色信息 insertUserRole(Long.valueOf(bean.getId()), roleIds); } else { - return AjaxResult.error("总监手机号已存在!"); + return AjaxResult.error("总监手机号已存在!"); } // 添加监理信息到监理单位表 result = projectMapper.addSupervisoryUnit(bean); if (result > 0) { // 抛出异常触发事务回滚 - return AjaxResult.success("添加成功"); + return AjaxResult.success("添加成功"); } TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); // 返回操作结果，可能是插入的记录数或者其他标识 } catch (Exception e) { // 手动进行回滚 TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint); - log.error(e.toString(),e); + log.error(e.toString(), e); } - return AjaxResult.error("添加总监人员失败,请联系管理员!"); + return AjaxResult.error("添加总监人员失败,请联系管理员!"); } + @Override public AjaxResult addSupervisoryUnitUser(SupervisoryUnit bean) { - try{ - int nums=projectMapper.getSupervisoryUnitUser(bean); - if(nums>0){ + try { + int nums = projectMapper.getSupervisoryUnitUser(bean); + if (nums > 0) { return AjaxResult.error("监理单位名称已存在"); } // 新增监理信息到人员表 @@ -261,36 +264,38 @@ public class ProjectServiceImpl implements ProjectService { bean.setCreatePerson(SecurityUtils.getUsername()); bean.setCreatePersonId(String.valueOf(SecurityUtils.getUserId())); bean.setUuid(StringUtils.getUuid()); - int successNum=projectMapper.addSupervisoryUnitUser(bean); - if(successNum<1){ + int successNum = projectMapper.addSupervisoryUnitUser(bean); + if (successNum < 1) { return AjaxResult.error("监理单位添加失败,请联系管理员"); } - return AjaxResult.success("添加成功",bean); - }catch (Exception e){ - log.error(e.toString(),e); + return AjaxResult.success("添加成功", bean); + } catch (Exception e) { + log.error(e.toString(), e); } return AjaxResult.error("监理单位添加失败,请联系管理员"); } /** * 查询工程必填项 + * * @param entity * @return */ @Override public AjaxResult getProRequest(Project entity) { - try{ - List list=projectMapper.getProRequest(entity); - String data= String.join(",", list); - return AjaxResult.success(data); - }catch (Exception e){ - log.error(e.toString(),e); + try { + List list = projectMapper.getProRequest(entity); + String data = String.join(",", list); + return AjaxResult.success(data); + } catch (Exception e) { + log.error(e.toString(), e); } - return AjaxResult.error("查询参数异常"); + return AjaxResult.error("查询参数异常"); } /** * 新增承包商单位 + * * @param bean 监理单位实体 * @return 是否新增成功 */ @@ -528,6 +533,31 @@ public class ProjectServiceImpl implements ProjectService { throw new RuntimeException("Failed to add address project"); } } + //插入承包商-工程关联信息(先删后增---临时先放开 后期可能会删除) + projectMapper.delConsProject(project); + projectMapper.delMaterialProject(project); + projectMapper.delConsPersonToPcp(project); + projectMapper.delConsPersonToLk(project); + for (int i = 0; i < project.getConsArr().size(); i++) { + project.setConsId(projectMapper.getConsUuid(project.getConsArr().get(i).getValue())); + project.setRelateUuid(StringUtils.getUuid()); + result = projectMapper.addConsProject(project); + if (result <= 0) { + throw new RuntimeException("Failed to add cons project"); + } + for (int j = 0; j < project.getConsArr().get(i).getCheckList().size(); j++) { + //插入材料-工程关联信息 + project.setMaterialId(project.getConsArr().get(i).getCheckList().get(j)); + project.setRelateUuid(StringUtils.getUuid()); + project.setConsId(project.getConsArr().get(i).getValue()); + result = projectMapper.addMaterialProject(project); + if (result <= 0) { + throw new RuntimeException("Failed to add material project"); + } + } + // TODO 获取承包商信息 --- 新增承包商信息到承包商人员表 + addConsPerson(project); + } } catch (Exception e) { result = 0; TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); @@ -536,7 +566,6 @@ public class ProjectServiceImpl implements ProjectService { } - /** * 插入关联信息 * @@ -588,6 +617,7 @@ public class ProjectServiceImpl implements ProjectService { } return result; } + /** * 新增监理人员 * @@ -603,6 +633,7 @@ public class ProjectServiceImpl implements ProjectService { //插入关联表 projectMapper.addSupPersonToLk(subPerson); } + /** * 新增承包商人员 * From f1448b60dadb3421ce40148d4a74cef0c804d909 Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Wed, 21 May 2025 16:00:20 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E6=9C=AA=E8=80=83=E8=AF=95=E6=8C=890?= =?UTF-8?q?=E5=88=86=E7=AE=97=EF=BC=8C=E6=88=90=E7=BB=A9=E4=B8=BA=E4=B8=8D?= =?UTF-8?q?=E5=8F=8A=E6=A0=BC=E4=BB=A5=E5=8F=8A=E5=B1=95=E7=A4=BA=E8=AF=95?= =?UTF-8?q?=E9=A2=98=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/common/exam/vo/QuestionsExamVo.java | 5 +++ .../resources/mapper/exam/ExamTaskMapper.xml | 32 +++++++++---------- .../mapper/exam/TestQuestLibraryMapper.xml | 2 +- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/exam/vo/QuestionsExamVo.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/exam/vo/QuestionsExamVo.java index be8007d..86393c6 100644 --- a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/exam/vo/QuestionsExamVo.java +++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/exam/vo/QuestionsExamVo.java @@ -51,6 +51,11 @@ public class QuestionsExamVo { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createTime; + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTimeDate; /** * 修改时间 */ diff --git a/bonus-modules/bonus-exam/src/main/resources/mapper/exam/ExamTaskMapper.xml b/bonus-modules/bonus-exam/src/main/resources/mapper/exam/ExamTaskMapper.xml index 99dbba5..d95e40f 100644 --- a/bonus-modules/bonus-exam/src/main/resources/mapper/exam/ExamTaskMapper.xml +++ b/bonus-modules/bonus-exam/src/main/resources/mapper/exam/ExamTaskMapper.xml @@ -162,22 +162,22 @@ diff --git a/bonus-modules/bonus-project/src/main/resources/mapper/system/SupervisionUnitMapper.xml b/bonus-modules/bonus-project/src/main/resources/mapper/system/SupervisionUnitMapper.xml index 70a295b..80f332b 100644 --- a/bonus-modules/bonus-project/src/main/resources/mapper/system/SupervisionUnitMapper.xml +++ b/bonus-modules/bonus-project/src/main/resources/mapper/system/SupervisionUnitMapper.xml @@ -204,7 +204,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND ppi.pro_name like concat('%',#{proName},'%') - AND ppi.sup_name like concat('%',#{supName},'%') + AND ppi.sup_unit_name like concat('%',#{supName},'%') AND ppi.pro_id = #{proId} @@ -252,4 +252,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - \ No newline at end of file + From d8b5a24bfaea2910faf8686615b4645122d72d18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Tue, 27 May 2025 18:22:57 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9B=91=E7=90=86?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=88=97=E8=A1=A8=E5=92=8C=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/common/core/domain/BaseBean.java | 3 + .../controller/SupervisionUnitController.java | 19 +++++ .../project/mapper/SupervisionUnitMapper.java | 14 ++++ .../service/SupervisionUnitService.java | 7 ++ .../impl/SupervisionUnitServiceImpl.java | 17 ++++- .../mapper/system/SupervisionUnitMapper.xml | 71 ++++++++++++++++++- 6 files changed, 127 insertions(+), 4 deletions(-) diff --git a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/domain/BaseBean.java b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/domain/BaseBean.java index 48ae8fd..b998238 100644 --- a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/domain/BaseBean.java +++ b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/domain/BaseBean.java @@ -41,6 +41,9 @@ public class BaseBean implements Serializable { private String procInsId; + /** + * 用户类型（00业主用户、01监理用户、02承包商、03分包商） + */ private String userType; /** diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/SupervisionUnitController.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/SupervisionUnitController.java index cb69f54..6e8bb91 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/SupervisionUnitController.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/SupervisionUnitController.java @@ -1,5 +1,6 @@ package com.bonus.project.controller; +import com.bonus.common.core.utils.PageUtils; import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; @@ -256,4 +257,22 @@ public class SupervisionUnitController extends BaseController { } return error("系统异常,请联系管理员"); } + + /** + * 获取新增监管人员列表 + * @param bean + * @return + */ + @GetMapping("/getPtSupPerson") + @SysLog(title = "监理管理", businessType = OperaType.INSERT,logType = 0,module = "监理管理->监理入场",details = "监理入场申请") + public TableDataInfo getPtSupPerson(SupervisorPerson bean) { + try{ + startPage(); + List list = suService.getPtSupPerson(bean); + return getDataTable(list); + }catch (Exception e){ + logger.error(e.toString(),e); + } + return getDataTableError(null); + } } diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/mapper/SupervisionUnitMapper.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/mapper/SupervisionUnitMapper.java index 1dc4d7a..d23e873 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/mapper/SupervisionUnitMapper.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/mapper/SupervisionUnitMapper.java @@ -196,4 +196,18 @@ public interface SupervisionUnitMapper { * @param userId */ void deleteUserById(@Param("userId") String userId); + + /** + * 获取新增监管人员列表 + * @param bean + * @return + */ + List getPtSupPerson(SupervisorPerson bean); + + /** + * 获取新增监管人员列表 + * @param bean + * @return + */ + List getPtSupPersonAll(SupervisorPerson bean); } diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/SupervisionUnitService.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/SupervisionUnitService.java index 388335a..8341317 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/SupervisionUnitService.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/SupervisionUnitService.java @@ -88,4 +88,11 @@ public interface SupervisionUnitService { AjaxResult delSupervisionUnitUser(Long[] addressId); int delSupervisoryPersonApply(SupervisorPerson supervisorPerson); + + /** + * 获取新增监管人员列表 + * @param bean + * @return + */ + List getPtSupPerson(SupervisorPerson bean); } diff --git a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SupervisionUnitServiceImpl.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SupervisionUnitServiceImpl.java index 94ed539..459cd88 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SupervisionUnitServiceImpl.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/impl/SupervisionUnitServiceImpl.java @@ -468,11 +468,10 @@ public class SupervisionUnitServiceImpl implements SupervisionUnitService { @Override @Transactional(rollbackFor = Exception.class) public int delSupervisoryPersonApply(SupervisorPerson supervisorPerson) { - Integer supUserId = suMapper.getsupUserId(supervisorPerson); // 删除监理人员信息(lk_sup_person表) Integer i1 = suMapper.delPtSupPerson(supervisorPerson); if (i1 > 0) { - supervisorPerson.setSupId(supUserId); + supervisorPerson.setSupId(Integer.valueOf(supervisorPerson.getUserId())); // 删除监理人员信息(pt_sup_person表) Integer i2 = suMapper.delLkSupPerson(supervisorPerson); if (i2 > 0) { @@ -485,6 +484,20 @@ public class SupervisionUnitServiceImpl implements SupervisionUnitService { } } + /** + * 获取新增监管人员列表 + * @param bean + * @return + */ + @Override + public List getPtSupPerson(SupervisorPerson bean) { + //判断如果是业主,查询全部 + if (StaticVariableUtils.ZERO_00.equals(bean.getUserType())) { + return suMapper.getPtSupPersonAll(bean); + } + return suMapper.getPtSupPerson(bean); + } + private int qualificationMaterialsFile(@NotNull String filePath, int proId, long fileSize, String fromType, String informationType, String uuid) { diff --git a/bonus-modules/bonus-project/src/main/resources/mapper/system/SupervisionUnitMapper.xml b/bonus-modules/bonus-project/src/main/resources/mapper/system/SupervisionUnitMapper.xml index 80f332b..d65316e 100644 --- a/bonus-modules/bonus-project/src/main/resources/mapper/system/SupervisionUnitMapper.xml +++ b/bonus-modules/bonus-project/src/main/resources/mapper/system/SupervisionUnitMapper.xml @@ -109,7 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete from sys_user where id_card = #{idCard} and phonenumber = #{phone} and del_flag = '0' - delete from lk_sup_person where pro_id = #{proId} and sup_uuid = #{supUuid} + delete from lk_sup_person where pro_id = #{proId} and sup_uuid = #{supUuid} and sup_persion_id = #{userId} delete from pt_sup_person where sup_user_id = #{supId} and is_active = 1 @@ -243,13 +243,80 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + From 1fb21ef912c23989008bae908a299c64fc57e551 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Thu, 29 May 2025 18:13:44 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E7=9B=91=E7=90=86=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=85=A5=E5=9C=BA=E5=87=BA=E5=9C=BA=E5=AE=A1=E6=A0=B8=E6=B5=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flowable/listener/StageEndListener.java | 8 + .../bonus/flowable/mapper/BusinessMapper.java | 41 +++ .../flowable/service/BusinessService.java | 12 + .../service/impl/BusinessServiceImpl.java | 33 +++ .../main/resources/mapper/BusinessMapper.xml | 32 +++ .../controller/SupervisionUnitController.java | 54 ++++ .../project/domain/SupervisorPerson.java | 12 + .../project/mapper/SupervisionUnitMapper.java | 34 ++- .../service/SupervisionUnitService.java | 21 ++ .../impl/SupervisionUnitServiceImpl.java | 74 ++++++ .../mapper/system/SupervisionUnitMapper.xml | 250 +++++++++++++++++- 11 files changed, 566 insertions(+), 5 deletions(-) diff --git a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/listener/StageEndListener.java b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/listener/StageEndListener.java index 26d4db7..edc64be 100644 --- a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/listener/StageEndListener.java +++ b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/listener/StageEndListener.java @@ -252,6 +252,14 @@ public class StageEndListener implements ExecutionListener, ApplicationContextAw //修改延期申请状态 businessService.updateExtensionApplicationByUuid(id, statusType,""); break; + case "18": + //监理入场申请状态 + businessService.updateSupPersonIntoStatusByUuid(id, statusType); + break; + case "19": + //监理出场申请状态 + businessService.updateSupPersonOutStatusByUuid(id, statusType); + break; default: } } diff --git a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/mapper/BusinessMapper.java b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/mapper/BusinessMapper.java index c1a77a1..b8d5bfb 100644 --- a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/mapper/BusinessMapper.java +++ b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/mapper/BusinessMapper.java @@ -545,4 +545,45 @@ public interface BusinessMapper { String getCheckTree(String taskId); void updateAuditUserInfo(ConfigurationVo add); + + /** + * 修改监理中途入场任务id流程实例id 审核状态 + * @param uuid + * @param taskId + * @param processInstanceId + * @param enterStatus + * @return + */ + Integer updateSupPersonStatus(@Param("uuid") String uuid, @Param("taskId")String taskId,@Param("processInstanceId") String processInstanceId,@Param("enterStatus") String enterStatus); + /** + * 修改监理中途出场任务id流程实例id 审核状态 + * @param uuid + * @param taskId + * @param processInstanceId + * @param enterStatus + * @return + */ + Integer updateSupPersonOutStatus(@Param("uuid") String uuid, @Param("taskId")String taskId, @Param("processInstanceId")String processInstanceId, @Param("enterStatus") String enterStatus); + + /** + * 修改用户状态 + * @param uuid + */ + void updateSupPersonSysUserStatus(String uuid); + + /** + * 修改监理中途入场审核状态 + * @param uuid + * @param statusType + * @return + */ + int updateSupPersonIntoStatusByUuid(@Param("uuid")String uuid, @Param("statusType")String statusType); + + /** + * 修改监理中途出场审核状态 + * @param uuid + * @param statusType + * @return + */ + int updateSupPersonOutStatusByUuid(@Param("uuid")String uuid, @Param("statusType")String statusType); } diff --git a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/BusinessService.java b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/BusinessService.java index 47d677f..21ea84d 100644 --- a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/BusinessService.java +++ b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/BusinessService.java @@ -204,4 +204,16 @@ public interface BusinessService { void updateExtensionApplicationByUuid(String uuid,String statusType,String rejectReason); List checkHistory(RequestEntity entity); + /** + * 修改延期申请状态 + * @param uuid uuid + * @param statusType 状态 + */ + int updateSupPersonIntoStatusByUuid(String uuid, String statusType); + /** + * 修改延期申请状态 + * @param uuid uuid + * @param statusType 状态 + */ + int updateSupPersonOutStatusByUuid(String uuid, String statusType); } diff --git a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/impl/BusinessServiceImpl.java b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/impl/BusinessServiceImpl.java index 37ccc8e..116b629 100644 --- a/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/impl/BusinessServiceImpl.java +++ b/bonus-modules/bonus-flowable/src/main/java/com/bonus/flowable/service/impl/BusinessServiceImpl.java @@ -790,6 +790,12 @@ public class BusinessServiceImpl implements BusinessService { case "17": //延期申请---修改任务ID和流程实例ID return mapper.updateExtensionApplicationStatus(uuid, taskId, processInstanceId, enterStatus); + case "18": + //监理施工中入场审批---修改任务ID和流程实例ID + return mapper.updateSupPersonStatus(uuid, taskId, processInstanceId, enterStatus); + case "19": + //监理施工中出场审批---修改任务ID和流程实例ID + return mapper.updateSupPersonOutStatus(uuid, taskId, processInstanceId, enterStatus); default: break; } @@ -1048,6 +1054,33 @@ public class BusinessServiceImpl implements BusinessService { return list; } + /** + * 修改延期申请状态 + * @param uuid uuid + * @param statusType 状态 + */ + @Override + public int updateSupPersonIntoStatusByUuid(String uuid, String statusType) { + try { + if ("3".equals(statusType)) { + mapper.updateSupPersonSysUserStatus(uuid); + } + } catch (Exception e) { + log.error("修改监理人员状态失败"); + } + return mapper.updateSupPersonIntoStatusByUuid(uuid, statusType); + } + + /** + * 修改延期申请状态 + * @param uuid uuid + * @param statusType 状态 + */ + @Override + public int updateSupPersonOutStatusByUuid(String uuid, String statusType) { + return mapper.updateSupPersonOutStatusByUuid(uuid, statusType); + } + @Override public void addComment(@Param("uuid") String taskId, @Param("uuid") String processInstanceId, @Param("uuid") String userId, @Param("uuid") String comment, @Param("agree") String agree, @Param("rejectReason") String rejectReason) { mapper.addComment(taskId, processInstanceId, userId, comment, agree, rejectReason); diff --git a/bonus-modules/bonus-flowable/src/main/resources/mapper/BusinessMapper.xml b/bonus-modules/bonus-flowable/src/main/resources/mapper/BusinessMapper.xml index 7c0f887..27d26fe 100644 --- a/bonus-modules/bonus-flowable/src/main/resources/mapper/BusinessMapper.xml +++ b/bonus-modules/bonus-flowable/src/main/resources/mapper/BusinessMapper.xml @@ -325,6 +325,7 @@ update nxdt_ii.lk_sup_person set status = #{statusType}, + into_status = #{statusType}, admission_date = DATE(NOW()) where sup_uuid = (select sup_uuid from nxdt_ii.lk_pro_sup where uuid = #{uuid}) @@ -704,6 +705,37 @@ SET audit_status=#{state},is_audit=#{isAudit},is_now=#{isNow} where task_id=#{taskId} and audit_user=#{userId} + + update nxdt_ii.lk_sup_person + set into_status =#{enterStatus}, + task_id_into = #{taskId}, + proc_inst_id_into = #{processInstanceId} + where uuid = #{uuid} + + + update nxdt_ii.lk_sup_person + set out_status =#{enterStatus}, + task_id_out = #{taskId}, + proc_inst_id_out = #{processInstanceId} + where uuid = #{uuid} + + + update nxdt_ii.sys_user + set status = '0' + where parent_uuid = (select sup_uuid from nxdt_ii.lk_sup_person where uuid = #{uuid}) + + + update nxdt_ii.lk_sup_person + set into_status =#{statusType}, + admission_date = DATE(NOW()) + where uuid = #{uuid} + + + update nxdt_ii.lk_sup_person + set out_status =#{statusType}, + departure_date = DATE(NOW()) + where uuid = #{uuid} + - select (@rowNum := @rowNum + 1) as exportId, lsp.pro_id as proId, lsp.sup_uuid as supUuid, lsp.uuid as uuid, lsp.status as status, + lsp.into_status as intoStatus, + lsp.out_status as outStatus, + lsp.task_id_into as taskId, + lsp.proc_inst_id_into as procInsId, sup_user_id as id, sup_name as name, if(sex = '0','男','女') as sex, @@ -305,7 +316,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" on psp.sup_user_id = lsp.sup_persion_id left join sys_dict_data sdd on sdd.dict_value = psp.post and sdd.dict_type = 'sys_sup_post' and sdd.status = '0' - where psp.is_active = '1' and lsp.status!='3' + where psp.is_active = '1' and lsp.sup_uuid = (select uuid from pt_sup_info where sup_id = #{supId}) @@ -316,6 +327,237 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and psp.sup_name like concat('%', #{name}, '%') + + and lsp.into_status = #{intoStatus} + + + + + + + From 8972e9adbad71c6a7d24f7e38dc321f42194e902 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Tue, 3 Jun 2025 09:46:26 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E7=9B=91=E7=90=86=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=EF=BC=8C=E4=B8=93=E8=B4=A3=E6=96=B0=E5=BB=BA=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E6=B5=81bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/system/SupervisionUnitMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-project/src/main/resources/mapper/system/SupervisionUnitMapper.xml b/bonus-modules/bonus-project/src/main/resources/mapper/system/SupervisionUnitMapper.xml index c09e49a..59d1362 100644 --- a/bonus-modules/bonus-project/src/main/resources/mapper/system/SupervisionUnitMapper.xml +++ b/bonus-modules/bonus-project/src/main/resources/mapper/system/SupervisionUnitMapper.xml @@ -274,7 +274,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" on psp.sup_user_id = lsp.sup_persion_id left join sys_dict_data sdd on sdd.dict_value = psp.post and sdd.dict_type = 'sys_sup_post' and sdd.status = '0' - where psp.is_active = '1' + where psp.is_active = '1' and lsp.status = '0' and lsp.sup_uuid = (select uuid from pt_sup_info where sup_id = #{supId}) @@ -316,7 +316,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" on psp.sup_user_id = lsp.sup_persion_id left join sys_dict_data sdd on sdd.dict_value = psp.post and sdd.dict_type = 'sys_sup_post' and sdd.status = '0' - where psp.is_active = '1' + where psp.is_active = '1' and lsp.status = '0' and lsp.sup_uuid = (select uuid from pt_sup_info where sup_id = #{supId}) From 8c4d98de40cf4c327ee82d6520b07cd03ba1c5f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Wed, 4 Jun 2025 14:20:14 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9A=8F=E6=89=8B?= =?UTF-8?q?=E6=8B=8D=E5=88=97=E8=A1=A8=E5=A7=93=E5=90=8D=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/system/SnapshotMapper.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-project/src/main/resources/mapper/system/SnapshotMapper.xml b/bonus-modules/bonus-project/src/main/resources/mapper/system/SnapshotMapper.xml index 0013b03..a33975a 100644 --- a/bonus-modules/bonus-project/src/main/resources/mapper/system/SnapshotMapper.xml +++ b/bonus-modules/bonus-project/src/main/resources/mapper/system/SnapshotMapper.xml @@ -86,7 +86,7 @@ SELECT ss.create_user_id as snapshotId, ss.phone as phone, - ss.create_user_name as userName, + su.nick_name as userName, ss.dept_name as deptName, ss.post_name as postName, count(1) as num, @@ -102,6 +102,7 @@ from sys_role sr LEFT JOIN sys_user_role sur ON sur.role_id = sr.role_id group by sur.user_id)r on r.user_id = ss.create_user_id + LEFT JOIN sys_user su on su.user_id = ss.create_user_id WHERE ss.is_active = '1' and ss.phone like concat('%', #{phone}, '%') @@ -133,4 +134,4 @@ and st_id = #{snapshotId} - \ No newline at end of file +