smartor.git - Gitblit

			@@ -23,6 +23,7 @@
			import com.ruoyi.system.service.ISysConfigService;
			import com.ruoyi.system.service.ISysUserDeptService;
			import com.smartor.domain.*;
			import com.smartor.domain.VO.HeLibraryCountVO;
			import com.smartor.domain.VO.ServiceSubtaskCotinueCountVO;
			import com.smartor.domain.VO.ServiceSubtaskVO;
			import com.smartor.domain.entity.ServiceSubtaskEntity;
			@@ -37,6 +38,7 @@
			import org.apache.commons.lang3.ObjectUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.beans.factory.annotation.Value;
			import org.springframework.web.bind.WebDataBinder;
			import org.springframework.web.bind.annotation.*;

			import javax.servlet.http.HttpServletResponse;
			@@ -56,6 +58,11 @@
			@RestController
			@RequestMapping("/smartor/serviceSubtask")
			public class ServiceSubtaskController extends BaseController {
			@InitBinder
			public void initBinder(WebDataBinder binder) {
			binder.setAutoGrowCollectionLimit(1024); // 或 2048、4096 等
			}

			@Autowired
			private IServiceSubtaskService serviceSubtaskService;

			@@ -113,16 +120,6 @@
			// 直接从已有聚合结果推算total，避免去掉分页后再全量查一遍大表
			long total = 0L;
			try {
			// * wzx: 未执行数量
			// * ysf: 已随访数量
			// * fssb: 发送失败数量
			// * yfs: 已发送数量
			// * dsf: 待随访数量

			// long wzx = map.get("wzx") != null ? ((Number) map.get("wzx")).longValue() : 0L;
			// long ysf = map.get("ysf") != null ? ((Number) map.get("ysf")).longValue() : 0L;
			// long dsf = map.get("dsf") != null ? ((Number) map.get("dsf")).longValue() : 0L;
			// long fssb = map.get("fssb") != null ? ((Number) map.get("fssb")).longValue() : 0L;
			total = map.get("total") != null ? ((Number) map.get("total")).longValue() : 0L;

			} catch (Exception e) {
			@@ -179,7 +176,7 @@
			if (ObjectUtils.isNotEmpty(oldCondition) && isSameCondition(oldCondition, serviceSubtaskEntity)) {
			redisFlag = true;
			map = redisMap;
			redisCache.setCacheObject(userId + "patItemCount", map, 120, TimeUnit.MINUTES);
			redisCache.setCacheObject(userId + "patItemCount", map, 60, TimeUnit.MINUTES);
			}
			}
			if (!redisFlag) {
			@@ -211,7 +208,7 @@
			//@PreAuthorize("@ss.hasPermi('system:taskcall:export')")
			@Log(title = "单一任务（随访宣教）", businessType = BusinessType.EXPORT)
			@PostMapping("/patItemExport")
			public void patItemExport(HttpServletResponse response, @RequestBody ServiceSubtaskEntity serviceSubtaskVO) {
			public void patItemExport(HttpServletResponse response, ServiceSubtaskEntity serviceSubtaskVO) {
			LoginUser loginUser = getLoginUser();
			SysUser user = loginUser.getUser();
			serviceSubtaskVO.setOrgid(user.getOrgid());
			@@ -246,13 +243,12 @@
			//@PreAuthorize("@ss.hasPermi('system:taskcall:list')")
			@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
			@PostMapping("/patItemByCondition")
			public TableDataInfo patItemByCondition(@RequestBody ServiceSubtaskVO serviceSubtaskVO) {
			public Map<String, Object> patItemByCondition(@RequestBody ServiceSubtaskVO serviceSubtaskVO) {
			List<ServiceSubtask> serviceSubtaskList = null;
			ServiceSubtaskEntity serviceSubtaskEntity = DtoConversionUtils.sourceToTarget(serviceSubtaskVO, ServiceSubtaskEntity.class);
			serviceSubtaskEntity.setContinueContent(ObjectUtils.isNotEmpty(serviceSubtaskVO.getContinueContent()) ? serviceSubtaskVO.getContinueContent().toString() : null);
			if (serviceSubtaskEntity != null) {
			PageUtils.startPageByPost(serviceSubtaskEntity.getPageNum(), serviceSubtaskEntity.getPageSize());

			serviceSubtaskEntity.setPageNum(PageUtils.getOffset(serviceSubtaskEntity.getPageNum(), serviceSubtaskEntity.getPageSize()));
			serviceSubtaskList = serviceSubtaskService.patItem2(serviceSubtaskEntity);
			}
			for (ServiceSubtask serviceSubtask : serviceSubtaskList) {
			@@ -277,7 +273,7 @@
			serviceSubtaskService.patItem2(serviceSubtaskEntity);
			}
			});
			return getDataTable2(total, list);
			return getDataTable3(total, list);
			}

			/**
			@@ -519,17 +515,23 @@
			@ApiOperation("获取随访统计比例")
			@AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid")
			@PostMapping("/getSfStatistics")
			public AjaxResult getSfStatistics(@RequestBody ServiceSubtaskCountReq serviceSubtaskCountReq) {
			public Map<String, Object> getSfStatistics(@RequestBody ServiceSubtaskCountReq serviceSubtaskCountReq) {
			if (CollectionUtils.isEmpty(serviceSubtaskCountReq.getServiceType())) {
			return error("服务类型不能为空");
			}
			Integer offset = PageUtils.getOffset(serviceSubtaskCountReq.getPageNum(), serviceSubtaskCountReq.getPageSize());
			serviceSubtaskCountReq.setPageNum(offset);

			String followUpCountStyle = configService.selectConfigByKey("followUpCountStyle", serviceSubtaskCountReq.getOrgid());
			if (ObjectUtils.isNotEmpty(followUpCountStyle)) {
			serviceSubtaskCountReq.setFollowUpCountStyle(followUpCountStyle);
			} else {
			serviceSubtaskCountReq.setFollowUpCountStyle("1");
			}
			return success(serviceSubtaskService.getSfStatistics(serviceSubtaskCountReq));
			serviceSubtaskCountReq.setPageNum(null);
			serviceSubtaskCountReq.setPageSize(null);
			List<ServiceSubtaskStatistic> sfStatistics = serviceSubtaskService.getSfStatistics(serviceSubtaskCountReq);
			return getDataTable4(CollectionUtils.isEmpty(sfStatistics) ? sfStatistics.size() : 0, serviceSubtaskService.getSfStatistics(serviceSubtaskCountReq));
			}

			/**
			@@ -593,7 +595,6 @@
			}



			/**
			* 延续护理统计
			*/
			@@ -611,9 +612,6 @@
			}
			return success(serviceSubtaskService.getContinueNurseCount(serviceSubtaskCotinueCountVO));
			}





			/**
			@@ -732,5 +730,11 @@
			return map;
			}

			@ApiOperation("获取当前用户宣教数量统计")
			@PostMapping("/gethelibraryCount")
			public Map<String, Object> getHeLibraryCount(@RequestBody HeLibraryCountVO heLibraryCountVO) {
			log.info("获取当前用户宣教数量统计的入参为：{}", heLibraryCountVO);
			return serviceSubtaskService.getHeLibraryCount(heLibraryCountVO);
			}

			}