From 593057ae8f4944ab049fcca1fa47fcacf372f7b4 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 31 Jul 2021 17:38:52 +0800
Subject: [PATCH] 修复导入bug
---
zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java
index b82ce4e..20ffba2 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java
@@ -15,7 +15,9 @@
import com.matrix.core.tools.excl.ExcelUtil;
import com.matrix.core.tools.excl.ExcelVersion;
import com.matrix.system.common.bean.SysUsers;
+import com.matrix.system.common.dao.SysCompanyDao;
import com.matrix.system.common.service.SysUsersService;
+import com.matrix.system.common.tools.DataAuthUtil;
import com.matrix.system.common.tools.ResponseHeadUtil;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.hive.bean.*;
@@ -28,6 +30,7 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -35,7 +38,9 @@
import java.io.IOException;
import java.io.OutputStream;
import java.net.URLEncoder;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
/**
@@ -146,6 +151,9 @@
}
if (StringUtils.isBlank(pageVo.getOrder())) {
pageVo.setOrder("desc");
+ }
+ if (!DataAuthUtil.hasAllShopAuth()) {
+ projService.setShopId(getMe().getShopId());
}
List<SysProjServices> dataList = projServicesSerivce.findInPage(projService, pageVo);
AjaxResult result = new AjaxResult(AjaxResult.STATUS_SUCCESS, dataList, projServicesSerivce.findTotal(projService));
@@ -435,6 +443,25 @@
return new AjaxResult(AjaxResult.STATUS_SUCCESS, "成功");
}
+ @Autowired
+ private SysCompanyDao sysCompanyDao;
+
+ /**
+ * 服务单打印
+ */
+ @RequestMapping(value = "/printOrder")
+ public @ResponseBody
+ ModelAndView printOrder() throws GlobleException {
+ ModelAndView mv = new ModelAndView("admin/hive/beautySalon/print-service");
+ SysUsers user=(SysUsers)WebUtil.getSession().getAttribute(MatrixConstance.LOGIN_KEY);
+ String comRegisterCode = sysCompanyDao.selectById(user.getCompanyId()).getComRegisterCode();
+ if(StringUtils.isNotBlank(comRegisterCode)){
+ mv.addObject("page",comRegisterCode);
+ }else {
+ mv.addObject("page","taiyan");
+ }
+ return mv;
+ }
/**
* 根据id对服务单进行派单
--
Gitblit v1.9.1