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-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/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-exam/src/main/resources/mapper/exam/CoursewareLibraryMapper.xml b/bonus-modules/bonus-exam/src/main/resources/mapper/exam/CoursewareLibraryMapper.xml index d342712..8d294e2 100644 --- a/bonus-modules/bonus-exam/src/main/resources/mapper/exam/CoursewareLibraryMapper.xml +++ b/bonus-modules/bonus-exam/src/main/resources/mapper/exam/CoursewareLibraryMapper.xml @@ -78,6 +78,7 @@ update_time AS updateTime, file_type AS fileType, parent_id AS parentId, + file_path AS filePath, IFNULL(marl,'') AS marl FROM edu_courseware WHERE is_active = '1' 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/java/com/bonus/project/controller/AdmissionRequestController.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/AdmissionRequestController.java index cb80337..ea206d9 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 d4c0452..02987a6 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/controller/SupervisionUnitController.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/controller/SupervisionUnitController.java index cb69f54..ffc44af 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,76 @@ 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); + } + + /** + * 获取监管人员入场列表 + * @param bean + * @return + */ + @GetMapping("/getPtSupPersonInto") + @SysLog(title = "监理管理", businessType = OperaType.INSERT,logType = 0,module = "监理管理->监理入场",details = "监理入场申请") + public TableDataInfo getPtSupPersonInto(SupervisorPerson bean) { + try{ + startPage(); + List list = suService.getPtSupPersonInto(bean); + return getDataTable(list); + }catch (Exception e){ + logger.error(e.toString(),e); + } + return getDataTableError(null); + } + + /** + * 获取监管人员出场列表 + * @param bean + * @return + */ + @GetMapping("/getPtSupPersonOut") + @SysLog(title = "监理管理", businessType = OperaType.INSERT,logType = 0,module = "监理管理->监理入场",details = "监理入场申请") + public TableDataInfo getPtSupPersonOut(SupervisorPerson bean) { + try{ + startPage(); + List list = suService.getPtSupPersonOut(bean); + return getDataTable(list); + }catch (Exception e){ + logger.error(e.toString(),e); + } + return getDataTableError(null); + } + + /** + * 获取监管人员入场/出场申请列表 + * @param bean + * @return + */ + @GetMapping("/getPtSupPersonList") + @SysLog(title = "监理管理", businessType = OperaType.INSERT,logType = 0,module = "监理管理->监理入场",details = "监理入场申请") + public TableDataInfo getPtSupPersonList(SupervisorPerson bean) { + try{ + startPage(); + List list = suService.getPtSupPersonList(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/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/domain/SupervisorPerson.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/SupervisorPerson.java index 512a471..b0a854c 100644 --- a/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/SupervisorPerson.java +++ b/bonus-modules/bonus-project/src/main/java/com/bonus/project/domain/SupervisorPerson.java @@ -82,4 +82,16 @@ public class SupervisorPerson extends BaseBean implements Serializable { private String roleId; private String deptId; private String status; + /** + * 0待审核;1已提交 2 审核中 3通过 4驳回 5回撤 + */ + private String intoStatus; + /** + * 0待审核;1已提交 2 审核中 3通过 4驳回 5回撤 + */ + private String outStatus; + + private List proInsId; + private int dataType=0; + } 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 5d79ced..30e7749 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 @@ -299,4 +299,6 @@ public interface AdmissionRequestMapper { * @return */ String getIdCardByPhone(@Param("phone") String phone); + + 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/mapper/SupervisionUnitMapper.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/mapper/SupervisionUnitMapper.java index 1dc4d7a..850c9f3 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,50 @@ 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); + + /** + * 获取入场监理人员列表 + * @param bean + * @return + */ + List getPtSupPersonInto(SupervisorPerson bean); + /** + * 业主获取入场监理人员列表 + * @param bean + * @return + */ + List getPtSupPersonIntoAll(SupervisorPerson bean); + /** + * 获取出场监理人员列表 + * @param bean + * @return + */ + List getPtSupPersonOut(SupervisorPerson bean); + /** + * 业主获取出场监理人员列表 + * @param bean + * @return + */ + List getPtSupPersonOutAll(SupervisorPerson bean); + + /** + * 获取监管人员入场/出场申请列表 + * @param bean + * @return + */ + List getPtSupPersonList(SupervisorPerson 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 464adf8..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 @@ -149,4 +149,11 @@ public interface AdmissionRequestService { * @return 是否存在 */ List 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/SupervisionUnitService.java b/bonus-modules/bonus-project/src/main/java/com/bonus/project/service/SupervisionUnitService.java index 388335a..61bb53c 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,32 @@ public interface SupervisionUnitService { AjaxResult delSupervisionUnitUser(Long[] addressId); int delSupervisoryPersonApply(SupervisorPerson supervisorPerson); + + /** + * 获取新增监管人员列表 + * @param bean + * @return + */ + List getPtSupPerson(SupervisorPerson bean); + + /** + * 获取入场监管人员列表 + * @param bean + * @return + */ + List getPtSupPersonInto(SupervisorPerson bean); + + /** + * 获取出场监管人员列表 + * @param bean + * @return + */ + List getPtSupPersonOut(SupervisorPerson bean); + + /** + * 获取监管人员入场/出场申请列表 + * @param bean + * @return + */ + List getPtSupPersonList(SupervisorPerson 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 aec99f7..478d279 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 @@ -936,6 +936,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 06bf8d9..6112d0d 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 @@ -241,6 +241,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/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); } + /** * 新增承包商人员 * 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..0b6ef18 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,94 @@ 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); + } + + /** + * 获取入场监管人员列表 + * @param bean + * @return + */ + @Override + public List getPtSupPersonInto(SupervisorPerson bean) { + //判断如果是业主,查询全部 + if (StaticVariableUtils.ZERO_00.equals(bean.getUserType())) { + return suMapper.getPtSupPersonIntoAll(bean); + } + return suMapper.getPtSupPersonInto(bean); + } + + /** + * 获取出场监管人员列表 + * @param bean + * @return + */ + @Override + public List getPtSupPersonOut(SupervisorPerson bean) { + //判断如果是业主,查询全部 + if (StaticVariableUtils.ZERO_00.equals(bean.getUserType())) { + return suMapper.getPtSupPersonOutAll(bean); + } + return suMapper.getPtSupPersonOut(bean); + } + + /** + * 获取监管人员入场/出场申请列表 + * @param bean + * @return + */ + @Override + public List getPtSupPersonList(SupervisorPerson bean) { + long startTime = System.currentTimeMillis(); + RequestEntity entity = new RequestEntity(); + //数据查询 + Map checkMaps= Maps.newHashMap(); + List list = new ArrayList<>(); + if("1".equals(bean.getStatus())){ + entity.setUserId(String.valueOf(SecurityUtils.getLoginUser().getUserid())); + AjaxResult ajaxResult = flowTaskService.getStayFlow(entity); + if (ajaxResult.isSuccess()) { + List> data = (List>) ajaxResult.get("data"); + List proInsId=new ArrayList<>(); + data.forEach(map->{ + proInsId.add((String)map.get("proInsId")); + checkMaps.put((String)map.get("proInsId"),(String) map.get("finalCheck")); + }); + if(StringUtils.isNotEmpty(data)){ + bean.setDataType(1); + bean.setProInsId(proInsId); + } + if (proInsId.isEmpty()){ + return list; + } + } + } + PageUtils.startPage(); + list = suMapper.getPtSupPersonList(bean); + list.forEach(data->{ + if("1".equals(data.getStatus())){ + if ("2".equals(data.getIntoStatus())) { + data.setIntoStatus("1"); + } + data.setFinalCheck(checkMaps.get(data.getProcInsId())); + } + }); + long endTime = System.currentTimeMillis(); + System.err.println("耗时："+(endTime-startTime)); + return list; + } + 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/AdmissionRequestMapper.xml b/bonus-modules/bonus-project/src/main/resources/mapper/system/AdmissionRequestMapper.xml index 9974ae1..9fa44a2 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 @@ -534,6 +534,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and pfp.create_time between #{params.beginTime} and #{params.endTime} + order by pfp.create_time desc @@ -593,6 +594,53 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and lpec.pro_id = #{proId} + 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 3f227b0..c2b88cf 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 @@ -218,5 +218,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 b48e4b4..f694381 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 @@ -535,6 +535,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') 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 + 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..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 @@ -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 @@ -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} @@ -243,13 +243,322 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + - \ No newline at end of file +