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

#E10人事自助门户-处理人事自助门户接口，本年流程处理数量接口

Browse Source
main
wangjie 1 year ago
parent 484822ace3
commit 4a867e522d
7 changed files with 94 additions and 122 deletions
Show Stats Download Patch File Download Diff File

37
src/main/java/com/weaver/seconddev/jcldoor/cmd/DevCollaborationInfoCmd.java
Unescape Escape View File

@ -7,6 +7,7 @@ import com.weaver.framework.rpc.annotation.RpcReference;
import com.weaver.seconddev.jcldoor.util.DatabaseUtils;
import com.weaver.teams.domain.user.SimpleEmployee;
import com.weaver.teams.security.context.UserContext;
import com.weaver.workflow.common.constant.list.api.DateTimeConditionEnum;
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.publicapi.RequestCountInfoPAEntity;
@ -62,7 +63,7 @@ public class DevCollaborationInfoCmd {
Map<String, Object> gtxzMap = getInteractInfo(startday, endday, employeeId);
int gtxz = (int) gtxzMap.get("count");
Map<String, Object> wfMap = getWfInfo(startday, endday);
Map<String, Object> wfMap = getWfInfo();
Long lccl = (Long) wfMap.get("count");
dataMap.put("rtcount", rtcount);
@ -273,36 +274,22 @@ public class DevCollaborationInfoCmd {
* @param
* @return
*/
public Map<String, Object> getWfInfo(String startday, String endday) {
log.error("PortalWfDealCountCmd");
public Map<String, Object> getWfInfo() {
Map<String, Object> data = new HashMap<>(100);
DateTimeFormatter format = DateTimeFormatter.ofPattern("yyyy-MM-dd");
Long count = 0L;
try {
Long count = 0L ;
try{
RequestListConditionApiEntity conditionEntity = new RequestListConditionApiEntity();
SimpleEmployee employee = UserContext.getCurrentUser();
LocalDateTime startDateTime = LocalDateTime.of(LocalDate.from(LocalDateTime.now().with(TemporalAdjusters.firstDayOfYear())), LocalTime.MIN);
if (StringUtils.isNotBlank(startday)) {
startDateTime = LocalDateTime.parse(startday, format);
}
LocalDateTime endDateTime = LocalDateTime.now();
if (StringUtils.isNotBlank(endday)) {
endDateTime = LocalDateTime.parse(endday, format);
}
conditionEntity.setCusOperateDateStart(startDateTime);
conditionEntity.setCusOperateDateEnd(endDateTime);
WeaResult<RequestCountInfoPAEntity> RequestCountInfoPAEntity = wflRequestListRest.getRequestCountByTabId(employee, RequestListInitDimensionTabEnum.DONE_FLOWALL.getTabid(), conditionEntity);
int code = RequestCountInfoPAEntity.getCode();
if (code == 200) {
count = RequestCountInfoPAEntity.getData().getCount();
conditionEntity.setOperatedate(DateTimeConditionEnum.CURRENT_YEAR);
WeaResult<RequestCountInfoPAEntity> requestCountInfo = wflRequestListRest.getRequestCountByTabId(employee, RequestListInitDimensionTabEnum.DONE_FLOWALL.getTabid(), conditionEntity);
int code = requestCountInfo.getCode();
if(code == 200){
RequestCountInfoPAEntity requestCountInfoPAEntity = requestCountInfo.getData();
count = requestCountInfoPAEntity.getCount();
}
} catch (Exception e) {
log.error("PortalWfDealCountCmd-Exception:" + e);
log.error("getWfInfo-Exception:" + e);
}
data.put("count", count);
return data;

2
src/main/java/com/weaver/seconddev/jcldoor/cmd/DevQuestCountCmd.java
Unescape Escape View File

@ -1,8 +1,6 @@
package com.weaver.seconddev.jcldoor.cmd;
import com.weaver.common.base.entity.result.WeaResult;
import com.weaver.ebuilder.datasource.api.entity.SqlParamEntity;
import com.weaver.ebuilder.datasource.api.enums.SqlParamType;
import com.weaver.seconddev.jcldoor.util.DatabaseUtils;
import com.weaver.teams.domain.user.SimpleEmployee;
import com.weaver.teams.security.context.UserContext;

34
src/main/java/com/weaver/seconddev/jcldoor/cmd/PortalCollaborationInfoCmd.java
Unescape Escape View File

@ -7,6 +7,7 @@ import com.weaver.framework.rpc.annotation.RpcReference;
import com.weaver.seconddev.jcldoor.util.DatabaseUtils;
import com.weaver.teams.domain.user.SimpleEmployee;
import com.weaver.teams.security.context.UserContext;
import com.weaver.workflow.common.constant.list.api.DateTimeConditionEnum;
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.publicapi.RequestCountInfoPAEntity;
@ -66,7 +67,7 @@ public class PortalCollaborationInfoCmd {
Map<String,Object> gtxzMap = getInteractInfo(startday,endday,employeeId);
gtxz = (int) gtxzMap.get("count");
Map<String,Object> wfMap = getWfInfo(startday,endday);
Map<String,Object> wfMap = getWfInfo();
lccl = (Long) wfMap.get("count");
@ -252,39 +253,26 @@ public class PortalCollaborationInfoCmd {
* @param
* @return
*/
public Map<String, Object> getWfInfo(String startday,String endday) {
public Map<String, Object> getWfInfo() {
log.error("PortalWfDealCountCmd");
Map<String,Object> data = new HashMap<>(100);
DateTimeFormatter format = DateTimeFormatter.ofPattern("yyyy-MM-dd");
Long count = 0L ;
try{
RequestListConditionApiEntity conditionEntity = new RequestListConditionApiEntity();
SimpleEmployee employee = UserContext.getCurrentUser();
LocalDateTime startDateTime = LocalDateTime.of(LocalDate.from(LocalDateTime.now().with(TemporalAdjusters.firstDayOfYear())), LocalTime.MIN);
if(StringUtils.isNotBlank(startday)){
startDateTime = LocalDateTime.parse(startday, format);
}
LocalDateTime endDateTime = LocalDateTime.now();
if(StringUtils.isNotBlank(endday)){
endDateTime = LocalDateTime.parse(endday, format);
}
conditionEntity.setCusOperateDateStart(startDateTime);
conditionEntity.setCusOperateDateEnd(endDateTime);
WeaResult<RequestCountInfoPAEntity> RequestCountInfoPAEntity = wflRequestListRest.getRequestCountByTabId(employee, RequestListInitDimensionTabEnum.DONE_FLOWALL.getTabid(), conditionEntity);
int code = RequestCountInfoPAEntity.getCode();
conditionEntity.setOperatedate(DateTimeConditionEnum.CURRENT_YEAR);
WeaResult<RequestCountInfoPAEntity> requestCountInfo = wflRequestListRest.getRequestCountByTabId(employee, RequestListInitDimensionTabEnum.DONE_FLOWALL.getTabid(), conditionEntity);
int code = requestCountInfo.getCode();
if(code == 200){
count = RequestCountInfoPAEntity.getData().getCount();
RequestCountInfoPAEntity requestCountInfoPAEntity = requestCountInfo.getData();
count = requestCountInfoPAEntity.getCount();
}
}catch (Exception e){
log.error("PortalWfDealCountCmd-Exception:"+e.getMessage());
data.put("count",0);
} catch (Exception e) {
log.error("PortalWfDealCountCmd-Exception:" + e);
}
data.put("count",count);
data.put("count", count);
return data;
}

32
src/main/java/com/weaver/seconddev/jcldoor/cmd/PortalWfDealCountCmd.java
Unescape Escape View File

@ -5,6 +5,7 @@ import com.weaver.framework.rpc.annotation.RpcReference;
import com.weaver.seconddev.jcldoor.util.DatabaseUtils;
import com.weaver.teams.domain.user.SimpleEmployee;
import com.weaver.teams.security.context.UserContext;
import com.weaver.workflow.common.constant.list.api.DateTimeConditionEnum;
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.publicapi.RequestCountInfoPAEntity;
@ -50,36 +51,23 @@ public class PortalWfDealCountCmd {
public Map<String, Object> getInfo(HttpServletRequest request, SimpleEmployee simpleEmployee) {
log.error("PortalWfDealCountCmd");
Map<String,Object> data = new HashMap<>(100);
String startday = request.getParameter("startday");
String endday = request.getParameter("endday");
DateTimeFormatter format = DateTimeFormatter.ofPattern("yyyy-MM-dd");
Long count = 0L ;
try{
RequestListConditionApiEntity conditionEntity = new RequestListConditionApiEntity();
SimpleEmployee employee = UserContext.getCurrentUser();
LocalDateTime startDateTime = LocalDateTime.of(LocalDate.from(LocalDateTime.now().with(TemporalAdjusters.firstDayOfYear())), LocalTime.MIN);
if(StringUtils.isNotBlank(startday)){
startDateTime = LocalDateTime.parse(startday, format);
}
LocalDateTime endDateTime = LocalDateTime.now();
if(StringUtils.isNotBlank(endday)){
endDateTime = LocalDateTime.parse(endday, format);
}
conditionEntity.setCusOperateDateStart(startDateTime);
conditionEntity.setCusOperateDateEnd(endDateTime);
WeaResult<RequestCountInfoPAEntity> RequestCountInfoPAEntity = wflRequestListRest.getRequestCountByTabId(employee, RequestListInitDimensionTabEnum.DONE_FLOWALL.getTabid(), conditionEntity);
int code = RequestCountInfoPAEntity.getCode();
conditionEntity.setOperatedate(DateTimeConditionEnum.CURRENT_YEAR);
WeaResult<RequestCountInfoPAEntity> requestCountInfo = wflRequestListRest.getRequestCountByTabId(employee, RequestListInitDimensionTabEnum.DONE_FLOWALL.getTabid(), conditionEntity);
int code = requestCountInfo.getCode();
if(code == 200){
count = RequestCountInfoPAEntity.getData().getCount();
RequestCountInfoPAEntity requestCountInfoPAEntity = requestCountInfo.getData();
count = requestCountInfoPAEntity.getCount();
}
}catch (Exception e){
log.error("PortalWfDealCountCmd-Exception:"+e.getMessage());
} catch (Exception e) {
log.error("PortalWfDealCountCmd-Exception:" + e);
}
data.put("count",count);
data.put("count", count);
return data;
}

7
src/main/java/com/weaver/seconddev/jcldoor/cmd/SelfServiceInfoCmd.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.weaver.seconddev.jcldoor.cmd;
import com.weaver.ebuilder.datasource.api.entity.SqlParamEntity;
import com.weaver.seconddev.jcldoor.util.DatabaseUtils;
import com.weaver.seconddev.jcldoor.util.JucailinPortalUtils;
import com.weaver.teams.domain.user.SimpleEmployee;
import com.weaver.teams.security.context.UserContext;
import org.apache.commons.lang3.StringUtils;
@ -31,11 +32,15 @@ public class SelfServiceInfoCmd {
@Autowired
private DatabaseUtils databaseUtils;
@Autowired
private JucailinPortalUtils jucailinPortalUtils;
public String tenant_key = "t7akvdnf84";
public Map<String, Object> getInfo(HttpServletRequest request, SimpleEmployee simpleEmployee) {
Map<String,Object> recordMap = new HashMap<String,Object>();
String field_id = "977306579913818114" ;
String pkey = "uf_zzfwcsh.taby.fieldId";
String field_id = jucailinPortalUtils.getUfPropData(pkey,tenant_key);
String groupId = "weaver-ebuilder-form-service";
String sourceType = "LOGIC";

6
src/main/java/com/weaver/seconddev/jcldoor/cmd/UserInfoCmd.java
Unescape Escape View File

@ -165,6 +165,7 @@ public class UserInfoCmd {
try {
SimpleEmployee employee = UserContext.getCurrentUser();
RequestListConditionApiEntity conditionEntity = new RequestListConditionApiEntity();
WeaResult<RequestCountInfoPAEntity> RequestCountInfoPAEntity = wflRequestListRest.getRequestCountByTabId(employee, RequestListInitDimensionTabEnum.MINE_FLOWALL.getTabid(), conditionEntity);
Long count = RequestCountInfoPAEntity.getData().getCount();
num = count + "";
@ -183,11 +184,14 @@ public class UserInfoCmd {
public String getWfDealNum() {
String num = "0";
try {
Long count = 0L;
SimpleEmployee employee = UserContext.getCurrentUser();
RequestListConditionApiEntity conditionEntity = new RequestListConditionApiEntity();
WeaResult<RequestCountInfoPAEntity> RequestCountInfoPAEntity = wflRequestListRest.getRequestCountByTabId(employee, RequestListInitDimensionTabEnum.DONE_FLOWALL.getTabid(), conditionEntity);
int code = RequestCountInfoPAEntity.getCode();
Long count = RequestCountInfoPAEntity.getData().getCount();
if(code == 200){
count = RequestCountInfoPAEntity.getData().getCount();
}
num = count + "";
} catch (Exception e) {
e.printStackTrace();

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

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

Write Preview
Loading…
Cancel
Save