职位管理新增关联

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceVacationBalanceController.java

@@ -33,10 +33,11 @@ public class AttendanceVacationBalanceController extends BaseCRUDJsonBodyMapping
         super.init(model, context);
     }
 
+
     @Override
-    protected int infoAfter(Long id, Map<String, Object> model, AttendanceVacationBalanceEntity entity, Context context) throws AppException {
-        AttendanceVacationBalanceEntity attendanceVacationBalanceEntity = service.get(id);
+    protected int doListAfter(AttendanceVacationBalanceEntity query, Map<String, Object> model, Context context) throws AppException {
+        AttendanceVacationBalanceEntity attendanceVacationBalanceEntity = service.get(query.getId());
         model.put("allHoliday",attendanceVacationBalanceEntity);
-        return super.infoAfter(id, model, entity, context);
+        return super.doListAfter(query, model, context);
     }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/job/web/JobController.java

@@ -4,6 +4,7 @@ import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.job.model.JobEntity;
+import com.mortals.xhx.module.job.model.JobQuery;
 import com.mortals.xhx.module.job.service.JobService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -11,6 +12,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
+
 /**
 *
 * 职位信息
@@ -32,14 +35,15 @@ public class JobController extends BaseCRUDJsonBodyMappingController<JobService,
     @Override
     protected void init(Map<String, Object> model, Context context) {
         this.addDict(model, "type", paramService.getParamBySecondOrganize("Job", "type"));
+        this.addDict(model, "groupId", service.find(new JobQuery()).stream().collect(Collectors.toMap(x->x.getId().toString(), y->y.getGroupId(),(o, n)->n)));
         super.init(model, context);
     }
 
 
     @Override
     public void doImportDataBefore(List<JobEntity> list, boolean updateSupport, Context context) throws AppException {
-
-
         super.doImportDataBefore(list, updateSupport, context);
     }
+
+
 }