智慧保安后台管理-外网项目备份
Administrator
2021-08-02 a144dec759ca53e72a6421596fda2e92b468084f
src/main/java/org/springblade/modules/workreport/controller/WorkReportController.java
@@ -4,6 +4,7 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import org.springblade.common.utils.arg;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
@@ -65,11 +66,6 @@
   @GetMapping("/pageReply")
   public R<IPage<WorkReportVo>> pageReply(WorkReportVo workReport, Query query) {
      IPage<WorkReportVo> pages = workReportService.selectWorkReplyPage(Condition.getPage(query), workReport);
//      List<WorkReportVo> records = pages.getRecords();
//      for (WorkReportVo record : records) {
//         record.setReplyRealName(getReplyRealName(record));
//         record.setReplyDeptName(getReplyDeptName(record));
//      }
      return R.data(pages);
   }
@@ -97,7 +93,7 @@
    * @param workReport 工作汇报信息对象
    */
   @PostMapping("/submit")
   public R submit(@RequestBody WorkReport workReport) {
   public R submit(@RequestBody WorkReport workReport) throws Exception {
      if (null!=workReport.getId()){
         workReport.setReplyTime(new Date());
         workReport.setReplyDeptIds(getReplyDeptIds(workReport.getReceivedIds()));
@@ -105,6 +101,7 @@
         workReport.setReportTime(new Date());
         workReport.setReplyDeptIds(getReplyDeptIds(workReport.getReceivedIds()));
      }
      arg.test01(arg.url+"/workReport/submit",workReport);
      return R.status(workReportService.saveOrUpdate(workReport));
   }
@@ -114,6 +111,7 @@
    */
   @PostMapping("/remove")
   public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
      arg.sendPostRemoveByIds(arg.url+"/workReport/remove",ids);
      return R.status(workReportService.removeByIds(Func.toLongList(ids)));
   }