From eabcae45188a8b371d559d95e451cc2e788ac825 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Tue, 15 Jul 2025 22:22:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/enums/ApprovalTypes.java | 33 ++ .../manage/domain/ProProjectApproval.java | 112 ++++++ .../manage/domain/ProProjectChecked.java | 338 ++++++++++++++++++ .../mapper/ProProjectApprovalMapper.java | 61 ++++ .../mapper/ProProjectCheckedMapper.java | 61 ++++ .../manage/ProProjectApprovalMapper.xml | 95 +++++ .../mapper/manage/ProProjectCheckedMapper.xml | 163 +++++++++ .../ProProjectApprovalController.java | 98 +++++ .../ProProjectCheckedController.java | 105 ++++++ .../service/IProProjectApprovalService.java | 61 ++++ .../service/IProProjectCheckedService.java | 61 ++++ .../impl/ProProjectApprovalServiceImpl.java | 100 ++++++ .../impl/ProProjectCheckedServiceImpl.java | 144 ++++++++ 13 files changed, 1432 insertions(+) create mode 100644 yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/enums/ApprovalTypes.java create mode 100644 yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectApproval.java create mode 100644 yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectChecked.java create mode 100644 yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectApprovalMapper.java create mode 100644 yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectCheckedMapper.java create mode 100644 yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectApprovalMapper.xml create mode 100644 yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectCheckedMapper.xml create mode 100644 yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectApprovalController.java create mode 100644 yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectCheckedController.java create mode 100644 yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectApprovalService.java create mode 100644 yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectCheckedService.java create mode 100644 yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectApprovalServiceImpl.java create mode 100644 yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectCheckedServiceImpl.java diff --git a/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/enums/ApprovalTypes.java b/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/enums/ApprovalTypes.java new file mode 100644 index 00000000..fdfae696 --- /dev/null +++ b/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/enums/ApprovalTypes.java @@ -0,0 +1,33 @@ +package com.yanzhu.common.core.enums; + +/** + * 审批类型 + */ +public enum ApprovalTypes { + + Approval_TYPE_QYFS("1", "取样复试"), + Approval_TYPE_CLFY("4", "材料封样"), + Approval_TYPE_JPYS("3", "举牌验收"), + Approval_TYPE_SCSL("2", "实测实量"), + Approval_TYPE_GCGNJY("5", "工程功能检验"); + + private final String code; + private final String info; + + ApprovalTypes(String code, String info) + { + this.code = code; + this.info = info; + } + + public String getCode() + { + return code; + } + + public String getInfo() + { + return info; + } + +} diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectApproval.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectApproval.java new file mode 100644 index 00000000..0c5dd62f --- /dev/null +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectApproval.java @@ -0,0 +1,112 @@ +package com.yanzhu.manage.domain; + +import com.yanzhu.common.core.annotation.Excel; +import com.yanzhu.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 项目审核信息对象 pro_project_approval + * + * @author yanzhu + * @date 2025-07-12 + */ +public class ProProjectApproval extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long id; + + /** 来自类型 */ + @Excel(name = "来自类型") + private String fromType; + + /** 来自主键 */ + @Excel(name = "来自主键") + private Long fromId; + + /** 审批状态 */ + @Excel(name = "审批状态") + private String approveStatus; + + /** 数据状态 */ + @Excel(name = "数据状态") + private String isDel; + + /** 审核意见 */ + @Excel(name = "审核意见") + private String comment; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setFromType(String fromType) + { + this.fromType = fromType; + } + + public String getFromType() + { + return fromType; + } + public void setFromId(Long fromId) + { + this.fromId = fromId; + } + + public Long getFromId() + { + return fromId; + } + public void setApproveStatus(String approveStatus) + { + this.approveStatus = approveStatus; + } + + public String getApproveStatus() + { + return approveStatus; + } + public void setIsDel(String isDel) + { + this.isDel = isDel; + } + + public String getIsDel() + { + return isDel; + } + public void setComment(String comment) + { + this.comment = comment; + } + + public String getComment() + { + return comment; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("fromType", getFromType()) + .append("fromId", getFromId()) + .append("approveStatus", getApproveStatus()) + .append("isDel", getIsDel()) + .append("comment", getComment()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectChecked.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectChecked.java new file mode 100644 index 00000000..c1cc076c --- /dev/null +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectChecked.java @@ -0,0 +1,338 @@ +package com.yanzhu.manage.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yanzhu.common.core.annotation.Excel; +import com.yanzhu.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.util.Date; + +/** + * 项目举牌验收对象 pro_project_checked + * + * @author yanzhu + * @date 2025-07-12 + */ +public class ProProjectChecked extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long id; + + /** 公司主键 */ + @Excel(name = "公司主键") + private Long comId; + + /** 项目主键 */ + @Excel(name = "项目主键") + private Long projectId; + + /** 验收类型 */ + @Excel(name = "验收类型") + private String checkType; + + /** 验收主图 */ + @Excel(name = "验收主图") + private String mainImage; + + /** 图片列表 */ + @Excel(name = "图片列表") + private String imageUrls; + + /** 工序部位 */ + @Excel(name = "工序部位") + private String workingPosition; + + /** 工序部位类型 */ + @Excel(name = "工序部位类型") + private String workingPositionType; + + /** 验收次数 */ + @Excel(name = "验收次数") + private Long checkingNum; + + /** 验收结果 */ + @Excel(name = "验收结果") + private String checkResult; + + /** 验收描述 */ + @Excel(name = "验收描述") + private String intro; + + /** 技术用户 */ + @Excel(name = "技术用户") + private String technicianUser; + + /** 技术用户名称 */ + @Excel(name = "技术用户名称") + private String technicianUserName; + + /** 监理用户 */ + @Excel(name = "监理用户") + private String superviseUser; + + /** 监理用户名称 */ + @Excel(name = "监理用户名称") + private String superviseUserName; + + /** 班组用户 */ + @Excel(name = "班组用户") + private String groupDeptUser; + + /** 班组用户名称 */ + @Excel(name = "班组用户名称") + private String groupDeptUserName; + + /** 验收时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "验收时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date checkingDate; + + /** 验收附件 */ + @Excel(name = "验收附件") + private String checkingFiles; + + /** 数据状态 */ + @Excel(name = "数据状态") + private Long isDel; + + /** 审核状态 */ + @Excel(name = "审核状态") + private String approveStatus; + + /** 审核意见 */ + @Excel(name = "审核意见") + private String comment; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setComId(Long comId) + { + this.comId = comId; + } + + public Long getComId() + { + return comId; + } + public void setProjectId(Long projectId) + { + this.projectId = projectId; + } + + public Long getProjectId() + { + return projectId; + } + public void setCheckType(String checkType) + { + this.checkType = checkType; + } + + public String getCheckType() + { + return checkType; + } + public void setMainImage(String mainImage) + { + this.mainImage = mainImage; + } + + public String getMainImage() + { + return mainImage; + } + public void setImageUrls(String imageUrls) + { + this.imageUrls = imageUrls; + } + + public String getImageUrls() + { + return imageUrls; + } + public void setWorkingPosition(String workingPosition) + { + this.workingPosition = workingPosition; + } + + public String getWorkingPosition() + { + return workingPosition; + } + public void setWorkingPositionType(String workingPositionType) + { + this.workingPositionType = workingPositionType; + } + + public String getWorkingPositionType() + { + return workingPositionType; + } + public void setCheckingNum(Long checkingNum) + { + this.checkingNum = checkingNum; + } + + public Long getCheckingNum() + { + return checkingNum; + } + public void setCheckResult(String checkResult) + { + this.checkResult = checkResult; + } + + public String getCheckResult() + { + return checkResult; + } + public void setIntro(String intro) + { + this.intro = intro; + } + + public String getIntro() + { + return intro; + } + public void setTechnicianUser(String technicianUser) + { + this.technicianUser = technicianUser; + } + + public String getTechnicianUser() + { + return technicianUser; + } + public void setTechnicianUserName(String technicianUserName) + { + this.technicianUserName = technicianUserName; + } + + public String getTechnicianUserName() + { + return technicianUserName; + } + public void setSuperviseUser(String superviseUser) + { + this.superviseUser = superviseUser; + } + + public String getSuperviseUser() + { + return superviseUser; + } + public void setSuperviseUserName(String superviseUserName) + { + this.superviseUserName = superviseUserName; + } + + public String getSuperviseUserName() + { + return superviseUserName; + } + public void setGroupDeptUser(String groupDeptUser) + { + this.groupDeptUser = groupDeptUser; + } + + public String getGroupDeptUser() + { + return groupDeptUser; + } + public void setGroupDeptUserName(String groupDeptUserName) + { + this.groupDeptUserName = groupDeptUserName; + } + + public String getGroupDeptUserName() + { + return groupDeptUserName; + } + public void setCheckingDate(Date checkingDate) + { + this.checkingDate = checkingDate; + } + + public Date getCheckingDate() + { + return checkingDate; + } + public void setCheckingFiles(String checkingFiles) + { + this.checkingFiles = checkingFiles; + } + + public String getCheckingFiles() + { + return checkingFiles; + } + public void setIsDel(Long isDel) + { + this.isDel = isDel; + } + + public Long getIsDel() + { + return isDel; + } + public void setApproveStatus(String approveStatus) + { + this.approveStatus = approveStatus; + } + + public String getApproveStatus() + { + return approveStatus; + } + + public String getComment() { + return comment; + } + + public void setComment(String comment) { + this.comment = comment; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("comId", getComId()) + .append("projectId", getProjectId()) + .append("checkType", getCheckType()) + .append("mainImage", getMainImage()) + .append("imageUrls", getImageUrls()) + .append("workingPosition", getWorkingPosition()) + .append("workingPositionType", getWorkingPositionType()) + .append("checkingNum", getCheckingNum()) + .append("checkResult", getCheckResult()) + .append("intro", getIntro()) + .append("technicianUser", getTechnicianUser()) + .append("technicianUserName", getTechnicianUserName()) + .append("superviseUser", getSuperviseUser()) + .append("superviseUserName", getSuperviseUserName()) + .append("groupDeptUser", getGroupDeptUser()) + .append("groupDeptUserName", getGroupDeptUserName()) + .append("checkingDate", getCheckingDate()) + .append("checkingFiles", getCheckingFiles()) + .append("isDel", getIsDel()) + .append("approveStatus", getApproveStatus()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectApprovalMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectApprovalMapper.java new file mode 100644 index 00000000..ebbf7670 --- /dev/null +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectApprovalMapper.java @@ -0,0 +1,61 @@ +package com.yanzhu.manage.mapper; + +import java.util.List; +import com.yanzhu.manage.domain.ProProjectApproval; + +/** + * 项目审核信息Mapper接口 + * + * @author yanzhu + * @date 2025-07-12 + */ +public interface ProProjectApprovalMapper +{ + /** + * 查询项目审核信息 + * + * @param id 项目审核信息主键 + * @return 项目审核信息 + */ + public ProProjectApproval selectProProjectApprovalById(Long id); + + /** + * 查询项目审核信息列表 + * + * @param proProjectApproval 项目审核信息 + * @return 项目审核信息集合 + */ + public List selectProProjectApprovalList(ProProjectApproval proProjectApproval); + + /** + * 新增项目审核信息 + * + * @param proProjectApproval 项目审核信息 + * @return 结果 + */ + public int insertProProjectApproval(ProProjectApproval proProjectApproval); + + /** + * 修改项目审核信息 + * + * @param proProjectApproval 项目审核信息 + * @return 结果 + */ + public int updateProProjectApproval(ProProjectApproval proProjectApproval); + + /** + * 删除项目审核信息 + * + * @param id 项目审核信息主键 + * @return 结果 + */ + public int deleteProProjectApprovalById(Long id); + + /** + * 批量删除项目审核信息 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteProProjectApprovalByIds(Long[] ids); +} diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectCheckedMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectCheckedMapper.java new file mode 100644 index 00000000..9048125c --- /dev/null +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectCheckedMapper.java @@ -0,0 +1,61 @@ +package com.yanzhu.manage.mapper; + +import java.util.List; +import com.yanzhu.manage.domain.ProProjectChecked; + +/** + * 项目举牌验收Mapper接口 + * + * @author yanzhu + * @date 2025-07-12 + */ +public interface ProProjectCheckedMapper +{ + /** + * 查询项目举牌验收 + * + * @param id 项目举牌验收主键 + * @return 项目举牌验收 + */ + public ProProjectChecked selectProProjectCheckedById(Long id); + + /** + * 查询项目举牌验收列表 + * + * @param proProjectChecked 项目举牌验收 + * @return 项目举牌验收集合 + */ + public List selectProProjectCheckedList(ProProjectChecked proProjectChecked); + + /** + * 新增项目举牌验收 + * + * @param proProjectChecked 项目举牌验收 + * @return 结果 + */ + public int insertProProjectChecked(ProProjectChecked proProjectChecked); + + /** + * 修改项目举牌验收 + * + * @param proProjectChecked 项目举牌验收 + * @return 结果 + */ + public int updateProProjectChecked(ProProjectChecked proProjectChecked); + + /** + * 删除项目举牌验收 + * + * @param id 项目举牌验收主键 + * @return 结果 + */ + public int deleteProProjectCheckedById(Long id); + + /** + * 批量删除项目举牌验收 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteProProjectCheckedByIds(Long[] ids); +} diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectApprovalMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectApprovalMapper.xml new file mode 100644 index 00000000..c281cecc --- /dev/null +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectApprovalMapper.xml @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + select id, from_type, from_id, approve_status, is_del, comment, create_by, create_time, update_by, update_time, remark from pro_project_approval + + + + + + + + insert into pro_project_approval + + from_type, + from_id, + approve_status, + is_del, + comment, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{fromType}, + #{fromId}, + #{approveStatus}, + #{isDel}, + #{comment}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update pro_project_approval + + from_type = #{fromType}, + from_id = #{fromId}, + approve_status = #{approveStatus}, + is_del = #{isDel}, + comment = #{comment}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete from pro_project_approval where id = #{id} + + + + delete from pro_project_approval where id in + + #{id} + + + \ No newline at end of file diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectCheckedMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectCheckedMapper.xml new file mode 100644 index 00000000..71072be9 --- /dev/null +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectCheckedMapper.xml @@ -0,0 +1,163 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, com_id, project_id, check_type, main_image, image_urls, working_position, working_position_type, checking_num, check_result, intro, technician_user, technician_user_name, supervise_user, supervise_user_name, group_dept_user, group_dept_user_name, checking_date, checking_files, is_del, approve_status, create_by, create_time, update_by, update_time, remark from pro_project_checked + + + + + + + + insert into pro_project_checked + + com_id, + project_id, + check_type, + main_image, + image_urls, + working_position, + working_position_type, + checking_num, + check_result, + intro, + technician_user, + technician_user_name, + supervise_user, + supervise_user_name, + group_dept_user, + group_dept_user_name, + checking_date, + checking_files, + is_del, + approve_status, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{comId}, + #{projectId}, + #{checkType}, + #{mainImage}, + #{imageUrls}, + #{workingPosition}, + #{workingPositionType}, + #{checkingNum}, + #{checkResult}, + #{intro}, + #{technicianUser}, + #{technicianUserName}, + #{superviseUser}, + #{superviseUserName}, + #{groupDeptUser}, + #{groupDeptUserName}, + #{checkingDate}, + #{checkingFiles}, + #{isDel}, + #{approveStatus}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update pro_project_checked + + com_id = #{comId}, + project_id = #{projectId}, + check_type = #{checkType}, + main_image = #{mainImage}, + image_urls = #{imageUrls}, + working_position = #{workingPosition}, + working_position_type = #{workingPositionType}, + checking_num = #{checkingNum}, + check_result = #{checkResult}, + intro = #{intro}, + technician_user = #{technicianUser}, + technician_user_name = #{technicianUserName}, + supervise_user = #{superviseUser}, + supervise_user_name = #{superviseUserName}, + group_dept_user = #{groupDeptUser}, + group_dept_user_name = #{groupDeptUserName}, + checking_date = #{checkingDate}, + checking_files = #{checkingFiles}, + is_del = #{isDel}, + approve_status = #{approveStatus}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete from pro_project_checked where id = #{id} + + + + delete from pro_project_checked where id in + + #{id} + + + \ No newline at end of file diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectApprovalController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectApprovalController.java new file mode 100644 index 00000000..de0cc8fd --- /dev/null +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectApprovalController.java @@ -0,0 +1,98 @@ +package com.yanzhu.manage.controller; + +import com.yanzhu.common.core.utils.poi.ExcelUtil; +import com.yanzhu.common.core.web.controller.BaseController; +import com.yanzhu.common.core.web.domain.AjaxResult; +import com.yanzhu.common.core.web.page.TableDataInfo; +import com.yanzhu.common.log.annotation.Log; +import com.yanzhu.common.log.enums.BusinessType; +import com.yanzhu.common.security.annotation.RequiresPermissions; +import com.yanzhu.manage.domain.ProProjectApproval; +import com.yanzhu.manage.service.IProProjectApprovalService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 项目审核信息Controller + * + * @author yanzhu + * @date 2025-07-12 + */ +@RestController +@RequestMapping("/projectApproval") +public class ProProjectApprovalController extends BaseController +{ + @Autowired + private IProProjectApprovalService proProjectApprovalService; + + /** + * 查询项目审核信息列表 + */ + @RequiresPermissions("manage:projectApproval:list") + @GetMapping("/list") + public TableDataInfo list(ProProjectApproval proProjectApproval) + { + startPage(); + List list = proProjectApprovalService.selectProProjectApprovalList(proProjectApproval); + return getDataTable(list); + } + + /** + * 导出项目审核信息列表 + */ + @RequiresPermissions("manage:projectApproval:export") + @Log(title = "项目审核信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ProProjectApproval proProjectApproval) + { + List list = proProjectApprovalService.selectProProjectApprovalList(proProjectApproval); + ExcelUtil util = new ExcelUtil(ProProjectApproval.class); + util.exportExcel(response, list, "项目审核信息数据"); + } + + /** + * 获取项目审核信息详细信息 + */ + @RequiresPermissions("manage:projectApproval:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(proProjectApprovalService.selectProProjectApprovalById(id)); + } + + /** + * 新增项目审核信息 + */ + @RequiresPermissions("manage:projectApproval:add") + @Log(title = "项目审核信息", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody ProProjectApproval proProjectApproval) + { + return toAjax(proProjectApprovalService.insertProProjectApproval(proProjectApproval)); + } + + /** + * 修改项目审核信息 + */ + @RequiresPermissions("manage:projectApproval:edit") + @Log(title = "项目审核信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody ProProjectApproval proProjectApproval) + { + return toAjax(proProjectApprovalService.updateProProjectApproval(proProjectApproval)); + } + + /** + * 删除项目审核信息 + */ + @RequiresPermissions("manage:projectApproval:remove") + @Log(title = "项目审核信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(proProjectApprovalService.deleteProProjectApprovalByIds(ids)); + } +} diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectCheckedController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectCheckedController.java new file mode 100644 index 00000000..a03847ef --- /dev/null +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectCheckedController.java @@ -0,0 +1,105 @@ +package com.yanzhu.manage.controller; + +import com.yanzhu.common.core.utils.poi.ExcelUtil; +import com.yanzhu.common.core.web.controller.BaseController; +import com.yanzhu.common.core.web.domain.AjaxResult; +import com.yanzhu.common.core.web.page.TableDataInfo; +import com.yanzhu.common.log.annotation.Log; +import com.yanzhu.common.log.enums.BusinessType; +import com.yanzhu.common.security.annotation.RequiresPermissions; +import com.yanzhu.common.security.utils.SecurityUtils; +import com.yanzhu.manage.domain.ProProjectChecked; +import com.yanzhu.manage.service.IProProjectCheckedService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 项目举牌验收Controller + * + * @author yanzhu + * @date 2025-07-12 + */ +@RestController +@RequestMapping("/projectChecked") +public class ProProjectCheckedController extends BaseController +{ + @Autowired + private IProProjectCheckedService proProjectCheckedService; + + /** + * 查询项目举牌验收列表 + */ + @RequiresPermissions("manage:projectChecked:list") + @GetMapping("/list") + public TableDataInfo list(ProProjectChecked proProjectChecked) + { + startPage(); + if(proProjectChecked.getProjectId()==null){ + proProjectChecked.setProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId()); + } + List list = proProjectCheckedService.selectProProjectCheckedList(proProjectChecked); + return getDataTable(list); + } + + /** + * 导出项目举牌验收列表 + */ + @RequiresPermissions("manage:projectChecked:export") + @Log(title = "项目举牌验收", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ProProjectChecked proProjectChecked) + { + if(proProjectChecked.getProjectId()==null){ + proProjectChecked.setProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId()); + } + List list = proProjectCheckedService.selectProProjectCheckedList(proProjectChecked); + ExcelUtil util = new ExcelUtil(ProProjectChecked.class); + util.exportExcel(response, list, "项目举牌验收数据"); + } + + /** + * 获取项目举牌验收详细信息 + */ + @RequiresPermissions("manage:projectChecked:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(proProjectCheckedService.selectProProjectCheckedById(id)); + } + + /** + * 新增项目举牌验收 + */ + @RequiresPermissions("manage:projectChecked:add") + @Log(title = "项目举牌验收", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody ProProjectChecked proProjectChecked) + { + return toAjax(proProjectCheckedService.insertProProjectChecked(proProjectChecked)); + } + + /** + * 修改项目举牌验收 + */ + @RequiresPermissions("manage:projectChecked:edit") + @Log(title = "项目举牌验收", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody ProProjectChecked proProjectChecked) + { + return toAjax(proProjectCheckedService.updateProProjectChecked(proProjectChecked)); + } + + /** + * 删除项目举牌验收 + */ + @RequiresPermissions("manage:projectChecked:remove") + @Log(title = "项目举牌验收", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(proProjectCheckedService.deleteProProjectCheckedByIds(ids)); + } +} diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectApprovalService.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectApprovalService.java new file mode 100644 index 00000000..bc468280 --- /dev/null +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectApprovalService.java @@ -0,0 +1,61 @@ +package com.yanzhu.manage.service; + +import java.util.List; +import com.yanzhu.manage.domain.ProProjectApproval; + +/** + * 项目审核信息Service接口 + * + * @author yanzhu + * @date 2025-07-12 + */ +public interface IProProjectApprovalService +{ + /** + * 查询项目审核信息 + * + * @param id 项目审核信息主键 + * @return 项目审核信息 + */ + public ProProjectApproval selectProProjectApprovalById(Long id); + + /** + * 查询项目审核信息列表 + * + * @param proProjectApproval 项目审核信息 + * @return 项目审核信息集合 + */ + public List selectProProjectApprovalList(ProProjectApproval proProjectApproval); + + /** + * 新增项目审核信息 + * + * @param proProjectApproval 项目审核信息 + * @return 结果 + */ + public int insertProProjectApproval(ProProjectApproval proProjectApproval); + + /** + * 修改项目审核信息 + * + * @param proProjectApproval 项目审核信息 + * @return 结果 + */ + public int updateProProjectApproval(ProProjectApproval proProjectApproval); + + /** + * 批量删除项目审核信息 + * + * @param ids 需要删除的项目审核信息主键集合 + * @return 结果 + */ + public int deleteProProjectApprovalByIds(Long[] ids); + + /** + * 删除项目审核信息信息 + * + * @param id 项目审核信息主键 + * @return 结果 + */ + public int deleteProProjectApprovalById(Long id); +} diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectCheckedService.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectCheckedService.java new file mode 100644 index 00000000..ad071c5c --- /dev/null +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectCheckedService.java @@ -0,0 +1,61 @@ +package com.yanzhu.manage.service; + +import java.util.List; +import com.yanzhu.manage.domain.ProProjectChecked; + +/** + * 项目举牌验收Service接口 + * + * @author yanzhu + * @date 2025-07-12 + */ +public interface IProProjectCheckedService +{ + /** + * 查询项目举牌验收 + * + * @param id 项目举牌验收主键 + * @return 项目举牌验收 + */ + public ProProjectChecked selectProProjectCheckedById(Long id); + + /** + * 查询项目举牌验收列表 + * + * @param proProjectChecked 项目举牌验收 + * @return 项目举牌验收集合 + */ + public List selectProProjectCheckedList(ProProjectChecked proProjectChecked); + + /** + * 新增项目举牌验收 + * + * @param proProjectChecked 项目举牌验收 + * @return 结果 + */ + public int insertProProjectChecked(ProProjectChecked proProjectChecked); + + /** + * 修改项目举牌验收 + * + * @param proProjectChecked 项目举牌验收 + * @return 结果 + */ + public int updateProProjectChecked(ProProjectChecked proProjectChecked); + + /** + * 批量删除项目举牌验收 + * + * @param ids 需要删除的项目举牌验收主键集合 + * @return 结果 + */ + public int deleteProProjectCheckedByIds(Long[] ids); + + /** + * 删除项目举牌验收信息 + * + * @param id 项目举牌验收主键 + * @return 结果 + */ + public int deleteProProjectCheckedById(Long id); +} diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectApprovalServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectApprovalServiceImpl.java new file mode 100644 index 00000000..42d9bce7 --- /dev/null +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectApprovalServiceImpl.java @@ -0,0 +1,100 @@ +package com.yanzhu.manage.service.impl; + +import com.yanzhu.common.core.context.SecurityContextHolder; +import com.yanzhu.common.core.utils.DateUtils; +import com.yanzhu.manage.domain.ProProjectApproval; +import com.yanzhu.manage.mapper.ProProjectApprovalMapper; +import com.yanzhu.manage.service.IProProjectApprovalService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 项目审核信息Service业务层处理 + * + * @author yanzhu + * @date 2025-07-12 + */ +@Service +public class ProProjectApprovalServiceImpl implements IProProjectApprovalService +{ + @Autowired + private ProProjectApprovalMapper proProjectApprovalMapper; + + /** + * 查询项目审核信息 + * + * @param id 项目审核信息主键 + * @return 项目审核信息 + */ + @Override + public ProProjectApproval selectProProjectApprovalById(Long id) + { + return proProjectApprovalMapper.selectProProjectApprovalById(id); + } + + /** + * 查询项目审核信息列表 + * + * @param proProjectApproval 项目审核信息 + * @return 项目审核信息 + */ + @Override + public List selectProProjectApprovalList(ProProjectApproval proProjectApproval) + { + return proProjectApprovalMapper.selectProProjectApprovalList(proProjectApproval); + } + + /** + * 新增项目审核信息 + * + * @param proProjectApproval 项目审核信息 + * @return 结果 + */ + @Override + public int insertProProjectApproval(ProProjectApproval proProjectApproval) + { + proProjectApproval.setCreateBy(SecurityContextHolder.getUserName()); + proProjectApproval.setCreateTime(DateUtils.getNowDate()); + return proProjectApprovalMapper.insertProProjectApproval(proProjectApproval); + } + + /** + * 修改项目审核信息 + * + * @param proProjectApproval 项目审核信息 + * @return 结果 + */ + @Override + public int updateProProjectApproval(ProProjectApproval proProjectApproval) + { + proProjectApproval.setUpdateBy(SecurityContextHolder.getUserName()); + proProjectApproval.setUpdateTime(DateUtils.getNowDate()); + return proProjectApprovalMapper.updateProProjectApproval(proProjectApproval); + } + + /** + * 批量删除项目审核信息 + * + * @param ids 需要删除的项目审核信息主键 + * @return 结果 + */ + @Override + public int deleteProProjectApprovalByIds(Long[] ids) + { + return proProjectApprovalMapper.deleteProProjectApprovalByIds(ids); + } + + /** + * 删除项目审核信息信息 + * + * @param id 项目审核信息主键 + * @return 结果 + */ + @Override + public int deleteProProjectApprovalById(Long id) + { + return proProjectApprovalMapper.deleteProProjectApprovalById(id); + } +} diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectCheckedServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectCheckedServiceImpl.java new file mode 100644 index 00000000..38653ffa --- /dev/null +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectCheckedServiceImpl.java @@ -0,0 +1,144 @@ +package com.yanzhu.manage.service.impl; + +import com.yanzhu.common.core.context.SecurityContextHolder; +import com.yanzhu.common.core.enums.ApprovalTypes; +import com.yanzhu.common.core.utils.DateUtils; +import com.yanzhu.common.core.utils.StringUtils; +import com.yanzhu.manage.domain.ProProjectApproval; +import com.yanzhu.manage.domain.ProProjectChecked; +import com.yanzhu.manage.mapper.ProProjectApprovalMapper; +import com.yanzhu.manage.mapper.ProProjectCheckedMapper; +import com.yanzhu.manage.service.IProProjectCheckedService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 项目举牌验收Service业务层处理 + * + * @author yanzhu + * @date 2025-07-12 + */ +@Service +public class ProProjectCheckedServiceImpl implements IProProjectCheckedService +{ + @Autowired + private ProProjectCheckedMapper proProjectCheckedMapper; + + @Autowired + private ProProjectApprovalMapper proProjectApprovalMapper; + + /** + * 查询项目举牌验收 + * + * @param id 项目举牌验收主键 + * @return 项目举牌验收 + */ + @Override + public ProProjectChecked selectProProjectCheckedById(Long id) + { + return proProjectCheckedMapper.selectProProjectCheckedById(id); + } + + /** + * 查询项目举牌验收列表 + * + * @param proProjectChecked 项目举牌验收 + * @return 项目举牌验收 + */ + @Override + public List selectProProjectCheckedList(ProProjectChecked proProjectChecked) + { + return proProjectCheckedMapper.selectProProjectCheckedList(proProjectChecked); + } + + /** + * 新增项目举牌验收 + * + * @param proProjectChecked 项目举牌验收 + * @return 结果 + */ + @Override + public int insertProProjectChecked(ProProjectChecked proProjectChecked) + { + //默认第一张图是主图 + proProjectChecked.setMainImage(proProjectChecked.getImageUrls().split(",")[0]); + proProjectChecked.setCreateBy(SecurityContextHolder.getUserName()); + proProjectChecked.setCreateTime(DateUtils.getNowDate()); + int rows = proProjectCheckedMapper.insertProProjectChecked(proProjectChecked); + + //操作日志 + if(StringUtils.isNotBlank(proProjectChecked.getApproveStatus()) && rows>0){ + ProProjectApproval proProjectApproval = new ProProjectApproval(); + proProjectApproval.setFromType(ApprovalTypes.Approval_TYPE_JPYS.getCode()); + proProjectApproval.setFromId(proProjectChecked.getId()); + proProjectApproval.setApproveStatus(proProjectChecked.getApproveStatus()); + if(StringUtils.isNotBlank(proProjectChecked.getComment())){ + proProjectApproval.setComment(proProjectChecked.getComment()); + }else{ + proProjectApproval.setComment("提交项目举牌验收申请"); + } + proProjectApproval.setCreateBy(proProjectChecked.getCreateBy()); + proProjectApproval.setCreateTime(proProjectChecked.getCreateTime()); + proProjectApprovalMapper.insertProProjectApproval(proProjectApproval); + } + return rows; + } + + /** + * 修改项目举牌验收 + * + * @param proProjectChecked 项目举牌验收 + * @return 结果 + */ + @Override + public int updateProProjectChecked(ProProjectChecked proProjectChecked) + { + proProjectChecked.setMainImage(proProjectChecked.getImageUrls().split(",")[0]); + proProjectChecked.setUpdateBy(SecurityContextHolder.getUserName()); + proProjectChecked.setUpdateTime(DateUtils.getNowDate()); + int rows = proProjectCheckedMapper.updateProProjectChecked(proProjectChecked); + + //操作日志 + if(StringUtils.isNotBlank(proProjectChecked.getApproveStatus()) && rows>0){ + ProProjectApproval proProjectApproval = new ProProjectApproval(); + proProjectApproval.setFromType(ApprovalTypes.Approval_TYPE_JPYS.getCode()); + proProjectApproval.setFromId(proProjectChecked.getId()); + proProjectApproval.setApproveStatus(proProjectChecked.getApproveStatus()); + if(StringUtils.isNotBlank(proProjectChecked.getComment())){ + proProjectApproval.setComment(proProjectChecked.getComment()); + }else{ + proProjectApproval.setComment("提交项目举牌验收申请"); + } + proProjectApproval.setCreateBy(proProjectChecked.getUpdateBy()); + proProjectApproval.setCreateTime(proProjectChecked.getUpdateTime()); + proProjectApprovalMapper.insertProProjectApproval(proProjectApproval); + } + return rows; + } + + /** + * 批量删除项目举牌验收 + * + * @param ids 需要删除的项目举牌验收主键 + * @return 结果 + */ + @Override + public int deleteProProjectCheckedByIds(Long[] ids) + { + return proProjectCheckedMapper.deleteProProjectCheckedByIds(ids); + } + + /** + * 删除项目举牌验收信息 + * + * @param id 项目举牌验收主键 + * @return 结果 + */ + @Override + public int deleteProProjectCheckedById(Long id) + { + return proProjectCheckedMapper.deleteProProjectCheckedById(id); + } +}