ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java
@@ -47,7 +47,7 @@ //@PreAuthorize("@ss.hasPermi('smartor:patarchive:list')") @PostMapping("/list") public TableDataInfo list(@RequestBody PatArchive patArchive) { startPage(); PageUtils.startPageByPost(patArchive.getPageNum(), patArchive.getPageSize()); List<PatArchive> list = patArchiveService.selectPatArchiveList(patArchive); return getDataTable(list); } ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
@@ -91,7 +91,7 @@ //@PreAuthorize("@ss.hasPermi('system:taskcall:export')") @Log(title = "单一任务（随访宣教）", businessType = BusinessType.EXPORT) @PostMapping("/patItemExport") public void patItemExport(HttpServletResponse response, @RequestBody ServiceSubtaskVO serviceSubtaskVO) { public void patItemExport(HttpServletResponse response,ServiceSubtaskVO serviceSubtaskVO) { List<ServiceSubtask> serviceSubtaskList = null; if (serviceSubtaskVO != null) { if (serviceSubtaskVO.getPageNum() != null && serviceSubtaskVO.getPageSize() != null) ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -307,23 +307,15 @@ * @return */ public boolean isDateToday(Date date) { //如果给的日期小于当前日期，也直接发送 LocalDateTime localDateTime = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime(); if (localDateTime.isBefore(LocalDateTime.now())) { return true; if (date == null) { return false; } // 获取当前日期 Calendar calendarNow = Calendar.getInstance(); int todayYear = calendarNow.get(Calendar.YEAR); int todayMonth = calendarNow.get(Calendar.MONTH); int todayDay = calendarNow.get(Calendar.DAY_OF_MONTH); // 创建一个 Calendar 实例用于检查的日期 Calendar calendarToCheck = Calendar.getInstance(); calendarToCheck.setTime(date); // 比较年、月和日 return (calendarToCheck.get(Calendar.YEAR) == todayYear && calendarToCheck.get(Calendar.MONTH) == todayMonth && calendarToCheck.get(Calendar.DAY_OF_MONTH) == todayDay); // 将 Date 转为 LocalDate LocalDate localDate = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(); // 获取今天的 LocalDate LocalDate today = LocalDate.now(); // 如果日期早于或等于今天，返回 true return !localDate.isAfter(today); } public void sfHandlle(CommonTaskcallMQ commonTaskcallMQ, String ip) { @@ -610,7 +602,7 @@ if ((Boolean) map.get("succ") == true) { serviceSubtask.setResult("success"); } else { log.error("serviceSubtask1231313的值为：{}",serviceSubtask); log.error("serviceSubtask1231313的值为：{}", serviceSubtask); serviceSubtask.setResult("error"); serviceSubtask.setSendstate(5L); serviceSubtask.setRemark(map.get("msg").toString()); smartor/src/main/java/com/smartor/domain/PatArchive.java
@@ -380,4 +380,16 @@ @Excel(name = " 第二年龄单位 ") private String ageUnit2; /** * pageNum */ @ApiModelProperty("pageNum") private Integer pageNum; /** * pageSize */ @ApiModelProperty("pageSize") private Integer pageSize; } smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
@@ -478,8 +478,8 @@ if (svyTaskTemplateScriptVO.getScore() != null) { score = String.valueOf(svyTaskTemplateScriptVO.getScore()); } serviceSubtaskDetailVO.setAsrtext(svyTaskTemplateScriptVO.getScriptResult().replaceAll("^\"|\"$", "")); serviceSubtaskDetailVO.setMatchedtext(svyTaskTemplateScriptVO.getScriptResult().replaceAll("^\"|\"$", "")); serviceSubtaskDetailVO.setAsrtext(StringUtils.isEmpty(svyTaskTemplateScriptVO.getScriptResult()) ? "" : svyTaskTemplateScriptVO.getScriptResult().replaceAll("^\"|\"$", "")); serviceSubtaskDetailVO.setMatchedtext(StringUtils.isEmpty(svyTaskTemplateScriptVO.getScriptResult()) ? "" : svyTaskTemplateScriptVO.getScriptResult().replaceAll("^\"|\"$", "")); // if (StringUtils.isEmpty(serviceSubtaskDetailVO.getAsrtext())) { // nextScriptNo = svyTaskTemplateScriptVO.getNextScriptno().toString(); // } @@ -509,7 +509,7 @@ serviceSubtaskDetailVO.setGuid(serviceTask.getGuid()); serviceSubtaskDetailVO.setOrgid(serviceTask.getOrgid()); } serviceSubtaskDetailVO.setSubId(selectServiceSubtaskList.get(0).getId()); serviceSubtaskDetailVO.setSubId(CollectionUtils.isNotEmpty(selectServiceSubtaskList) ? selectServiceSubtaskList.get(0).getId() : null); serviceSubtaskDetailVO.setTemplatequestionnum(svyTaskTemplateScriptVO.getId()); ServiceSubtaskDetail serviceSubtaskDetail = DtoConversionUtils.sourceToTarget(serviceSubtaskDetailVO, ServiceSubtaskDetail.class); serviceSubtaskDetailMapper.insertServiceSubtaskDetail(serviceSubtaskDetail); smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -488,6 +488,7 @@ ServiceTaskdept serviceTaskdept = new ServiceTaskdept(); serviceTaskdept.setTaskId(serviceTask.getTaskid()); serviceTaskdept.setTaskName(serviceTask.getTaskName()); serviceTaskdept.setOrgid(serviceTask.getOrgid()); serviceTaskdept.setLongtask(0L); if (serviceTaskVO.getLongTask() == 1) serviceTaskdept.setLongtask(1L); if (StringUtils.isNotEmpty(serviceTaskVO.getDeptcode())) { smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
@@ -294,7 +294,12 @@ a.telcode, a.id, a.sex order by b.inhospid desc <if test="cry==1"> order by b.endtime desc </if> <if test="cry==0"> order by b.starttime desc </if> </select> <select id="selectPatMedInhospListByCondition" parameterType="com.smartor.domain.PatMedInhospVO" resultMap="PatMedInhospResult">
