|
@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
import java.util.ArrayList;
|
|
|
+import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
|
|
@@ -28,18 +29,21 @@ public class KC134ApiRequestAndProcessing implements ApiRequestAndProcessingStra
|
|
|
private AttendanceAssessmentSdk attendanceAssessmentSdk;
|
|
|
|
|
|
@Override
|
|
|
- public Map<String, Object> assembleData(String id,String dateId) {
|
|
|
+ public Map<String, Object> assembleData(String id,String dataId,String code) {
|
|
|
List<OrgApiDataConfigDTO> assembleData = new ArrayList<>();
|
|
|
|
|
|
assembleData.add(setOrdinaryDatePattern("DATAID", JtGsjtbsj::getDataid));
|
|
|
|
|
|
JtGsjtbsj jtGsjtbsj = new JtGsjtbsj();
|
|
|
- Map<String, Object> stringObjectMap = assembleApiData(jtGsjtbsj, assembleData);
|
|
|
+ Map<String, Object> stringObjectMap = new HashMap<String,Object>(){{
|
|
|
+ put("INDEXID",id);
|
|
|
+ put("DATAID",dataId);
|
|
|
+ }};
|
|
|
return stringObjectMap;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public R apiCallAndDataProcessing(String id, String code, Map<String, Object> apiCallData) {
|
|
|
+ public R apiCallAndDataProcessing(String id, String dataId, String code, Map<String, Object> apiCallData) {
|
|
|
ApiCallDto paramVo = new ApiCallDto();
|
|
|
paramVo.setData(apiCallData);
|
|
|
paramVo.setApiCode(code);
|