|
@@ -9,6 +9,7 @@ import com.yvan.Model;
|
|
import com.yvan.ModelOps;
|
|
import com.yvan.ModelOps;
|
|
import com.yvan.mvc.Pd;
|
|
import com.yvan.mvc.Pd;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
+import org.springframework.web.bind.annotation.GetMapping;
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
@@ -54,17 +55,22 @@ public class RiBaoController {
|
|
|
|
|
|
|
|
|
|
//查询家人
|
|
//查询家人
|
|
- @PostMapping("/riBao/getRibao")
|
|
|
|
- public MsReport queryRibao(@Pd(name = "userCreate") Long userCreate) {
|
|
|
|
|
|
+ @GetMapping("/riBao/getRibao")
|
|
|
|
+ public Model<MsReport> queryRibao(@Pd(name = "userCreate") Long userCreate) {
|
|
|
|
+// public MsReport queryRibao(@RequestBody MsReport msReportQuery) {
|
|
|
|
+// public MsReport queryRibao(@RequestParam(name = "userCreate") Long userCreate) {
|
|
|
|
+// Long userCreate = Long.parseLong(request.getParameter("userCreate"));
|
|
|
|
+// Long userCreate = msReportQuery.getUserCreate();
|
|
Long reportId = riBaoService.getNowByYesterday(userCreate);
|
|
Long reportId = riBaoService.getNowByYesterday(userCreate);
|
|
MsReport msReport = riBaoService.selectById(reportId);
|
|
MsReport msReport = riBaoService.selectById(reportId);
|
|
String houseStr = riBaoService.getHouseStr(msReport.getHouseId());
|
|
String houseStr = riBaoService.getHouseStr(msReport.getHouseId());
|
|
msReport.setHouseIdStr(houseStr);
|
|
msReport.setHouseIdStr(houseStr);
|
|
- return msReport;
|
|
|
|
|
|
+// return msReport;
|
|
|
|
+ return Model.newSuccess(msReport);
|
|
}
|
|
}
|
|
|
|
|
|
// 进入日报首页
|
|
// 进入日报首页
|
|
- @PostMapping("/riBao/queryRibaoDetailList")
|
|
|
|
|
|
+ @GetMapping("/riBao/queryRibaoDetailList")
|
|
public Model<List<MsSuspected>> queryRibaoDetailList(@Pd(name = "userCreate") Long userCreate) {
|
|
public Model<List<MsSuspected>> queryRibaoDetailList(@Pd(name = "userCreate") Long userCreate) {
|
|
Long reportId = riBaoService.getNowByYesterday(userCreate);
|
|
Long reportId = riBaoService.getNowByYesterday(userCreate);
|
|
List<MsSuspected> listSuspected = riBaoService.queryRibaoDetailList(reportId);
|
|
List<MsSuspected> listSuspected = riBaoService.queryRibaoDetailList(reportId);
|