diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/BmBasicDataHisVo.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/BmBasicDataHisVo.java new file mode 100644 index 0000000..a1eb936 --- /dev/null +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/BmBasicDataHisVo.java @@ -0,0 +1,52 @@ +package com.bonus.bmw.domain.po; + +import lombok.Data; + +/** + * @author 马三炮 + * @date 2025/8/13 + */ +@Data +public class BmBasicDataHisVo { + + /** + * 编号 + */ + private Integer id; + + /** + * 编号 + */ + private String orgId; + + /** + * 类型 + * 1 分公司 2 项目部 3 主工程 4 工程 + */ + private Integer type; + + /** + * 工程名称 + */ + private String oldName; + + /** + * 工程名称 + */ + private String name; + + + /** + * 工程名称 + */ + private String updateUser; + + + /** + * 修改时间 + */ + private String createTime; + + + +} diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmComMapper.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmComMapper.java index d19da49..847269a 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmComMapper.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmComMapper.java @@ -1,5 +1,6 @@ package com.bonus.bmw.mapper; +import com.bonus.bmw.domain.po.BmBasicDataHisVo; import com.bonus.bmw.domain.po.PmCompany; import java.util.List; @@ -35,4 +36,18 @@ public interface PmComMapper { * @return */ PmCompany getPmCompanyByCompanyName(PmCompany pmCompany); + + /** + * 保存旧名称 + * @param bmBasicDataHisVo + * @return + */ + void insertOldComName(BmBasicDataHisVo bmBasicDataHisVo); + + /** + * 根据id查看信息 + * @param id + * @return + */ + PmCompany getPmCompanyByComId(Integer id); } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmMainProjectMapper.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmMainProjectMapper.java index 25b5169..6b6ec4f 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmMainProjectMapper.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmMainProjectMapper.java @@ -1,5 +1,6 @@ package com.bonus.bmw.mapper; +import com.bonus.bmw.domain.po.BmBasicDataHisVo; import com.bonus.bmw.domain.po.PmMainProject; import com.bonus.bmw.domain.vo.PmMainProjectVo; @@ -45,4 +46,17 @@ public interface PmMainProjectMapper { * @return */ List selectMainProjectListAll(PmMainProject pmMainProject); + + /** + * 保存总包工程名称修改记录 + * @param bmBasicDataHisVo + */ + void insertOldMainProName(BmBasicDataHisVo bmBasicDataHisVo); + + /** + * 根据id查询总包工程 + * @param pmMainProject + * @return + */ + PmMainProject selectMainProjectByMainProId(PmMainProject pmMainProject); } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmOrgMapper.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmOrgMapper.java index 9aafc85..85595b0 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmOrgMapper.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmOrgMapper.java @@ -1,5 +1,6 @@ package com.bonus.bmw.mapper; +import com.bonus.bmw.domain.po.BmBasicDataHisVo; import com.bonus.bmw.domain.po.PmOrg; import com.bonus.bmw.domain.vo.PmOrgVo; @@ -30,4 +31,14 @@ public interface PmOrgMapper { * 删除项目部 */ int delPmOrg(PmOrg pmOrg); + + /** + * 保存修改前的部门名称 + */ + void insertOldOrgName(BmBasicDataHisVo bmBasicDataHisVo); + + /** + * 根据id查询项目部 + */ + PmOrg getPmOrgByOrgId(String id); } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmProjectMapper.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmProjectMapper.java index f439684..84e2442 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmProjectMapper.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmProjectMapper.java @@ -1,9 +1,6 @@ package com.bonus.bmw.mapper; -import com.bonus.bmw.domain.po.BmSubContract; -import com.bonus.bmw.domain.po.MapBeanPo; -import com.bonus.bmw.domain.po.PmProject; -import com.bonus.bmw.domain.po.PmSubCompany; +import com.bonus.bmw.domain.po.*; import com.bonus.bmw.domain.vo.*; import org.apache.ibatis.annotations.Param; @@ -132,4 +129,18 @@ public interface PmProjectMapper { void updateMonthSalary( @Param("netSalary") BigDecimal netSalary, @Param("monthId") String monthId); List getSalaryByWorkerId(ProMonthTable proMonthTable); + + /** + * 保存旧标段名称 + */ + void insertOldProName(BmBasicDataHisVo o); + + /** + * 同步修改标段名称 + */ + void updateProjectName(BmBasicDataHisVo bmBasicDataHisVo); + /** + * 根据标段id获取标段名称 + */ + PmProject selectProjectByProId(PmProject pmProject); } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmSubComMapper.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmSubComMapper.java index 66919ad..3fbbac6 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmSubComMapper.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmSubComMapper.java @@ -1,5 +1,6 @@ package com.bonus.bmw.mapper; +import com.bonus.bmw.domain.po.BmBasicDataHisVo; import com.bonus.bmw.domain.po.PmSubCompany; import java.util.List; @@ -31,4 +32,17 @@ public interface PmSubComMapper { int delSubCompany(PmSubCompany pmSubCompany); List selectSubCompanyListAll(PmSubCompany pmSubCompany); + + /** + * 根据id获取分公司信息 + * @param id + * @return + */ + PmSubCompany getPmSubCompanyBySubComId(Integer id); + + /** + * 插入历史数据 + * @param bmBasicDataHisVo + */ + void insertOldSubComName(BmBasicDataHisVo bmBasicDataHisVo); } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmSubMapper.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmSubMapper.java index 793450b..ea28f5d 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmSubMapper.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmSubMapper.java @@ -1,5 +1,6 @@ package com.bonus.bmw.mapper; +import com.bonus.bmw.domain.po.BmBasicDataHisVo; import com.bonus.bmw.domain.po.BmSubContract; import com.bonus.bmw.domain.po.PmSub; @@ -45,4 +46,17 @@ public interface PmSubMapper { List selectSubListAll(PmSub pmSub); List getSublistByProId(BmSubContract bmSubContract); + + /** + * 根据分包商id获取分包商信息 + * @param pmSub + * @return + */ + PmSub selectSubBySubId(PmSub pmSub); + + /** + * 同步修改分包商名称 + * @param bmBasicDataHisVo + */ + void updateSubName(BmBasicDataHisVo bmBasicDataHisVo); } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmSubTeamMapper.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmSubTeamMapper.java index 622338b..d74dc74 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmSubTeamMapper.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmSubTeamMapper.java @@ -1,5 +1,6 @@ package com.bonus.bmw.mapper; +import com.bonus.bmw.domain.po.BmBasicDataHisVo; import com.bonus.bmw.domain.po.PmSubTeam; import java.util.List; @@ -29,4 +30,17 @@ public interface PmSubTeamMapper { List selectSubTeamListAll(PmSubTeam pmSubTeam); PmSubTeam getSubTeamByName(PmSubTeam pmSubTeam); + + /** + * 根据id查询分包班组信息 + * @param pmSubTeam + * @return + */ + PmSubTeam selectTeamByTeamId(PmSubTeam pmSubTeam); + + /** + * 修改分包班组名称 + * @param bmBasicDataHisVo + */ + void updateSubName(BmBasicDataHisVo bmBasicDataHisVo); } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmComServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmComServiceImpl.java index 0287b40..0b0825c 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmComServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmComServiceImpl.java @@ -1,5 +1,6 @@ package com.bonus.bmw.service.impl; +import com.bonus.bmw.domain.po.BmBasicDataHisVo; import com.bonus.bmw.domain.po.PmCompany; import com.bonus.bmw.domain.po.PmSubCompany; import com.bonus.bmw.mapper.PmComMapper; @@ -47,6 +48,17 @@ public class PmComServiceImpl implements PmComService { if (StringUtils.isNotNull(pmCompanyOld) && !pmCompanyOld.getId().equals(pmCompany.getId())){ return 0; } + //如果修改了名字就保存记录,并且将以前别的表存的静态name修改 20251226 + PmCompany oldCompanyName = pmComMapper.getPmCompanyByComId(pmCompany.getId()); + if (!oldCompanyName.getCompanyName().equals(pmCompany.getCompanyName())){ + BmBasicDataHisVo bmBasicDataHisVo = new BmBasicDataHisVo(); + bmBasicDataHisVo.setId(pmCompany.getId()); + bmBasicDataHisVo.setType(1); + bmBasicDataHisVo.setOldName(oldCompanyName.getCompanyName()); + bmBasicDataHisVo.setName(pmCompany.getCompanyName()); + bmBasicDataHisVo.setUpdateUser(SecurityUtils.getLoginUser().getSysUser().getNickName()); + pmComMapper.insertOldComName(bmBasicDataHisVo); + } pmCompany.setUpdateUser(SecurityUtils.getLoginUser().getUsername()); pmCompany.setUpdateTime(new Date()); return pmComMapper.updatePmCompany(pmCompany); diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmMainProjectServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmMainProjectServiceImpl.java index 10816bd..29ae10c 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmMainProjectServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmMainProjectServiceImpl.java @@ -1,5 +1,6 @@ package com.bonus.bmw.service.impl; +import com.bonus.bmw.domain.po.BmBasicDataHisVo; import com.bonus.bmw.domain.po.PmMainProject; import com.bonus.bmw.domain.po.PmProject; import com.bonus.bmw.domain.vo.PmMainProjectVo; @@ -59,6 +60,17 @@ public class PmMainProjectServiceImpl implements PmMainProjectService { if (StringUtils.isNotNull(pmMainProjectOld) && !pmMainProjectOld.getId().equals(pmMainProject.getId())){ return 0; } + //如果修改了名字就保存记录,并且将以前别的表存的静态name修改 20251226 + PmMainProject oldMainProjectOld = pmMainProjectMapper.selectMainProjectByMainProId(pmMainProject); + if (!oldMainProjectOld.getMainProName().equals(pmMainProject.getMainProName())){ + BmBasicDataHisVo bmBasicDataHisVo = new BmBasicDataHisVo(); + bmBasicDataHisVo.setId(pmMainProject.getId()); + bmBasicDataHisVo.setType(4); + bmBasicDataHisVo.setOldName(oldMainProjectOld.getMainProName()); + bmBasicDataHisVo.setName(pmMainProject.getMainProName()); + bmBasicDataHisVo.setUpdateUser(SecurityUtils.getLoginUser().getSysUser().getNickName()); + pmMainProjectMapper.insertOldMainProName(bmBasicDataHisVo); + } pmMainProject.setUpdateUser(SecurityUtils.getLoginUser().getUsername()); pmMainProject.setUpdateTime(new Date()); return pmMainProjectMapper.updateMainProject(pmMainProject); diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmOrgServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmOrgServiceImpl.java index 49ae45e..a15dcad 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmOrgServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmOrgServiceImpl.java @@ -1,6 +1,7 @@ package com.bonus.bmw.service.impl; import cn.hutool.core.util.IdUtil; +import com.bonus.bmw.domain.po.BmBasicDataHisVo; import com.bonus.bmw.domain.po.PmOrg; import com.bonus.bmw.domain.po.PmProject; import com.bonus.bmw.domain.vo.PmOrgVo; @@ -9,7 +10,6 @@ import com.bonus.bmw.mapper.PmOrgMapper; import com.bonus.bmw.mapper.PmProjectMapper; import com.bonus.bmw.service.PmOrgService; import com.bonus.common.core.utils.StringUtils; -import com.bonus.common.core.utils.uuid.IdUtils; import com.bonus.common.security.utils.SecurityUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -60,6 +60,18 @@ public class PmOrgServiceImpl implements PmOrgService { if (StringUtils.isNotNull(pmOrgOld) && !pmOrgOld.getId().equals(pmOrg.getId())){ return 0; } + //如果修改了名字就保存记录,并且将以前别的表存的静态name修改 20251226 + PmOrg oldOrgName = pmOrgMapper.getPmOrgByOrgId(pmOrg.getId()); + if (!oldOrgName.getOrgName().equals(pmOrg.getOrgName())){ + BmBasicDataHisVo bmBasicDataHisVo = new BmBasicDataHisVo(); + bmBasicDataHisVo.setOrgId(pmOrg.getOrgId()); + bmBasicDataHisVo.setType(3); + bmBasicDataHisVo.setOldName(oldOrgName.getOrgName()); + bmBasicDataHisVo.setName(pmOrg.getOrgName()); + bmBasicDataHisVo.setUpdateUser(SecurityUtils.getLoginUser().getSysUser().getNickName()); + pmOrgMapper.insertOldOrgName(bmBasicDataHisVo); + } + pmOrg.setUpdateUser(SecurityUtils.getLoginUser().getUsername()); pmOrg.setUpdateTime(new Date()); return pmOrgMapper.updatePmOrg(pmOrg); diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmProjectServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmProjectServiceImpl.java index c189419..67f5668 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmProjectServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmProjectServiceImpl.java @@ -4,10 +4,7 @@ import cn.hutool.core.date.DateUtil; import com.bonus.bmw.domain.dto.FileBasicMsgDto; import com.bonus.bmw.domain.dto.RepairCardApplyDto; import com.bonus.bmw.domain.dto.WebFileDto; -import com.bonus.bmw.domain.po.BmSubContract; -import com.bonus.bmw.domain.po.MapBeanPo; -import com.bonus.bmw.domain.po.PmProject; -import com.bonus.bmw.domain.po.PmSubCompany; +import com.bonus.bmw.domain.po.*; import com.bonus.bmw.domain.vo.*; import com.bonus.bmw.mapper.BmSubContractMapper; import com.bonus.bmw.mapper.PmProjectMapper; @@ -27,7 +24,10 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.math.BigDecimal; -import java.util.*; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -77,6 +77,19 @@ public class PmProjectServiceImpl implements PmProjectService { if (StringUtils.isNotNull(pmProjectOld) && !pmProjectOld.getId().equals(pmProject.getId())){ return res; } + //如果修改了名字就保存记录,并且将以前别的表存的静态name修改 20251226 + PmProject oldProjectName = pmProjectMapper.selectProjectByProId(pmProject); + if (!oldProjectName.getProName().equals(pmProject.getProName())){ + BmBasicDataHisVo bmBasicDataHisVo = new BmBasicDataHisVo(); + bmBasicDataHisVo.setId(pmProject.getId()); + bmBasicDataHisVo.setType(5); + bmBasicDataHisVo.setOldName(oldProjectName.getProName()); + bmBasicDataHisVo.setName(pmProject.getProName()); + bmBasicDataHisVo.setUpdateUser(SecurityUtils.getLoginUser().getSysUser().getNickName()); + pmProjectMapper.insertOldProName(bmBasicDataHisVo); + + pmProjectMapper.updateProjectName(bmBasicDataHisVo); + } pmProject.setUpdateUser(SecurityUtils.getLoginUser().getUsername()); pmProject.setUpdateTime(new Date()); res= pmProjectMapper.updateProject(pmProject); diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmSubComServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmSubComServiceImpl.java index 112c627..e10b623 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmSubComServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmSubComServiceImpl.java @@ -1,5 +1,6 @@ package com.bonus.bmw.service.impl; +import com.bonus.bmw.domain.po.BmBasicDataHisVo; import com.bonus.bmw.domain.po.PmOrg; import com.bonus.bmw.domain.po.PmSubCompany; import com.bonus.bmw.domain.vo.PmOrgVo; @@ -48,6 +49,19 @@ public class PmSubComServiceImpl implements PmSubComService { if (StringUtils.isNotNull(pmSubCompanyOld) && !pmSubCompanyOld.getId().equals(pmSubCompany.getId())){ return 0; } + + //如果修改了名字就保存记录,并且将以前别的表存的静态name修改 20251226 + PmSubCompany oldSubCompanyName = pmSubComMapper.getPmSubCompanyBySubComId(pmSubCompany.getId()); + if (!oldSubCompanyName.getSubCompanyName().equals(pmSubCompany.getSubCompanyName())){ + BmBasicDataHisVo bmBasicDataHisVo = new BmBasicDataHisVo(); + bmBasicDataHisVo.setId(pmSubCompany.getId()); + bmBasicDataHisVo.setType(2); + bmBasicDataHisVo.setOldName(oldSubCompanyName.getSubCompanyName()); + bmBasicDataHisVo.setName(pmSubCompany.getSubCompanyName()); + bmBasicDataHisVo.setUpdateUser(SecurityUtils.getLoginUser().getSysUser().getNickName()); + pmSubComMapper.insertOldSubComName(bmBasicDataHisVo); + } + pmSubCompany.setUpdateUser(SecurityUtils.getLoginUser().getUsername()); pmSubCompany.setUpdateTime(new Date()); return pmSubComMapper.updateSubCompany(pmSubCompany); diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmSubServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmSubServiceImpl.java index 2320c3d..baba046 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmSubServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmSubServiceImpl.java @@ -2,6 +2,7 @@ package com.bonus.bmw.service.impl; import com.bonus.bmw.domain.dto.FileBasicMsgDto; import com.bonus.bmw.domain.dto.WebFileDto; +import com.bonus.bmw.domain.po.BmBasicDataHisVo; import com.bonus.bmw.domain.po.BmSubContract; import com.bonus.bmw.domain.po.PmSub; import com.bonus.bmw.domain.vo.BmSubContractVo; @@ -70,6 +71,17 @@ public class PmSubServiceImpl implements PmSubService { if (StringUtils.isNotNull(pmSubOld) && !pmSubOld.getId().equals(pmSub.getId())){ return res; } + + //如果修改了名字就保存记录,并且将以前别的表存的静态name修改 20251226 + PmSub oldSubName = pmSubMapper.selectSubBySubId(pmSub); + if (!oldSubName.getSubName().equals(pmSub.getSubName())){ + BmBasicDataHisVo bmBasicDataHisVo = new BmBasicDataHisVo(); + bmBasicDataHisVo.setId(pmSub.getId()); + bmBasicDataHisVo.setOldName(oldSubName.getSubName()); + bmBasicDataHisVo.setName(pmSub.getSubName()); + bmBasicDataHisVo.setUpdateUser(SecurityUtils.getLoginUser().getSysUser().getNickName()); + pmSubMapper.updateSubName(bmBasicDataHisVo); + } pmSub.setUpdateUser(SecurityUtils.getLoginUser().getUsername()); pmSub.setUpdateTime(new Date()); res = pmSubMapper.updateSub(pmSub); diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmSubTeamServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmSubTeamServiceImpl.java index e6df964..4ce945d 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmSubTeamServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmSubTeamServiceImpl.java @@ -1,5 +1,7 @@ package com.bonus.bmw.service.impl; +import com.bonus.bmw.domain.po.BmBasicDataHisVo; +import com.bonus.bmw.domain.po.PmSub; import com.bonus.bmw.domain.po.PmSubTeam; import com.bonus.bmw.domain.po.PmSubTeamContract; import com.bonus.bmw.mapper.PmSubTeamContractMapper; @@ -48,6 +50,18 @@ public class PmSubTeamServiceImpl implements PmSubTeamService { if (StringUtils.isNotNull(pmSubTeamOld) && !pmSubTeamOld.getId().equals(pmSubTeam.getId())){ return 0; } + + //如果修改了名字就保存记录,并且将以前别的表存的静态name修改 20251226 + PmSubTeam oldTeamName = pmSubTeamMapper.selectTeamByTeamId(pmSubTeam); + if (!oldTeamName.getTeamName().equals(pmSubTeam.getTeamName())){ + BmBasicDataHisVo bmBasicDataHisVo = new BmBasicDataHisVo(); + bmBasicDataHisVo.setId(pmSubTeam.getId()); + bmBasicDataHisVo.setOldName(oldTeamName.getSubName()); + bmBasicDataHisVo.setName(pmSubTeam.getSubName()); + bmBasicDataHisVo.setUpdateUser(SecurityUtils.getLoginUser().getSysUser().getNickName()); + pmSubTeamMapper.updateSubName(bmBasicDataHisVo); + } + pmSubTeam.setUpdateUser(SecurityUtils.getLoginUser().getUsername()); pmSubTeam.setUpdateTime(new Date()); return pmSubTeamMapper.updateSubTeam(pmSubTeam); diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmComMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmComMapper.xml index 901badc..8371099 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmComMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmComMapper.xml @@ -40,4 +40,13 @@ from pm_company where is_active='1' and company_name = #{companyName} + + insert into bm_basic_data_his (id, type, old_name, name, update_user) + values (#{id}, #{type}, #{oldName}, #{name}, #{updateUser}) + + + diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmMainProjectMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmMainProjectMapper.xml index e9c708d..863319e 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmMainProjectMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmMainProjectMapper.xml @@ -62,4 +62,15 @@ and sub_com_id=#{subComId} + + + + insert into bm_basic_data_his (id, type, old_name, name) + values (#{id}, #{type}, #{oldName}, #{name}) + + + diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmOrgMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmOrgMapper.xml index 5cc58d4..0258790 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmOrgMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmOrgMapper.xml @@ -59,4 +59,15 @@ is_enable as isEnable from pm_org where is_active='1' and org_name = #{orgName} + + + insert into bm_basic_data_his (org_id,type,old_name,name) + values (#{orgId},#{type},#{oldName},#{name}) + + + diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmProjectMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmProjectMapper.xml index db0bfdc..27f8f08 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmProjectMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmProjectMapper.xml @@ -354,4 +354,24 @@ AND d.att_month = #{tableMonth} and d.worker_id = #{workerId} + + + insert into bm_basic_data_his (id, type, old_name, name) + values (#{id}, #{type}, #{oldName}, #{name}) + + + + update pm_sub_team_contract set pro_name = #{name} where pro_id = #{id}; + update bm_worker_ein_msg set pro_name = #{name} where pro_id = #{id}; + update bm_worker_ein_pro set pro_name = #{name} where pro_id = #{id}; + update bm_worker_ein_pro_record set pro_name = #{name} where pro_id = #{id}; + update bm_worker_ein_day_record set pro_name = #{name} where pro_id = #{id}; + update bm_att_person set pro_name = #{name} where pro_id = #{id}; + + + diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubComMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubComMapper.xml index 0aafe84..db218ef 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubComMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubComMapper.xml @@ -84,4 +84,13 @@ order by psc.create_time desc + + + + insert into bm_basic_data_his (id, type, old_name, name, update_user) + values (#{id}, #{type}, #{oldName}, #{name}, #{updateUser}) + diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubMapper.xml index aeaa654..5d0c33f 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubMapper.xml @@ -106,4 +106,17 @@ GROUP BY bsc.sub_id + + + + + update pm_sub_team_contract set sub_name = #{name} where sub_id = #{id}; + update bm_worker_ein_msg set sub_name = #{name} where sub_id = #{id}; + update bm_worker_ein_pro_record set sub_name = #{name} where sub_id = #{id}; + update bm_worker_ein_day_record set sub_name = #{name} where sub_id = #{id}; + update bm_att_person set sub_name = #{name} where sub_id = #{id}; + diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubTeamMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubTeamMapper.xml index b7b3822..74a3b7c 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubTeamMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubTeamMapper.xml @@ -71,4 +71,19 @@ from pm_sub_team pst where pst.is_active = '1' and pst.sub_id=#{subId} and pst.team_name = #{teamName} + + + + + update pm_sub_team_contract set team_name = #{name} where team_id = #{id}; + update bm_worker_ein_msg set team_name = #{name} where team_id = #{id}; + update bm_worker_ein_pro_record set team_name = #{name} where team_id = #{id}; + update bm_worker_ein_day_record set team_name = #{name} where team_id = #{id}; + update bm_att_person set team_name = #{name} where team_id = #{id}; +