人事信息查询表改动1.01

src/main/java/com/ydool/staff/dto/PersonnelStatementDto.java

@@ -33,4 +33,7 @@ public class PersonnelStatementDto {
 
     @ApiModelProperty(value = "其中：用工计划数")
     private Integer thereIntoNum;
+
+    @ApiModelProperty(value = "董监人数")
+    private Integer supervisorsNum;
 }

src/main/java/com/ydool/staff/service/impl/CompanyNameServiceImpl.java

@@ -12,11 +12,13 @@ import com.ydool.staff.dto.EnterpriseIndicatorsExportDto;
 import com.ydool.staff.dto.PersonnelReportExportDto;
 import com.ydool.staff.dto.PersonnelStatementDto;
 import com.ydool.staff.entity.CompanyName;
+import com.ydool.staff.entity.DirectorsSupervisors;
 import com.ydool.staff.entity.Personnel;
 import com.ydool.staff.entity.Recruitment;
 import com.ydool.staff.excel.EnterpriseIndicatorsExportVO;
 import com.ydool.staff.excel.PersonnelReportExportVO;
 import com.ydool.staff.mapper.CompanyNameMapper;
+import com.ydool.staff.mapper.DirectorsSupervisorsMapper;
 import com.ydool.staff.mapper.PersonnelMapper;
 import com.ydool.staff.mapper.RecruitmentMapper;
 import com.ydool.staff.request.CompanyNameRequest;
@@ -25,6 +27,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
@@ -45,6 +48,8 @@ public class CompanyNameServiceImpl extends BaseService<CompanyNameMapper, Compa
     RecruitmentMapper recruitmentMapper;
     @Autowired
     PersonnelMapper personnelMapper;
+    @Resource
+    private DirectorsSupervisorsMapper directorsSupervisorsMapper;
 
     @Override
     public AjaxResult companyList() {
@@ -122,6 +127,8 @@ public class CompanyNameServiceImpl extends BaseService<CompanyNameMapper, Compa
         CompanyNameMapper companyNameMapper = SpringUtil.getBean(CompanyNameMapper.class);
         PersonnelStatementDto statementDto = new PersonnelStatementDto();
         CompanyName companyName = companyNameMapper.selectById(id);
+        Integer count = directorsSupervisorsMapper.selectCount(new LambdaQueryWrapper<DirectorsSupervisors>().eq(DirectorsSupervisors::getOrganizationId, companyName.getId()));
+        statementDto.setSupervisorsNum(count);
         statementDto.setCompetentDeptName("县发展和改革局");
         statementDto.setSocialCreditCode(companyName.getCreditCode());
         statementDto.setCompetent(companyName.getCompanyName());

src/main/java/com/ydool/staff/service/impl/PersonnelServiceImpl.java

@@ -149,7 +149,10 @@ public class PersonnelServiceImpl extends BaseService<PersonnelMapper, Personnel
                     .eq(PersonnelMiddle::getBeforeId, id).eq(PersonnelMiddle::getState, "1"));
             BeanUtil.copyProperties(personnelMapper.selectById(middle.getAfterId()),personnel);
         }
+        if (ObjectUtil.isEmpty(personnel))return AjaxResult.fail().msg("该人员不存在！");
         PersonnelUpdateDto personnelUpdateDto = BeanUtil.copyProperties(personnel, PersonnelUpdateDto.class);
+        personnelUpdateDto.setPresentDept(deptMapper.selectById(personnelUpdateDto.getPresentDept()).getName());
+        personnelUpdateDto.setCompanyName(companyNameMapper.selectById(personnelUpdateDto.getCompanyName()).getCompanyName());
         List<Audit> list = auditMapper.selectList(new LambdaQueryWrapper<Audit>()
                 .eq(Audit::getPersonnelId, personnel.getId())
                 .eq(Audit::getApprover,StpUtil.getLoginIdAsString()));