1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/CommonUserController.java

@@ -22,7 +22,9 @@ import com.winsea.svc.base.security.vo.command.AuthUserCommand;
 import com.winsea.svc.base.workflow.entity.Workflow;
 import com.winsea.svc.base.workflow.entity.WorkflowHistoricTask;
 import com.winsea.svc.base.workflow.entity.WorkflowStep;
+import com.winsea.svc.notice.entity.NoticeNewsInfo;
 import com.winsea.svc.notice.entity.NoticeTaskInfo;
+import com.winsea.svc.notice.service.INoticeNewsService;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.common.support.util.StringUtils;
 import com.yh.saas.plugin.yiliangyiyun.constant.ImageCensorConsts;
@@ -82,11 +84,6 @@ public class CommonUserController {
     private INewWorkflowService workflowService;
     @Autowired
     private ICommonCompanyService companyService;
-    @Autowired
-    private WebSocket webSocket;
-    @Autowired
-    private GeTuiUtils geTuiUtils;
-
 
     /**
      * 图像审核识别Demo
@@ -631,6 +628,16 @@ public class CommonUserController {
         return commonUserService.findHisPageNoticeTasksMy(noticeTask);
     }
 
+    /**
+     * 查询PC通知
+     *
+     * @param noticeNewsInfo 查询条件
+     * @return 返回分页查询结果
+     */
+    @GetMapping("/query/noticeNewsInfoList")
+    public Page<NoticeNewsInfo> noticeNewsInfoList(NoticeNewsInfo noticeNewsInfo) {
+        return commonUserService.noticeNewsInfoList(noticeNewsInfo);
+    }
     /**
      * 查验app 账号
      *

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/ExpenseInfo.java

@@ -394,6 +394,11 @@ public class ExpenseInfo extends BaseModel<ExpenseInfo> {
      */
     @TableField(exist = false)
     private String toExamineType;
+    /**
+     *操作人ID
+     */
+    @TableField(exist = false)
+    private String operatorId;
 
     @Override
     protected Serializable pkVal() {

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ICommonUserService.java

@@ -5,6 +5,7 @@ import com.winsea.svc.base.base.entity.CommonCompany;
 import com.winsea.svc.base.base.entity.CommonStaff;
 import com.winsea.svc.base.base.entity.CommonStaffRole;
 import com.winsea.svc.base.security.entity.Account;
+import com.winsea.svc.notice.entity.NoticeNewsInfo;
 import com.winsea.svc.notice.entity.NoticeTaskInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.CommonUser;
 import com.baomidou.mybatisplus.service.IService;
@@ -95,7 +96,7 @@ public interface ICommonUserService extends IService<CommonUser> {
     Page<NoticeTaskInfo> findHisPageNoticeTasks(NoticeTaskInfo noticeTask);
     Page<NoticeTaskInfo> findHisPageNoticeTasksMy(NoticeTaskInfo noticeTask);
 
-
+    Page<NoticeNewsInfo> noticeNewsInfoList(NoticeNewsInfo noticeNewsInfo);
     String checkApp(CommonUser commonUser) throws ServiceException;
     String checkSession() throws ServiceException;
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CommonUserServiceImpl.java

@@ -6,7 +6,10 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.google.common.collect.Lists;
 import com.sun.org.apache.xerces.internal.xs.StringList;
+import com.winsea.svc.notice.entity.NoticeNewsInfo;
+import com.winsea.svc.notice.service.*;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
+import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.exception.*;
 import org.apache.commons.collections.CollectionUtils;
 import com.google.common.collect.Sets;
@@ -25,10 +28,6 @@ import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.winsea.svc.notice.entity.NoticeBusinessConstantInfo;
 import com.winsea.svc.notice.entity.NoticeTaskInfo;
 import com.winsea.svc.notice.entity.base.BaseNotice;
-import com.winsea.svc.notice.service.INoticeBusinessConstantService;
-import com.winsea.svc.notice.service.INoticeBusinessResourceService;
-import com.winsea.svc.notice.service.INoticeTaskService;
-import com.winsea.svc.notice.service.INoticeUtilService;
 import com.yh.saas.common.support.entity.BaseModel;
 import com.yh.saas.common.support.event.SupportEventBus;
 import com.yh.saas.common.support.util.IdGenerator;
@@ -117,7 +116,7 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
     private INoticeUtilService noticeUtilService;
 
     @Autowired
-    private INoticeTaskService noticeTaskService;
+    private INoticeNewsService noticeNewsService;
     @Autowired
     private CommonStaffMapper staffMapper;
 
@@ -901,6 +900,31 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
         return page;
     }
 
+    @Override
+    public Page<NoticeNewsInfo> noticeNewsInfoList(NoticeNewsInfo noticeNewsInfo) {
+        if (null == noticeNewsInfo.getPageSize()) {
+            noticeNewsInfo.setPageSize(10);
+        }
+        if (null == noticeNewsInfo.getCurrentPage()) {
+            noticeNewsInfo.setCurrentPage(1);
+        }
+        Wrapper<NoticeNewsInfo> noticeNewsWrapper = new EntityWrapper<>();
+        if (!StringUtils.isEmpty(noticeNewsInfo.getCreateDateStart())) {
+            noticeNewsWrapper.gt("create_date", noticeNewsInfo.getCreateDateStart());
+        }
+        if (!StringUtils.isEmpty(noticeNewsInfo.getCreateDateEnd())) {
+            noticeNewsWrapper.lt("create_date", noticeNewsInfo.getCreateDateEnd());
+        }
+        noticeNewsWrapper.eq("accept_id", AuthSecurityUtils.getCurrentUserId()).orderBy("message_status");
+        Page<NoticeNewsInfo> noticeNewsInfoPage = noticeNewsService.selectPage(noticeNewsInfo.getQueryPage(), noticeNewsWrapper);
+        List<NoticeNewsInfo> noticeNewsInfos = noticeNewsInfoPage.getRecords();
+        noticeNewsInfoPage.setRecords(noticeNewsInfos);
+        Integer count = noticeNewsService.selectCount(new EntityWrapper<NoticeNewsInfo>()
+                .eq("accept_id", AuthSecurityUtils.getCurrentUserId()));
+        noticeNewsInfoPage.setSize(count);
+        return noticeNewsInfoPage;
+    }
+
     /**
      * 过滤没有这个权限的任务
      *

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/ExpenseInfoServiceImpl.java

@@ -973,7 +973,7 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
     public String uploadAttachments(ExpenseInfo expenseInfo) {
         this.updateById(expenseInfo);
         ExpenseInfo expenseInfo1=this.selectById(expenseInfo.getId());
-        CommonStaff commitUserInfo = staffService.getInfo(AuthSecurityUtils.getCurrentUserId());
+        CommonStaff commitUserInfo = staffService.getInfo(expenseInfo.getOperatorId()!=null?expenseInfo.getOperatorId():AuthSecurityUtils.getCurrentUserId());
         CommonDepartment commonDepartment=commonDepartmentService.selectOne(new EntityWrapper<CommonDepartment>()
                 .eq("dept_name", "财务部")
                 .eq("comp_id", commitUserInfo.getCompId())