diff --git a/ruoyi-ui/src/views/project/projectDeptWroks/projectDeptWroksDrawer.vue b/ruoyi-ui/src/views/project/projectDeptWroks/projectDeptWroksDrawer.vue index b8bdbe22..ce01e3ae 100644 --- a/ruoyi-ui/src/views/project/projectDeptWroks/projectDeptWroksDrawer.vue +++ b/ruoyi-ui/src/views/project/projectDeptWroks/projectDeptWroksDrawer.vue @@ -105,6 +105,9 @@ export default { projectId: this.project.id, }).then((d) => { this.form = d.rows[0]; + this.form.oldServicePersonnel = this.form.servicePersonnel; + this.form.oldSupervisorPersonnel = this.form.supervisorPersonnel; + this.form.oldContractorPersonnel = this.form.contractorPersonnel; }); } }); diff --git a/ruoyi-ui/src/views/project/surProjectAttendance/attendanceDrawer.vue b/ruoyi-ui/src/views/project/surProjectAttendance/attendanceDrawer.vue index 40fdbf7a..d7beeb66 100644 --- a/ruoyi-ui/src/views/project/surProjectAttendance/attendanceDrawer.vue +++ b/ruoyi-ui/src/views/project/surProjectAttendance/attendanceDrawer.vue @@ -1,5 +1,5 @@ - - - - - + + + + +
+ + 人 + + + 人 + + + 人 + +
import { mapGetters } from "vuex"; -import { selectByDate } from "@/api/project/surProjectAttendance"; +import { + unitList, + listProjectDeptWroks2, + updateProjectDeptWroks, +} from "@/api/project/projectDeptWroks"; export default { - name: "RuoyiUiAttendanceDrawer", - + name: "RuoyiUiProjectDeptWroksDrawer", data() { return { isOpen: false, - prj: null, + project: null, title: "", - oldData: null, - formData: { - servicePersonnel: 0, - supervisorPersonnel: 0, - contractorPersonnel: 0, - }, - queryParams: { - prijectId: null, - workDate: null, - }, + nodes: [], + vform: {}, + form: {}, rules: {}, + activeName: "", }; }, computed: { @@ -84,25 +113,35 @@ export default { mounted() {}, methods: { - doOk() {}, + doOk() { + updateProjectDeptWroks(this.form).then((response) => { + this.$modal.msgSuccess("保存成功"); + this.isOpen = false; + }); + }, doCanel() { this.isOpen = false; }, - show(prj) { - this.prj = prj; - this.title = prj.projectName; + show(project) { + this.project = project; + this.title = project.projectName; this.isOpen = true; - selectByDate({ - prijectId: prj.id, - deptId: this.dept.deptId, - createTime: +new Date(), + unitList({ + projectId: project.id, + unitType: 2, }).then((d) => { - let tmps = d.data || []; - this.oldData = tmps.length > 0 ? tmps[0] : null; + this.nodes = d.rows; + if (this.nodes.length > 0) { + this.activeName = this.nodes[0].unitId + ""; + listProjectDeptWroks2({ + projectId: this.project.id, + }).then((d) => { + this.vform = d.rows[0]; + }); + } }); }, }, }; - 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 index b32422ab..5308c765 100644 --- 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 @@ -42,6 +42,10 @@ public class SurProjectDeptWroks extends BaseEntity @Excel(name = "总包人员") private Long contractorPersonnel; + private Integer oldServicePersonnel; + private Integer oldSupervisorPersonnel; + private Integer oldContractorPersonnel; + public void setId(Long id) { this.id = id; @@ -105,6 +109,30 @@ public class SurProjectDeptWroks extends BaseEntity this.deptName = deptName; } + public Integer getOldServicePersonnel() { + return oldServicePersonnel; + } + + public void setOldServicePersonnel(Integer oldServicePersonnel) { + this.oldServicePersonnel = oldServicePersonnel; + } + + public Integer getOldSupervisorPersonnel() { + return oldSupervisorPersonnel; + } + + public void setOldSupervisorPersonnel(Integer oldSupervisorPersonnel) { + this.oldSupervisorPersonnel = oldSupervisorPersonnel; + } + + public Integer getOldContractorPersonnel() { + return oldContractorPersonnel; + } + + public void setOldContractorPersonnel(Integer oldContractorPersonnel) { + this.oldContractorPersonnel = oldContractorPersonnel; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) 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 index f4e34d01..61db29b9 100644 --- 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 @@ -57,7 +57,15 @@ public interface SurProjectDeptWroksMapper * @param surProjectDeptWroks 项目部门在册人员 * @return 结果 */ - public int updateProjectDeptWorksById(SurProjectDeptWroks surProjectDeptWroks); + public int updateProjectDeptWorks1(SurProjectDeptWroks surProjectDeptWroks); + + /** + * 修改项目部门在册人员 + * + * @param surProjectDeptWroks 项目部门在册人员 + * @return 结果 + */ + public int updateProjectDeptWorks2(SurProjectDeptWroks surProjectDeptWroks); /** * 删除项目部门在册人员 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 index 2bd9f904..ac9de371 100644 --- 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 @@ -82,12 +82,12 @@ public class SurProjectDeptWroksServiceImpl implements ISurProjectDeptWroksServi if(surProjectDeptWroks.getId()!=null){ surProjectDeptWroks.setUpdateBy(SecurityUtils.getUsername()); surProjectDeptWroks.setUpdateTime(DateUtils.getNowDate()); - int res = surProjectDeptWroksMapper.updateProjectDeptWorksById(surProjectDeptWroks); + int res = surProjectDeptWroksMapper.updateProjectDeptWorks2(surProjectDeptWroks); return surProjectDeptWroksMapper.updateSurProjectDeptWroks(surProjectDeptWroks); }else{ surProjectDeptWroks.setCreateBy(SecurityUtils.getUsername()); surProjectDeptWroks.setCreateTime(DateUtils.getNowDate()); - int res = surProjectDeptWroksMapper.updateProjectDeptWorksById(surProjectDeptWroks); + int res = surProjectDeptWroksMapper.updateProjectDeptWorks1(surProjectDeptWroks); return surProjectDeptWroksMapper.insertSurProjectDeptWroks(surProjectDeptWroks); } } diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectDeptWroksMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectDeptWroksMapper.xml index 279b362c..98864012 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectDeptWroksMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectDeptWroksMapper.xml @@ -118,35 +118,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + 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} + SET sp.servicePersonnel = sp.servicePersonnel+#{servicePersonnel}, + sp.supervisorPersonnel = sp.supervisorPersonnel+#{supervisorPersonnel}, + sp.generalContractor = sp.generalContractor+#{contractorPersonnel} WHERE id = #{projectId} + + UPDATE sur_project sp + SET sp.servicePersonnel = sp.servicePersonnel-#{oldServicePersonnel}+#{servicePersonnel}, + sp.supervisorPersonnel = sp.supervisorPersonnel-#{oldSupervisorPersonnel}+#{supervisorPersonnel}, + sp.generalContractor = sp.generalContractor-#{oldContractorPersonnel}+#{contractorPersonnel} + WHERE + id = #{projectId} + \ No newline at end of file