bonus
/
smart-bid-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
LHD_HY 2025-11-17 19:28:44 +08:00
parent ae1f870ea2 2b3eda2de9
commit d1809af5e4
8 changed files with 66 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
bonus-admin/src/main/java/com/bonus/web/service/enterprise/PersonnelService.java
View File

@ -200,8 +200,17 @@ public class PersonnelService {
sourceFileService.delResourceFile(dto.getDelFiles(), TableConstants.TB_ENTERPRISE_PERSONNEL);
}
// 异常信息删除集合
// 证书相关
// 查询人员相关证书
List<PersonnelCertificate> oldCertificateList = imdCertificateService.getCertificates(dto);
List<ErrorInfo> delErrorInfoList = new ArrayList<>();
if(CollectionUtils.isNotEmpty(oldCertificateList)){
for (PersonnelCertificate item : oldCertificateList) {
// 添加需要删除的异常信息
ErrorInfo delErrorInfo = setErrorInfo(item);
delErrorInfoList.add(delErrorInfo);
}
}
// 处理资质信息和职称信息
if(CollectionUtils.isNotEmpty(dto.getPersonnelCertificateFiles())){
// 查询人员职位是否发生了变化，是否导致证书类型也发生了变化
@ -214,9 +223,6 @@ public class PersonnelService {
// 添加需要删除的资源文件
ResourceFilePo delResourceFilePo = setResourceFile(item,TableConstants.TB_PERSONNEL_CERTIFICATE);
delFiles.add(delResourceFilePo);
// 添加需要删除的异常信息
ErrorInfo delErrorInfo = setErrorInfo(item);
delErrorInfoList.add(delErrorInfo);
}
// 删除证书资源文件根据业务id、来源表、业务类型
sourceFileService.delResourceFileBybusinessId(delFiles);
@ -228,14 +234,16 @@ public class PersonnelService {
List<ResourceFilePo> certificateList = new ArrayList<>();
List<ErrorInfo> errorInfos = new ArrayList<>();
for (EnterprisePersonnelDto.PersonnelCertificateDto item : dto.getPersonnelCertificateFiles()) {
// 新建的证书
if(item.getPersonnelCertificate().getPersonnelCertificateId() == null){
item.getPersonnelCertificate().setPersonnelId(dto.getPersonnelId());
imdCertificateService.addSingleCertificateData(item);
}
if(Objects.nonNull(item.getResourceFilePo())){
item.getResourceFilePo().setBusinessId(item.getPersonnelCertificate().getPersonnelCertificateId());// 添加证书id
item.getResourceFilePo().setSourceTable(TableConstants.TB_PERSONNEL_CERTIFICATE); // 来源表
certificateList.add(item.getResourceFilePo());
}
// 添加需要删除的异常信息
ErrorInfo delErrorInfo = setErrorInfo(item.getPersonnelCertificate());
delErrorInfoList.add(delErrorInfo);
// 检查证书资源文件是否存在过期
ErrorInfo errorInfo = CertificateUtil.checkCertificateState(item.getPersonnelCertificate().getCertificateValidityPeriod(),
item.getPersonnelCertificate().getCertificateType(),
@ -256,7 +264,9 @@ public class PersonnelService {
sourceFileService.saveResourceFile(certificateList);
}
// 删除异常信息数据-根据业务id、业务类型、来源表
if(CollectionUtils.isNotEmpty(delErrorInfoList)){
imdErrorInfoService.delErrorInfoByBusinessId(delErrorInfoList);
}
// 存在证书过期异常信息则添加
if(CollectionUtils.isNotEmpty(errorInfos)){
imdErrorInfoService.addErrorInfo(errorInfos);

2
bonus-admin/src/main/java/com/bonus/web/service/enterprise/TechnicalService.java
View File

@ -136,7 +136,7 @@ public class TechnicalService {
// 1.技术方案库类别是否存在子集
int result = imdTechnicalService.hasChildData(dto);
if(result > 0){
return AjaxResult.error("技术方案库类别子集数据，无法删除");
return AjaxResult.error("技术方案库类别存在子集数据，无法删除");
}
// 2.添加技术方案库类别数据
imdTechnicalService.operTypeData(dto, 3);

9
bonus-mainDatabase/src/main/java/com/bonus/mainDataBase/mapper/IMDCertificateMapper.java
View File

@ -60,4 +60,13 @@ public interface IMDCertificateMapper {
* @date 2025/10/24 13:12
*/
List<PersonnelCertificate> getCertificates(EnterprisePersonnelDto dto);
/**
* 添加单个人员证书
* @param item
* @return void
* @author cwchen
* @date 2025/11/17 17:07
*/
void addSingleCertificateData(@Param("item") EnterprisePersonnelDto.PersonnelCertificateDto item);
}

9
bonus-mainDatabase/src/main/java/com/bonus/mainDataBase/service/IMDCertificateService.java
View File

@ -58,4 +58,13 @@ public interface IMDCertificateService {
* @date 2025/10/24 13:11
*/
List<PersonnelCertificate> getCertificates(EnterprisePersonnelDto dto);
/**
* 单个添加人员证书
* @param item
* @return void
* @author cwchen
* @date 2025/11/17 17:06
*/
void addSingleCertificateData(EnterprisePersonnelDto.PersonnelCertificateDto item);
}

5
bonus-mainDatabase/src/main/java/com/bonus/mainDataBase/service/impl/MDCertificateServiceImpl.java
View File

@ -60,4 +60,9 @@ public class MDCertificateServiceImpl implements IMDCertificateService {
return null;
}
}
@Override
public void addSingleCertificateData(EnterprisePersonnelDto.PersonnelCertificateDto item) {
imdCertificateMapper.addSingleCertificateData(item);
}
}

20
bonus-mainDatabase/src/main/resources/mapper/CertificateMapper.xml
View File

@ -85,4 +85,24 @@
WHERE personnel_id = #{personnelId}
AND del_flag = '0'
</select>
<!--添加单个人员证书-->
<insert id="addSingleCertificateData" useGeneratedKeys="true" keyProperty="personnelCertificate.personnelCertificateId" keyColumn="personnel_certificate_id">
INSERT INTO tb_personnel_certificate
(personnel_id, certificate_type, professional_type, certificate_code, certificate_level,
certificate_validity_period,use_validity_period,register_professional,title_name,professional_name)
VALUES
(
#{item.personnelCertificate.personnelId},
#{item.personnelCertificate.certificateType},
#{item.personnelCertificate.professionalType},
#{item.personnelCertificate.certificateCode},
#{item.personnelCertificate.certificateLevel},
#{item.personnelCertificate.certificateValidityPeriod},
#{item.personnelCertificate.useValidityPeriod},
#{item.personnelCertificate.registerProfessional},
#{item.personnelCertificate.titleName},
#{item.personnelCertificate.professionalName}
)
</insert>
</mapper>

2
bonus-mainDatabase/src/main/resources/mapper/EnterpriseMapper.xml
View File

@ -42,6 +42,8 @@
SELECT COUNT(*) AS num FROM tb_enterprise_technical_solution_type WHERE enterprise_id = #{enterpriseId} AND del_flag = '0'
UNION ALL
SELECT COUNT(*) AS num FROM tb_enterprise_tool WHERE enterprise_id = #{enterpriseId} AND del_flag = '0'
UNION ALL
SELECT COUNT(*) AS num FROM tb_enterprise_rejection_item WHERE enterprise_id = #{enterpriseId} AND del_flag = '0'
) A
</select>

4
bonus-mainDatabase/src/main/resources/mapper/ToolMapper.xml
View File

@ -104,10 +104,10 @@
<!--企业知识库->工器具库->查询工器具名称是否重复-->
<select id="isRepeat" resultType="java.lang.Integer">
<if test="toolId == null">
SELECT COUNT(*) FROM tb_enterprise_tool WHERE tool_name = #{toolName} AND model = #{model} AND del_flag = '0'
SELECT COUNT(*) FROM tb_enterprise_tool WHERE tool_name = #{toolName} AND model = #{model} AND enterprise_id = #{enterpriseId} AND del_flag = '0'
</if>
<if test="toolId!=null">
SELECT COUNT(*) FROM tb_enterprise_tool WHERE tool_id !=#{toolId} AND tool_name = #{toolName} AND model = #{model} AND del_flag = '0'
SELECT COUNT(*) FROM tb_enterprise_tool WHERE tool_id !=#{toolId} AND tool_name = #{toolName} AND model = #{model} AND enterprise_id = #{enterpriseId} AND del_flag = '0'
</if>
</select>
<!--企业知识库->工器具库->查询已存在的工器具-->