From a4e30eb43219ccc05b0826f49ecd5a3b639cf0c0 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 28 八月 2025 09:27:20 +0800
Subject: [PATCH] 修改计算百分比位置
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamRepairOrderController.java | 119 ++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 80 insertions(+), 39 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamRepairOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamRepairOrderController.java
index 0d74404..30e0f98 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamRepairOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamRepairOrderController.java
@@ -14,6 +14,8 @@
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.TranslateDictTextUtils;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
+import org.jeecg.modules.eam.dto.EamRepairOrderDto;
+import org.jeecg.modules.eam.dto.EamRepairOrderExport;
import org.jeecg.modules.eam.entity.EamRepairOrder;
import org.jeecg.modules.eam.request.EamRepairOrderQuery;
import org.jeecg.modules.eam.request.EamRepairOrderRequest;
@@ -26,10 +28,16 @@
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.service.ISysUserService;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+
+import java.util.Date;
+import java.util.List;
/**
* @Description: 缁翠慨宸ュ崟
@@ -74,55 +82,47 @@
/**
* 棰嗗彇
- *
- * @param eamRepairOrder
+ * @param id
* @return
*/
@AutoLog(value = "缁翠慨宸ュ崟-棰嗗彇")
@ApiOperation(value = "缁翠慨宸ュ崟-棰嗗彇", notes = "缁翠慨宸ュ崟-棰嗗彇")
- @PostMapping(value = "/add")
- public Result<?> add(@RequestBody EamRepairOrder eamRepairOrder) {
- if (StringUtils.isBlank(eamRepairOrder.getReportId())) {
- return Result.error("棰嗗彇澶辫触,璇烽�夋嫨缁翠慨璁板綍锛�");
- }
+ @GetMapping(value = "/claim")
+ public Result<?> claim(String id) {
// 鏍￠獙棰嗗彇鏉冮檺
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if (!BusinessCodeConst.PCR0002.equals(user.getPost())) {
- return Result.error("棰嗗彇澶辫触,娌℃湁棰嗗彇鏉冮檺锛�");
+ return Result.error("棰嗗彇澶辫触,娌℃湁棰嗗彇鏉冮檺锛�,闇�缁翠慨宸ラ鍙�");
}
- eamRepairOrderService.saveRepairOrder(eamRepairOrder);
- return Result.OK("娣诲姞鎴愬姛锛�");
+ EamRepairOrder eamRepairOrder=eamRepairOrderService.getById(id);
+ if (eamRepairOrder==null) {
+ return Result.error("缁翠慨宸ュ崟涓嶅瓨鍦�");
+ }else {
+ if ("1".equals(eamRepairOrder.getClaimStatus())) {
+ return Result.error("璇ョ淮淇伐鍗曞凡琚鍙�");
+ }
+ }
+ eamRepairOrder.setClaimStatus("1");
+ eamRepairOrder.setActualStartTime(new Date());
+ eamRepairOrderService.updateById(eamRepairOrder);
+ return Result.OK("棰嗗彇鎴愬姛");
}
-
/**
- * 鎸囨淳
- *
- * @param
+ * 鎻愪氦
+ * @param id
* @return
*/
- @AutoLog(value = "鏁呴殰鎶ヤ慨-鎸囨淳")
- @ApiOperation(value = "鏁呴殰鎶ヤ慨-鎸囨淳", notes = "鏁呴殰鎶ヤ慨-鎸囨淳")
- @PostMapping(value = "/assign")
- public Result<?> assign(@RequestBody EamReportRepairQuery eamReportRepairQuery) {
- if (StringUtils.isBlank(eamReportRepairQuery.getRepairer())) {
- return Result.error("鎸囨淳澶辫触,璇烽�夋嫨缁翠慨宸ワ紒");
- }
- // 鏍￠獙鎸囨淳鏉冮檺
+ @AutoLog(value = "缁翠慨宸ュ崟-鎻愪氦")
+ @ApiOperation(value = "缁翠慨宸ュ崟-鎻愪氦", notes = "缁翠慨宸ュ崟-鎻愪氦")
+ @GetMapping(value = "/submit")
+ public Result<?> submit(String id) {
+ // 鏍￠獙棰嗗彇鏉冮檺
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- if (!BusinessCodeConst.PCR0004.equals(user.getPost())) {
- return Result.error("鎸囨淳澶辫触,娌℃湁鎸囨淳鏉冮檺锛�");
+ if (!BusinessCodeConst.PCR0002.equals(user.getPost())) {
+ return Result.error("鎻愪氦澶辫触,娌℃湁鎻愪氦鏉冮檺锛�,闇�缁翠慨宸ユ彁浜�");
}
- // 鏍￠獙缁翠慨宸ユ潈闄�
- SysUser sysUser = sysUserService.getUserByName(eamReportRepairQuery.getRepairer());
- if (sysUser == null) {
- return Result.error("鎸囨淳澶辫触,鏈壘鍒版缁翠慨宸ョ敤鎴凤紒");
- }
- if (!BusinessCodeConst.PCR0002.equals(sysUser.getPost())) {
- return Result.error("鎸囨淳澶辫触,姝ょ敤鎴蜂笉鏄淮淇伐锛�");
- }
- eamRepairOrderService.assign(eamReportRepairQuery);
-
- return Result.OK("鎸囨淳鎴愬姛锛�");
+ eamRepairOrderService.saveRepairOrder(id);
+ return Result.OK("鎻愪氦鎴愬姛锛�");
}
/**
@@ -150,6 +150,41 @@
}
/**
+ * 濉姤璇︽儏
+ * @param id
+ */
+ @AutoLog(value = "缁翠慨宸ュ崟-濉姤璇︽儏")
+ @ApiOperation(value = "缁翠慨宸ュ崟-濉姤璇︽儏", notes = "缁翠慨宸ュ崟-濉姤璇︽儏")
+ @GetMapping(value = "/queryByReportId")
+ public Result<?> queryByReportId(@RequestParam(name = "id", required = true) String id) {
+ return Result.ok(eamRepairOrderService.queryByReportId(id));
+ }
+
+ /**
+ * 濉姤缁翠慨宸ュ崟
+ * @param eamRepairOrderDto
+ */
+ @ApiOperation(value = "缁翠慨宸ュ崟-濉姤缁翠慨宸ュ崟", notes = "缁翠慨宸ュ崟-濉姤缁翠慨宸ュ崟")
+ @PostMapping(value = "/report")
+ public Result<?> report(@RequestBody EamRepairOrderDto eamRepairOrderDto) {
+ // 鏍￠獙棰嗗彇鏉冮檺
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (!BusinessCodeConst.PCR0002.equals(user.getPost())) {
+ return Result.error("濉姤澶辫触,娌℃湁濉姤鏉冮檺锛�,闇�缁翠慨宸ユ彁浜�");
+ }
+ if (eamRepairOrderDto == null) {
+ return Result.error("濉姤鐨勫璞′笉鑳戒负绌猴紒");
+ }else {
+ boolean b = eamRepairOrderService.report(eamRepairOrderDto);
+ if(!b) {
+ return Result.error("濉姤澶辫触锛岃閲嶈瘯");
+ }else {
+ return Result.OK("濉姤鎴愬姛");
+ }
+ }
+ }
+
+ /**
* 閫氳繃id鏌ヨ
*
* @param id
@@ -172,7 +207,6 @@
translateDictTextUtils.translateField("reportStatus", eamRepairOrder.getReportStatus(), item, "report_repair_status");
translateDictTextUtils.translateField("equipmentId", eamRepairOrder.getEquipmentId(), item, "eam_equipment,id,equipment_code");
translateDictTextUtils.translateField("repairStatus", eamRepairOrder.getRepairStatus(), item, "report_repair_status");
- translateDictTextUtils.translateField("repairer", eamRepairOrder.getRepairer(), item, "sys_user,username,realname");
return Result.OK(item);
} catch (Exception e) {
return Result.error("鏁版嵁杞瘧澶辫触锛�");
@@ -183,11 +217,18 @@
* 瀵煎嚭excel
*
* @param request
- * @param eamRepairOrder
+ * @param eamRepairOrderQuery
*/
@RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, EamRepairOrder eamRepairOrder) {
- return super.exportXls(request, eamRepairOrder, EamRepairOrder.class, "缁翠慨宸ュ崟");
+ public ModelAndView exportXls(HttpServletRequest request, EamRepairOrderQuery eamRepairOrderQuery) {
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ List<EamRepairOrderExport> eamRepairOrderExports=eamRepairOrderService.exportList(eamRepairOrderQuery);
+ ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+ mv.addObject(NormalExcelConstants.FILE_NAME, "缁翠慨宸ュ崟鍙拌处"); //姝ゅ璁剧疆鐨刦ilename鏃犳晥 ,鍓嶇浼氶噸鏇存柊璁剧疆涓�涓�
+ mv.addObject(NormalExcelConstants.CLASS, EamRepairOrderExport.class);
+ mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("缁翠慨宸ュ崟鍙拌处" + "鎶ヨ〃", "瀵煎嚭浜�:" + sysUser.getRealname(), "缁翠慨宸ュ崟鍙拌处"));
+ mv.addObject(NormalExcelConstants.DATA_LIST, eamRepairOrderExports);
+ return mv;
}
}
--
Gitblit v1.9.3