From 2896fc4e41fadbd1436061dc45355755211ce55b 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 Aug 2023 23:58:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/api/project/projectDeptWroks.js | 60 ++ .../views/project/projectDeptWroks/index.vue | 289 ++++++ .../projectDeptWroksDrawer.vue | 115 +++ .../src/views/project/surProject/index.vue | 975 ++++++++++++------ .../src/views/project/surProject/myIndex.vue | 2 +- .../surProjectAttendance/attendanceDrawer.vue | 154 +-- .../views/trouble/pshProblemmodify/index.vue | 376 ++++--- .../views/trouble/sspProblemmodify/index.vue | 380 ++++--- .../SurProjectDeptWroksController.java | 150 +++ .../yanzhu/jh/project/domain/SurProject.java | 4 +- .../project/domain/SurProjectDeptWroks.java | 124 +++ .../mapper/SurProjectDeptWroksMapper.java | 77 ++ .../service/ISurProjectDeptWroksService.java | 69 ++ .../impl/SurProjectDeptWroksServiceImpl.java | 118 +++ .../project/SurProjectDeptWroksMapper.xml | 152 +++ .../trouble/SmzSspProblemmodifyMapper.xml | 2 +- 16 files changed, 2373 insertions(+), 674 deletions(-) create mode 100644 ruoyi-ui/src/api/project/projectDeptWroks.js create mode 100644 ruoyi-ui/src/views/project/projectDeptWroks/index.vue create mode 100644 ruoyi-ui/src/views/project/projectDeptWroks/projectDeptWroksDrawer.vue create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectDeptWroksController.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectDeptWroks.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectDeptWroksMapper.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectDeptWroksService.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectDeptWroksServiceImpl.java create mode 100644 yanzhu-jh/src/main/resources/mapper/project/SurProjectDeptWroksMapper.xml diff --git a/ruoyi-ui/src/api/project/projectDeptWroks.js b/ruoyi-ui/src/api/project/projectDeptWroks.js new file mode 100644 index 00000000..39619830 --- /dev/null +++ b/ruoyi-ui/src/api/project/projectDeptWroks.js @@ -0,0 +1,60 @@ +import request from '@/utils/request' + +// 查询项目部门在册人员列表 +export function listProjectDeptWroks(query) { + return request({ + url: '/project/projectDeptWroks/list', + method: 'get', + params: query + }) +} + +export function listProjectDeptWroks2(query) { + return request({ + url: '/project/projectDeptWroks/list2', + method: 'get', + params: query + }) +} + +export function unitList(query) { + return request({ + url: '/project/projectDeptWroks/unitList', + method: 'get', + params: query + }) +} + +// 查询项目部门在册人员详细 +export function getProjectDeptWroks(id) { + return request({ + url: '/project/projectDeptWroks/' + id, + method: 'get' + }) +} + +// 新增项目部门在册人员 +export function addProjectDeptWroks(data) { + return request({ + url: '/project/projectDeptWroks', + method: 'post', + data: data + }) +} + +// 修改项目部门在册人员 +export function updateProjectDeptWroks(data) { + return request({ + url: '/project/projectDeptWroks', + method: 'put', + data: data + }) +} + +// 删除项目部门在册人员 +export function delProjectDeptWroks(id) { + return request({ + url: '/project/projectDeptWroks/' + id, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/views/project/projectDeptWroks/index.vue b/ruoyi-ui/src/views/project/projectDeptWroks/index.vue new file mode 100644 index 00000000..cef7c0e7 --- /dev/null +++ b/ruoyi-ui/src/views/project/projectDeptWroks/index.vue @@ -0,0 +1,289 @@ + + + diff --git a/ruoyi-ui/src/views/project/projectDeptWroks/projectDeptWroksDrawer.vue b/ruoyi-ui/src/views/project/projectDeptWroks/projectDeptWroksDrawer.vue new file mode 100644 index 00000000..b8bdbe22 --- /dev/null +++ b/ruoyi-ui/src/views/project/projectDeptWroks/projectDeptWroksDrawer.vue @@ -0,0 +1,115 @@ + + + + diff --git a/ruoyi-ui/src/views/project/surProject/index.vue b/ruoyi-ui/src/views/project/surProject/index.vue index 1f4035fa..044ecf90 100644 --- a/ruoyi-ui/src/views/project/surProject/index.vue +++ b/ruoyi-ui/src/views/project/surProject/index.vue @@ -1,12 +1,17 @@ diff --git a/ruoyi-ui/src/views/project/surProject/myIndex.vue b/ruoyi-ui/src/views/project/surProject/myIndex.vue index 8d3ff0da..64827904 100644 --- a/ruoyi-ui/src/views/project/surProject/myIndex.vue +++ b/ruoyi-ui/src/views/project/surProject/myIndex.vue @@ -60,7 +60,7 @@ {{ prj.floorArea?prj.floorArea+'平方米':'' }} - 总产值: + 开累产值: {{ prj.totalOutputValue?prj.totalOutputValue+'万元':'' }} diff --git a/ruoyi-ui/src/views/project/surProjectAttendance/attendanceDrawer.vue b/ruoyi-ui/src/views/project/surProjectAttendance/attendanceDrawer.vue index bff558ef..40fdbf7a 100644 --- a/ruoyi-ui/src/views/project/surProjectAttendance/attendanceDrawer.vue +++ b/ruoyi-ui/src/views/project/surProjectAttendance/attendanceDrawer.vue @@ -1,82 +1,108 @@ - \ No newline at end of file + diff --git a/ruoyi-ui/src/views/trouble/pshProblemmodify/index.vue b/ruoyi-ui/src/views/trouble/pshProblemmodify/index.vue index 3feca11d..d8c0a863 100644 --- a/ruoyi-ui/src/views/trouble/pshProblemmodify/index.vue +++ b/ruoyi-ui/src/views/trouble/pshProblemmodify/index.vue @@ -1,6 +1,13 @@ diff --git a/ruoyi-ui/src/views/trouble/sspProblemmodify/index.vue b/ruoyi-ui/src/views/trouble/sspProblemmodify/index.vue index dc28b612..05aae9eb 100644 --- a/ruoyi-ui/src/views/trouble/sspProblemmodify/index.vue +++ b/ruoyi-ui/src/views/trouble/sspProblemmodify/index.vue @@ -1,6 +1,13 @@ diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectDeptWroksController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectDeptWroksController.java new file mode 100644 index 00000000..ff701a86 --- /dev/null +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectDeptWroksController.java @@ -0,0 +1,150 @@ +package com.yanzhu.jh.project.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.SysRoleEnum; +import com.ruoyi.system.service.ISysDeptService; +import com.yanzhu.jh.project.domain.SurProjectUnitInfo; +import com.yanzhu.jh.project.service.ISurProjectUnitInfoService; +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.SurProjectDeptWroks; +import com.yanzhu.jh.project.service.ISurProjectDeptWroksService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 项目部门在册人员Controller + * + * @author JiangYuQi + * @date 2023-08-15 + */ +@RestController +@RequestMapping("/project/projectDeptWroks") +public class SurProjectDeptWroksController extends BaseController +{ + @Autowired + private ISurProjectDeptWroksService surProjectDeptWroksService; + + @Autowired + private ISurProjectUnitInfoService surProjectUnitInfoService; + + @Autowired + private ISysDeptService sysDeptService; + + /** + * 查询项目部门在册人员列表 + */ + @PreAuthorize("@ss.hasPermi('project:projectDeptWroks:list')") + @GetMapping("/list") + public TableDataInfo list(SurProjectDeptWroks surProjectDeptWroks) + { + surProjectDeptWroks.setNowRole(Convert.toStr(getUserFirstRole())); + if(SysRoleEnum.ZGS.getCode().equals(surProjectDeptWroks.getNowRole())){ + surProjectDeptWroks.setNowDept(Convert.toStr(sysDeptService.getZGSDeptId(getDeptId()))); + }else{ + surProjectDeptWroks.setNowDept(Convert.toStr(getDeptId())); + } + surProjectDeptWroks.setNowUser(Convert.toStr(getUserId())); + List list = surProjectDeptWroksService.selectSurProjectDeptWroksList(surProjectDeptWroks); + return getDataTable(list); + } + + /** + * 查询项目部门在册人员列表 + */ + @PreAuthorize("@ss.hasPermi('project:projectDeptWroks:list')") + @GetMapping("/list2") + public TableDataInfo list2(SurProjectDeptWroks surProjectDeptWroks) + { + surProjectDeptWroks.setNowRole(Convert.toStr(getUserFirstRole())); + if(SysRoleEnum.ZGS.getCode().equals(surProjectDeptWroks.getNowRole())){ + surProjectDeptWroks.setNowDept(Convert.toStr(sysDeptService.getZGSDeptId(getDeptId()))); + }else{ + surProjectDeptWroks.setNowDept(Convert.toStr(getDeptId())); + } + surProjectDeptWroks.setNowUser(Convert.toStr(getUserId())); + List list = surProjectDeptWroksService.selectSurProjectDeptWroksListv2(surProjectDeptWroks); + return getDataTable(list); + } + + /** + * 查询项目部门在册人员列表 + */ + @PreAuthorize("@ss.hasPermi('project:projectDeptWroks:list')") + @GetMapping("/unitList") + public TableDataInfo unitList(SurProjectUnitInfo surProjectUnitInfo) + { + return getDataTable(surProjectUnitInfoService.selectSurProjectUnitInfoList(surProjectUnitInfo)); + } + + /** + * 导出项目部门在册人员列表 + */ + @PreAuthorize("@ss.hasPermi('project:projectDeptWroks:export')") + @Log(title = "项目部门在册人员", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, SurProjectDeptWroks surProjectDeptWroks) + { + List list = surProjectDeptWroksService.selectSurProjectDeptWroksList(surProjectDeptWroks); + ExcelUtil util = new ExcelUtil(SurProjectDeptWroks.class); + util.exportExcel(response, list, "项目部门在册人员数据"); + } + + /** + * 获取项目部门在册人员详细信息 + */ + @PreAuthorize("@ss.hasPermi('project:projectDeptWroks:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(surProjectDeptWroksService.selectSurProjectDeptWroksById(id)); + } + + /** + * 新增项目部门在册人员 + */ + @PreAuthorize("@ss.hasPermi('project:projectDeptWroks:add')") + @Log(title = "项目部门在册人员", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody SurProjectDeptWroks surProjectDeptWroks) + { + return toAjax(surProjectDeptWroksService.insertSurProjectDeptWroks(surProjectDeptWroks)); + } + + /** + * 修改项目部门在册人员 + */ + @PreAuthorize("@ss.hasPermi('project:projectDeptWroks:edit')") + @Log(title = "项目部门在册人员", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SurProjectDeptWroks surProjectDeptWroks) + { + return toAjax(surProjectDeptWroksService.updateSurProjectDeptWroks(surProjectDeptWroks)); + } + + /** + * 删除项目部门在册人员 + */ + @PreAuthorize("@ss.hasPermi('project:projectDeptWroks:remove')") + @Log(title = "项目部门在册人员", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(surProjectDeptWroksService.deleteSurProjectDeptWroksByIds(ids)); + } +} diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProject.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProject.java index d3a8d5f3..cac4e2bf 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProject.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProject.java @@ -101,8 +101,8 @@ public class SurProject extends BaseEntity @Excel(name = "建筑面积") private String floorArea; - /** 总产值 */ - @Excel(name = "总产值") + /** 开累产值 */ + @Excel(name = "开累产值") private String totalOutputValue; /** 计划完成时间 */ diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectDeptWroks.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectDeptWroks.java new file mode 100644 index 00000000..b32422ab --- /dev/null +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectDeptWroks.java @@ -0,0 +1,124 @@ +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_dept_wroks + * + * @author JiangYuQi + * @date 2023-08-15 + */ +public class SurProjectDeptWroks extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long id; + + /** 项目主键 */ + @Excel(name = "项目主键") + private Long projectId; + + /** 部门主键 */ + @Excel(name = "部门主键") + private Long deptId; + + /** 部门名称 */ + @Excel(name = "部门名称") + private String deptName; + + /** 劳务人员 */ + @Excel(name = "劳务人员") + private Long servicePersonnel; + + /** 管理人员 */ + @Excel(name = "管理人员") + private Long supervisorPersonnel; + + /** 总包人员 */ + @Excel(name = "总包人员") + private Long contractorPersonnel; + + 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 setServicePersonnel(Long servicePersonnel) + { + this.servicePersonnel = servicePersonnel; + } + + public Long getServicePersonnel() + { + return servicePersonnel; + } + public void setSupervisorPersonnel(Long supervisorPersonnel) + { + this.supervisorPersonnel = supervisorPersonnel; + } + + public Long getSupervisorPersonnel() + { + return supervisorPersonnel; + } + public void setContractorPersonnel(Long contractorPersonnel) + { + this.contractorPersonnel = contractorPersonnel; + } + + public Long getContractorPersonnel() + { + return contractorPersonnel; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("projectId", getProjectId()) + .append("deptId", getDeptId()) + .append("servicePersonnel", getServicePersonnel()) + .append("supervisorPersonnel", getSupervisorPersonnel()) + .append("contractorPersonnel", getContractorPersonnel()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectDeptWroksMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectDeptWroksMapper.java new file mode 100644 index 00000000..f4e34d01 --- /dev/null +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectDeptWroksMapper.java @@ -0,0 +1,77 @@ +package com.yanzhu.jh.project.mapper; + +import java.util.List; +import com.yanzhu.jh.project.domain.SurProjectDeptWroks; + +/** + * 项目部门在册人员Mapper接口 + * + * @author JiangYuQi + * @date 2023-08-15 + */ +public interface SurProjectDeptWroksMapper +{ + /** + * 查询项目部门在册人员 + * + * @param id 项目部门在册人员主键 + * @return 项目部门在册人员 + */ + public SurProjectDeptWroks selectSurProjectDeptWroksById(Long id); + + /** + * 查询项目部门在册人员列表 + * + * @param surProjectDeptWroks 项目部门在册人员 + * @return 项目部门在册人员集合 + */ + public List selectSurProjectDeptWroksList(SurProjectDeptWroks surProjectDeptWroks); + + /** + * 查询项目部门在册人员列表 + * + * @param surProjectDeptWroks 项目部门在册人员 + * @return 项目部门在册人员集合 + */ + public List selectSurProjectDeptWroksListv2(SurProjectDeptWroks surProjectDeptWroks); + + /** + * 新增项目部门在册人员 + * + * @param surProjectDeptWroks 项目部门在册人员 + * @return 结果 + */ + public int insertSurProjectDeptWroks(SurProjectDeptWroks surProjectDeptWroks); + + /** + * 修改项目部门在册人员 + * + * @param surProjectDeptWroks 项目部门在册人员 + * @return 结果 + */ + public int updateSurProjectDeptWroks(SurProjectDeptWroks surProjectDeptWroks); + + /** + * 修改项目部门在册人员 + * + * @param surProjectDeptWroks 项目部门在册人员 + * @return 结果 + */ + public int updateProjectDeptWorksById(SurProjectDeptWroks surProjectDeptWroks); + + /** + * 删除项目部门在册人员 + * + * @param id 项目部门在册人员主键 + * @return 结果 + */ + public int deleteSurProjectDeptWroksById(Long id); + + /** + * 批量删除项目部门在册人员 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteSurProjectDeptWroksByIds(Long[] ids); +} diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectDeptWroksService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectDeptWroksService.java new file mode 100644 index 00000000..f942710e --- /dev/null +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectDeptWroksService.java @@ -0,0 +1,69 @@ +package com.yanzhu.jh.project.service; + +import java.util.List; +import com.yanzhu.jh.project.domain.SurProjectDeptWroks; + +/** + * 项目部门在册人员Service接口 + * + * @author JiangYuQi + * @date 2023-08-15 + */ +public interface ISurProjectDeptWroksService +{ + /** + * 查询项目部门在册人员 + * + * @param id 项目部门在册人员主键 + * @return 项目部门在册人员 + */ + public SurProjectDeptWroks selectSurProjectDeptWroksById(Long id); + + /** + * 查询项目部门在册人员列表 + * + * @param surProjectDeptWroks 项目部门在册人员 + * @return 项目部门在册人员集合 + */ + public List selectSurProjectDeptWroksList(SurProjectDeptWroks surProjectDeptWroks); + + /** + * 查询项目部门在册人员列表 + * + * @param surProjectDeptWroks 项目部门在册人员 + * @return 项目部门在册人员集合 + */ + public List selectSurProjectDeptWroksListv2(SurProjectDeptWroks surProjectDeptWroks); + + /** + * 新增项目部门在册人员 + * + * @param surProjectDeptWroks 项目部门在册人员 + * @return 结果 + */ + public int insertSurProjectDeptWroks(SurProjectDeptWroks surProjectDeptWroks); + + /** + * 修改项目部门在册人员 + * + * @param surProjectDeptWroks 项目部门在册人员 + * @return 结果 + */ + public int updateSurProjectDeptWroks(SurProjectDeptWroks surProjectDeptWroks); + + /** + * 批量删除项目部门在册人员 + * + * @param ids 需要删除的项目部门在册人员主键集合 + * @return 结果 + */ + public int deleteSurProjectDeptWroksByIds(Long[] ids); + + /** + * 删除项目部门在册人员信息 + * + * @param id 项目部门在册人员主键 + * @return 结果 + */ + public int deleteSurProjectDeptWroksById(Long id); +} diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectDeptWroksServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectDeptWroksServiceImpl.java new file mode 100644 index 00000000..2bd9f904 --- /dev/null +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectDeptWroksServiceImpl.java @@ -0,0 +1,118 @@ +package com.yanzhu.jh.project.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.yanzhu.jh.project.mapper.SurProjectDeptWroksMapper; +import com.yanzhu.jh.project.domain.SurProjectDeptWroks; +import com.yanzhu.jh.project.service.ISurProjectDeptWroksService; +import com.ruoyi.common.utils.SecurityUtils; +/** + * 项目部门在册人员Service业务层处理 + * + * @author JiangYuQi + * @date 2023-08-15 + */ +@Service +public class SurProjectDeptWroksServiceImpl implements ISurProjectDeptWroksService +{ + @Autowired + private SurProjectDeptWroksMapper surProjectDeptWroksMapper; + + /** + * 查询项目部门在册人员 + * + * @param id 项目部门在册人员主键 + * @return 项目部门在册人员 + */ + @Override + public SurProjectDeptWroks selectSurProjectDeptWroksById(Long id) + { + return surProjectDeptWroksMapper.selectSurProjectDeptWroksById(id); + } + + /** + * 查询项目部门在册人员列表 + * + * @param surProjectDeptWroks 项目部门在册人员 + * @return 项目部门在册人员 + */ + @Override + public List selectSurProjectDeptWroksList(SurProjectDeptWroks surProjectDeptWroks) + { + return surProjectDeptWroksMapper.selectSurProjectDeptWroksList(surProjectDeptWroks); + } + + /** + * 查询项目部门在册人员列表 + * + * @param surProjectDeptWroks 项目部门在册人员 + * @return 项目部门在册人员集合 + */ + @Override + public List selectSurProjectDeptWroksListv2(SurProjectDeptWroks surProjectDeptWroks) + { + return surProjectDeptWroksMapper.selectSurProjectDeptWroksListv2(surProjectDeptWroks); + } + + /** + * 新增项目部门在册人员 + * + * @param surProjectDeptWroks 项目部门在册人员 + * @return 结果 + */ + @Override + public int insertSurProjectDeptWroks(SurProjectDeptWroks surProjectDeptWroks) + { + surProjectDeptWroks.setCreateBy(SecurityUtils.getUsername()); + surProjectDeptWroks.setCreateTime(DateUtils.getNowDate()); + return surProjectDeptWroksMapper.insertSurProjectDeptWroks(surProjectDeptWroks); + } + + /** + * 修改项目部门在册人员 + * + * @param surProjectDeptWroks 项目部门在册人员 + * @return 结果 + */ + @Override + public int updateSurProjectDeptWroks(SurProjectDeptWroks surProjectDeptWroks) + { + if(surProjectDeptWroks.getId()!=null){ + surProjectDeptWroks.setUpdateBy(SecurityUtils.getUsername()); + surProjectDeptWroks.setUpdateTime(DateUtils.getNowDate()); + int res = surProjectDeptWroksMapper.updateProjectDeptWorksById(surProjectDeptWroks); + return surProjectDeptWroksMapper.updateSurProjectDeptWroks(surProjectDeptWroks); + }else{ + surProjectDeptWroks.setCreateBy(SecurityUtils.getUsername()); + surProjectDeptWroks.setCreateTime(DateUtils.getNowDate()); + int res = surProjectDeptWroksMapper.updateProjectDeptWorksById(surProjectDeptWroks); + return surProjectDeptWroksMapper.insertSurProjectDeptWroks(surProjectDeptWroks); + } + } + + /** + * 批量删除项目部门在册人员 + * + * @param ids 需要删除的项目部门在册人员主键 + * @return 结果 + */ + @Override + public int deleteSurProjectDeptWroksByIds(Long[] ids) + { + return surProjectDeptWroksMapper.deleteSurProjectDeptWroksByIds(ids); + } + + /** + * 删除项目部门在册人员信息 + * + * @param id 项目部门在册人员主键 + * @return 结果 + */ + @Override + public int deleteSurProjectDeptWroksById(Long id) + { + return surProjectDeptWroksMapper.deleteSurProjectDeptWroksById(id); + } +} diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectDeptWroksMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectDeptWroksMapper.xml new file mode 100644 index 00000000..279b362c --- /dev/null +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectDeptWroksMapper.xml @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + select id, project_id, dept_id, service_personnel, supervisor_personnel, contractor_personnel, create_by, create_time, update_by, update_time, remark from sur_project_dept_wroks + + + + + + + + + + insert into sur_project_dept_wroks + + project_id, + dept_id, + service_personnel, + supervisor_personnel, + contractor_personnel, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{projectId}, + #{deptId}, + #{servicePersonnel}, + #{supervisorPersonnel}, + #{contractorPersonnel}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update sur_project_dept_wroks + + project_id = #{projectId}, + dept_id = #{deptId}, + service_personnel = #{servicePersonnel}, + supervisor_personnel = #{supervisorPersonnel}, + contractor_personnel = #{contractorPersonnel}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete from sur_project_dept_wroks where id = #{id} + + + + delete from sur_project_dept_wroks where id in + + #{id} + + + + + UPDATE sur_project sp + SET sp.servicePersonnel = (IFNULL(sp.servicePersonnel,0) - ( + SELECT + IFNULL(service_personnel,0) + FROM + sur_project_dept_wroks + WHERE + project_id = sp.id + AND dept_id =#{deptId} + )) +#{servicePersonnel}, sp.supervisorPersonnel = (IFNULL(sp.supervisorPersonnel,0) - ( + SELECT + IFNULL(supervisor_personnel,0) + FROM + sur_project_dept_wroks + WHERE + project_id = sp.id + AND dept_id =#{deptId} + )) +#{supervisorPersonnel}, sp.generalContractor = (IFNULL(sp.generalContractor,0) - ( + SELECT + IFNULL(contractor_personnel,0) + FROM + sur_project_dept_wroks + WHERE + project_id = sp.id + AND dept_id =#{deptId} + )) +#{contractorPersonnel} + WHERE + id = #{projectId} + + + \ No newline at end of file diff --git a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml index 1e2e3060..2bf12456 100644 --- a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml @@ -89,7 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and ssp.checkState in (0,3) and ssp.checkState in (1) and ssp.checkState = 4 - and (ssp.updateTime is null or ssp.updateTime ]]> ssp.nickedTime) + and (NOW() ]]> ssp.nickedTime and (ssp.updateTime is null or ssp.updateTime ]]> ssp.nickedTime)) order by createTime desc