shilei
/
E10-secondev-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#E10-43# 人员信息增加时间差及优化流程效率分享接口

Browse Source
main
shilei 11 months ago
parent dacb6aa248
commit 66e56dddc6
3 changed files with 245 additions and 199 deletions
Show Stats Download Patch File Download Diff File

34
src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitUserDataCmd.java
Unescape Escape View File

@ -13,6 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.Period;
import java.util.*; import java.util.*;
/** /**
@ -270,6 +272,38 @@ public class CockpitUserDataCmd {
if(!empList.isEmpty() && empList.size()>0){ if(!empList.isEmpty() && empList.size()>0){
changeList.addAll(empList); changeList.addAll(empList);
} }
for (int i = 0; i < changeList.size()-1; i++) {
Map<String,Object> currentMap = changeList.get(i);
Map<String,Object> nextMap = changeList.get(i+1);
String current_changedate = String.valueOf(currentMap.get("changedate"));
String next_changedate = String.valueOf(nextMap.get("changedate"));
log.error("current_changedate:"+current_changedate);
log.error("next_changedate:"+next_changedate);
String diffdate = "";
if(StringUtils.isNotBlank(current_changedate) && StringUtils.isNotBlank(next_changedate)){
try{
LocalDate current_date = LocalDate.parse(current_changedate);
LocalDate next_date = LocalDate.parse(next_changedate);
// 计算两个日期之间的期间
Period period = Period.between(current_date, next_date);
int year = period.getYears();
int month = period.getMonths();
if(year > 0){
diffdate = year+"年";
}
if(month > 0){
diffdate = diffdate +month+"月";
}
}catch (Exception e){
e.printStackTrace();
log.error("getDataInfo:"+e);
}
}
currentMap.put("diffdate",diffdate);
}
userMap.put("changeList", changeList); userMap.put("changeList", changeList);
} catch (Exception e) { } catch (Exception e) {

60
src/main/java/com/weaver/seconddev/cockpit/cmd/CockpitWorkflowAnalysisCmd.java
Unescape Escape View File

@ -8,6 +8,7 @@ import com.weaver.seconddev.cockpit.util.DatabaseUtils;
import com.weaver.seconddev.cockpit.util.JucailinCockpitUtils; import com.weaver.seconddev.cockpit.util.JucailinCockpitUtils;
import com.weaver.seconddev.jcldoor.util.CommonUtils; import com.weaver.seconddev.jcldoor.util.CommonUtils;
import com.weaver.teams.domain.user.SimpleEmployee; import com.weaver.teams.domain.user.SimpleEmployee;
import com.weaver.workflow.common.constant.list.api.DateTimeConditionEnum;
import com.weaver.workflow.common.constant.list.listdimension.RequestListInitDimensionTabEnum; import com.weaver.workflow.common.constant.list.listdimension.RequestListInitDimensionTabEnum;
import com.weaver.workflow.common.entity.list.api.RequestListConditionApiEntity; import com.weaver.workflow.common.entity.list.api.RequestListConditionApiEntity;
import com.weaver.workflow.common.entity.list.api.publicapi.RequestCountInfoPAEntity; import com.weaver.workflow.common.entity.list.api.publicapi.RequestCountInfoPAEntity;
@ -174,30 +175,43 @@ public class CockpitWorkflowAnalysisCmd {
String count = "0.0"; String count = "0.0";
try{ try{
RequestListConditionApiEntity conditionEntity = new RequestListConditionApiEntity(); RequestListConditionApiEntity conditionEntity = new RequestListConditionApiEntity();
WeaResult<List<RequestListInfoPAEntity>> requestListData = wflRequestListRest.getRequestListByTabId(employee, RequestListInitDimensionTabEnum.DONE_FLOWALL.getTabid(), 1, 500, conditionEntity); conditionEntity.setOperatedate(DateTimeConditionEnum.CURRENT_YEAR);
int code = requestListData.getCode(); int wfcount = 0 ;
if(code == 200){ WeaResult<RequestCountInfoPAEntity> requestCountInfo = wflRequestListRest.getRequestCountByTabId(employee, RequestListInitDimensionTabEnum.DONE_FLOWALL.getTabid(), conditionEntity);
Long minutescount = 0L; log.error("requestCountInfo--:"+requestCountInfo.toString());
List<RequestListInfoPAEntity> requestCountInfoPAEntityList = requestListData.getData(); int code1 = requestCountInfo.getCode();
int requestLength = requestCountInfoPAEntityList.size() ; log.error("code1--:"+code1);
log.error("requestLength:"+requestLength); if(code1 == 200){
for(int i=0;i<requestLength;i++){ RequestCountInfoPAEntity requestCountInfoPAEntity = requestCountInfo.getData();
RequestListInfoPAEntity requestListInfoPAEntity = requestCountInfoPAEntityList.get(i); Long wf_count = requestCountInfoPAEntity.getCount();
LocalDateTime receiveDateTime = requestListInfoPAEntity.getReceiveTime(); log.error("wfcount--:"+wfcount);
LocalDateTime operateDateTime = requestListInfoPAEntity.getOperateTime(); wfcount = wf_count.intValue();
log.error("receiveDateTime:"+receiveDateTime); }
log.error("operateDateTime:"+operateDateTime);
Long minutesDiff = ChronoUnit.MINUTES.between(receiveDateTime, operateDateTime);
log.error("minutesDiff:"+minutesDiff);
minutescount += minutesDiff ;
}
log.error("minutescount:"+minutescount);
if(requestLength > 0 && minutescount > 0){ if(wfcount > 0){
double average = minutescount/requestLength ; WeaResult<List<RequestListInfoPAEntity>> requestListData = wflRequestListRest.getRequestListByTabId(employee, RequestListInitDimensionTabEnum.DONE_FLOWALL.getTabid(), 1, wfcount, conditionEntity);
count = String.valueOf(average); int code2 = requestListData.getCode();
if(code2 == 200){
Long minutescount = 0L;
List<RequestListInfoPAEntity> requestCountInfoPAEntityList = requestListData.getData();
int requestLength = requestCountInfoPAEntityList.size() ;
log.error("requestLength:"+requestLength);
for(int i=0;i<requestLength;i++){
RequestListInfoPAEntity requestListInfoPAEntity = requestCountInfoPAEntityList.get(i);
LocalDateTime receiveDateTime = requestListInfoPAEntity.getReceiveTime();
LocalDateTime operateDateTime = requestListInfoPAEntity.getOperateTime();
// log.error("receiveDateTime:"+receiveDateTime);
// log.error("operateDateTime:"+operateDateTime);
Long minutesDiff = ChronoUnit.MINUTES.between(receiveDateTime, operateDateTime);
// log.error("minutesDiff:"+minutesDiff);
minutescount += minutesDiff ;
}
log.error("minutescount:"+minutescount);
if(requestLength > 0 && minutescount > 0){
double average = minutescount/requestLength ;
count = String.valueOf(average);
}
} }
} }
} catch (Exception e) { } catch (Exception e) {

350
src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java
Unescape Escape View File

@ -101,116 +101,116 @@ public class HrmSelfHelpController {
public String tenant_key = "t7akvdnf84" ; public String tenant_key = "t7akvdnf84" ;
@GetMapping("/testSapi12") // @GetMapping("/testSapi12")
@WeaPermission(publicPermission = true) // @WeaPermission(publicPermission = true)
public WeaResult<Object> testSapi12(HttpServletRequest request){ // public WeaResult<Object> testSapi12(HttpServletRequest request){
Map<String,Object> dataMap = new HashMap<String,Object>(); // Map<String,Object> dataMap = new HashMap<String,Object>();
dataMap.put("test","testSapi13"); // dataMap.put("test","testSapi13");
//
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); // SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
try { // try {
//
String pageSize = request.getParameter("pagesize"); // String pageSize = request.getParameter("pagesize");
String pageNum = request.getParameter("pagenum"); // String pageNum = request.getParameter("pagenum");
String startDate = request.getParameter("startDate"); // String startDate = request.getParameter("startDate");
//
SimpleEmployee employee = UserContext.getCurrentUser(); // SimpleEmployee employee = UserContext.getCurrentUser();
if(StringUtils.isBlank(startDate)){ // if(StringUtils.isBlank(startDate)){
startDate = "2001-01-01"; // startDate = "2001-01-01";
} // }
//
Calendar cal = Calendar.getInstance(); // Calendar cal = Calendar.getInstance();
//设置当前时间 // //设置当前时间
cal.setTime(new Date()); // cal.setTime(new Date());
//同理增加一天的方法： // //同理增加一天的方法：
cal.add(Calendar.DATE, -1); // cal.add(Calendar.DATE, -1);
String endDate = format.format(cal.getTime()); // String endDate = format.format(cal.getTime());
Long cid = employee.getCid(); // Long cid = employee.getCid();
dataMap.put("startDate",startDate); // dataMap.put("startDate",startDate);
dataMap.put("endDate",endDate); // dataMap.put("endDate",endDate);
dataMap.put("cid",cid); // dataMap.put("cid",cid);
//
dataMap.put("pageSize",pageSize); // dataMap.put("pageSize",pageSize);
dataMap.put("pageNum",pageNum); // dataMap.put("pageNum",pageNum);
//
//
Map<String, Object> json = new HashMap<String, Object>(); // Map<String, Object> json = new HashMap<String, Object>();
json.put("cid",cid); // json.put("cid",cid);
json.put("pageNum",pageNum); // json.put("pageNum",pageNum);
json.put("pageSize",pageSize); // json.put("pageSize",pageSize);
json.put("startDate",startDate); // json.put("startDate",startDate);
json.put("endDate",endDate); // json.put("endDate",endDate);
//
com.weaver.em.msg.api.entity.Request emrequest = new com.weaver.em.msg.api.entity.Request(); // com.weaver.em.msg.api.entity.Request emrequest = new com.weaver.em.msg.api.entity.Request();
emrequest.setUrl("/user-profile/dailySingleSession"); // emrequest.setUrl("/user-profile/dailySingleSession");
emrequest.setParamsMap(json); // emrequest.setParamsMap(json);
emrequest.setAsync(false); // emrequest.setAsync(false);
com.weaver.em.msg.api.entity.Response response2 = oaRest.executeIm(emrequest); // com.weaver.em.msg.api.entity.Response response2 = oaRest.executeIm(emrequest);
String data = response2.getData(); // String data = response2.getData();
dataMap.put("datas",data); // dataMap.put("datas",data);
} catch (Exception e) { // } catch (Exception e) {
e.printStackTrace(); // e.printStackTrace();
log.error("testSapi13:"+e); // log.error("testSapi13:"+e);
dataMap.put("count","-1"); // dataMap.put("count","-1");
} // }
return WeaResult.success(dataMap); // return WeaResult.success(dataMap);
} // }
//
//
@GetMapping("/testSapi13") // @GetMapping("/testSapi13")
@WeaPermission(publicPermission = true) // @WeaPermission(publicPermission = true)
public WeaResult<Object> testSapi13(HttpServletRequest request){ // public WeaResult<Object> testSapi13(HttpServletRequest request){
Map<String,Object> dataMap = new HashMap<String,Object>(); // Map<String,Object> dataMap = new HashMap<String,Object>();
dataMap.put("test","testSapi13"); // dataMap.put("test","testSapi13");
//
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); // SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
try { // try {
//
String pageSize = request.getParameter("pagesize"); // String pageSize = request.getParameter("pagesize");
String pageNum = request.getParameter("pagenum"); // String pageNum = request.getParameter("pagenum");
String startDate = request.getParameter("startDate"); // String startDate = request.getParameter("startDate");
//
SimpleEmployee employee = UserContext.getCurrentUser(); // SimpleEmployee employee = UserContext.getCurrentUser();
if(StringUtils.isBlank(startDate)){ // if(StringUtils.isBlank(startDate)){
startDate = "2001-01-01"; // startDate = "2001-01-01";
} // }
//
Calendar cal = Calendar.getInstance(); // Calendar cal = Calendar.getInstance();
//设置当前时间 // //设置当前时间
cal.setTime(new Date()); // cal.setTime(new Date());
//同理增加一天的方法： // //同理增加一天的方法：
cal.add(Calendar.DATE, -1); // cal.add(Calendar.DATE, -1);
String endDate = format.format(cal.getTime()); // String endDate = format.format(cal.getTime());
Long cid = employee.getCid(); // Long cid = employee.getCid();
dataMap.put("startDate",startDate); // dataMap.put("startDate",startDate);
dataMap.put("endDate",endDate); // dataMap.put("endDate",endDate);
dataMap.put("cid",cid); // dataMap.put("cid",cid);
//
dataMap.put("pageSize",pageSize); // dataMap.put("pageSize",pageSize);
dataMap.put("pageNum",pageNum); // dataMap.put("pageNum",pageNum);
//
//
Map<String, Object> json = new HashMap<String, Object>(); // Map<String, Object> json = new HashMap<String, Object>();
json.put("cid",cid); // json.put("cid",cid);
json.put("pageNum",pageNum); // json.put("pageNum",pageNum);
json.put("pageSize",pageSize); // json.put("pageSize",pageSize);
json.put("startDate",startDate); // json.put("startDate",startDate);
json.put("endDate",endDate); // json.put("endDate",endDate);
//
com.weaver.em.msg.api.entity.Request emrequest = new com.weaver.em.msg.api.entity.Request(); // com.weaver.em.msg.api.entity.Request emrequest = new com.weaver.em.msg.api.entity.Request();
emrequest.setUrl("/user-profile/groupSession"); // emrequest.setUrl("/user-profile/groupSession");
emrequest.setParamsMap(json); // emrequest.setParamsMap(json);
emrequest.setAsync(false); // emrequest.setAsync(false);
com.weaver.em.msg.api.entity.Response response2 = oaRest.executeIm(emrequest); // com.weaver.em.msg.api.entity.Response response2 = oaRest.executeIm(emrequest);
String data = response2.getData(); // String data = response2.getData();
dataMap.put("datas",data); // dataMap.put("datas",data);
} catch (Exception e) { // } catch (Exception e) {
e.printStackTrace(); // e.printStackTrace();
log.error("testSapi13:"+e); // log.error("testSapi13:"+e);
dataMap.put("count","-1"); // dataMap.put("count","-1");
} // }
return WeaResult.success(dataMap); // return WeaResult.success(dataMap);
} // }
// @GetMapping("/testSapi15") // @GetMapping("/testSapi15")
@ -674,8 +674,6 @@ public class HrmSelfHelpController {
@WeaPermission(publicPermission = true) @WeaPermission(publicPermission = true)
public WeaResult<Object> testSapi60(HttpServletRequest request){ public WeaResult<Object> testSapi60(HttpServletRequest request){
log.error("testSapi60"); log.error("testSapi60");
Long count = 0L ; Long count = 0L ;
try{ try{
RequestListConditionApiEntity conditionEntity = new RequestListConditionApiEntity(); RequestListConditionApiEntity conditionEntity = new RequestListConditionApiEntity();
@ -1822,72 +1820,72 @@ public class HrmSelfHelpController {
// } // }
@GetMapping("/test200") // @GetMapping("/test200")
@WeaPermission(publicPermission = true) // @WeaPermission(publicPermission = true)
public WeaResult<Object> test200(HttpServletRequest request){ // public WeaResult<Object> test200(HttpServletRequest request){
//
Map<String,Object> dataMap = new HashMap<String,Object>(); // Map<String,Object> dataMap = new HashMap<String,Object>();
dataMap.put("test","test200"); // dataMap.put("test","test200");
try { // try {
String objid = request.getParameter("objid"); // String objid = request.getParameter("objid");
if(StringUtils.isNotBlank(objid)) { // if(StringUtils.isNotBlank(objid)) {
Long obj_id = Long.valueOf(objid); // Long obj_id = Long.valueOf(objid);
WeaResult<Obj> list = remoteEBObjService.getObjInfo(obj_id,tenant_key); // WeaResult<Obj> list = remoteEBObjService.getObjInfo(obj_id,tenant_key);
dataMap.put("datas",list); // dataMap.put("datas",list);
} // }
} catch (Exception e) { // } catch (Exception e) {
e.printStackTrace(); // e.printStackTrace();
log.error("test200:"+e); // log.error("test200:"+e);
dataMap.put("message",e.getMessage()); // dataMap.put("message",e.getMessage());
} // }
//
return WeaResult.success(dataMap); // return WeaResult.success(dataMap);
} // }
//
//
@GetMapping("/test201") // @GetMapping("/test201")
@WeaPermission(publicPermission = true) // @WeaPermission(publicPermission = true)
public WeaResult<Object> test201(HttpServletRequest request){ // public WeaResult<Object> test201(HttpServletRequest request){
//
Map<String,Object> dataMap = new HashMap<String,Object>(); // Map<String,Object> dataMap = new HashMap<String,Object>();
dataMap.put("test","test201"); // dataMap.put("test","test201");
String columnnames = request.getParameter("columnnames"); // String columnnames = request.getParameter("columnnames");
String objid = request.getParameter("objid"); // String objid = request.getParameter("objid");
log.error("objid:"+objid); // log.error("objid:"+objid);
try { // try {
if(StringUtils.isNotBlank(objid)){ // if(StringUtils.isNotBlank(objid)){
Long obj_id = Long.valueOf(objid); // Long obj_id = Long.valueOf(objid);
List<Obj> fieldlist = remoteEBObjService.getAllTablesByMasterId(obj_id,tenant_key); // List<Obj> fieldlist = remoteEBObjService.getAllTablesByMasterId(obj_id,tenant_key);
dataMap.put("datas",fieldlist); // dataMap.put("datas",fieldlist);
} // }
} catch (Exception e) { // } catch (Exception e) {
e.printStackTrace(); // e.printStackTrace();
log.error("test201:"+e); // log.error("test201:"+e);
dataMap.put("message",e.getMessage()); // dataMap.put("message",e.getMessage());
} // }
return WeaResult.success(dataMap); // return WeaResult.success(dataMap);
} // }
@GetMapping("/test202")
@WeaPermission(publicPermission = true)
public WeaResult<Object> test202(HttpServletRequest request){
Map<String,Object> dataMap = new HashMap<String,Object>(); // @GetMapping("/test202")
dataMap.put("test","test202"); // @WeaPermission(publicPermission = true)
try { // public WeaResult<Object> test202(HttpServletRequest request){
String TenantKey = TenantRpcContext.getTenantKey(); //
dataMap.put("TenantKey",TenantKey); // Map<String,Object> dataMap = new HashMap<String,Object>();
String appIds = request.getParameter("appIds"); // dataMap.put("test","test202");
List<Obj> list = IEtFormDatasetService.getTables(appIds); // try {
dataMap.put("datas",list); // String TenantKey = TenantRpcContext.getTenantKey();
} catch (Exception e) { // dataMap.put("TenantKey",TenantKey);
e.printStackTrace(); // String appIds = request.getParameter("appIds");
log.error("test202:"+e); // List<Obj> list = IEtFormDatasetService.getTables(appIds);
dataMap.put("message",e.getMessage()); // dataMap.put("datas",list);
} // } catch (Exception e) {
return WeaResult.success(dataMap); // e.printStackTrace();
} // log.error("test202:"+e);
// dataMap.put("message",e.getMessage());
// }
// return WeaResult.success(dataMap);
// }
@GetMapping("/test203") @GetMapping("/test203")

Write Preview
Loading…
Cancel
Save