|
|
|
@ -66,6 +66,9 @@ public class HrmSelfHelpController {
|
|
|
|
@Autowired
|
|
|
|
@Autowired
|
|
|
|
private DatabaseUtils databaseUtils;
|
|
|
|
private DatabaseUtils databaseUtils;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
|
|
|
private JucailinPortalUtils jucailinPortalUtils;
|
|
|
|
|
|
|
|
|
|
|
|
public String tenant_key = "t7akvdnf84" ;
|
|
|
|
public String tenant_key = "t7akvdnf84" ;
|
|
|
|
|
|
|
|
|
|
|
|
@GetMapping("/testSapi10")
|
|
|
|
@GetMapping("/testSapi10")
|
|
|
|
@ -676,53 +679,53 @@ public class HrmSelfHelpController {
|
|
|
|
* @param request
|
|
|
|
* @param request
|
|
|
|
* @return
|
|
|
|
* @return
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
@GetMapping("/testSapi61")
|
|
|
|
// @GetMapping("/testSapi61")
|
|
|
|
@WeaPermission(publicPermission = true)
|
|
|
|
// @WeaPermission(publicPermission = true)
|
|
|
|
public WeaResult<Object> testSapi61(HttpServletRequest request){
|
|
|
|
// public WeaResult<Object> testSapi61(HttpServletRequest request){
|
|
|
|
log.error("testSapi61");
|
|
|
|
// log.error("testSapi61");
|
|
|
|
|
|
|
|
//
|
|
|
|
String startday = request.getParameter("startday");
|
|
|
|
// String startday = request.getParameter("startday");
|
|
|
|
String endday = request.getParameter("endday");
|
|
|
|
// String endday = request.getParameter("endday");
|
|
|
|
DateTimeFormatter format = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
|
|
|
// DateTimeFormatter format = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
|
|
|
|
|
|
|
//
|
|
|
|
String defineTime = " 00:00:01";
|
|
|
|
// String defineTime = " 00:00:01";
|
|
|
|
Long count = 0L ;
|
|
|
|
// Long count = 0L ;
|
|
|
|
try{
|
|
|
|
// try{
|
|
|
|
RequestListConditionApiEntity conditionEntity = new RequestListConditionApiEntity();
|
|
|
|
// RequestListConditionApiEntity conditionEntity = new RequestListConditionApiEntity();
|
|
|
|
SimpleEmployee employee = UserContext.getCurrentUser();
|
|
|
|
// SimpleEmployee employee = UserContext.getCurrentUser();
|
|
|
|
log.error("employee--:"+employee.getEmployeeId());
|
|
|
|
// log.error("employee--:"+employee.getEmployeeId());
|
|
|
|
|
|
|
|
//
|
|
|
|
conditionEntity.setOperatedate(DateTimeConditionEnum.CUSTOM_DATE);
|
|
|
|
// conditionEntity.setOperatedate(DateTimeConditionEnum.CUSTOM_DATE);
|
|
|
|
|
|
|
|
//
|
|
|
|
LocalDateTime startDateTime = LocalDateTime.of(LocalDate.from(LocalDateTime.now().with(TemporalAdjusters.firstDayOfYear())), LocalTime.MIN);
|
|
|
|
// LocalDateTime startDateTime = LocalDateTime.of(LocalDate.from(LocalDateTime.now().with(TemporalAdjusters.firstDayOfYear())), LocalTime.MIN);
|
|
|
|
if(StringUtils.isNotBlank(startday)){
|
|
|
|
// if(StringUtils.isNotBlank(startday)){
|
|
|
|
startDateTime = LocalDateTime.parse(startday+defineTime, format);
|
|
|
|
// startDateTime = LocalDateTime.parse(startday+defineTime, format);
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
LocalDateTime endDateTime = LocalDateTime.now();
|
|
|
|
// LocalDateTime endDateTime = LocalDateTime.now();
|
|
|
|
if(StringUtils.isNotBlank(endday)){
|
|
|
|
// if(StringUtils.isNotBlank(endday)){
|
|
|
|
endDateTime = LocalDateTime.parse(endday+defineTime, format);
|
|
|
|
// endDateTime = LocalDateTime.parse(endday+defineTime, format);
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
conditionEntity.setCusOperateDateStart(startDateTime);
|
|
|
|
// conditionEntity.setCusOperateDateStart(startDateTime);
|
|
|
|
conditionEntity.setCusOperateDateEnd(endDateTime);
|
|
|
|
// conditionEntity.setCusOperateDateEnd(endDateTime);
|
|
|
|
|
|
|
|
//
|
|
|
|
log.error("conditionEntity--:"+conditionEntity.toString());
|
|
|
|
// log.error("conditionEntity--:"+conditionEntity.toString());
|
|
|
|
|
|
|
|
//
|
|
|
|
WeaResult<RequestCountInfoPAEntity> requestCountInfo = wflRequestListRest.getRequestCountByTabId(employee, RequestListInitDimensionTabEnum.DONE_FLOWALL.getTabid(), conditionEntity);
|
|
|
|
// WeaResult<RequestCountInfoPAEntity> requestCountInfo = wflRequestListRest.getRequestCountByTabId(employee, RequestListInitDimensionTabEnum.DONE_FLOWALL.getTabid(), conditionEntity);
|
|
|
|
log.error("requestCountInfo--:"+requestCountInfo.toString());
|
|
|
|
// log.error("requestCountInfo--:"+requestCountInfo.toString());
|
|
|
|
int code = requestCountInfo.getCode();
|
|
|
|
// int code = requestCountInfo.getCode();
|
|
|
|
log.error("code--:"+code);
|
|
|
|
// log.error("code--:"+code);
|
|
|
|
if(code == 200){
|
|
|
|
// if(code == 200){
|
|
|
|
RequestCountInfoPAEntity requestCountInfoPAEntity = requestCountInfo.getData();
|
|
|
|
// RequestCountInfoPAEntity requestCountInfoPAEntity = requestCountInfo.getData();
|
|
|
|
log.error("requestCountInfoPAEntity--:"+requestCountInfoPAEntity.toString());
|
|
|
|
// log.error("requestCountInfoPAEntity--:"+requestCountInfoPAEntity.toString());
|
|
|
|
count = requestCountInfoPAEntity.getCount();
|
|
|
|
// count = requestCountInfoPAEntity.getCount();
|
|
|
|
log.error("count--:"+count);
|
|
|
|
// log.error("count--:"+count);
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
}catch (Exception e){
|
|
|
|
// }catch (Exception e){
|
|
|
|
log.error("getWorkFlowInfo-Exception:"+e.getMessage());
|
|
|
|
// log.error("getWorkFlowInfo-Exception:"+e.getMessage());
|
|
|
|
return WeaResult.fail(500,"程序执行异常");
|
|
|
|
// return WeaResult.fail(500,"程序执行异常");
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
return WeaResult.success(count);
|
|
|
|
// return WeaResult.success(count);
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
/***
|
|
|
|
/***
|
|
|
|
* 本年开发人天
|
|
|
|
* 本年开发人天
|
|
|
|
@ -957,7 +960,6 @@ public class HrmSelfHelpController {
|
|
|
|
|
|
|
|
|
|
|
|
log.error("testSapi80");
|
|
|
|
log.error("testSapi80");
|
|
|
|
|
|
|
|
|
|
|
|
JucailinPortalUtils jucailinPortalUtils = new JucailinPortalUtils();
|
|
|
|
|
|
|
|
String pkey = "uf_zzfwcsh.taby.fieldId";
|
|
|
|
String pkey = "uf_zzfwcsh.taby.fieldId";
|
|
|
|
String field_id = jucailinPortalUtils.getUfPropData(pkey,tenant_key);
|
|
|
|
String field_id = jucailinPortalUtils.getUfPropData(pkey,tenant_key);
|
|
|
|
log.error("field_id:"+field_id);
|
|
|
|
log.error("field_id:"+field_id);
|
|
|
|
|
