diff --git a/src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java b/src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java index fcf160e..7509c9d 100644 --- a/src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java +++ b/src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java @@ -14,12 +14,12 @@ import com.weaver.teams.client.doc.remote.DocClientService; import com.weaver.teams.domain.hr.RemoteHrKpiService; 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; import com.weaver.workflow.list.api.rest.publicapi.WflRequestListRest; import com.weaver.workrelate.performance.api.rest.RemotePerformanceService; -import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -639,17 +639,18 @@ public class HrmSelfHelpController { SimpleEmployee employee = UserContext.getCurrentUser(); log.error("employee--:"+employee.getEmployeeId()); - LocalDateTime startDateTime = LocalDateTime.of(LocalDate.from(LocalDateTime.now().with(TemporalAdjusters.firstDayOfYear())), LocalTime.MIN); - if(StringUtils.isNotBlank(startday)){ - startDateTime = LocalDateTime.parse(startday+defineTime, format); - } +// 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); - LocalDateTime endDateTime = LocalDateTime.now(); - if(StringUtils.isNotBlank(endday)){ - endDateTime = LocalDateTime.parse(endday+defineTime, format); - } - conditionEntity.setCusOperateDateStart(startDateTime); - conditionEntity.setCusOperateDateEnd(endDateTime); + conditionEntity.setOperatedate(DateTimeConditionEnum.CURRENT_YEAR); log.error("conditionEntity--:"+conditionEntity.toString()); WeaResult requestCountInfo = wflRequestListRest.getRequestCountByTabId(employee, RequestListInitDimensionTabEnum.DONE_FLOWALL.getTabid(), conditionEntity); @@ -918,22 +919,25 @@ public class HrmSelfHelpController { List> dataList = new ArrayList>(); try{ - String sql = " select distinct taby from uf_zzfwrkpz where ry=? and qy is not null and taby is not null and delete_type=0 and tenant_key ='"+tenant_key+"'"; - log.error("sql:"+sql); - - List sqlparam = new ArrayList(); - SqlParamEntity sqlParamEntity = new SqlParamEntity(); - sqlParamEntity.setParamType(SqlParamType.VARCHAR); - sqlParamEntity.setValue(employeeId); - sqlparam.add(sqlParamEntity); - - Map result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam); - List> recordList = databaseUtils.getDataSourceList(result); - if(recordList.size()>0){ - // /api/file/preview?type=redirect&imgFormat=small&fileId=977697615197618177&module=ebuilderform&authModule=ebuilderform&source=form&fieldId=977686869110833154&customParam=%7B%22dataId%22%3A%22977697666574729218%22%7D&refId=977697666574729218&folderId=8120831157448215424 - dataList = getCustomeServiceData(groupId,sourceType,field_id,recordList,employeeId); - }else{ - dataList = getDefaultServiceData(groupId,sourceType,field_id); + + if(StringUtils.isNotBlank(field_id)){ + String sql = " select distinct taby from uf_zzfwrkpz where ry=? and qy is not null and taby is not null and delete_type=0 and tenant_key ='"+tenant_key+"'"; + log.error("sql:"+sql); + + List sqlparam = new ArrayList(); + SqlParamEntity sqlParamEntity = new SqlParamEntity(); + sqlParamEntity.setParamType(SqlParamType.VARCHAR); + sqlParamEntity.setValue(employeeId); + sqlparam.add(sqlParamEntity); + + Map result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam); + List> recordList = databaseUtils.getDataSourceList(result); + if(recordList.size()>0){ + // /api/file/preview?type=redirect&imgFormat=small&fileId=977697615197618177&module=ebuilderform&authModule=ebuilderform&source=form&fieldId=977686869110833154&customParam=%7B%22dataId%22%3A%22977697666574729218%22%7D&refId=977697666574729218&folderId=8120831157448215424 + dataList = getCustomeServiceData(groupId,sourceType,field_id,recordList,employeeId); + }else{ + dataList = getDefaultServiceData(groupId,sourceType,field_id); + } } }catch (Exception e){ log.error("testSapi51-Exception:"+e.getMessage()); diff --git a/src/main/java/com/weaver/seconddev/jcldoor/util/JucailinPortalUtils.java b/src/main/java/com/weaver/seconddev/jcldoor/util/JucailinPortalUtils.java index 56bffc3..be65237 100644 --- a/src/main/java/com/weaver/seconddev/jcldoor/util/JucailinPortalUtils.java +++ b/src/main/java/com/weaver/seconddev/jcldoor/util/JucailinPortalUtils.java @@ -9,12 +9,16 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; import java.util.*; + + +@Component public class JucailinPortalUtils { - private final Logger log = LoggerFactory.getLogger(JucailinPortalController.class); + private final Logger log = LoggerFactory.getLogger(JucailinPortalUtils.class); @Autowired private DatabaseUtils databaseUtils; @@ -24,14 +28,17 @@ public class JucailinPortalUtils { String groupId = "weaver-ebuilder-form-service"; String sourceType = "LOGIC"; try{ + log.error("pkey:"+pkey); if(StringUtils.isNotBlank(pkey)) { String dataSql =" select pvalue \n" + " from uf_nj_prop \n" + - " where pkey= ? \n" + + " where pkey = ? \n" + " and delete_type = 0 \n" + " and tenant_key='"+tenant_key+"'" ; + log.error("dataSql:"+dataSql); + List sqlparam = new ArrayList(); SqlParamEntity sqlParamEntity = new SqlParamEntity(); sqlParamEntity.setParamType(SqlParamType.VARCHAR); @@ -40,7 +47,9 @@ public class JucailinPortalUtils { Map result = databaseUtils.executeForQuery(sourceType, groupId, dataSql,sqlparam); List> recordList = databaseUtils.getDataSourceList(result); - if(CollectionUtils.isNotEmpty(recordList)) { + log.error("recordList:"+recordList.size()); + + if(CollectionUtils.isNotEmpty(recordList) && recordList.size() >0 ) { Map recordMap = recordList.get(0); if(recordMap.containsKey("pvalue")){ pvalue = String.valueOf(recordMap.get("pvalue")); @@ -48,7 +57,8 @@ public class JucailinPortalUtils { } } }catch (Exception e){ - log.error("getUfPropData-Exception:"+e.getMessage()); + e.printStackTrace(); + log.error("getUfPropData-Exception:"+e); } return pvalue; }