Browse Source

修改职位详情薪资周期未显示

LiFei 6 years ago
parent
commit
a42936506c

+ 11 - 1
src/main/java/com/jeeplus/modules/api/dpposition/entity/DpPositionForApplyAPI.java

@@ -67,9 +67,10 @@ public class DpPositionForApplyAPI extends DataEntity<DpPositionForApplyAPI> {
     private String workDay;   //存放workDate
     private Date publishTime;        // 发布时间(岗位招聘开始时间),岗位招聘对外显示条件为发布时间到截至时间,且岗位未暂停招聘
     private Date authenticationTime; //认证时间
-    private String authenticationBy;  //认证操作者
+    private String authenticationBy;  //认证操作者no
     private HpMember hpMember;  //会员表用户
     private String workTime;  //存放startWorkTime与endWordTime拼接的时间
+    private String salaryPeriodno;        // 薪资周期(兼职)(0:天 1:周 2:月:3 次 4:时 5:其他)
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     public Date getAuthenticationTime() {
@@ -260,6 +261,15 @@ public class DpPositionForApplyAPI extends DataEntity<DpPositionForApplyAPI> {
         this.salaryPeriod = salaryPeriod;
     }
 
+
+    public String getSalaryPeriodno() {
+        return salaryPeriodno;
+    }
+
+    public void setSalaryPeriodno(String salaryPeriodno) {
+        this.salaryPeriodno = salaryPeriodno;
+    }
+
     @ExcelField(title = "基本薪资(兼职)", align = 2, sort = 10)
     public String getSalary() {
         return salary;

+ 1 - 0
src/main/java/com/jeeplus/modules/dpposition/mapper/xml/DpPositionMapper.xml

@@ -330,6 +330,7 @@
 		a.recruit_number AS "recruitNumber",
 		a.basic_salary AS "basicSalary",
 		a.salary_period AS "salaryPeriod",
+		a.salary_period AS "salaryPeriodno",
 		a.salary AS "salary",
 		a.other_salary AS "otherSalary",
 		a.salary_structure AS "salaryStructure",

+ 2 - 2
src/main/java/com/jeeplus/modules/hpposition/service/HpFulltimePositionService.java

@@ -599,8 +599,8 @@ public class HpFulltimePositionService extends CrudService<HpFulltimePositionMap
                 dpPositionForApplyAPI9.setSpecialWelfare(welfare);
                 dpPositionForApplyAPI9.setPublishTime(dpPositionForApplyAPI9.getAuthenticationTime());
                 String salaryPeriod = "";
-                if ("0".equals(dpPositionForApplyAPI9.getSalaryPeriod()) || "1".equals(dpPositionForApplyAPI9.getSalaryPeriod())) {
-                    salaryPeriod = DictUtils.getDictLabel(dpPositionForApplyAPI9.getSalaryPeriod(), "salaryPeriod", "");
+                if ("0".equals(dpPositionForApplyAPI9.getSalaryPeriodno()) || "1".equals(dpPositionForApplyAPI9.getSalaryPeriodno())) {
+                    salaryPeriod = DictUtils.getDictLabel(dpPositionForApplyAPI9.getSalaryPeriodno(), "salaryPeriod", "");
                     dpPositionForApplyAPI9.setSalary(dpPositionForApplyAPI9.getSalary() + "元/" + salaryPeriod);
                 } else {
                     dpPositionForApplyAPI9.setSalary(dpPositionForApplyAPI9.getSalary() + "元");