| @@ -47,12 +47,12 @@ public class WxUserStructureController extends BaseController { | |||||
| WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); | WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); | ||||
| dto.setTenantId(getTenantId()); | dto.setTenantId(getTenantId()); | ||||
| dto.setStartTime(startTime); | dto.setStartTime(startTime); | ||||
| if (endTime != null) { | |||||
| Calendar c = Calendar.getInstance(); | |||||
| c.setTime(endTime); | |||||
| c.add(Calendar.DAY_OF_YEAR, 1); | |||||
| endTime = c.getTime(); | |||||
| } | |||||
| // if (endTime != null) { | |||||
| // Calendar c = Calendar.getInstance(); | |||||
| // c.setTime(endTime); | |||||
| // c.add(Calendar.DAY_OF_YEAR, 1); | |||||
| // endTime = c.getTime(); | |||||
| // } | |||||
| //保密 | //保密 | ||||
| dto.setSex(0); | dto.setSex(0); | ||||
| long secrecy = wxCUserBasicInfoService.findCountBySex(dto); | long secrecy = wxCUserBasicInfoService.findCountBySex(dto); | ||||
| @@ -74,12 +74,12 @@ public class WxUserStructureController extends BaseController { | |||||
| WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); | WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); | ||||
| dto.setTenantId(getTenantId()); | dto.setTenantId(getTenantId()); | ||||
| dto.setStartTime(startTime); | dto.setStartTime(startTime); | ||||
| if (endTime != null) { | |||||
| Calendar c = Calendar.getInstance(); | |||||
| c.setTime(endTime); | |||||
| c.add(Calendar.DAY_OF_YEAR, 1); | |||||
| endTime = c.getTime(); | |||||
| } | |||||
| // if (endTime != null) { | |||||
| // Calendar c = Calendar.getInstance(); | |||||
| // c.setTime(endTime); | |||||
| // c.add(Calendar.DAY_OF_YEAR, 1); | |||||
| // endTime = c.getTime(); | |||||
| // } | |||||
| dto.setEndTime(endTime); | dto.setEndTime(endTime); | ||||
| long all = wxCUserBasicInfoService.findCount(dto); | long all = wxCUserBasicInfoService.findCount(dto); | ||||
| List<UserStructureVo> vos = new ArrayList<>(); | List<UserStructureVo> vos = new ArrayList<>(); | ||||