Commit e4f0764a authored by 竹天卫's avatar 竹天卫

送样结果单列表展示 增加筛选条件 收样时间

parent 9c08069c
......@@ -129,10 +129,12 @@ public class TSampleLaboratorysheetController {
param.setYh(yh);
return itSampleLaboratorysheetService.getImage(param,response);
}
@ApiOperation(value = "送样结果单列表展示")
@RequestMapping(value = "/getList",method = RequestMethod.GET)
public R getList() {
return itSampleLaboratorysheetService.getList();
public R getList(String Sysj) {
return itSampleLaboratorysheetService.getList(Sysj);
}
}
......@@ -31,7 +31,7 @@ public interface ITSampleLaboratorysheetService extends IService<TSampleLaborato
R getPage(TSampleLaboratorysheetQuery tSampleLaboratorysheetQuery, Query query);
R getList();
R getList(String Sysj);
R getSampleListByYh(TSampleListQuery param);
}
......@@ -24,6 +24,8 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletResponse;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.format.DateTimeFormatter;
import java.util.HashMap;
import java.util.List;
......@@ -224,8 +226,20 @@ public class TSampleLaboratorysheetServiceImpl extends ServiceImpl<TSampleLabora
}
@Override
public R getList() {
List<TSampleLaboratorysheet> list = baseMapper.getList();
public R getList(String Sysj) {
QueryWrapper<TSampleLaboratorysheet> queryWrapper = new QueryWrapper<>();
if(StringUtils.isNotBlank(Sysj)){
try {
SimpleDateFormat formatter = new SimpleDateFormat(
"yyyy-MM-dd HH:mm:ss");
String startDate = Sysj + " 00:00:00";
String endDate = Sysj + " 23:59:59";
queryWrapper.between("Sysj", formatter.parse(startDate), formatter.parse(endDate));
} catch (ParseException e) {
e.printStackTrace();
}
}
List<TSampleLaboratorysheet> list = baseMapper.selectList(queryWrapper);
return R.ok(list);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment