From 31ae5e42a71e9e663d2e46628310fdbb81cc8eb6 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: Sat, 21 Sep 2024 21:58:31 +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 --- .../manage/domain/ProProjectInfoSubdepts.java | 33 +++- .../manage/mapper/ProProjectInfoMapper.java | 7 + .../manage/ProProjectInfoDeptsMapper.xml | 2 +- .../mapper/manage/ProProjectInfoMapper.xml | 2 - .../manage/ProProjectInfoSettingMapper.xml | 2 +- .../ProProjectInfoSubdeptsGroupMapper.xml | 2 +- .../manage/ProProjectInfoSubdeptsMapper.xml | 12 +- .../ProProjectInfoSubdeptsUsersMapper.xml | 2 +- .../manage/ProProjectInfoUsersMapper.xml | 2 +- .../impl/ProProjectInfoServiceImpl.java | 16 +- .../manage/proProjectInfoSubdepts/index.vue | 179 +++++++++++------- 11 files changed, 184 insertions(+), 75 deletions(-) diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdepts.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdepts.java index 2804fc6c..1ae3f853 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdepts.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdepts.java @@ -1,10 +1,13 @@ 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_info_subdepts * @@ -66,6 +69,15 @@ public class ProProjectInfoSubdepts extends BaseEntity @Excel(name = "负责人电话") private String subDeptLeaderPhone; + /** 合同承包内容 */ + @Excel(name = "合同承包内容") + private String contractInfos; + + /** 进场时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "进场时间") + private Date useDates; + /** 进场状态 */ @Excel(name = "进场状态") private String useStatus; @@ -181,7 +193,24 @@ public class ProProjectInfoSubdepts extends BaseEntity { return subDeptLeaderPhone; } - public void setUseStatus(String useStatus) + + public String getContractInfos() { + return contractInfos; + } + + public void setContractInfos(String contractInfos) { + this.contractInfos = contractInfos; + } + + public Date getUseDates() { + return useDates; + } + + public void setUseDates(Date useDates) { + this.useDates = useDates; + } + + public void setUseStatus(String useStatus) { this.useStatus = useStatus; } @@ -248,6 +277,8 @@ public class ProProjectInfoSubdepts extends BaseEntity .append("subDeptLeaderName", getSubDeptLeaderName()) .append("subDeptLeaderCode", getSubDeptLeaderCode()) .append("subDeptLeaderPhone", getSubDeptLeaderPhone()) + .append("contractInfos", getContractInfos()) + .append("useDates", getUseDates()) .append("useStatus", getUseStatus()) .append("approveStatus", getApproveStatus()) .append("qrCode", getQrCode()) diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectInfoMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectInfoMapper.java index 0ab18e12..73bbc81c 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectInfoMapper.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectInfoMapper.java @@ -67,4 +67,11 @@ public interface ProProjectInfoMapper * @return */ public int insertDept(ProDept proDept); + + /** + * 在单位层级新增项目 + * @param proDept + * @return + */ + public int updateDept(ProDept proDept); } diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoDeptsMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoDeptsMapper.xml index bfe3eb62..cb301d88 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoDeptsMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoDeptsMapper.xml @@ -24,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select pd.id, pd.project_id, pi.project_name, pd.dept_type, pd.dept_name, pd.dept_code, leader, phone, pd.is_del, pd.create_by, pd.create_time, pd.update_by, pd.update_time, pd.remark from pro_project_info_depts pd left join pro_project_info pi on pi.id = pd.project_id - left join sys_dept sd on sd.dept_id = pi.dept_id + left join sys_dept sd on sd.dept_id = pi.com_id diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsGroupMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsGroupMapper.xml index e8798343..2dd4403d 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsGroupMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsGroupMapper.xml @@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select psg.id, psg.com_id, psg.project_id, pi.project_name, psg.sub_dept_id, psg.sub_dept_type, psg.sub_dept_name, psg.sub_dept_code, psg.group_name, psg.group_code, psg.craft_type, psg.craft_post, psg.group_leader_name, psg.group_leader_code, psg.group_leader_phone, psg.use_status, psg.approve_status, psg.qr_code, psg.is_del, psg.create_by, psg.create_time, psg.update_by, psg.update_time, psg.remark from pro_project_info_subdepts_group psg left join pro_project_info pi on pi.id = psg.project_id - left join sys_dept sd on sd.dept_id = pi.dept_id + left join sys_dept sd on sd.dept_id = pi.com_id @@ -74,6 +76,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sub_dept_leader_name, sub_dept_leader_code, sub_dept_leader_phone, + contract_infos, + use_dates, use_status, approve_status, qr_code, @@ -95,6 +99,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{subDeptLeaderName}, #{subDeptLeaderCode}, #{subDeptLeaderPhone}, + #{contractInfos}, + #{useDates}, #{useStatus}, #{approveStatus}, #{qrCode}, @@ -120,6 +126,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sub_dept_leader_name = #{subDeptLeaderName}, sub_dept_leader_code = #{subDeptLeaderCode}, sub_dept_leader_phone = #{subDeptLeaderPhone}, + contract_infos = #{contractInfos}, + use_dates = #{useDates}, use_status = #{useStatus}, approve_status = #{approveStatus}, qr_code = #{qrCode}, diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml index a5f15562..42dfbd02 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml @@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select psu.id, psu.com_id, psu.project_id, pi.project_name, psu.sub_dept_id, psu.sub_dept_type, psu.sub_dept_name, psu.user_id, psu.user_type, psu.user_name, psu.craft_type, psu.craft_post, psu.edu_status, psu.edu_file_path, psu.edu_sign_path, psu.edu_date, psu.approve_status, psu.use_status, psu.sub_step, psu.illness_status, psu.sup_illness_status, psu.is_del, psu.create_by, psu.create_time, psu.update_by, psu.update_time, psu.remark from pro_project_info_subdepts_users psu left join pro_project_info pi on pi.id = psu.project_id - left join sys_dept sd on sd.dept_id = pi.dept_id + left join sys_dept sd on sd.dept_id = pi.com_id diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoServiceImpl.java index 90a1c032..9086868b 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoServiceImpl.java @@ -136,7 +136,21 @@ public class ProProjectInfoServiceImpl implements IProProjectInfoService settingMapper.insertProProjectInfoSetting(setting); } } - return proProjectInfoMapper.updateProProjectInfo(proProjectInfo); + int res = proProjectInfoMapper.updateProProjectInfo(proProjectInfo); + if(res>0){ + R deptResult = remoteDeptService.getDeptInfo(proProjectInfo.getDisDeptId(), SecurityConstants.INNER); + SysDept sysDept = deptResult.getData(); + ProDept proDept = new ProDept(); + proDept.setDeptId(proProjectInfo.getId()); + proDept.setParentId(proProjectInfo.getDisDeptId()); + proDept.setAncestors(sysDept.getAncestors()+","+proProjectInfo.getDisDeptId()); + proDept.setDeptName(proProjectInfo.getProjectName()); + proDept.setDeptShortName(proProjectInfo.getSimpleName()); + proDept.setLeader(proProjectInfo.getProjectPerson()); + proDept.setPhone(proProjectInfo.getProjectPersonPhone()); + proProjectInfoMapper.updateDept(proDept); + } + return res; } /** diff --git a/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdepts/index.vue b/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdepts/index.vue index 9687a2ab..00357075 100644 --- a/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdepts/index.vue +++ b/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdepts/index.vue @@ -96,9 +96,7 @@ - - - +