diff --git a/src/com/engine/sskj/controller/KqWorkflowController.java b/src/com/engine/sskj/controller/KqWorkflowController.java index 53e3e9c..fbb090b 100644 --- a/src/com/engine/sskj/controller/KqWorkflowController.java +++ b/src/com/engine/sskj/controller/KqWorkflowController.java @@ -10,6 +10,7 @@ import weaver.hrm.User; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import javax.ws.rs.GET; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; @@ -53,5 +54,15 @@ public class KqWorkflowController { return new Gson().toJson(resultDatas); } + @GET + @Path("/getEntryType") + @Produces(MediaType.APPLICATION_JSON) + public String getEntryType(@Context HttpServletRequest request, @Context HttpServletResponse response) { + User user = HrmUserVarify.getUser(request, response); + Map params = ParamUtil.request2Map(request); + Map resultDatas = getKqWorkflowService(user).getEntryType(params); + return new Gson().toJson(resultDatas); + } + } diff --git a/src/com/engine/sskj/service/KqWorkflowService.java b/src/com/engine/sskj/service/KqWorkflowService.java index ebcd95f..e5a752b 100644 --- a/src/com/engine/sskj/service/KqWorkflowService.java +++ b/src/com/engine/sskj/service/KqWorkflowService.java @@ -18,5 +18,10 @@ public interface KqWorkflowService { */ Map importOverTime(Map params); + /** + * 获取人员的入职类型 + */ + Map getEntryType(Map params); + } diff --git a/src/com/engine/sskj/service/impl/KqWorkflowServiceImpl.java b/src/com/engine/sskj/service/impl/KqWorkflowServiceImpl.java index 8189fea..5d8f1ee 100644 --- a/src/com/engine/sskj/service/impl/KqWorkflowServiceImpl.java +++ b/src/com/engine/sskj/service/impl/KqWorkflowServiceImpl.java @@ -290,4 +290,42 @@ public class KqWorkflowServiceImpl extends Service implements KqWorkflowService return null; } + + @Override + public Map getEntryType(Map params) { + Map result = new HashMap<>(); + bb.writeLog("getEntryType start "); + + String resourceId = Util.null2String(params.get("resourceid")); + bb.writeLog("resourceId: " + resourceId); + + if (StringUtils.isBlank(resourceId) ) { + result.put("code",500); + result.put("msg", "请先选择请假人"); + return result; + } + + String entryTypeField = Util.null2String(bb.getPropValue("project_sskj", "entryTypeField")); + bb.writeLog("entryTypeField: " + entryTypeField); + + String entryTypeFieldValue = ""; + String acqEntryTypeSql = "select " + entryTypeField + " from cus_fielddata where scopeid = 3 and id = ? "; + bb.writeLog("acqEntryTypeSql: " + acqEntryTypeSql); + RecordSet rs = new RecordSet(); + rs.executeQuery(acqEntryTypeSql, resourceId); + if (rs.next()) { + String temp = Util.null2String(rs.getString(1)); + bb.writeLog("temp: " + temp); + + if (StringUtils.isNotBlank(temp)) { + entryTypeFieldValue = temp; + } + } + + result.put("code",200); + result.put("data",entryTypeFieldValue); + return result; + } + + }