diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPojoVersionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPojoVersionController.java index 283a896..eb32ba7 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPojoVersionController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPojoVersionController.java @@ -94,10 +94,13 @@ public class SysPojoVersionController extends CrudBaseController BaseResultBean exportUserOperation(HttpServletResponse response, @RequestBody SysVersionExportModel model) { File file =null; try { -// final String ZERO_TIME = " 00:00:00"; -// startDate += ZERO_TIME; -// endDate += ZERO_TIME; - + String startDate = model.getStartDate(); + String endDate = model.getEndDate(); + final String ZERO_TIME = " 00:00:00"; + startDate += ZERO_TIME; + endDate += ZERO_TIME; + model.setStartDate(startDate); + model.setEndDate(endDate); List pojoVersions = pojoVersionService.findPojoVersionByUserBetweenTime(model); ExcelTool excelTool = new ExcelTool(entityManager, redisRes); String fileName = "user-operation-" + System.currentTimeMillis() + ".xls"; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/CheckLoginTimeDayJob.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/CheckLoginTimeDayJob.java index 68c3a94..37b55be 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/CheckLoginTimeDayJob.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/CheckLoginTimeDayJob.java @@ -14,7 +14,7 @@ //import com.xxl.job.core.handler.annotation.XxlJob; //import io.swagger.annotations.ApiOperation; //import org.quartz.DisallowConcurrentExecution; -//import org.quartz.JobExecutionContext; +//import org.quartz.JobExecutionContext;impp/operate/pojo-version/export-user-operation //import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.stereotype.Component; // diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPojoVersionService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPojoVersionService.java index 49760cd..4e6748d 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPojoVersionService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPojoVersionService.java @@ -76,14 +76,14 @@ public class SysPojoVersionService extends CrudService implement DdlPackBean roleRefPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getNumEqualPack(roleId,"roleId",roleRefPackBean); List refUserRoles = refUserRoleRepository.findByHqlWhere(roleRefPackBean); - List userNameList = refUserRoles.stream().map(SysRefUserRole::getRoleNameRdd).collect(Collectors.toList()); - DdlPreparedPack.getInPackList(userNameList,"modifyUser",packBean); + List userNameList = refUserRoles.stream().map(SysRefUserRole::getUserNameRdd).collect(Collectors.toList()); + DdlPreparedPack.getInPackList(userNameList.stream().distinct().collect(Collectors.toList()), "modifyUser",packBean); } +// DdlPackBean planPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.timeBuilder(startDate, endDate, "modifyDatetime", true, false, packBean); List pojoVersions = pojoVersionRDao.findByHqlWhere(packBean); - DdlPackBean planPackBean = DdlPackBean.getDdlPackBean(); - List pojoVersionPlans = pojoVersionPlanRepository.findByHqlWhere(planPackBean); + List pojoVersionPlans = pojoVersionPlanRepository.findByHqlWhere(packBean); pojoVersions.stream().parallel().forEach(d -> { Optional plan = pojoVersionPlans.stream().filter(p -> d.getPlanId().equals(p.getId())).findFirst(); @@ -126,7 +126,7 @@ public class SysPojoVersionService extends CrudService implement DdlPreparedPack.timeBuilder(modifyDateTimeStart,modifyDateTimeEnd,"createDatetime",versionPackBean,true); } if (sysRefUserRoleList.size() > 0){ - List userNameList = sysRefUserRoleList.stream().map(SysRefUserRole::getUserNameRdd).collect(Collectors.toList()); + List userNameList = sysRefUserRoleList.stream().map(SysRefUserRole::getUserNameRdd).distinct().collect(Collectors.toList()); DdlPreparedPack.getInPackList(userNameList,"createUser",versionPackBean); } int count = pojoVersionRDao.findByHqlWhereCount(versionPackBean);