ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchiveController.java
@@ -53,10 +53,14 @@ //@PreAuthorize("@ss.hasPermi('smartor:patarchive:list')") @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid") @PostMapping("list") public TableDataInfo list(@RequestBody PatArchive patArchive) { PageUtils.startPageByPost(patArchive.getPageNum(), patArchive.getPageSize()); public Map<String, Object> list(@RequestBody PatArchive patArchive) { patArchive.setPageNum(PageUtils.getOffset(patArchive.getPageNum(), patArchive.getPageSize())); List<PatArchive> list = patArchiveService.selectPatArchiveList(patArchive); return getDataTable(list); patArchive.setPageNum(null); patArchive.setPageSize(null); List<PatArchive> patArchives = patArchiveService.selectPatArchiveList(patArchive); return getDataTable3(patArchives.size(), list); } /** smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -1,8 +1,6 @@ package com.smartor.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.json.JSON; import cn.hutool.json.JSONUtil; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.ruoyi.common.core.domain.entity.SysDept; @@ -10,8 +8,6 @@ import com.ruoyi.common.core.domain.entity.SysUserDept; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.exception.base.BaseException; import com.ruoyi.common.utils.AesUtils; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DtoConversionUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.http.HttpUtils; @@ -21,7 +17,6 @@ import com.smartor.service.IPatMedOuthospService; import com.smartor.service.IServiceExternalService; import lombok.extern.slf4j.Slf4j; import netscape.javascript.JSObject; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -30,8 +25,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.text.ParseException; import java.text.SimpleDateFormat; import java.time.LocalDate; smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
@@ -15,7 +15,6 @@ import com.smartor.domain.entity.ServiceSubtaskEntity; import com.smartor.mapper.*; import com.smartor.service.*; import com.sun.org.apache.bcel.internal.generic.NEW; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
@@ -189,7 +189,6 @@ <if test="idcardno != null and idcardno != ''">and idcardno = #{idcardno}</if> <if test="sourcefrom != null ">and sourcefrom = #{sourcefrom}</if> <if test="telcode != null and telcode != ''">and telcode = #{telcode}</if> <if test="orgid != null and orgid != ''">and orgid = #{orgid}</if> <if test="id != null and id != ''">and id = #{id}</if> <if test="isupload != null ">and isupload = #{isupload}</if> <if test="uploadTime != null ">and upload_time = #{uploadTime}</if> @@ -214,7 +213,7 @@ <if test="casePersonAge != null ">and case_person_age = #{casePersonAge}</if> <if test="filterDrname != null ">and filter_drname = #{filterDrname}</if> <if test="filterDrcode != null ">and filter_drcode = #{filterDrcode}</if> <if test="campusid != null ">and campusid = #{campusid}</if> <if test="pageSize != null and pageNum != null">limit ${pageSize} OFFSET ${pageNum}</if> </select>
