Merge remote-tracking branch 'origin/dev-chenwnj' into dev-chenwnj

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<String, Object> params = ParamUtil.request2Map(request);
+        Map<String, Object> resultDatas = getKqWorkflowService(user).getEntryType(params);
+        return  new Gson().toJson(resultDatas);
+    }
+
 
 }

src/com/engine/sskj/service/KqWorkflowService.java

@@ -18,5 +18,10 @@ public interface KqWorkflowService {
      */
     Map<String, Object>  importOverTime(Map<String, Object> params);
 
+    /**
+     * 获取人员的入职类型
+     */
+    Map<String, Object>  getEntryType(Map<String, Object> params);
+
 
 }

src/com/engine/sskj/service/impl/KqWorkflowServiceImpl.java

@@ -290,4 +290,42 @@ public class KqWorkflowServiceImpl extends Service implements KqWorkflowService
 
         return null;
     }
+
+    @Override
+    public Map<String, Object> getEntryType(Map<String, Object> params) {
+        Map<String, Object> 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;
+    }
+
+
 }