diff --git a/ruoyi-ui/src/api/project/projectStandard.js b/ruoyi-ui/src/api/project/projectStandard.js new file mode 100644 index 00000000..8dba457b --- /dev/null +++ b/ruoyi-ui/src/api/project/projectStandard.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询标准化管理列表 +export function listProjectStandard(query) { + return request({ + url: '/project/projectStandard/list', + method: 'get', + params: query + }) +} + +// 查询标准化管理详细 +export function getProjectStandard(id) { + return request({ + url: '/project/projectStandard/' + id, + method: 'get' + }) +} + +// 新增标准化管理 +export function addProjectStandard(data) { + return request({ + url: '/project/projectStandard', + method: 'post', + data: data + }) +} + +// 修改标准化管理 +export function updateProjectStandard(data) { + return request({ + url: '/project/projectStandard', + method: 'put', + data: data + }) +} + +// 删除标准化管理 +export function delProjectStandard(id) { + return request({ + url: '/project/projectStandard/' + id, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/views/project/projectStandard/index.vue b/ruoyi-ui/src/views/project/projectStandard/index.vue new file mode 100644 index 00000000..41b1257f --- /dev/null +++ b/ruoyi-ui/src/views/project/projectStandard/index.vue @@ -0,0 +1,314 @@ + + + diff --git a/ruoyi-ui/src/views/project/projectStandard/projectStandardDlg.vue b/ruoyi-ui/src/views/project/projectStandard/projectStandardDlg.vue new file mode 100644 index 00000000..4ff49e60 --- /dev/null +++ b/ruoyi-ui/src/views/project/projectStandard/projectStandardDlg.vue @@ -0,0 +1,136 @@ + + + + + \ No newline at end of file diff --git a/ruoyi-ui/src/views/project/projectStandard/projectStandardDrawer.vue b/ruoyi-ui/src/views/project/projectStandard/projectStandardDrawer.vue new file mode 100644 index 00000000..b716ac42 --- /dev/null +++ b/ruoyi-ui/src/views/project/projectStandard/projectStandardDrawer.vue @@ -0,0 +1,239 @@ + + + + + \ No newline at end of file diff --git a/ruoyi-ui/src/views/project/surProject/index.vue b/ruoyi-ui/src/views/project/surProject/index.vue index 385bbca8..8137fb54 100644 --- a/ruoyi-ui/src/views/project/surProject/index.vue +++ b/ruoyi-ui/src/views/project/surProject/index.vue @@ -376,6 +376,7 @@ 'video:videoConfig:list', 'project:checkDetection:list', 'project:costOutput:edit', + 'project:projectStandard:edit', 'project:surProject:remove', ]" > @@ -467,6 +468,12 @@ v-hasPermi="['project:costOutput:edit']" >项目成本产值管理 + 标准化管理 + @@ -779,6 +787,7 @@ import projectMeasureDrawer from "../projectMeasure/projectMeasureDrawer.vue"; import videoConfigDrawer from "@/views/video/videoConfig/videoConfigDrawer"; import costOutputDrawer from "@/views/project/costOutput/costOutputDrawer.vue"; import checkDetectionDrawer from "../checkDetection/checkDetectionDrawer.vue"; +import standardDrawer from '@/views/project/projectStandard/projectStandardDrawer.vue' import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数 export default { @@ -801,6 +810,7 @@ export default { videoConfigDrawer, costOutputDrawer, checkDetectionDrawer, + standardDrawer }, dicts: [ "sys_check_state", @@ -1054,6 +1064,9 @@ export default { case "handleCheckDetection": this.$refs.checkDetection.show(row); break; + case "handleStandard": + this.$refs.standard.show(row); + break; default: break; } diff --git a/ruoyi-ui/src/views/project/surProject/myIndex.vue b/ruoyi-ui/src/views/project/surProject/myIndex.vue index 34446dc6..11e94f5d 100644 --- a/ruoyi-ui/src/views/project/surProject/myIndex.vue +++ b/ruoyi-ui/src/views/project/surProject/myIndex.vue @@ -150,6 +150,8 @@ icon="el-icon-s-check">今日出勤 项目成本产值管理 + 标准化管理 @@ -159,6 +161,7 @@ + @@ -171,6 +174,7 @@ import AssessDrawer from "../surProjectQuarterlyAssess/assessDrawer.vue"; import buildNodeDrawer from "../surBuildNode/buildNodeDrawer.vue"; import attendanceDrawer from "../surProjectAttendance/attendanceDrawer.vue"; import costOutputDrawer from '@/views/project/costOutput/costOutputDrawer.vue' +import standardDrawer from '@/views/project/projectStandard/projectStandardDrawer.vue' export default { dicts: [ @@ -189,7 +193,8 @@ export default { buildNodeDrawer, attendanceDrawer, projectUserInfoDrawer, - costOutputDrawer + costOutputDrawer, + standardDrawer }, data() { return { @@ -228,6 +233,9 @@ export default { } }); }, + doPrjStandard(){ + this.$refs.standard.show(this.prj); + }, doPrjCostOutput(){ this.$refs.costOutput.show(this.prj); }, @@ -312,8 +320,13 @@ export default { box-shadow: 5px 5px 7px 4px rgba(0, 0, 0, 0.3); margin-top: 24px; overflow: auto; - padding: 12px; + padding: 12px 12px 0px ; line-height: 32px; + .el-button{ + margin-bottom: 12px; + margin-left: 0px; + margin-right: 12px; + } } } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectStandardController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectStandardController.java new file mode 100644 index 00000000..df076e6e --- /dev/null +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectStandardController.java @@ -0,0 +1,104 @@ +package com.yanzhu.jh.project.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.yanzhu.jh.project.domain.SurProjectStandard; +import com.yanzhu.jh.project.service.ISurProjectStandardService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 标准化管理Controller + * + * @author ruoyi + * @date 2023-09-19 + */ +@RestController +@RequestMapping("/project/projectStandard") +public class SurProjectStandardController extends BaseController +{ + @Autowired + private ISurProjectStandardService surProjectStandardService; + + /** + * 查询标准化管理列表 + */ + @PreAuthorize("@ss.hasPermi('project:projectStandard:list')") + @GetMapping("/list") + public TableDataInfo list(SurProjectStandard surProjectStandard) + { + startPage(); + List list = surProjectStandardService.selectSurProjectStandardList(surProjectStandard); + return getDataTable(list); + } + + /** + * 导出标准化管理列表 + */ + @PreAuthorize("@ss.hasPermi('project:projectStandard:export')") + @Log(title = "标准化管理", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, SurProjectStandard surProjectStandard) + { + List list = surProjectStandardService.selectSurProjectStandardList(surProjectStandard); + ExcelUtil util = new ExcelUtil(SurProjectStandard.class); + util.exportExcel(response, list, "标准化管理数据"); + } + + /** + * 获取标准化管理详细信息 + */ + @PreAuthorize("@ss.hasPermi('project:projectStandard:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(surProjectStandardService.selectSurProjectStandardById(id)); + } + + /** + * 新增标准化管理 + */ + @PreAuthorize("@ss.hasPermi('project:projectStandard:add')") + @Log(title = "标准化管理", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody SurProjectStandard surProjectStandard) + { + return toAjax(surProjectStandardService.insertSurProjectStandards(surProjectStandard)); + } + + /** + * 修改标准化管理 + */ + @PreAuthorize("@ss.hasPermi('project:projectStandard:edit')") + @Log(title = "标准化管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SurProjectStandard surProjectStandard) + { + return toAjax(surProjectStandardService.updateSurProjectStandard(surProjectStandard)); + } + + /** + * 删除标准化管理 + */ + @PreAuthorize("@ss.hasPermi('project:projectStandard:remove')") + @Log(title = "标准化管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(surProjectStandardService.deleteSurProjectStandardByIds(ids)); + } +} diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectStandard.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectStandard.java new file mode 100644 index 00000000..ce6793e6 --- /dev/null +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectStandard.java @@ -0,0 +1,139 @@ +package com.yanzhu.jh.project.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 标准化管理对象 sur_project_standard + * + * @author ruoyi + * @date 2023-09-19 + */ +public class SurProjectStandard extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** */ + private Long id; + + /** 项目ID */ + @Excel(name = "项目ID") + private Long projectId; + + /** 总包单位 */ + @Excel(name = "总包单位") + private Long deptId; + + /** 图片路径 */ + @Excel(name = "图片路径") + private String imageFile; + + /** 图片描述 */ + @Excel(name = "图片描述") + private String standardDesc; + + /** 排序 */ + @Excel(name = "排序") + private Long ord; + + /** 类型1、现场管理标准化2、作业标准化3、安全技术标准化4、设备管理标准化5、文明施工标准化6、环境保护标准化 */ + @Excel(name = "类型1、现场管理标准化2、作业标准化3、安全技术标准化4、设备管理标准化5、文明施工标准化6、环境保护标准化") + private String standardType; + + /** */ + @Excel(name = "") + private Long isDel; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setProjectId(Long projectId) + { + this.projectId = projectId; + } + + public Long getProjectId() + { + return projectId; + } + public void setDeptId(Long deptId) + { + this.deptId = deptId; + } + + public Long getDeptId() + { + return deptId; + } + public void setImageFile(String imageFile) + { + this.imageFile = imageFile; + } + + public String getImageFile() + { + return imageFile; + } + public void setStandardDesc(String standardDesc) + { + this.standardDesc = standardDesc; + } + + public String getStandardDesc() + { + return standardDesc; + } + public void setOrd(Long ord) + { + this.ord = ord; + } + + public Long getOrd() + { + return ord; + } + public void setStandardType(String standardType) + { + this.standardType = standardType; + } + + public String getStandardType() + { + return standardType; + } + public void setIsDel(Long isDel) + { + this.isDel = isDel; + } + + public Long getIsDel() + { + return isDel; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("projectId", getProjectId()) + .append("deptId", getDeptId()) + .append("imageFile", getImageFile()) + .append("standardDesc", getStandardDesc()) + .append("ord", getOrd()) + .append("standardType", getStandardType()) + .append("isDel", getIsDel()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectStandardMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectStandardMapper.java new file mode 100644 index 00000000..9d781eb7 --- /dev/null +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectStandardMapper.java @@ -0,0 +1,61 @@ +package com.yanzhu.jh.project.mapper; + +import java.util.List; +import com.yanzhu.jh.project.domain.SurProjectStandard; + +/** + * 标准化管理Mapper接口 + * + * @author ruoyi + * @date 2023-09-19 + */ +public interface SurProjectStandardMapper +{ + /** + * 查询标准化管理 + * + * @param id 标准化管理主键 + * @return 标准化管理 + */ + public SurProjectStandard selectSurProjectStandardById(Long id); + + /** + * 查询标准化管理列表 + * + * @param surProjectStandard 标准化管理 + * @return 标准化管理集合 + */ + public List selectSurProjectStandardList(SurProjectStandard surProjectStandard); + + /** + * 新增标准化管理 + * + * @param surProjectStandard 标准化管理 + * @return 结果 + */ + public int insertSurProjectStandard(SurProjectStandard surProjectStandard); + + /** + * 修改标准化管理 + * + * @param surProjectStandard 标准化管理 + * @return 结果 + */ + public int updateSurProjectStandard(SurProjectStandard surProjectStandard); + + /** + * 删除标准化管理 + * + * @param id 标准化管理主键 + * @return 结果 + */ + public int deleteSurProjectStandardById(Long id); + + /** + * 批量删除标准化管理 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteSurProjectStandardByIds(Long[] ids); +} diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectStandardService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectStandardService.java new file mode 100644 index 00000000..0aac8da8 --- /dev/null +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectStandardService.java @@ -0,0 +1,63 @@ +package com.yanzhu.jh.project.service; + +import java.util.List; +import com.yanzhu.jh.project.domain.SurProjectStandard; + +/** + * 标准化管理Service接口 + * + * @author ruoyi + * @date 2023-09-19 + */ +public interface ISurProjectStandardService +{ + /** + * 查询标准化管理 + * + * @param id 标准化管理主键 + * @return 标准化管理 + */ + public SurProjectStandard selectSurProjectStandardById(Long id); + + /** + * 查询标准化管理列表 + * + * @param surProjectStandard 标准化管理 + * @return 标准化管理集合 + */ + public List selectSurProjectStandardList(SurProjectStandard surProjectStandard); + + /** + * 新增标准化管理 + * + * @param surProjectStandard 标准化管理 + * @return 结果 + */ + public int insertSurProjectStandard(SurProjectStandard surProjectStandard); + + /** + * 修改标准化管理 + * + * @param surProjectStandard 标准化管理 + * @return 结果 + */ + public int updateSurProjectStandard(SurProjectStandard surProjectStandard); + + /** + * 批量删除标准化管理 + * + * @param ids 需要删除的标准化管理主键集合 + * @return 结果 + */ + public int deleteSurProjectStandardByIds(Long[] ids); + + /** + * 删除标准化管理信息 + * + * @param id 标准化管理主键 + * @return 结果 + */ + public int deleteSurProjectStandardById(Long id); + + public int insertSurProjectStandards(SurProjectStandard surProjectStandard); +} diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectStandardServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectStandardServiceImpl.java new file mode 100644 index 00000000..1d406842 --- /dev/null +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectStandardServiceImpl.java @@ -0,0 +1,114 @@ +package com.yanzhu.jh.project.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.apache.logging.log4j.util.Strings; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.yanzhu.jh.project.mapper.SurProjectStandardMapper; +import com.yanzhu.jh.project.domain.SurProjectStandard; +import com.yanzhu.jh.project.service.ISurProjectStandardService; +import com.ruoyi.common.utils.SecurityUtils; +/** + * 标准化管理Service业务层处理 + * + * @author ruoyi + * @date 2023-09-19 + */ +@Service +public class SurProjectStandardServiceImpl implements ISurProjectStandardService +{ + @Autowired + private SurProjectStandardMapper surProjectStandardMapper; + + /** + * 查询标准化管理 + * + * @param id 标准化管理主键 + * @return 标准化管理 + */ + @Override + public SurProjectStandard selectSurProjectStandardById(Long id) + { + return surProjectStandardMapper.selectSurProjectStandardById(id); + } + + /** + * 查询标准化管理列表 + * + * @param surProjectStandard 标准化管理 + * @return 标准化管理 + */ + @Override + public List selectSurProjectStandardList(SurProjectStandard surProjectStandard) + { + return surProjectStandardMapper.selectSurProjectStandardList(surProjectStandard); + } + + /** + * 新增标准化管理 + * + * @param surProjectStandard 标准化管理 + * @return 结果 + */ + @Override + public int insertSurProjectStandard(SurProjectStandard surProjectStandard) + { + surProjectStandard.setCreateBy(SecurityUtils.getUsername()); + surProjectStandard.setCreateTime(DateUtils.getNowDate()); + return surProjectStandardMapper.insertSurProjectStandard(surProjectStandard); + } + + /** + * 修改标准化管理 + * + * @param surProjectStandard 标准化管理 + * @return 结果 + */ + @Override + public int updateSurProjectStandard(SurProjectStandard surProjectStandard) + { + surProjectStandard.setUpdateBy(SecurityUtils.getUsername()); + surProjectStandard.setUpdateTime(DateUtils.getNowDate()); + return surProjectStandardMapper.updateSurProjectStandard(surProjectStandard); + } + + /** + * 批量删除标准化管理 + * + * @param ids 需要删除的标准化管理主键 + * @return 结果 + */ + @Override + public int deleteSurProjectStandardByIds(Long[] ids) + { + return surProjectStandardMapper.deleteSurProjectStandardByIds(ids); + } + + /** + * 删除标准化管理信息 + * + * @param id 标准化管理主键 + * @return 结果 + */ + @Override + public int deleteSurProjectStandardById(Long id) + { + return surProjectStandardMapper.deleteSurProjectStandardById(id); + } + + @Override + public int insertSurProjectStandards(SurProjectStandard surProjectStandard) { + String imgFile=surProjectStandard.getImageFile(); + surProjectStandard.setOrd(1l); + String[] images=imgFile.split(","); + int n=0; + for(String img :images){ + if(Strings.isNotEmpty(img)){ + surProjectStandard.setImageFile(img); + n+=insertSurProjectStandard(surProjectStandard); + } + } + return n; + } +} diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectStandardMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectStandardMapper.xml new file mode 100644 index 00000000..65adbd41 --- /dev/null +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectStandardMapper.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + select id, project_id, dept_id, image_file, standard_desc, ord, standard_type, is_del, create_by, create_time, update_by, update_time from sur_project_standard + + + + + + + + insert into sur_project_standard + + project_id, + dept_id, + image_file, + standard_desc, + ord, + standard_type, + is_del, + create_by, + create_time, + update_by, + update_time, + + + #{projectId}, + #{deptId}, + #{imageFile}, + #{standardDesc}, + #{ord}, + #{standardType}, + #{isDel}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update sur_project_standard + + project_id = #{projectId}, + dept_id = #{deptId}, + image_file = #{imageFile}, + standard_desc = #{standardDesc}, + ord = #{ord}, + standard_type = #{standardType}, + is_del = #{isDel}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from sur_project_standard where id = #{id} + + + + delete from sur_project_standard where id in + + #{id} + + + \ No newline at end of file