审核

common/src/main/java/com/jpsoft/employment/modules/base/entity/LabourServicesApprove.java

@@ -21,6 +21,7 @@ public class LabourServicesApprove {
         @ApiModelProperty(value = "")
     private String createBy;
     private String createByName;
+    private String companyName;
         @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone ="GMT+8")
 	    @ApiModelProperty(value = "")

web/src/main/java/com/jpsoft/employment/modules/base/controller/LabourServicesApproveController.java

@@ -4,6 +4,7 @@ import com.github.pagehelper.Page;
 import com.jpsoft.employment.modules.base.entity.Company;
 import com.jpsoft.employment.modules.base.entity.EnterpriseCertificationApprove;
 import com.jpsoft.employment.modules.base.entity.LabourServices;
+import com.jpsoft.employment.modules.base.service.CompanyService;
 import com.jpsoft.employment.modules.base.service.LabourServicesService;
 import com.jpsoft.employment.modules.common.utils.PojoUtils;
 import com.jpsoft.employment.modules.common.dto.Sort;
@@ -36,6 +37,8 @@ public class LabourServicesApproveController {
     private LabourServicesApproveService labourServicesApproveService;
     @Autowired
     private UserService userService;
+    @Autowired
+    private CompanyService companyService;
 
     @ApiOperation(value="创建空记录")
     @GetMapping("create")
@@ -228,6 +231,10 @@ public class LabourServicesApproveController {
                 case "2": labourServicesApprove.setApprovalStatusName("已审批"); break;
             }
             User user = userService.get(labourServicesApprove.getCreateBy());
+            Company company = companyService.get(user.getCompanyId());
+            if(company != null){
+                labourServicesApprove.setCompanyName(company.getName());
+            }
             labourServicesApprove.setCreateByName(user.getRealName());
             LabourServices labourServices = labourServicesService.get(labourServicesApprove.getLabourServicesId());
             labourServicesApprove.setLabourServicesName(labourServices.getContent());

web/src/main/java/com/jpsoft/employment/modules/job/controller/ResumeController.java

@@ -87,6 +87,7 @@ public class ResumeController {
             resume.setDreamMoneyName(dataDictionaryService.getName(resume.getDreamMoney()));
             resume.setWorkList(workList);
             resume.setEducateList(educationList);
+            resume.setDreamAddName(dataDictionaryService.getName(resume.getDreamAdd()));
             //人员就业轨迹
             Integer sortNo = 0;
             List<WorkStepDTO> workStepList = new ArrayList<>();