|
@@ -173,6 +173,7 @@ import com.jeeplus.modules.workprojectcompletion.entity.WorkProjectCompletionInf
|
|
|
import com.jeeplus.modules.workprojectcompletion.service.WorkProjectCompletionService;
|
|
|
import com.jeeplus.modules.workprojectdeposit.entity.WorkProjectDeposit;
|
|
|
import com.jeeplus.modules.workprojectdeposit.service.WorkProjectDepositService;
|
|
|
+import com.jeeplus.modules.workprojectnotify.dao.WorkProjectNotifyDao;
|
|
|
import com.jeeplus.modules.workprojectnotify.entity.WorkProjectNotify;
|
|
|
import com.jeeplus.modules.workprojectnotify.service.WorkProjectNotifyService;
|
|
|
import com.jeeplus.modules.workreceiptsrevise.entity.WorkReceiptsRevise;
|
|
@@ -480,6 +481,8 @@ public class WorkProjectNotifyController extends BaseController {
|
|
|
private ProjectEngineeringService engineeringService;
|
|
|
@Autowired
|
|
|
private SubProjectInfoService subProjectInfoService;
|
|
|
+ @Autowired
|
|
|
+ private WorkProjectNotifyDao workProjectNotifyDao;
|
|
|
|
|
|
@ModelAttribute
|
|
|
public WorkProjectNotify get(@RequestParam(required=false) String id) {
|
|
@@ -559,6 +562,23 @@ public class WorkProjectNotifyController extends BaseController {
|
|
|
return "modules/workprojectnotify/workProjectNotifyReadBacklogList";
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 已审批待办列表页面
|
|
|
+ */
|
|
|
+ @RequestMapping(value = {"readShowCount"})
|
|
|
+ @ResponseBody
|
|
|
+ public Map<String,Object> readShowCount (WorkProjectNotify workProjectNotify, HttpServletRequest request, HttpServletResponse response, Model model) {
|
|
|
+ Map<String,Object> map=new HashMap<>();
|
|
|
+ User user = UserUtils.getUser();
|
|
|
+ workProjectNotify.setUser(user);
|
|
|
+ workProjectNotify.setStatus("2");
|
|
|
+ workProjectNotify.setRemarks("待通知");
|
|
|
+ workProjectNotify.setCompanyId(UserUtils.getSelectCompany().getId());
|
|
|
+ Integer count=workProjectNotifyDao.queryReadCount(workProjectNotify);
|
|
|
+ map.put("count",count);
|
|
|
+ return map;
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
/**
|
|
|
* 我发起的待办列表页面
|
|
@@ -1685,7 +1705,7 @@ public class WorkProjectNotifyController extends BaseController {
|
|
|
}
|
|
|
}
|
|
|
model.addAttribute("datalist", workReviewAuditList);
|
|
|
-
|
|
|
+
|
|
|
//查询总审人员信息
|
|
|
List<User> auditUserList = userService.getAuditUserList();
|
|
|
ruralProjectRecords.setBzshbUserList(auditUserList);
|
|
@@ -3858,7 +3878,7 @@ public class WorkProjectNotifyController extends BaseController {
|
|
|
}
|
|
|
model.addAttribute("datalist", workReviewAuditList);
|
|
|
|
|
|
-
|
|
|
+
|
|
|
if (workProjectNotify.getRemarks().contains("待通知") || "view".equals(workProjectNotify.getView())) {
|
|
|
projectReportRecord.setFileAttachmentList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileAttachmentList()));
|
|
|
projectReportRecord.setFileGistdataList(ruralProjectRecordsService.disposeDataAttachment(projectReportRecord.getFileGistdataList()));
|