1.工程分包班组修改名称,同步修改一些记录表

2.分公司添加总包或标段修改名称是记录历史数据
This commit is contained in:
方亮 2025-12-29 11:26:04 +08:00
parent f59ddd32c8
commit 5079b16f65
22 changed files with 332 additions and 10 deletions

View File

@ -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;
}

View File

@ -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);
}

View File

@ -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<PmMainProjectVo> selectMainProjectListAll(PmMainProject pmMainProject);
/**
* 保存总包工程名称修改记录
* @param bmBasicDataHisVo
*/
void insertOldMainProName(BmBasicDataHisVo bmBasicDataHisVo);
/**
* 根据id查询总包工程
* @param pmMainProject
* @return
*/
PmMainProject selectMainProjectByMainProId(PmMainProject pmMainProject);
}

View File

@ -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);
}

View File

@ -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<ProMonthTable> getSalaryByWorkerId(ProMonthTable proMonthTable);
/**
* 保存旧标段名称
*/
void insertOldProName(BmBasicDataHisVo o);
/**
* 同步修改标段名称
*/
void updateProjectName(BmBasicDataHisVo bmBasicDataHisVo);
/**
* 根据标段id获取标段名称
*/
PmProject selectProjectByProId(PmProject pmProject);
}

View File

@ -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<PmSubCompany> selectSubCompanyListAll(PmSubCompany pmSubCompany);
/**
* 根据id获取分公司信息
* @param id
* @return
*/
PmSubCompany getPmSubCompanyBySubComId(Integer id);
/**
* 插入历史数据
* @param bmBasicDataHisVo
*/
void insertOldSubComName(BmBasicDataHisVo bmBasicDataHisVo);
}

View File

@ -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<PmSub> selectSubListAll(PmSub pmSub);
List<PmSub> getSublistByProId(BmSubContract bmSubContract);
/**
* 根据分包商id获取分包商信息
* @param pmSub
* @return
*/
PmSub selectSubBySubId(PmSub pmSub);
/**
* 同步修改分包商名称
* @param bmBasicDataHisVo
*/
void updateSubName(BmBasicDataHisVo bmBasicDataHisVo);
}

View File

@ -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<PmSubTeam> selectSubTeamListAll(PmSubTeam pmSubTeam);
PmSubTeam getSubTeamByName(PmSubTeam pmSubTeam);
/**
* 根据id查询分包班组信息
* @param pmSubTeam
* @return
*/
PmSubTeam selectTeamByTeamId(PmSubTeam pmSubTeam);
/**
* 修改分包班组名称
* @param bmBasicDataHisVo
*/
void updateSubName(BmBasicDataHisVo bmBasicDataHisVo);
}

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -40,4 +40,13 @@
from pm_company where is_active='1' and company_name = #{companyName}
</select>
<insert id="insertOldComName">
insert into bm_basic_data_his (id, type, old_name, name, update_user)
values (#{id}, #{type}, #{oldName}, #{name}, #{updateUser})
</insert>
<select id="getPmCompanyByComId" resultType="com.bonus.bmw.domain.po.PmCompany">
select id,company_name
from pm_company where is_active='1' and id = #{id}
</select>
</mapper>

View File

@ -62,4 +62,15 @@
and sub_com_id=#{subComId}
</if>
</select>
<insert id="insertOldMainProName">
insert into bm_basic_data_his (id, type, old_name, name)
values (#{id}, #{type}, #{oldName}, #{name})
</insert>
<select id="selectMainProjectByMainProId" resultType="com.bonus.bmw.domain.po.PmMainProject">
select id,main_pro_name
from pm_main_project where is_active='1' and id = #{id}
</select>
</mapper>

View File

@ -59,4 +59,15 @@
is_enable as isEnable
from pm_org where is_active='1' and org_name = #{orgName}
</select>
<insert id="insertOldOrgName">
insert into bm_basic_data_his (org_id,type,old_name,name)
values (#{orgId},#{type},#{oldName},#{name})
</insert>
<select id="getPmOrgByOrgId" resultType="com.bonus.bmw.domain.po.PmOrg">
select id as id,
org_name as orgName
from pm_org where is_active='1' and id = #{id}
</select>
</mapper>

View File

@ -354,4 +354,24 @@
AND d.att_month = #{tableMonth}
and d.worker_id = #{workerId}
</select>
<insert id="insertOldProName">
insert into bm_basic_data_his (id, type, old_name, name)
values (#{id}, #{type}, #{oldName}, #{name})
</insert>
<update id="updateProjectName">
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};
</update>
<select id="selectProjectByProId" resultType="com.bonus.bmw.domain.po.PmProject">
select pp.id as id,
pp.pro_name as proName
from pm_project pp where pp.is_active = '1' and pp.id = #{id}
</select>
</mapper>

View File

@ -84,4 +84,13 @@
order by psc.create_time desc
</select>
<select id="getPmSubCompanyBySubComId" resultType="com.bonus.bmw.domain.po.PmSubCompany">
select id,sub_company_name
from pm_sub_company where is_active='1' and id = #{id}
</select>
<insert id="insertOldSubComName">
insert into bm_basic_data_his (id, type, old_name, name, update_user)
values (#{id}, #{type}, #{oldName}, #{name}, #{updateUser})
</insert>
</mapper>

View File

@ -106,4 +106,17 @@
GROUP BY
bsc.sub_id
</select>
<select id="selectSubBySubId" resultType="com.bonus.bmw.domain.po.PmSub">
select id,sub_name
from pm_sub where is_active='1' and id= #{id}
</select>
<update id="updateSubName">
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};
</update>
</mapper>

View File

@ -71,4 +71,19 @@
from pm_sub_team pst
where pst.is_active = '1' and pst.sub_id=#{subId} and pst.team_name = #{teamName}
</select>
<select id="selectTeamByTeamId" resultType="com.bonus.bmw.domain.po.PmSubTeam">
select pst.id as id,
pst.team_name as teamName
from pm_sub_team pst
where pst.is_active = '1' and pst.id = #{id}
</select>
<update id="updateSubName">
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};
</update>
</mapper>