|
|
@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; |
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
|
|
import com.hxhq.business.domain.*; |
|
|
import com.hxhq.business.domain.*; |
|
|
|
|
|
import com.hxhq.business.dto.sj.SjListDto; |
|
|
import com.hxhq.business.dto.study.StudyListDto; |
|
|
import com.hxhq.business.dto.study.StudyListDto; |
|
|
import com.hxhq.business.enums.study.StudyStatusEnum; |
|
|
import com.hxhq.business.enums.study.StudyStatusEnum; |
|
|
import com.hxhq.business.form.common.SignForm; |
|
|
import com.hxhq.business.form.common.SignForm; |
|
|
|
|
|
import com.hxhq.business.form.sj.SjSearchListForm; |
|
|
import com.hxhq.business.form.study.StudyFormPreSearchForm; |
|
|
import com.hxhq.business.form.study.StudyFormPreSearchForm; |
|
|
import com.hxhq.business.form.study.StudySearchForm; |
|
|
import com.hxhq.business.form.study.StudySearchForm; |
|
|
import com.hxhq.business.form.zcg.ZcgSearchForm; |
|
|
import com.hxhq.business.form.zcg.ZcgSearchForm; |
|
|
@ -61,6 +63,8 @@ public class PublicController extends BaseController { |
|
|
public ISnGenService snGenService; |
|
|
public ISnGenService snGenService; |
|
|
@Autowired |
|
|
@Autowired |
|
|
public ISysUserService sysUserService; |
|
|
public ISysUserService sysUserService; |
|
|
|
|
|
@Autowired |
|
|
|
|
|
public ISjService sjService; |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 获取编号 |
|
|
* 获取编号 |
|
|
@ -181,5 +185,17 @@ public class PublicController extends BaseController { |
|
|
return AjaxResult.success(); |
|
|
return AjaxResult.success(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
* 查询试剂列表 |
|
|
|
|
|
*/ |
|
|
|
|
|
@GetMapping("/sjList") |
|
|
|
|
|
public TableDataInfo list(SjSearchListForm form) |
|
|
|
|
|
{ |
|
|
|
|
|
form.setZjzt(1); |
|
|
|
|
|
startPage(); |
|
|
|
|
|
List<SjListDto> list = sjService.queryList(form); |
|
|
|
|
|
return getDataTable(list); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
} |