Merge pull request '#chabaodao-1# 北森绩效增加考核周期类型字段赋值' (#1) from shilei-0722 into release
Reviewed-on: http://221.226.25.34:3003/shilei/E10-chabaidao/pulls/1
This commit is contained in:
commit
d711842e39
|
|
@ -249,6 +249,8 @@ public class Esb2BeisenPerformanceCronJobNew implements EsbServerlessRpcRemoteIn
|
||||||
JSONObject dataJson = new JSONObject();
|
JSONObject dataJson = new JSONObject();
|
||||||
dataJson.put("bsjxid",id);
|
dataJson.put("bsjxid",id);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
for(int n=0;n<fieldDatas.size();n++){
|
for(int n=0;n<fieldDatas.size();n++){
|
||||||
JSONObject fieldDataJson = fieldDatas.getJSONObject(n);
|
JSONObject fieldDataJson = fieldDatas.getJSONObject(n);
|
||||||
log.error("fieldDataJson:{}",fieldDataJson.toJSONString());
|
log.error("fieldDataJson:{}",fieldDataJson.toJSONString());
|
||||||
|
|
@ -258,7 +260,7 @@ public class Esb2BeisenPerformanceCronJobNew implements EsbServerlessRpcRemoteIn
|
||||||
String text = fieldDataJson.getString("text");
|
String text = fieldDataJson.getString("text");
|
||||||
|
|
||||||
if("ActivityManagerId".equals(name)){
|
if("ActivityManagerId".equals(name)){
|
||||||
dataJson.put("jxhdmc",value);
|
dataJson.put("jxhdmc",text);
|
||||||
}
|
}
|
||||||
|
|
||||||
// if("Employee".equals(name)){
|
// if("Employee".equals(name)){
|
||||||
|
|
@ -273,6 +275,29 @@ public class Esb2BeisenPerformanceCronJobNew implements EsbServerlessRpcRemoteIn
|
||||||
}
|
}
|
||||||
if("Period".equals(name)){
|
if("Period".equals(name)){
|
||||||
dataJson.put("khzq",value);
|
dataJson.put("khzq",value);
|
||||||
|
|
||||||
|
if("-1".equals(value)){
|
||||||
|
dataJson.put("khzqlx","年度考核");
|
||||||
|
}else if("1".equals(value) || "2".equals(value)
|
||||||
|
|| "3".equals(value)
|
||||||
|
|| "4".equals(value)
|
||||||
|
|| "5".equals(value)
|
||||||
|
|| "6".equals(value)
|
||||||
|
|| "7".equals(value)
|
||||||
|
|| "8".equals(value)
|
||||||
|
|| "9".equals(value)
|
||||||
|
|| "10".equals(value)
|
||||||
|
|| "11".equals(value)
|
||||||
|
|| "12".equals(value)
|
||||||
|
){
|
||||||
|
dataJson.put("khzqlx","月度考核");
|
||||||
|
}else if("31".equals(value) || "22".equals(value)
|
||||||
|
){
|
||||||
|
dataJson.put("khzqlx","半年度考核");
|
||||||
|
}else if("21".equals(value) || "22".equals(value) || "23".equals(value) || "24".equals(value)
|
||||||
|
){
|
||||||
|
dataJson.put("khzqlx","季度考核");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if("Name".equals(name)){
|
if("Name".equals(name)){
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue