北京数据版本记录问题---修改数据版本记录下载操作

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<SysPojoVersion>
     BaseResultBean<SysPojoVersion> exportUserOperation(HttpServletResponse response, @RequestBody SysVersionExportModel model) {
         File file =null;
         try {
-//            final String ZERO_TIME = " 00:00:00";
+            String startDate = model.getStartDate();
-//            startDate += ZERO_TIME;
+            String endDate = model.getEndDate();
-//            endDate += ZERO_TIME;
+            final String ZERO_TIME = " 00:00:00";
-
+            startDate += ZERO_TIME;
+            endDate += ZERO_TIME;
+            model.setStartDate(startDate);
+            model.setEndDate(endDate);
             List<SysPojoVersion> pojoVersions = pojoVersionService.findPojoVersionByUserBetweenTime(model);
             ExcelTool excelTool = new ExcelTool(entityManager, redisRes);
             String fileName = "user-operation-" + System.currentTimeMillis() + ".xls";

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;
 //

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<SysPojoVersion> implement
             DdlPackBean roleRefPackBean = DdlPackBean.getDdlPackBean();
             DdlPreparedPack.getNumEqualPack(roleId,"roleId",roleRefPackBean);
             List<SysRefUserRole> refUserRoles = refUserRoleRepository.findByHqlWhere(roleRefPackBean);
-            List<String> userNameList = refUserRoles.stream().map(SysRefUserRole::getRoleNameRdd).collect(Collectors.toList());
+            List<String> userNameList = refUserRoles.stream().map(SysRefUserRole::getUserNameRdd).collect(Collectors.toList());
-            DdlPreparedPack.getInPackList(userNameList,"modifyUser",packBean);
+            DdlPreparedPack.getInPackList(userNameList.stream().distinct().collect(Collectors.toList()), "modifyUser",packBean);
         }
+//        DdlPackBean planPackBean = DdlPackBean.getDdlPackBean();
         DdlPreparedPack.timeBuilder(startDate, endDate, "modifyDatetime", true, false, packBean);
         List<SysPojoVersion> pojoVersions = pojoVersionRDao.findByHqlWhere(packBean);
 
-        DdlPackBean planPackBean = DdlPackBean.getDdlPackBean();
+        List<SysPojoVersionPlan> pojoVersionPlans = pojoVersionPlanRepository.findByHqlWhere(packBean);
-        List<SysPojoVersionPlan> pojoVersionPlans = pojoVersionPlanRepository.findByHqlWhere(planPackBean);
 
         pojoVersions.stream().parallel().forEach(d -> {
             Optional<SysPojoVersionPlan> plan = pojoVersionPlans.stream().filter(p -> d.getPlanId().equals(p.getId())).findFirst();
@@ -126,7 +126,7 @@ public class SysPojoVersionService extends CrudService<SysPojoVersion> implement
             DdlPreparedPack.timeBuilder(modifyDateTimeStart,modifyDateTimeEnd,"createDatetime",versionPackBean,true);
         }
         if (sysRefUserRoleList.size() > 0){
-            List<String> userNameList = sysRefUserRoleList.stream().map(SysRefUserRole::getUserNameRdd).collect(Collectors.toList());
+            List<String> userNameList = sysRefUserRoleList.stream().map(SysRefUserRole::getUserNameRdd).distinct().collect(Collectors.toList());
             DdlPreparedPack.getInPackList(userNameList,"createUser",versionPackBean);
         }
         int count = pojoVersionRDao.findByHqlWhereCount(versionPackBean);