过滤

src/main/java/com/ydool/staff/excel/ExcelPersonnel.java

@@ -91,16 +91,26 @@ public class ExcelPersonnel {
     private String hireType;
 
 
-    @ExcelProperty("执业资格证书")
-    @ApiModelProperty(value = "执业资格证书")
+    @ExcelProperty("执业资格")
+    @ApiModelProperty(value = "执业资格")
     private String qualification;
 
 
+    @ExcelProperty("执业资格(补充)")
+    @ApiModelProperty(value = "执业资格(补充)")
+    private String qualificationType;
+
+
     @ExcelProperty("专业技术职称")
     @ApiModelProperty(value = "专业技术职称")
     private String jobTitle;
 
 
+    @ExcelProperty("专业技术职称(补充)")
+    @ApiModelProperty(value = "专业技术职称(补充)")
+    private String jobTitleType;
+
+
     @ExcelProperty("所在部门")
     @ApiModelProperty(value = "所在部门")
     private String presentDept;
@@ -171,24 +181,9 @@ public class ExcelPersonnel {
     private String remark;
 
 
-    @ExcelProperty("初审意见")
-    @ApiModelProperty(value = "初审意见")
-    private String firstTrialRemark;
-
-
     @ExcelProperty("终审意见")
     @ApiModelProperty(value = "终审意见")
     private String finalTrialRemark;
 
 
-    @ExcelProperty("变更标志")
-    @ApiModelProperty(value = "变更标志")
-    private String alterationSign;
-
-
-    @ExcelProperty("单据状态")
-    @ApiModelProperty(value = "单据状态")
-    private String receipts;
-
-
 }

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

@@ -810,7 +810,9 @@ public class PersonnelServiceImpl extends BaseService<PersonnelMapper, Personnel
             personnelExportVO.setAnnualSalary(0);
         }
         CompanyName selectOne = companyNameMapper.selectOne(Wrappers.lambdaQuery(CompanyName.class).eq(CompanyName::getCompanyName, personnelExportVO.getCompanyName()));
-        if (selectOne != null) {
+        if (selectOne == null) {
+            failMsgVO.setFailMsg("企业不存在！");
+        } else {
             failMsgVO.setSocialCreditCode(selectOne.getCreditCode());
         }
         failMsgVO.setBirthday(retirementTime(personnelExportVO.getNumberId(), "birthday"));