From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 19:48:02 +0800
Subject: [PATCH] Merge branch 'developer' into hive2.0
---
zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java | 50 ++++++++++++++++++++++++++++----------------------
1 files changed, 28 insertions(+), 22 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 f8b24a4..968cd07 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
@@ -3,6 +3,7 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
import com.matrix.core.anotations.RemoveRequestToken;
import com.matrix.core.constance.MatrixConstance;
import com.matrix.core.exception.GlobleException;
@@ -15,16 +16,18 @@
import com.matrix.core.tools.excl.ExcelSheetPO;
import com.matrix.core.tools.excl.ExcelUtil;
import com.matrix.core.tools.excl.ExcelVersion;
-import com.matrix.system.app.dto.IdSubmitDto;
import com.matrix.system.common.bean.BusParameterSettings;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.common.dao.BusParameterSettingsDao;
import com.matrix.system.common.dao.SysCompanyDao;
+import com.matrix.system.common.service.OperationLogService;
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.enums.OperationButtonEnum;
+import com.matrix.system.enums.OperationFunctionEnum;
import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.*;
@@ -35,8 +38,8 @@
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.ui.ModelMap;
-import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@@ -108,6 +111,10 @@
@Autowired
SysShopInfoDao shopInfoDao;
+
+ @Autowired
+ private OperationLogService operationLogService;
+
/**
* 根据id查询服务单信息
@@ -464,6 +471,7 @@
*/
@RequestMapping(value = "/updateOrderTime")
public @ResponseBody
+ @Transactional(rollbackFor = Exception.class)
AjaxResult updateOrderTime(@RequestBody ServiceOrderTimeDto serviceOrderTimeDto) {
sysProjServicesDao.updateOrderTime(serviceOrderTimeDto);
// 更新业绩时间
@@ -471,6 +479,15 @@
achieveNew.setServiceOrderId(serviceOrderTimeDto.getId());
achieveNew.setDatatime(serviceOrderTimeDto.getConsumeTime());
achieveNewService.modifyAchieveTime(achieveNew);
+ SysProjServices projServices = sysProjServicesDao.selectById(serviceOrderTimeDto.getId());
+ //保存单据日志
+ operationLogService.saveOperation(projServices.getCompanyId(), projServices.getShopId(),getMe().getSuId(),
+ OperationFunctionEnum.SERVICE_ORDER,
+ OperationButtonEnum.ORDER_UPDATE_TIME,
+ projServices.getId(),
+ projServices.getServiceNo(),
+ projServices.getVipId(),
+ "更新参数: "+JSON.toJSONString(serviceOrderTimeDto));
return new AjaxResult(AjaxResult.STATUS_SUCCESS, "修改成功");
}
@@ -515,20 +532,7 @@
return mv;
}
- /**
- * 根据id对服务单进行派单
- */
- @RequestMapping(value = "/paidan")
- public @ResponseBody
- AjaxResult paidan(Long id) {
- SysProjServices services = sysProjServicesService.findById(id);
- int i = sysProjServicesService.modifyPDProjServices(services);
- if (i > 0) {
- return new AjaxResult(AjaxResult.STATUS_SUCCESS, "派单成功");
- } else {
- return new AjaxResult(AjaxResult.STATUS_FAIL, "派单失败");
- }
- }
+
@Autowired
BusParameterSettingsDao busParameterSettingsDao;
@@ -660,12 +664,6 @@
}
- @RequestMapping(value = "/addServiceProj")
- @ResponseBody
- public AjaxResult addServiceProj(SysProjServices sysProjServices) {
-
- return AjaxResult.buildSuccessInstance("保存成功");
- }
/**
* 删除服务单项目/套餐
@@ -725,6 +723,14 @@
private void doExportServiceOrder(HttpServletResponse response, SysProjServices projServices) throws IOException {
+
+ //保存单据日志
+ operationLogService.saveOperation(getMe().getCompanyId(), getMe().getShopId(),getMe().getSuId(),
+ OperationFunctionEnum.SERVICE_ORDER,
+ OperationButtonEnum.EXPORT,
+ String.format("导出参数:%s" , JSON.toJSONString(projServices)));
+
+
List<ExcelSheetPO> res = new ArrayList<>();
ExcelSheetPO orderSheet = new ExcelSheetPO();
String title = "服务订单明细";
--
Gitblit v1.9.1