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

#E10-36# 优化员工信息及平均每天沟通数量的值

Browse Source
main
shilei 1 year ago
parent 2b96c01522
commit 69bec612dd
2 changed files with 50 additions and 67 deletions
Show Stats Download Patch File Download Diff File

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

@ -1,7 +1,8 @@
package com.weaver.seconddev.jcldoor.cmd; package com.weaver.seconddev.jcldoor.cmd;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.weaver.common.base.entity.result.WeaResult; import com.weaver.common.base.entity.result.WeaResult;
import com.weaver.common.hrm.util.Util;
import com.weaver.ebuilder.datasource.api.entity.SqlParamEntity; import com.weaver.ebuilder.datasource.api.entity.SqlParamEntity;
import com.weaver.framework.rpc.annotation.RpcReference; import com.weaver.framework.rpc.annotation.RpcReference;
import com.weaver.seconddev.jcldoor.util.CommonUtils; import com.weaver.seconddev.jcldoor.util.CommonUtils;
@ -64,14 +65,15 @@ public class UserInfoCmd {
* @return * @return
*/ */
public Map<String, Object> getUserInfo(SimpleEmployee simpleEmployee) { public Map<String, Object> getUserInfo(SimpleEmployee simpleEmployee) {
Map<String, Object> map = new HashMap<>(100);
String groupId = "weaver-ebuilder-form-service";
String sourceType = "LOGIC";
Map<String, Object> map = new HashMap<>(100);
Long employeeId = simpleEmployee.getEmployeeId(); Long employeeId = simpleEmployee.getEmployeeId();
log.error("getUserInfo-employeeId:"+employeeId);
String userimageurl = "/profile/" + employeeId + "/personal";
String username = String.valueOf(simpleEmployee.getName()); String username = String.valueOf(simpleEmployee.getName());
log.error("username:"+username);
String userimageurl = "/profile/" + employeeId + "/personal";
String department = ""; String department = "";
String position = ""; String position = "";
String days = ""; String days = "";
@ -81,19 +83,9 @@ public class UserInfoCmd {
String cyqlsl = "0"; String cyqlsl = "0";
String mtgtrs = "0"; String mtgtrs = "0";
String groupId = "weaver-ebuilder-form-service";
String sourceType = "LOGIC";
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
try { try {
String department2 = simpleEmployee.getDepartment().getName();
log.error("department2:"+department2);
String position2 = simpleEmployee.getPosition().getName();
log.error("position2:"+position2);
String hiredate2 = sdf.format(simpleEmployee.getHiredate());
log.error("hiredate2:"+hiredate2);
Map<String, Object> recordMap = new HashMap<String, Object>(); Map<String, Object> recordMap = new HashMap<String, Object>();
if (StringUtils.isNotBlank(employeeId+"")) { if (StringUtils.isNotBlank(employeeId+"")) {
String dataSql =" select " + String dataSql =" select " +
" a.id, " + " a.id, " +
@ -112,6 +104,7 @@ public class UserInfoCmd {
" and a.type = 'inside'"; " and a.type = 'inside'";
log.error("getuserIfo--dataSql:" + dataSql); log.error("getuserIfo--dataSql:" + dataSql);
List<String> strlist = new ArrayList<>(100); List<String> strlist = new ArrayList<>(100);
strlist.add(employeeId+""); strlist.add(employeeId+"");
strlist.add(tenant_key); strlist.add(tenant_key);
@ -121,48 +114,35 @@ public class UserInfoCmd {
if (CollectionUtils.isNotEmpty(recordList)) { if (CollectionUtils.isNotEmpty(recordList)) {
recordMap = recordList.get(0); recordMap = recordList.get(0);
} }
username = CommonUtils.null2String(recordMap.get("username"));
log.error("username:"+username);
username = CommonUtils.null2String(recordMap.get("username"));
department = CommonUtils.null2String(recordMap.get("department")); department = CommonUtils.null2String(recordMap.get("department"));
log.error("department:"+department);
position = CommonUtils.null2String(recordMap.get("position")); position = CommonUtils.null2String(recordMap.get("position"));
log.error("position:"+position);
String hiredate = CommonUtils.null2String(recordMap.get("hiredate")); String hiredate = CommonUtils.null2String(recordMap.get("hiredate"));
log.error("hiredate:"+hiredate);
if (StringUtils.isNotBlank(hiredate)) { if (StringUtils.isNotBlank(hiredate)) {
try { try {
days = calculateMinute2(hiredate); days = calculateMinute2(hiredate);
} catch (Exception e) { } catch (Exception e) {
log.error("calculateMinute2-e:" + e); log.error("calculateMinute2-e:" + e);
} }
if (StringUtils.isBlank(days)) { if (StringUtils.isBlank(days)) {
days = String.valueOf(calculateMinute(hiredate)); days = String.valueOf(calculateMinute(hiredate));
} }
} }
log.error("days:"+days);
//文档创建 //文档创建
doccreate = getDocCreateNum(employeeId); doccreate = getDocCreateNum(employeeId);
log.error("doccreate:"+doccreate);
//流程创建 //流程创建
wfcreate = getWfCreateNum(simpleEmployee); wfcreate = getWfCreateNum(simpleEmployee);
log.error("wfcreate:"+wfcreate);
//流程处理 //流程处理
wfdeal = getWfDealNum(simpleEmployee); wfdeal = getWfDealNum(simpleEmployee);
log.error("wfdeal:"+wfdeal);
//参与群聊数量 //参与群聊数量
cyqlsl = getCyqlNumNew(employeeId+""); cyqlsl = getCyqlNumNew(employeeId);
log.error("cyqlsl:"+cyqlsl);
mtgtrs = getPjMtgtcsNew(employeeId+""); mtgtrs = getPjMtgtcsNew(employeeId);
log.error("mtgtrs:"+mtgtrs);
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace();
log.error("getUserInfo--Exception:" + e.getMessage()); log.error("getUserInfo--Exception:" + e.getMessage());
} }
@ -177,6 +157,7 @@ public class UserInfoCmd {
map.put("wfdeal", wfdeal); map.put("wfdeal", wfdeal);
map.put("cyqlsl", cyqlsl); map.put("cyqlsl", cyqlsl);
map.put("mtgtrs", mtgtrs); map.put("mtgtrs", mtgtrs);
return map; return map;
} }
@ -186,7 +167,7 @@ public class UserInfoCmd {
* @param employeeId * @param employeeId
* @return * @return
*/ */
public String getDocCreateNum(long employeeId) { public String getDocCreateNum(Long employeeId) {
String num = "0"; String num = "0";
try { try {
int doccreatecount = docClientService.countByCreator(employeeId); int doccreatecount = docClientService.countByCreator(employeeId);
@ -264,7 +245,7 @@ public class UserInfoCmd {
} }
public String calculateMinute2(String sdate) { public String calculateMinute2(String sdate) throws ParseException {
String rzsj = ""; String rzsj = "";
try { try {
if (sdate.length() >= 10) { if (sdate.length() >= 10) {
@ -369,34 +350,30 @@ public class UserInfoCmd {
* @param employeeId * @param employeeId
* @return * @return
*/ */
public String getCyqlNumNew(String employeeId) { public String getCyqlNumNew(Long employeeId) {
String amount = "0"; String amount = "0";
String groupId = "weaver-ebuilder-form-service";
String sourceType = "LOGIC";
try{ try{
String sql = "select amount from uf_nj_cyqltjb where ry = ? and delete_type=0 and tenant_key = ?"; String sql = "select amount from uf_nj_cyqltjb where ry = ? and delete_type=0 and tenant_key = ?";
List<String> strlist = new ArrayList<>(100); List<String> strlist = new ArrayList<>(100);
strlist.add(employeeId); strlist.add(employeeId+"");
strlist.add(tenant_key); strlist.add(tenant_key);
String groupId = "weaver-ebuilder-form-service";
String sourceType = "LOGIC";
List<SqlParamEntity> sqlparam = databaseUtils.getSqlParamEntity(strlist); List<SqlParamEntity> sqlparam = databaseUtils.getSqlParamEntity(strlist);
Map<String, Object> result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam); Map<String, Object> result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam);
List<Map<String,Object>> recordList = databaseUtils.getDataSourceList(result); List<Map<String,Object>> recordList = databaseUtils.getDataSourceList(result);
if(recordList.size()>0){ if(recordList.size()>0){
amount = String.valueOf(recordList.get(0).get("amount")); amount = String.valueOf(recordList.get(0).get("amount"));
} }
if(StringUtils.isBlank(amount)){
amount = "0";
}
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
log.error("getCyqlNumNew-e:" + e); log.error("getCyqlNumNew-e:" + e);
} }
return amount; return amount;
} }
// private String getCyqlNum(String hiredate) { // public String getCyqlNum(String hiredate) {
// int count = 0; // int count = 0;
// try { // try {
// //
@ -463,12 +440,12 @@ public class UserInfoCmd {
* @param employeeId * @param employeeId
* @return * @return
*/ */
public String getPjMtgtcsNew(String employeeId) { public String getPjMtgtcsNew(Long employeeId) {
String amount = "0.0"; String amount = "0.0";
try{ try{
String sql = "select amount from uf_nj_pjmrdlhhsl where ry = ? and delete_type=0 and tenant_key = ?"; String sql = "select amount from uf_nj_pjmrdlhhsl where ry = ? and delete_type=0 and tenant_key = ?";
List<String> strlist = new ArrayList<>(100); List<String> strlist = new ArrayList<>(100);
strlist.add(employeeId); strlist.add(employeeId+"");
strlist.add(tenant_key); strlist.add(tenant_key);
String groupId = "weaver-ebuilder-form-service"; String groupId = "weaver-ebuilder-form-service";
String sourceType = "LOGIC"; String sourceType = "LOGIC";
@ -486,7 +463,6 @@ public class UserInfoCmd {
return amount; return amount;
} }
// private String getPjMtgtcs(String hiredate){ // private String getPjMtgtcs(String hiredate){
// int count = 0; // int count = 0;
// try { // try {

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

@ -1,7 +1,5 @@
package com.weaver.seconddev.jcldoor.controller; package com.weaver.seconddev.jcldoor.controller;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.weaver.common.authority.annotation.WeaPermission; import com.weaver.common.authority.annotation.WeaPermission;
import com.weaver.common.base.entity.result.WeaResult; import com.weaver.common.base.entity.result.WeaResult;
import com.weaver.ebuilder.datasource.api.entity.SqlParamEntity; import com.weaver.ebuilder.datasource.api.entity.SqlParamEntity;
@ -16,7 +14,6 @@ import com.weaver.framework.rpc.annotation.RpcReference;
import com.weaver.framework.rpc.context.impl.TenantRpcContext; import com.weaver.framework.rpc.context.impl.TenantRpcContext;
import com.weaver.mc.api.async.AsyncSystemMessageRest; import com.weaver.mc.api.async.AsyncSystemMessageRest;
import com.weaver.mc.api.rest.SystemMessageRest; import com.weaver.mc.api.rest.SystemMessageRest;
import com.weaver.seconddev.jcldoor.cmd.UserInfoCmd;
import com.weaver.seconddev.jcldoor.util.ChatDayUtils; import com.weaver.seconddev.jcldoor.util.ChatDayUtils;
import com.weaver.seconddev.jcldoor.util.ChatGroupUtils; import com.weaver.seconddev.jcldoor.util.ChatGroupUtils;
import com.weaver.seconddev.jcldoor.util.DatabaseUtils; import com.weaver.seconddev.jcldoor.util.DatabaseUtils;
@ -1922,24 +1919,34 @@ public class HrmSelfHelpController {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
try { try {
department = simpleEmployee.getDepartment().getName(); Date hiredate = simpleEmployee.getHiredate();
log.error("department:"+department); log.error("hiredate:"+hiredate.toString());
position = simpleEmployee.getPosition().getName(); Long startDate = hiredate.getTime();
log.error("position:"+position); log.error("startDate:"+startDate);
String hiredate = sdf.format(simpleEmployee.getHiredate()); Date hire_date = new Date(startDate);
if (StringUtils.isNotBlank(employeeId+"")) { String entryDate = sdf.format(hire_date);
log.error("hiredate:"+hiredate); log.error("entryDate:"+entryDate);
if (StringUtils.isNotBlank(hiredate)) { if (StringUtils.isNotBlank(entryDate)) {
try { try {
days = userInfoCmd.calculateMinute2(hiredate); days = userInfoCmd.calculateMinute2(entryDate);
} catch (Exception e) { } catch (Exception e) {
log.error("calculateMinute2-e:" + e); log.error("calculateMinute2-e:" + e);
} }
if (StringUtils.isBlank(days)) { if (StringUtils.isBlank(days)) {
days = String.valueOf(userInfoCmd.calculateMinute(hiredate)); days = String.valueOf(userInfoCmd.calculateMinute(entryDate));
}
} }
}catch (Exception e){
e.printStackTrace();
log.error("hiredate-e:"+e);
} }
log.error("days:"+days);
try {
department = simpleEmployee.getDepartment().getName();
log.error("department:"+department);
position = simpleEmployee.getPosition().getName();
log.error("position:"+position);
if (StringUtils.isNotBlank(employeeId+"")) {
//文档创建 //文档创建
doccreate = userInfoCmd.getDocCreateNum(employeeId); doccreate = userInfoCmd.getDocCreateNum(employeeId);
log.error("doccreate:"+doccreate); log.error("doccreate:"+doccreate);
@ -1951,10 +1958,10 @@ public class HrmSelfHelpController {
log.error("wfdeal:"+wfdeal); log.error("wfdeal:"+wfdeal);
//参与群聊数量 //参与群聊数量
cyqlsl = userInfoCmd.getCyqlNumNew(employeeId+""); cyqlsl = userInfoCmd.getCyqlNumNew(employeeId);
log.error("cyqlsl:"+cyqlsl); log.error("cyqlsl:"+cyqlsl);
mtgtrs = userInfoCmd.getPjMtgtcsNew(employeeId+""); mtgtrs = userInfoCmd.getPjMtgtcsNew(employeeId);
log.error("mtgtrs:"+mtgtrs); log.error("mtgtrs:"+mtgtrs);
} }
} catch (Exception e) { } catch (Exception e) {

Write Preview
Loading…
Cancel
Save