From c8cd3c3bd67c33002700e110e3648eba0aa013dd Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期三, 09 七月 2025 22:03:21 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrderDetail.java | 73 + lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardDetailServiceImpl.java | 9 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationStandardService.java | 14 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusChangeDetail.java | 67 + lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusDeactivateServiceImpl.java | 19 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusChangeDetailService.java | 14 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusDeactivateService.java | 14 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderChangeServiceImpl.java | 19 db/430设备管理数据库设计.pdma.json | 6 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusEvaluationApplicationMapper.xml | 5 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderController.java | 151 +++ lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusChangeDetailController.java | 151 +++ lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusDeactivateDetailMapper.java | 17 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusChangeDetailServiceImpl.java | 19 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationApplication.java | 91 + lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationOrderChangeService.java | 14 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusDeactivateMapper.java | 17 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusEvaluationOrderDetailMapper.java | 17 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusChangeController.java | 151 +++ lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusChangeService.java | 14 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusChange.java | 79 + lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusChangeMapper.java | 17 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationApplicationServiceImpl.java | 19 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusDeactivateDetailMapper.xml | 5 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrder.java | 133 ++ lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrderChange.java | 97 ++ lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusEvaluationOrderMapper.xml | 5 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusChangeMapper.xml | 5 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusDeactivateMapper.xml | 5 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusEvaluationOrderDetailMapper.xml | 5 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusChangeServiceImpl.java | 19 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusEvaluationOrderChangeMapper.java | 17 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusDeactivateDetail.java | 55 + lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusChangeDetailMapper.xml | 5 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderDetailServiceImpl.java | 19 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusDeactivateController.java | 151 +++ lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardServiceImpl.java | 279 +++++ lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java | 19 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusDeactivateDetailController.java | 151 +++ lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusDeactivateDetailService.java | 14 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusEvaluationApplicationMapper.java | 17 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationApplicationController.java | 151 +++ lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusChangeDetailMapper.java | 17 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusDeactivateDetailServiceImpl.java | 19 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationStandardController.java | 82 + lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusEvaluationOrderMapper.java | 17 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationApplicationService.java | 14 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderDetailController.java | 151 +++ lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusEvaluationOrderChangeMapper.xml | 5 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationStandardDetailService.java | 9 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderChangeController.java | 151 +++ lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationOrderService.java | 14 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusDeactivate.java | 82 + lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationOrderDetailService.java | 14 54 files changed, 2,685 insertions(+), 39 deletions(-) diff --git "a/db/430\350\256\276\345\244\207\347\256\241\347\220\206\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241.pdma.json" "b/db/430\350\256\276\345\244\207\347\256\241\347\220\206\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241.pdma.json" index 6ebaead..bf57e7b 100644 --- "a/db/430\350\256\276\345\244\207\347\256\241\347\220\206\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241.pdma.json" +++ "b/db/430\350\256\276\345\244\207\347\256\241\347\220\206\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241.pdma.json" @@ -4,7 +4,7 @@ "avatar": "", "version": "4.9.2", "createdTime": "2025-3-10 16:38:19", - "updatedTime": "2025-7-8 15:34:54", + "updatedTime": "2025-7-9 19:20:22", "dbConns": [], "profile": { "default": { @@ -24945,7 +24945,7 @@ "id": "F19406B3-1B81-484F-B916-81143EB092A4" }, { - "defKey": "process_technician鈥媉signature", + "defKey": "process_technician_signature", "defName": "宸ヨ壓鍛樼瀛�", "comment": "", "type": "", @@ -24963,7 +24963,7 @@ "id": "44FAEC7F-5BA9-4AD0-8692-DA36C64E4B7C" }, { - "defKey": "process_technician鈥媉signature_time", + "defKey": "process_technician_signature_time", "defName": "宸ヨ壓鍛樼瀛楁椂闂�", "comment": "", "type": "", diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusChangeController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusChangeController.java new file mode 100644 index 0000000..bea94ef --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusChangeController.java @@ -0,0 +1,151 @@ +package org.jeecg.modules.eam.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.eam.entity.EamTechnicalStatusChange; +import org.jeecg.modules.eam.service.IEamTechnicalStatusChangeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; + + /** + * @Description: 鎶�鏈姸鎬佸彉鏇寸敵璇� + * @Author: jeecg-boot + * @Date: 2025-07-09 + * @Version: V1.0 + */ +@Slf4j +@Api(tags="鎶�鏈姸鎬佸彉鏇寸敵璇�") +@RestController +@RequestMapping("/eam/eamTechnicalStatusChange") +public class EamTechnicalStatusChangeController extends JeecgController<EamTechnicalStatusChange, IEamTechnicalStatusChangeService> { + @Autowired + private IEamTechnicalStatusChangeService eamTechnicalStatusChangeService; + + /** + * 鍒嗛〉鍒楄〃鏌ヨ + * + * @param eamTechnicalStatusChange + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @ApiOperation(value="鎶�鏈姸鎬佸彉鏇寸敵璇�-鍒嗛〉鍒楄〃鏌ヨ", notes="鎶�鏈姸鎬佸彉鏇寸敵璇�-鍒嗛〉鍒楄〃鏌ヨ") + @GetMapping(value = "/list") + public Result<?> queryPageList(EamTechnicalStatusChange eamTechnicalStatusChange, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper<EamTechnicalStatusChange> queryWrapper = QueryGenerator.initQueryWrapper(eamTechnicalStatusChange, req.getParameterMap()); + Page<EamTechnicalStatusChange> page = new Page<EamTechnicalStatusChange>(pageNo, pageSize); + IPage<EamTechnicalStatusChange> pageList = eamTechnicalStatusChangeService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 娣诲姞 + * + * @param eamTechnicalStatusChange + * @return + */ + @AutoLog(value = "鎶�鏈姸鎬佸彉鏇寸敵璇�-娣诲姞") + @ApiOperation(value="鎶�鏈姸鎬佸彉鏇寸敵璇�-娣诲姞", notes="鎶�鏈姸鎬佸彉鏇寸敵璇�-娣诲姞") + @PostMapping(value = "/add") + public Result<?> add(@RequestBody EamTechnicalStatusChange eamTechnicalStatusChange) { + eamTechnicalStatusChangeService.save(eamTechnicalStatusChange); + return Result.OK("娣诲姞鎴愬姛锛�"); + } + + /** + * 缂栬緫 + * + * @param eamTechnicalStatusChange + * @return + */ + @AutoLog(value = "鎶�鏈姸鎬佸彉鏇寸敵璇�-缂栬緫") + @ApiOperation(value="鎶�鏈姸鎬佸彉鏇寸敵璇�-缂栬緫", notes="鎶�鏈姸鎬佸彉鏇寸敵璇�-缂栬緫") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result<?> edit(@RequestBody EamTechnicalStatusChange eamTechnicalStatusChange) { + eamTechnicalStatusChangeService.updateById(eamTechnicalStatusChange); + return Result.OK("缂栬緫鎴愬姛!"); + } + + /** + * 閫氳繃id鍒犻櫎 + * + * @param id + * @return + */ + @AutoLog(value = "鎶�鏈姸鎬佸彉鏇寸敵璇�-閫氳繃id鍒犻櫎") + @ApiOperation(value="鎶�鏈姸鎬佸彉鏇寸敵璇�-閫氳繃id鍒犻櫎", notes="鎶�鏈姸鎬佸彉鏇寸敵璇�-閫氳繃id鍒犻櫎") + @DeleteMapping(value = "/delete") + public Result<?> delete(@RequestParam(name="id",required=true) String id) { + eamTechnicalStatusChangeService.removeById(id); + return Result.OK("鍒犻櫎鎴愬姛!"); + } + + /** + * 鎵归噺鍒犻櫎 + * + * @param ids + * @return + */ + @AutoLog(value = "鎶�鏈姸鎬佸彉鏇寸敵璇�-鎵归噺鍒犻櫎") + @ApiOperation(value="鎶�鏈姸鎬佸彉鏇寸敵璇�-鎵归噺鍒犻櫎", notes="鎶�鏈姸鎬佸彉鏇寸敵璇�-鎵归噺鍒犻櫎") + @DeleteMapping(value = "/deleteBatch") + public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.eamTechnicalStatusChangeService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�"); + } + + /** + * 閫氳繃id鏌ヨ + * + * @param id + * @return + */ + @AutoLog(value = "鎶�鏈姸鎬佸彉鏇寸敵璇�-閫氳繃id鏌ヨ") + @ApiOperation(value="鎶�鏈姸鎬佸彉鏇寸敵璇�-閫氳繃id鏌ヨ", notes="鎶�鏈姸鎬佸彉鏇寸敵璇�-閫氳繃id鏌ヨ") + @GetMapping(value = "/queryById") + public Result<?> queryById(@RequestParam(name="id",required=true) String id) { + EamTechnicalStatusChange eamTechnicalStatusChange = eamTechnicalStatusChangeService.getById(id); + return Result.OK(eamTechnicalStatusChange); + } + + /** + * 瀵煎嚭excel + * + * @param request + * @param eamTechnicalStatusChange + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, EamTechnicalStatusChange eamTechnicalStatusChange) { + return super.exportXls(request, eamTechnicalStatusChange, EamTechnicalStatusChange.class, "鎶�鏈姸鎬佸彉鏇寸敵璇�"); + } + + /** + * 閫氳繃excel瀵煎叆鏁版嵁 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, EamTechnicalStatusChange.class); + } + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusChangeDetailController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusChangeDetailController.java new file mode 100644 index 0000000..73b50e5 --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusChangeDetailController.java @@ -0,0 +1,151 @@ +package org.jeecg.modules.eam.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.eam.entity.EamTechnicalStatusChangeDetail; +import org.jeecg.modules.eam.service.IEamTechnicalStatusChangeDetailService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; + + /** + * @Description: 鎶�鏈姸鎬佸彉鏇寸敵璇锋槑缁� + * @Author: jeecg-boot + * @Date: 2025-07-09 + * @Version: V1.0 + */ +@Slf4j +@Api(tags="鎶�鏈姸鎬佸彉鏇寸敵璇锋槑缁�") +@RestController +@RequestMapping("/eam/eamTechnicalStatusChangeDetail") +public class EamTechnicalStatusChangeDetailController extends JeecgController<EamTechnicalStatusChangeDetail, IEamTechnicalStatusChangeDetailService> { + @Autowired + private IEamTechnicalStatusChangeDetailService eamTechnicalStatusChangeDetailService; + + /** + * 鍒嗛〉鍒楄〃鏌ヨ + * + * @param eamTechnicalStatusChangeDetail + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @ApiOperation(value="鎶�鏈姸鎬佸彉鏇寸敵璇锋槑缁�-鍒嗛〉鍒楄〃鏌ヨ", notes="鎶�鏈姸鎬佸彉鏇寸敵璇锋槑缁�-鍒嗛〉鍒楄〃鏌ヨ") + @GetMapping(value = "/list") + public Result<?> queryPageList(EamTechnicalStatusChangeDetail eamTechnicalStatusChangeDetail, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper<EamTechnicalStatusChangeDetail> queryWrapper = QueryGenerator.initQueryWrapper(eamTechnicalStatusChangeDetail, req.getParameterMap()); + Page<EamTechnicalStatusChangeDetail> page = new Page<EamTechnicalStatusChangeDetail>(pageNo, pageSize); + IPage<EamTechnicalStatusChangeDetail> pageList = eamTechnicalStatusChangeDetailService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 娣诲姞 + * + * @param eamTechnicalStatusChangeDetail + * @return + */ + @AutoLog(value = "鎶�鏈姸鎬佸彉鏇寸敵璇锋槑缁�-娣诲姞") + @ApiOperation(value="鎶�鏈姸鎬佸彉鏇寸敵璇锋槑缁�-娣诲姞", notes="鎶�鏈姸鎬佸彉鏇寸敵璇锋槑缁�-娣诲姞") + @PostMapping(value = "/add") + public Result<?> add(@RequestBody EamTechnicalStatusChangeDetail eamTechnicalStatusChangeDetail) { + eamTechnicalStatusChangeDetailService.save(eamTechnicalStatusChangeDetail); + return Result.OK("娣诲姞鎴愬姛锛�"); + } + + /** + * 缂栬緫 + * + * @param eamTechnicalStatusChangeDetail + * @return + */ + @AutoLog(value = "鎶�鏈姸鎬佸彉鏇寸敵璇锋槑缁�-缂栬緫") + @ApiOperation(value="鎶�鏈姸鎬佸彉鏇寸敵璇锋槑缁�-缂栬緫", notes="鎶�鏈姸鎬佸彉鏇寸敵璇锋槑缁�-缂栬緫") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result<?> edit(@RequestBody EamTechnicalStatusChangeDetail eamTechnicalStatusChangeDetail) { + eamTechnicalStatusChangeDetailService.updateById(eamTechnicalStatusChangeDetail); + return Result.OK("缂栬緫鎴愬姛!"); + } + + /** + * 閫氳繃id鍒犻櫎 + * + * @param id + * @return + */ + @AutoLog(value = "鎶�鏈姸鎬佸彉鏇寸敵璇锋槑缁�-閫氳繃id鍒犻櫎") + @ApiOperation(value="鎶�鏈姸鎬佸彉鏇寸敵璇锋槑缁�-閫氳繃id鍒犻櫎", notes="鎶�鏈姸鎬佸彉鏇寸敵璇锋槑缁�-閫氳繃id鍒犻櫎") + @DeleteMapping(value = "/delete") + public Result<?> delete(@RequestParam(name="id",required=true) String id) { + eamTechnicalStatusChangeDetailService.removeById(id); + return Result.OK("鍒犻櫎鎴愬姛!"); + } + + /** + * 鎵归噺鍒犻櫎 + * + * @param ids + * @return + */ + @AutoLog(value = "鎶�鏈姸鎬佸彉鏇寸敵璇锋槑缁�-鎵归噺鍒犻櫎") + @ApiOperation(value="鎶�鏈姸鎬佸彉鏇寸敵璇锋槑缁�-鎵归噺鍒犻櫎", notes="鎶�鏈姸鎬佸彉鏇寸敵璇锋槑缁�-鎵归噺鍒犻櫎") + @DeleteMapping(value = "/deleteBatch") + public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.eamTechnicalStatusChangeDetailService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�"); + } + + /** + * 閫氳繃id鏌ヨ + * + * @param id + * @return + */ + @AutoLog(value = "鎶�鏈姸鎬佸彉鏇寸敵璇锋槑缁�-閫氳繃id鏌ヨ") + @ApiOperation(value="鎶�鏈姸鎬佸彉鏇寸敵璇锋槑缁�-閫氳繃id鏌ヨ", notes="鎶�鏈姸鎬佸彉鏇寸敵璇锋槑缁�-閫氳繃id鏌ヨ") + @GetMapping(value = "/queryById") + public Result<?> queryById(@RequestParam(name="id",required=true) String id) { + EamTechnicalStatusChangeDetail eamTechnicalStatusChangeDetail = eamTechnicalStatusChangeDetailService.getById(id); + return Result.OK(eamTechnicalStatusChangeDetail); + } + + /** + * 瀵煎嚭excel + * + * @param request + * @param eamTechnicalStatusChangeDetail + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, EamTechnicalStatusChangeDetail eamTechnicalStatusChangeDetail) { + return super.exportXls(request, eamTechnicalStatusChangeDetail, EamTechnicalStatusChangeDetail.class, "鎶�鏈姸鎬佸彉鏇寸敵璇锋槑缁�"); + } + + /** + * 閫氳繃excel瀵煎叆鏁版嵁 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, EamTechnicalStatusChangeDetail.class); + } + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusDeactivateController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusDeactivateController.java new file mode 100644 index 0000000..f39d463 --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusDeactivateController.java @@ -0,0 +1,151 @@ +package org.jeecg.modules.eam.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.eam.entity.EamTechnicalStatusDeactivate; +import org.jeecg.modules.eam.service.IEamTechnicalStatusDeactivateService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; + + /** + * @Description: 鍋滅敤鍔犲伐璁惧鐢宠鍗� + * @Author: jeecg-boot + * @Date: 2025-07-09 + * @Version: V1.0 + */ +@Slf4j +@Api(tags="鍋滅敤鍔犲伐璁惧鐢宠鍗�") +@RestController +@RequestMapping("/eam/eamTechnicalStatusDeactivate") +public class EamTechnicalStatusDeactivateController extends JeecgController<EamTechnicalStatusDeactivate, IEamTechnicalStatusDeactivateService> { + @Autowired + private IEamTechnicalStatusDeactivateService eamTechnicalStatusDeactivateService; + + /** + * 鍒嗛〉鍒楄〃鏌ヨ + * + * @param eamTechnicalStatusDeactivate + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @ApiOperation(value="鍋滅敤鍔犲伐璁惧鐢宠鍗�-鍒嗛〉鍒楄〃鏌ヨ", notes="鍋滅敤鍔犲伐璁惧鐢宠鍗�-鍒嗛〉鍒楄〃鏌ヨ") + @GetMapping(value = "/list") + public Result<?> queryPageList(EamTechnicalStatusDeactivate eamTechnicalStatusDeactivate, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper<EamTechnicalStatusDeactivate> queryWrapper = QueryGenerator.initQueryWrapper(eamTechnicalStatusDeactivate, req.getParameterMap()); + Page<EamTechnicalStatusDeactivate> page = new Page<EamTechnicalStatusDeactivate>(pageNo, pageSize); + IPage<EamTechnicalStatusDeactivate> pageList = eamTechnicalStatusDeactivateService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 娣诲姞 + * + * @param eamTechnicalStatusDeactivate + * @return + */ + @AutoLog(value = "鍋滅敤鍔犲伐璁惧鐢宠鍗�-娣诲姞") + @ApiOperation(value="鍋滅敤鍔犲伐璁惧鐢宠鍗�-娣诲姞", notes="鍋滅敤鍔犲伐璁惧鐢宠鍗�-娣诲姞") + @PostMapping(value = "/add") + public Result<?> add(@RequestBody EamTechnicalStatusDeactivate eamTechnicalStatusDeactivate) { + eamTechnicalStatusDeactivateService.save(eamTechnicalStatusDeactivate); + return Result.OK("娣诲姞鎴愬姛锛�"); + } + + /** + * 缂栬緫 + * + * @param eamTechnicalStatusDeactivate + * @return + */ + @AutoLog(value = "鍋滅敤鍔犲伐璁惧鐢宠鍗�-缂栬緫") + @ApiOperation(value="鍋滅敤鍔犲伐璁惧鐢宠鍗�-缂栬緫", notes="鍋滅敤鍔犲伐璁惧鐢宠鍗�-缂栬緫") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result<?> edit(@RequestBody EamTechnicalStatusDeactivate eamTechnicalStatusDeactivate) { + eamTechnicalStatusDeactivateService.updateById(eamTechnicalStatusDeactivate); + return Result.OK("缂栬緫鎴愬姛!"); + } + + /** + * 閫氳繃id鍒犻櫎 + * + * @param id + * @return + */ + @AutoLog(value = "鍋滅敤鍔犲伐璁惧鐢宠鍗�-閫氳繃id鍒犻櫎") + @ApiOperation(value="鍋滅敤鍔犲伐璁惧鐢宠鍗�-閫氳繃id鍒犻櫎", notes="鍋滅敤鍔犲伐璁惧鐢宠鍗�-閫氳繃id鍒犻櫎") + @DeleteMapping(value = "/delete") + public Result<?> delete(@RequestParam(name="id",required=true) String id) { + eamTechnicalStatusDeactivateService.removeById(id); + return Result.OK("鍒犻櫎鎴愬姛!"); + } + + /** + * 鎵归噺鍒犻櫎 + * + * @param ids + * @return + */ + @AutoLog(value = "鍋滅敤鍔犲伐璁惧鐢宠鍗�-鎵归噺鍒犻櫎") + @ApiOperation(value="鍋滅敤鍔犲伐璁惧鐢宠鍗�-鎵归噺鍒犻櫎", notes="鍋滅敤鍔犲伐璁惧鐢宠鍗�-鎵归噺鍒犻櫎") + @DeleteMapping(value = "/deleteBatch") + public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.eamTechnicalStatusDeactivateService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�"); + } + + /** + * 閫氳繃id鏌ヨ + * + * @param id + * @return + */ + @AutoLog(value = "鍋滅敤鍔犲伐璁惧鐢宠鍗�-閫氳繃id鏌ヨ") + @ApiOperation(value="鍋滅敤鍔犲伐璁惧鐢宠鍗�-閫氳繃id鏌ヨ", notes="鍋滅敤鍔犲伐璁惧鐢宠鍗�-閫氳繃id鏌ヨ") + @GetMapping(value = "/queryById") + public Result<?> queryById(@RequestParam(name="id",required=true) String id) { + EamTechnicalStatusDeactivate eamTechnicalStatusDeactivate = eamTechnicalStatusDeactivateService.getById(id); + return Result.OK(eamTechnicalStatusDeactivate); + } + + /** + * 瀵煎嚭excel + * + * @param request + * @param eamTechnicalStatusDeactivate + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, EamTechnicalStatusDeactivate eamTechnicalStatusDeactivate) { + return super.exportXls(request, eamTechnicalStatusDeactivate, EamTechnicalStatusDeactivate.class, "鍋滅敤鍔犲伐璁惧鐢宠鍗�"); + } + + /** + * 閫氳繃excel瀵煎叆鏁版嵁 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, EamTechnicalStatusDeactivate.class); + } + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusDeactivateDetailController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusDeactivateDetailController.java new file mode 100644 index 0000000..13dd569 --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusDeactivateDetailController.java @@ -0,0 +1,151 @@ +package org.jeecg.modules.eam.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.eam.entity.EamTechnicalStatusDeactivateDetail; +import org.jeecg.modules.eam.service.IEamTechnicalStatusDeactivateDetailService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; + + /** + * @Description: 鍋滅敤鍔犲伐璁惧鐢宠鍗曟槑缁� + * @Author: jeecg-boot + * @Date: 2025-07-09 + * @Version: V1.0 + */ +@Slf4j +@Api(tags="鍋滅敤鍔犲伐璁惧鐢宠鍗曟槑缁�") +@RestController +@RequestMapping("/eam/eamTechnicalStatusDeactivateDetail") +public class EamTechnicalStatusDeactivateDetailController extends JeecgController<EamTechnicalStatusDeactivateDetail, IEamTechnicalStatusDeactivateDetailService> { + @Autowired + private IEamTechnicalStatusDeactivateDetailService eamTechnicalStatusDeactivateDetailService; + + /** + * 鍒嗛〉鍒楄〃鏌ヨ + * + * @param eamTechnicalStatusDeactivateDetail + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @ApiOperation(value="鍋滅敤鍔犲伐璁惧鐢宠鍗曟槑缁�-鍒嗛〉鍒楄〃鏌ヨ", notes="鍋滅敤鍔犲伐璁惧鐢宠鍗曟槑缁�-鍒嗛〉鍒楄〃鏌ヨ") + @GetMapping(value = "/list") + public Result<?> queryPageList(EamTechnicalStatusDeactivateDetail eamTechnicalStatusDeactivateDetail, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper<EamTechnicalStatusDeactivateDetail> queryWrapper = QueryGenerator.initQueryWrapper(eamTechnicalStatusDeactivateDetail, req.getParameterMap()); + Page<EamTechnicalStatusDeactivateDetail> page = new Page<EamTechnicalStatusDeactivateDetail>(pageNo, pageSize); + IPage<EamTechnicalStatusDeactivateDetail> pageList = eamTechnicalStatusDeactivateDetailService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 娣诲姞 + * + * @param eamTechnicalStatusDeactivateDetail + * @return + */ + @AutoLog(value = "鍋滅敤鍔犲伐璁惧鐢宠鍗曟槑缁�-娣诲姞") + @ApiOperation(value="鍋滅敤鍔犲伐璁惧鐢宠鍗曟槑缁�-娣诲姞", notes="鍋滅敤鍔犲伐璁惧鐢宠鍗曟槑缁�-娣诲姞") + @PostMapping(value = "/add") + public Result<?> add(@RequestBody EamTechnicalStatusDeactivateDetail eamTechnicalStatusDeactivateDetail) { + eamTechnicalStatusDeactivateDetailService.save(eamTechnicalStatusDeactivateDetail); + return Result.OK("娣诲姞鎴愬姛锛�"); + } + + /** + * 缂栬緫 + * + * @param eamTechnicalStatusDeactivateDetail + * @return + */ + @AutoLog(value = "鍋滅敤鍔犲伐璁惧鐢宠鍗曟槑缁�-缂栬緫") + @ApiOperation(value="鍋滅敤鍔犲伐璁惧鐢宠鍗曟槑缁�-缂栬緫", notes="鍋滅敤鍔犲伐璁惧鐢宠鍗曟槑缁�-缂栬緫") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result<?> edit(@RequestBody EamTechnicalStatusDeactivateDetail eamTechnicalStatusDeactivateDetail) { + eamTechnicalStatusDeactivateDetailService.updateById(eamTechnicalStatusDeactivateDetail); + return Result.OK("缂栬緫鎴愬姛!"); + } + + /** + * 閫氳繃id鍒犻櫎 + * + * @param id + * @return + */ + @AutoLog(value = "鍋滅敤鍔犲伐璁惧鐢宠鍗曟槑缁�-閫氳繃id鍒犻櫎") + @ApiOperation(value="鍋滅敤鍔犲伐璁惧鐢宠鍗曟槑缁�-閫氳繃id鍒犻櫎", notes="鍋滅敤鍔犲伐璁惧鐢宠鍗曟槑缁�-閫氳繃id鍒犻櫎") + @DeleteMapping(value = "/delete") + public Result<?> delete(@RequestParam(name="id",required=true) String id) { + eamTechnicalStatusDeactivateDetailService.removeById(id); + return Result.OK("鍒犻櫎鎴愬姛!"); + } + + /** + * 鎵归噺鍒犻櫎 + * + * @param ids + * @return + */ + @AutoLog(value = "鍋滅敤鍔犲伐璁惧鐢宠鍗曟槑缁�-鎵归噺鍒犻櫎") + @ApiOperation(value="鍋滅敤鍔犲伐璁惧鐢宠鍗曟槑缁�-鎵归噺鍒犻櫎", notes="鍋滅敤鍔犲伐璁惧鐢宠鍗曟槑缁�-鎵归噺鍒犻櫎") + @DeleteMapping(value = "/deleteBatch") + public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.eamTechnicalStatusDeactivateDetailService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�"); + } + + /** + * 閫氳繃id鏌ヨ + * + * @param id + * @return + */ + @AutoLog(value = "鍋滅敤鍔犲伐璁惧鐢宠鍗曟槑缁�-閫氳繃id鏌ヨ") + @ApiOperation(value="鍋滅敤鍔犲伐璁惧鐢宠鍗曟槑缁�-閫氳繃id鏌ヨ", notes="鍋滅敤鍔犲伐璁惧鐢宠鍗曟槑缁�-閫氳繃id鏌ヨ") + @GetMapping(value = "/queryById") + public Result<?> queryById(@RequestParam(name="id",required=true) String id) { + EamTechnicalStatusDeactivateDetail eamTechnicalStatusDeactivateDetail = eamTechnicalStatusDeactivateDetailService.getById(id); + return Result.OK(eamTechnicalStatusDeactivateDetail); + } + + /** + * 瀵煎嚭excel + * + * @param request + * @param eamTechnicalStatusDeactivateDetail + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, EamTechnicalStatusDeactivateDetail eamTechnicalStatusDeactivateDetail) { + return super.exportXls(request, eamTechnicalStatusDeactivateDetail, EamTechnicalStatusDeactivateDetail.class, "鍋滅敤鍔犲伐璁惧鐢宠鍗曟槑缁�"); + } + + /** + * 閫氳繃excel瀵煎叆鏁版嵁 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, EamTechnicalStatusDeactivateDetail.class); + } + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationApplicationController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationApplicationController.java new file mode 100644 index 0000000..7315c8a --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationApplicationController.java @@ -0,0 +1,151 @@ +package org.jeecg.modules.eam.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationApplication; +import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationApplicationService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; + + /** + * @Description: 鍔犲伐璁惧鎶�鏈壌瀹氱敵璇� + * @Author: jeecg-boot + * @Date: 2025-07-09 + * @Version: V1.0 + */ +@Slf4j +@Api(tags="鍔犲伐璁惧鎶�鏈壌瀹氱敵璇�") +@RestController +@RequestMapping("/eam/eamTechnicalStatusEvaluationApplication") +public class EamTechnicalStatusEvaluationApplicationController extends JeecgController<EamTechnicalStatusEvaluationApplication, IEamTechnicalStatusEvaluationApplicationService> { + @Autowired + private IEamTechnicalStatusEvaluationApplicationService eamTechnicalStatusEvaluationApplicationService; + + /** + * 鍒嗛〉鍒楄〃鏌ヨ + * + * @param eamTechnicalStatusEvaluationApplication + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @ApiOperation(value="鍔犲伐璁惧鎶�鏈壌瀹氱敵璇�-鍒嗛〉鍒楄〃鏌ヨ", notes="鍔犲伐璁惧鎶�鏈壌瀹氱敵璇�-鍒嗛〉鍒楄〃鏌ヨ") + @GetMapping(value = "/list") + public Result<?> queryPageList(EamTechnicalStatusEvaluationApplication eamTechnicalStatusEvaluationApplication, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper<EamTechnicalStatusEvaluationApplication> queryWrapper = QueryGenerator.initQueryWrapper(eamTechnicalStatusEvaluationApplication, req.getParameterMap()); + Page<EamTechnicalStatusEvaluationApplication> page = new Page<EamTechnicalStatusEvaluationApplication>(pageNo, pageSize); + IPage<EamTechnicalStatusEvaluationApplication> pageList = eamTechnicalStatusEvaluationApplicationService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 娣诲姞 + * + * @param eamTechnicalStatusEvaluationApplication + * @return + */ + @AutoLog(value = "鍔犲伐璁惧鎶�鏈壌瀹氱敵璇�-娣诲姞") + @ApiOperation(value="鍔犲伐璁惧鎶�鏈壌瀹氱敵璇�-娣诲姞", notes="鍔犲伐璁惧鎶�鏈壌瀹氱敵璇�-娣诲姞") + @PostMapping(value = "/add") + public Result<?> add(@RequestBody EamTechnicalStatusEvaluationApplication eamTechnicalStatusEvaluationApplication) { + eamTechnicalStatusEvaluationApplicationService.save(eamTechnicalStatusEvaluationApplication); + return Result.OK("娣诲姞鎴愬姛锛�"); + } + + /** + * 缂栬緫 + * + * @param eamTechnicalStatusEvaluationApplication + * @return + */ + @AutoLog(value = "鍔犲伐璁惧鎶�鏈壌瀹氱敵璇�-缂栬緫") + @ApiOperation(value="鍔犲伐璁惧鎶�鏈壌瀹氱敵璇�-缂栬緫", notes="鍔犲伐璁惧鎶�鏈壌瀹氱敵璇�-缂栬緫") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result<?> edit(@RequestBody EamTechnicalStatusEvaluationApplication eamTechnicalStatusEvaluationApplication) { + eamTechnicalStatusEvaluationApplicationService.updateById(eamTechnicalStatusEvaluationApplication); + return Result.OK("缂栬緫鎴愬姛!"); + } + + /** + * 閫氳繃id鍒犻櫎 + * + * @param id + * @return + */ + @AutoLog(value = "鍔犲伐璁惧鎶�鏈壌瀹氱敵璇�-閫氳繃id鍒犻櫎") + @ApiOperation(value="鍔犲伐璁惧鎶�鏈壌瀹氱敵璇�-閫氳繃id鍒犻櫎", notes="鍔犲伐璁惧鎶�鏈壌瀹氱敵璇�-閫氳繃id鍒犻櫎") + @DeleteMapping(value = "/delete") + public Result<?> delete(@RequestParam(name="id",required=true) String id) { + eamTechnicalStatusEvaluationApplicationService.removeById(id); + return Result.OK("鍒犻櫎鎴愬姛!"); + } + + /** + * 鎵归噺鍒犻櫎 + * + * @param ids + * @return + */ + @AutoLog(value = "鍔犲伐璁惧鎶�鏈壌瀹氱敵璇�-鎵归噺鍒犻櫎") + @ApiOperation(value="鍔犲伐璁惧鎶�鏈壌瀹氱敵璇�-鎵归噺鍒犻櫎", notes="鍔犲伐璁惧鎶�鏈壌瀹氱敵璇�-鎵归噺鍒犻櫎") + @DeleteMapping(value = "/deleteBatch") + public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.eamTechnicalStatusEvaluationApplicationService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�"); + } + + /** + * 閫氳繃id鏌ヨ + * + * @param id + * @return + */ + @AutoLog(value = "鍔犲伐璁惧鎶�鏈壌瀹氱敵璇�-閫氳繃id鏌ヨ") + @ApiOperation(value="鍔犲伐璁惧鎶�鏈壌瀹氱敵璇�-閫氳繃id鏌ヨ", notes="鍔犲伐璁惧鎶�鏈壌瀹氱敵璇�-閫氳繃id鏌ヨ") + @GetMapping(value = "/queryById") + public Result<?> queryById(@RequestParam(name="id",required=true) String id) { + EamTechnicalStatusEvaluationApplication eamTechnicalStatusEvaluationApplication = eamTechnicalStatusEvaluationApplicationService.getById(id); + return Result.OK(eamTechnicalStatusEvaluationApplication); + } + + /** + * 瀵煎嚭excel + * + * @param request + * @param eamTechnicalStatusEvaluationApplication + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, EamTechnicalStatusEvaluationApplication eamTechnicalStatusEvaluationApplication) { + return super.exportXls(request, eamTechnicalStatusEvaluationApplication, EamTechnicalStatusEvaluationApplication.class, "鍔犲伐璁惧鎶�鏈壌瀹氱敵璇�"); + } + + /** + * 閫氳繃excel瀵煎叆鏁版嵁 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, EamTechnicalStatusEvaluationApplication.class); + } + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderChangeController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderChangeController.java new file mode 100644 index 0000000..fe8cd09 --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderChangeController.java @@ -0,0 +1,151 @@ +package org.jeecg.modules.eam.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrderChange; +import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationOrderChangeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; + + /** + * @Description: 鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇� + * @Author: jeecg-boot + * @Date: 2025-07-09 + * @Version: V1.0 + */ +@Slf4j +@Api(tags="鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇�") +@RestController +@RequestMapping("/eam/eamTechnicalStatusEvaluationOrderChange") +public class EamTechnicalStatusEvaluationOrderChangeController extends JeecgController<EamTechnicalStatusEvaluationOrderChange, IEamTechnicalStatusEvaluationOrderChangeService> { + @Autowired + private IEamTechnicalStatusEvaluationOrderChangeService eamTechnicalStatusEvaluationOrderChangeService; + + /** + * 鍒嗛〉鍒楄〃鏌ヨ + * + * @param eamTechnicalStatusEvaluationOrderChange + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @ApiOperation(value="鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇�-鍒嗛〉鍒楄〃鏌ヨ", notes="鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇�-鍒嗛〉鍒楄〃鏌ヨ") + @GetMapping(value = "/list") + public Result<?> queryPageList(EamTechnicalStatusEvaluationOrderChange eamTechnicalStatusEvaluationOrderChange, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper<EamTechnicalStatusEvaluationOrderChange> queryWrapper = QueryGenerator.initQueryWrapper(eamTechnicalStatusEvaluationOrderChange, req.getParameterMap()); + Page<EamTechnicalStatusEvaluationOrderChange> page = new Page<EamTechnicalStatusEvaluationOrderChange>(pageNo, pageSize); + IPage<EamTechnicalStatusEvaluationOrderChange> pageList = eamTechnicalStatusEvaluationOrderChangeService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 娣诲姞 + * + * @param eamTechnicalStatusEvaluationOrderChange + * @return + */ + @AutoLog(value = "鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇�-娣诲姞") + @ApiOperation(value="鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇�-娣诲姞", notes="鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇�-娣诲姞") + @PostMapping(value = "/add") + public Result<?> add(@RequestBody EamTechnicalStatusEvaluationOrderChange eamTechnicalStatusEvaluationOrderChange) { + eamTechnicalStatusEvaluationOrderChangeService.save(eamTechnicalStatusEvaluationOrderChange); + return Result.OK("娣诲姞鎴愬姛锛�"); + } + + /** + * 缂栬緫 + * + * @param eamTechnicalStatusEvaluationOrderChange + * @return + */ + @AutoLog(value = "鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇�-缂栬緫") + @ApiOperation(value="鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇�-缂栬緫", notes="鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇�-缂栬緫") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result<?> edit(@RequestBody EamTechnicalStatusEvaluationOrderChange eamTechnicalStatusEvaluationOrderChange) { + eamTechnicalStatusEvaluationOrderChangeService.updateById(eamTechnicalStatusEvaluationOrderChange); + return Result.OK("缂栬緫鎴愬姛!"); + } + + /** + * 閫氳繃id鍒犻櫎 + * + * @param id + * @return + */ + @AutoLog(value = "鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇�-閫氳繃id鍒犻櫎") + @ApiOperation(value="鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇�-閫氳繃id鍒犻櫎", notes="鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇�-閫氳繃id鍒犻櫎") + @DeleteMapping(value = "/delete") + public Result<?> delete(@RequestParam(name="id",required=true) String id) { + eamTechnicalStatusEvaluationOrderChangeService.removeById(id); + return Result.OK("鍒犻櫎鎴愬姛!"); + } + + /** + * 鎵归噺鍒犻櫎 + * + * @param ids + * @return + */ + @AutoLog(value = "鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇�-鎵归噺鍒犻櫎") + @ApiOperation(value="鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇�-鎵归噺鍒犻櫎", notes="鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇�-鎵归噺鍒犻櫎") + @DeleteMapping(value = "/deleteBatch") + public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.eamTechnicalStatusEvaluationOrderChangeService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�"); + } + + /** + * 閫氳繃id鏌ヨ + * + * @param id + * @return + */ + @AutoLog(value = "鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇�-閫氳繃id鏌ヨ") + @ApiOperation(value="鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇�-閫氳繃id鏌ヨ", notes="鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇�-閫氳繃id鏌ヨ") + @GetMapping(value = "/queryById") + public Result<?> queryById(@RequestParam(name="id",required=true) String id) { + EamTechnicalStatusEvaluationOrderChange eamTechnicalStatusEvaluationOrderChange = eamTechnicalStatusEvaluationOrderChangeService.getById(id); + return Result.OK(eamTechnicalStatusEvaluationOrderChange); + } + + /** + * 瀵煎嚭excel + * + * @param request + * @param eamTechnicalStatusEvaluationOrderChange + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, EamTechnicalStatusEvaluationOrderChange eamTechnicalStatusEvaluationOrderChange) { + return super.exportXls(request, eamTechnicalStatusEvaluationOrderChange, EamTechnicalStatusEvaluationOrderChange.class, "鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇�"); + } + + /** + * 閫氳繃excel瀵煎叆鏁版嵁 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, EamTechnicalStatusEvaluationOrderChange.class); + } + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderController.java new file mode 100644 index 0000000..45b2c89 --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderController.java @@ -0,0 +1,151 @@ +package org.jeecg.modules.eam.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrder; +import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationOrderService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; + + /** + * @Description: 鎶�鏈姸鎬侀壌瀹氬伐鍗� + * @Author: jeecg-boot + * @Date: 2025-07-09 + * @Version: V1.0 + */ +@Slf4j +@Api(tags="鎶�鏈姸鎬侀壌瀹氬伐鍗�") +@RestController +@RequestMapping("/eam/eamTechnicalStatusEvaluationOrder") +public class EamTechnicalStatusEvaluationOrderController extends JeecgController<EamTechnicalStatusEvaluationOrder, IEamTechnicalStatusEvaluationOrderService> { + @Autowired + private IEamTechnicalStatusEvaluationOrderService eamTechnicalStatusEvaluationOrderService; + + /** + * 鍒嗛〉鍒楄〃鏌ヨ + * + * @param eamTechnicalStatusEvaluationOrder + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @ApiOperation(value="鎶�鏈姸鎬侀壌瀹氬伐鍗�-鍒嗛〉鍒楄〃鏌ヨ", notes="鎶�鏈姸鎬侀壌瀹氬伐鍗�-鍒嗛〉鍒楄〃鏌ヨ") + @GetMapping(value = "/list") + public Result<?> queryPageList(EamTechnicalStatusEvaluationOrder eamTechnicalStatusEvaluationOrder, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper<EamTechnicalStatusEvaluationOrder> queryWrapper = QueryGenerator.initQueryWrapper(eamTechnicalStatusEvaluationOrder, req.getParameterMap()); + Page<EamTechnicalStatusEvaluationOrder> page = new Page<EamTechnicalStatusEvaluationOrder>(pageNo, pageSize); + IPage<EamTechnicalStatusEvaluationOrder> pageList = eamTechnicalStatusEvaluationOrderService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 娣诲姞 + * + * @param eamTechnicalStatusEvaluationOrder + * @return + */ + @AutoLog(value = "鎶�鏈姸鎬侀壌瀹氬伐鍗�-娣诲姞") + @ApiOperation(value="鎶�鏈姸鎬侀壌瀹氬伐鍗�-娣诲姞", notes="鎶�鏈姸鎬侀壌瀹氬伐鍗�-娣诲姞") + @PostMapping(value = "/add") + public Result<?> add(@RequestBody EamTechnicalStatusEvaluationOrder eamTechnicalStatusEvaluationOrder) { + eamTechnicalStatusEvaluationOrderService.save(eamTechnicalStatusEvaluationOrder); + return Result.OK("娣诲姞鎴愬姛锛�"); + } + + /** + * 缂栬緫 + * + * @param eamTechnicalStatusEvaluationOrder + * @return + */ + @AutoLog(value = "鎶�鏈姸鎬侀壌瀹氬伐鍗�-缂栬緫") + @ApiOperation(value="鎶�鏈姸鎬侀壌瀹氬伐鍗�-缂栬緫", notes="鎶�鏈姸鎬侀壌瀹氬伐鍗�-缂栬緫") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result<?> edit(@RequestBody EamTechnicalStatusEvaluationOrder eamTechnicalStatusEvaluationOrder) { + eamTechnicalStatusEvaluationOrderService.updateById(eamTechnicalStatusEvaluationOrder); + return Result.OK("缂栬緫鎴愬姛!"); + } + + /** + * 閫氳繃id鍒犻櫎 + * + * @param id + * @return + */ + @AutoLog(value = "鎶�鏈姸鎬侀壌瀹氬伐鍗�-閫氳繃id鍒犻櫎") + @ApiOperation(value="鎶�鏈姸鎬侀壌瀹氬伐鍗�-閫氳繃id鍒犻櫎", notes="鎶�鏈姸鎬侀壌瀹氬伐鍗�-閫氳繃id鍒犻櫎") + @DeleteMapping(value = "/delete") + public Result<?> delete(@RequestParam(name="id",required=true) String id) { + eamTechnicalStatusEvaluationOrderService.removeById(id); + return Result.OK("鍒犻櫎鎴愬姛!"); + } + + /** + * 鎵归噺鍒犻櫎 + * + * @param ids + * @return + */ + @AutoLog(value = "鎶�鏈姸鎬侀壌瀹氬伐鍗�-鎵归噺鍒犻櫎") + @ApiOperation(value="鎶�鏈姸鎬侀壌瀹氬伐鍗�-鎵归噺鍒犻櫎", notes="鎶�鏈姸鎬侀壌瀹氬伐鍗�-鎵归噺鍒犻櫎") + @DeleteMapping(value = "/deleteBatch") + public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.eamTechnicalStatusEvaluationOrderService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�"); + } + + /** + * 閫氳繃id鏌ヨ + * + * @param id + * @return + */ + @AutoLog(value = "鎶�鏈姸鎬侀壌瀹氬伐鍗�-閫氳繃id鏌ヨ") + @ApiOperation(value="鎶�鏈姸鎬侀壌瀹氬伐鍗�-閫氳繃id鏌ヨ", notes="鎶�鏈姸鎬侀壌瀹氬伐鍗�-閫氳繃id鏌ヨ") + @GetMapping(value = "/queryById") + public Result<?> queryById(@RequestParam(name="id",required=true) String id) { + EamTechnicalStatusEvaluationOrder eamTechnicalStatusEvaluationOrder = eamTechnicalStatusEvaluationOrderService.getById(id); + return Result.OK(eamTechnicalStatusEvaluationOrder); + } + + /** + * 瀵煎嚭excel + * + * @param request + * @param eamTechnicalStatusEvaluationOrder + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, EamTechnicalStatusEvaluationOrder eamTechnicalStatusEvaluationOrder) { + return super.exportXls(request, eamTechnicalStatusEvaluationOrder, EamTechnicalStatusEvaluationOrder.class, "鎶�鏈姸鎬侀壌瀹氬伐鍗�"); + } + + /** + * 閫氳繃excel瀵煎叆鏁版嵁 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, EamTechnicalStatusEvaluationOrder.class); + } + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderDetailController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderDetailController.java new file mode 100644 index 0000000..573666c --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationOrderDetailController.java @@ -0,0 +1,151 @@ +package org.jeecg.modules.eam.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.aspect.annotation.AutoLog; +import org.jeecg.common.system.base.controller.JeecgController; +import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrderDetail; +import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationOrderDetailService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; + + /** + * @Description: 鎶�鏈姸鎬侀壌瀹氬伐鍗曟槑缁� + * @Author: jeecg-boot + * @Date: 2025-07-09 + * @Version: V1.0 + */ +@Slf4j +@Api(tags="鎶�鏈姸鎬侀壌瀹氬伐鍗曟槑缁�") +@RestController +@RequestMapping("/eam/eamTechnicalStatusEvaluationOrderDetail") +public class EamTechnicalStatusEvaluationOrderDetailController extends JeecgController<EamTechnicalStatusEvaluationOrderDetail, IEamTechnicalStatusEvaluationOrderDetailService> { + @Autowired + private IEamTechnicalStatusEvaluationOrderDetailService eamTechnicalStatusEvaluationOrderDetailService; + + /** + * 鍒嗛〉鍒楄〃鏌ヨ + * + * @param eamTechnicalStatusEvaluationOrderDetail + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @ApiOperation(value="鎶�鏈姸鎬侀壌瀹氬伐鍗曟槑缁�-鍒嗛〉鍒楄〃鏌ヨ", notes="鎶�鏈姸鎬侀壌瀹氬伐鍗曟槑缁�-鍒嗛〉鍒楄〃鏌ヨ") + @GetMapping(value = "/list") + public Result<?> queryPageList(EamTechnicalStatusEvaluationOrderDetail eamTechnicalStatusEvaluationOrderDetail, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper<EamTechnicalStatusEvaluationOrderDetail> queryWrapper = QueryGenerator.initQueryWrapper(eamTechnicalStatusEvaluationOrderDetail, req.getParameterMap()); + Page<EamTechnicalStatusEvaluationOrderDetail> page = new Page<EamTechnicalStatusEvaluationOrderDetail>(pageNo, pageSize); + IPage<EamTechnicalStatusEvaluationOrderDetail> pageList = eamTechnicalStatusEvaluationOrderDetailService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 娣诲姞 + * + * @param eamTechnicalStatusEvaluationOrderDetail + * @return + */ + @AutoLog(value = "鎶�鏈姸鎬侀壌瀹氬伐鍗曟槑缁�-娣诲姞") + @ApiOperation(value="鎶�鏈姸鎬侀壌瀹氬伐鍗曟槑缁�-娣诲姞", notes="鎶�鏈姸鎬侀壌瀹氬伐鍗曟槑缁�-娣诲姞") + @PostMapping(value = "/add") + public Result<?> add(@RequestBody EamTechnicalStatusEvaluationOrderDetail eamTechnicalStatusEvaluationOrderDetail) { + eamTechnicalStatusEvaluationOrderDetailService.save(eamTechnicalStatusEvaluationOrderDetail); + return Result.OK("娣诲姞鎴愬姛锛�"); + } + + /** + * 缂栬緫 + * + * @param eamTechnicalStatusEvaluationOrderDetail + * @return + */ + @AutoLog(value = "鎶�鏈姸鎬侀壌瀹氬伐鍗曟槑缁�-缂栬緫") + @ApiOperation(value="鎶�鏈姸鎬侀壌瀹氬伐鍗曟槑缁�-缂栬緫", notes="鎶�鏈姸鎬侀壌瀹氬伐鍗曟槑缁�-缂栬緫") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result<?> edit(@RequestBody EamTechnicalStatusEvaluationOrderDetail eamTechnicalStatusEvaluationOrderDetail) { + eamTechnicalStatusEvaluationOrderDetailService.updateById(eamTechnicalStatusEvaluationOrderDetail); + return Result.OK("缂栬緫鎴愬姛!"); + } + + /** + * 閫氳繃id鍒犻櫎 + * + * @param id + * @return + */ + @AutoLog(value = "鎶�鏈姸鎬侀壌瀹氬伐鍗曟槑缁�-閫氳繃id鍒犻櫎") + @ApiOperation(value="鎶�鏈姸鎬侀壌瀹氬伐鍗曟槑缁�-閫氳繃id鍒犻櫎", notes="鎶�鏈姸鎬侀壌瀹氬伐鍗曟槑缁�-閫氳繃id鍒犻櫎") + @DeleteMapping(value = "/delete") + public Result<?> delete(@RequestParam(name="id",required=true) String id) { + eamTechnicalStatusEvaluationOrderDetailService.removeById(id); + return Result.OK("鍒犻櫎鎴愬姛!"); + } + + /** + * 鎵归噺鍒犻櫎 + * + * @param ids + * @return + */ + @AutoLog(value = "鎶�鏈姸鎬侀壌瀹氬伐鍗曟槑缁�-鎵归噺鍒犻櫎") + @ApiOperation(value="鎶�鏈姸鎬侀壌瀹氬伐鍗曟槑缁�-鎵归噺鍒犻櫎", notes="鎶�鏈姸鎬侀壌瀹氬伐鍗曟槑缁�-鎵归噺鍒犻櫎") + @DeleteMapping(value = "/deleteBatch") + public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) { + this.eamTechnicalStatusEvaluationOrderDetailService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�"); + } + + /** + * 閫氳繃id鏌ヨ + * + * @param id + * @return + */ + @AutoLog(value = "鎶�鏈姸鎬侀壌瀹氬伐鍗曟槑缁�-閫氳繃id鏌ヨ") + @ApiOperation(value="鎶�鏈姸鎬侀壌瀹氬伐鍗曟槑缁�-閫氳繃id鏌ヨ", notes="鎶�鏈姸鎬侀壌瀹氬伐鍗曟槑缁�-閫氳繃id鏌ヨ") + @GetMapping(value = "/queryById") + public Result<?> queryById(@RequestParam(name="id",required=true) String id) { + EamTechnicalStatusEvaluationOrderDetail eamTechnicalStatusEvaluationOrderDetail = eamTechnicalStatusEvaluationOrderDetailService.getById(id); + return Result.OK(eamTechnicalStatusEvaluationOrderDetail); + } + + /** + * 瀵煎嚭excel + * + * @param request + * @param eamTechnicalStatusEvaluationOrderDetail + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, EamTechnicalStatusEvaluationOrderDetail eamTechnicalStatusEvaluationOrderDetail) { + return super.exportXls(request, eamTechnicalStatusEvaluationOrderDetail, EamTechnicalStatusEvaluationOrderDetail.class, "鎶�鏈姸鎬侀壌瀹氬伐鍗曟槑缁�"); + } + + /** + * 閫氳繃excel瀵煎叆鏁版嵁 + * + * @param request + * @param response + * @return + */ + @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, EamTechnicalStatusEvaluationOrderDetail.class); + } + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationStandardController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationStandardController.java index d169644..70448c1 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationStandardController.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationStandardController.java @@ -15,15 +15,16 @@ import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationStandardRequest; import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationStandardService; import org.jeecg.modules.system.service.ISysBusinessCodeRuleService; +import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.HashMap; +import java.util.ArrayList; import java.util.LinkedHashMap; +import java.util.List; import java.util.Map; /** @@ -149,6 +150,7 @@ /** * 鎻愪氦 + * * @param id * @return */ @@ -181,41 +183,45 @@ for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) { MultipartFile file = entity.getValue(); String fileName = file.getOriginalFilename(); - Result<?> importResult = eamTechnicalStatusEvaluationStandardService.importSafetyEquipmentCheck(file); - if (importResult.isSuccess()) { - results.put(fileName, "鎴愬姛: " + importResult.getMessage()); successCount++; } else { - results.put(fileName, "澶辫触: " + importResult.getMessage()); + results.put(fileName, importResult.getMessage()); failureCount++; } } // 鏋勫缓鏈�缁堝搷搴� - Map<String, Object> response = new HashMap<>(); - response.put("results", results); - response.put("totalFiles", fileMap.size()); - response.put("successCount", successCount); - response.put("failureCount", failureCount); - - if (failureCount > 0) { - return Result.error("閮ㄥ垎鏂囦欢瀵煎叆澶辫触", response); - } - - return Result.ok("鎵�鏈夋枃浠跺鍏ユ垚鍔�"+response); + return getResult(results, fileMap.size(), successCount, failureCount); } /** * 瀹夊叏瑁呯疆妫�鏌ユ槑缁嗗鍏� * * @param request - * @param response * @return */ @PostMapping(value = "/importPrecisionCheck") - public Result<?> importPrecisionCheck(HttpServletRequest request, HttpServletResponse response) { - return null; + public Result<?> importPrecisionCheck(HttpServletRequest request) { + MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; + Map<String, String> results = new LinkedHashMap<>(); + Map<String, MultipartFile> fileMap = multipartRequest.getFileMap(); + // 缁熻瀵煎叆缁撴灉 + int successCount = 0; + int failureCount = 0; + for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) { + MultipartFile file = entity.getValue(); + String fileName = file.getOriginalFilename(); + Result<?> importResult = eamTechnicalStatusEvaluationStandardService.importPrecisionCheck(file); + if (importResult.isSuccess()) { + successCount++; + } else { + results.put(fileName, importResult.getMessage()); + failureCount++; + } + } + // 鏋勫缓鏈�缁堝搷搴� + return getResult(results, fileMap.size(), successCount, failureCount); } @@ -223,12 +229,42 @@ * 瀹夊叏瑁呯疆妫�鏌ユ槑缁嗗鍏� * * @param request - * @param response * @return */ @PostMapping(value = "/importOtherCheck") - public Result<?> importOtherCheck(HttpServletRequest request, HttpServletResponse response) { - return null; + public Result<?> importOtherCheck(HttpServletRequest request) { + MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; + Map<String, String> results = new LinkedHashMap<>(); + Map<String, MultipartFile> fileMap = multipartRequest.getFileMap(); + // 缁熻瀵煎叆缁撴灉 + int successCount = 0; + int failureCount = 0; + for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) { + MultipartFile file = entity.getValue(); + String fileName = file.getOriginalFilename(); + Result<?> importResult = eamTechnicalStatusEvaluationStandardService.importOtherCheck(file); + if (importResult.isSuccess()) { + successCount++; + } else { + results.put(fileName, importResult.getMessage()); + failureCount++; + } + } + // 鏋勫缓鏈�缁堝搷搴� + return getResult(results, fileMap.size(), successCount, failureCount); + } + + @NotNull + private Result<?> getResult(Map<String, String> results, int fileCount, int successCount, int failureCount) { + List<String> response = new ArrayList<>(); + response.add("鎬绘枃浠舵暟锛�" + fileCount); + response.add("鎴愬姛鏁帮細" + successCount); + response.add("澶辫触鏁帮細" + failureCount); + if (failureCount > 0) { + response.add("閿欒淇℃伅锛�" + results.values()); + return Result.error("閮ㄥ垎鏂囦欢瀵煎叆澶辫触锛�" + response); + } + return Result.ok("鎵�鏈夋枃浠跺鍏ユ垚鍔燂細" + response); } diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusChange.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusChange.java new file mode 100644 index 0000000..1a2c818 --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusChange.java @@ -0,0 +1,79 @@ +package org.jeecg.modules.eam.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.util.Date; + +/** + * @Description: 鎶�鏈姸鎬佸彉鏇寸敵璇� + * @Author: jeecg-boot + * @Date: 2025-07-09 + * @Version: V1.0 + */ +@Data +@TableName("eam_technical_status_change") +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@ApiModel(value="eam_technical_status_change瀵硅薄", description="鎶�鏈姸鎬佸彉鏇寸敵璇�") +public class EamTechnicalStatusChange { + + /**涓婚敭*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "涓婚敭") + private String id; + /**鍒涘缓浜�*/ + @ApiModelProperty(value = "鍒涘缓浜�") + private String createBy; + /**鍒涘缓鏃堕棿*/ + @ApiModelProperty(value = "鍒涘缓鏃堕棿") + private Date createTime; + /**鏇存柊浜�*/ + @ApiModelProperty(value = "鏇存柊浜�") + private String updateBy; + /**鏇存柊鏃堕棿*/ + @ApiModelProperty(value = "鏇存柊鏃堕棿") + private Date updateTime; + /**鍒犻櫎鏍囪*/ + @ApiModelProperty(value = "鍒犻櫎鏍囪") + private Integer delFlag; + /**鍙樻洿鍗曞彿*/ + @ApiModelProperty(value = "鍙樻洿鍗曞彿") + private String changeOrderNum; + /**鍙樻洿鍗曠姸鎬�*/ + @ApiModelProperty(value = "鍙樻洿鍗曠姸鎬�") + private String changeStatus; + /**缂栧埗浜�*/ + @ApiModelProperty(value = "缂栧埗浜�") + private String designer; + /**缂栧埗鏃堕棿*/ + @ApiModelProperty(value = "缂栧埗鏃堕棿") + private Date designerTime; + /**浣跨敤鍗曚綅瀹や富绠$瀛�*/ + @ApiModelProperty(value = "浣跨敤鍗曚綅瀹や富绠$瀛�") + private String departHeaderSignature; + /**浣跨敤鍗曚綅瀹や富绠$瀛楁椂闂�*/ + @ApiModelProperty(value = "浣跨敤鍗曚綅瀹や富绠$瀛楁椂闂�") + private Date departHeaderSignatureTime; + /**浣跨敤鍗曚綅瀹や富绠℃剰瑙�*/ + @ApiModelProperty(value = "浣跨敤鍗曚綅瀹や富绠℃剰瑙�") + private String departHeaderSignatureComment; + /**浣跨敤鍗曚綅閮ㄤ富绠$瀛�*/ + @ApiModelProperty(value = "浣跨敤鍗曚綅閮ㄤ富绠$瀛�") + private String departLeaderSignature; + /**浣跨敤鍗曚綅閮ㄤ富绠$瀛楁椂闂�*/ + @ApiModelProperty(value = "浣跨敤鍗曚綅閮ㄤ富绠$瀛楁椂闂�") + private Date departLeaderSignatureTime; + /**浣跨敤鍗曚綅閮ㄤ富绠$瀛�*/ + @ApiModelProperty(value = "浣跨敤鍗曚綅閮ㄤ富绠$瀛�") + private String departLeaderSignatureComment; + /**HF缂栫爜*/ + @ApiModelProperty(value = "HF缂栫爜") + private String hfCode; +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusChangeDetail.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusChangeDetail.java new file mode 100644 index 0000000..567a90e --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusChangeDetail.java @@ -0,0 +1,67 @@ +package org.jeecg.modules.eam.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.util.Date; + +/** + * @Description: 鎶�鏈姸鎬佸彉鏇寸敵璇锋槑缁� + * @Author: jeecg-boot + * @Date: 2025-07-09 + * @Version: V1.0 + */ +@Data +@TableName("eam_technical_status_change_detail") +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@ApiModel(value="eam_technical_status_change_detail瀵硅薄", description="鎶�鏈姸鎬佸彉鏇寸敵璇锋槑缁�") +public class EamTechnicalStatusChangeDetail { + + /**涓婚敭*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "涓婚敭") + private String id; + /**鍒涘缓浜�*/ + @ApiModelProperty(value = "鍒涘缓浜�") + private String createBy; + /**鍒涘缓鏃堕棿*/ + @ApiModelProperty(value = "鍒涘缓鏃堕棿") + private Date createTime; + /**鏇存柊浜�*/ + @ApiModelProperty(value = "鏇存柊浜�") + private String updateBy; + /**鏇存柊鏃堕棿*/ + @ApiModelProperty(value = "鏇存柊鏃堕棿") + private Date updateTime; + /**璁惧ID*/ + @ApiModelProperty(value = "璁惧ID") + private String equipmentId; + /**鍙樻洿鍘熷洜;鎼縼銆佸ぇ淇�佹敼閫犮�佸叾浠�*/ + @ApiModelProperty(value = "鍙樻洿鍘熷洜;鎼縼銆佸ぇ淇�佹敼閫犮�佸叾浠�") + private String changeCategory; + /**鍙樻洿鏃ユ湡*/ + @ApiModelProperty(value = "鍙樻洿鏃ユ湡") + private Date changeDate; + /**鍙樻洿鍚庢妧鏈姸鎬�;鍙樻洿閫氳繃鍚庨粯璁よ澶囨妧鏈姸鎬佹敼涓虹鐢�*/ + @ApiModelProperty(value = "鍙樻洿鍚庢妧鏈姸鎬�;鍙樻洿閫氳繃鍚庨粯璁よ澶囨妧鏈姸鎬佹敼涓虹鐢�") + private String changeTechnicalStatus; + /**楠屾敹妫�鏌ヤ汉*/ + @ApiModelProperty(value = "楠屾敹妫�鏌ヤ汉") + private String acceptanceChecker; + /**楠屾敹妫�鏌ユ椂闂�*/ + @ApiModelProperty(value = "楠屾敹妫�鏌ユ椂闂�") + private Date acceptanceCheckTime; + /**楠屾敹妫�鏌ョ粨鏋�;澶т慨銆佹敼閫� 闇�瑕佸~鍐欓獙鏀剁粨鏋滐紝鎼縼鎸夌収鎶�鏈姸鎬侀壌瀹氬伐鍗曠淮鎶わ紝鍏朵粬鏆傛湭浣跨敤鍒帮紝鍙鐣欐绫诲瀷*/ + @ApiModelProperty(value = "楠屾敹妫�鏌ョ粨鏋�;澶т慨銆佹敼閫� 闇�瑕佸~鍐欓獙鏀剁粨鏋滐紝鎼縼鎸夌収鎶�鏈姸鎬侀壌瀹氬伐鍗曠淮鎶わ紝鍏朵粬鏆傛湭浣跨敤鍒帮紝鍙鐣欐绫诲瀷") + private String acceptanceCheckResult; + /**鎶�鏈姸鎬侀壌瀹氬伐鍗旾D;鎼縼浣跨敤*/ + @ApiModelProperty(value = "鎶�鏈姸鎬侀壌瀹氬伐鍗旾D;鎼縼浣跨敤") + private String orderId; +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusDeactivate.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusDeactivate.java new file mode 100644 index 0000000..3d25acc --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusDeactivate.java @@ -0,0 +1,82 @@ +package org.jeecg.modules.eam.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.util.Date; + +/** + * @Description: 鍋滅敤鍔犲伐璁惧鐢宠鍗� + * @Author: jeecg-boot + * @Date: 2025-07-09 + * @Version: V1.0 + */ +@Data +@TableName("eam_technical_status_deactivate") +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@ApiModel(value="eam_technical_status_deactivate瀵硅薄", description="鍋滅敤鍔犲伐璁惧鐢宠鍗�") +public class EamTechnicalStatusDeactivate { + + /**涓婚敭*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "涓婚敭") + private String id; + /**鍒涘缓浜�*/ + @ApiModelProperty(value = "鍒涘缓浜�") + private String createBy; + /**鍒涘缓鏃堕棿*/ + @ApiModelProperty(value = "鍒涘缓鏃堕棿") + private Date createTime; + /**鏇存柊浜�*/ + @ApiModelProperty(value = "鏇存柊浜�") + private String updateBy; + /**鏇存柊鏃堕棿*/ + @ApiModelProperty(value = "鏇存柊鏃堕棿") + private Date updateTime; + /**鍒犻櫎鏍囪*/ + @ApiModelProperty(value = "鍒犻櫎鏍囪") + private Integer delFlag; + /**鍋滅敤鍗曞彿*/ + @ApiModelProperty(value = "鍋滅敤鍗曞彿") + private String deactivateOrderNum; + /**鐢宠浜�*/ + @ApiModelProperty(value = "鐢宠浜�") + private String applicant; + /**鐢宠閮ㄩ棬*/ + @ApiModelProperty(value = "鐢宠閮ㄩ棬") + private String factoryOrgCode; + /**鐢宠鏃ユ湡*/ + @ApiModelProperty(value = "鐢宠鏃ユ湡") + private Date applyDate; + /**鐢宠鍗曠姸鎬�;寰呮彁浜ゃ�佸緟鍗曚綅瀹ょ骇棰嗗瀹℃牳銆佺敓浜ц澶囩鐞嗕富绠″鏍搞�佸緟淇濋殰閮ㄩ瀵煎鏍搞�佸凡浣滃簾銆佸凡瀹屾垚*/ + @ApiModelProperty(value = "鐢宠鍗曠姸鎬�;寰呮彁浜ゃ�佸緟鍗曚綅瀹ょ骇棰嗗瀹℃牳銆佺敓浜ц澶囩鐞嗕富绠″鏍搞�佸緟淇濋殰閮ㄩ瀵煎鏍搞�佸凡浣滃簾銆佸凡瀹屾垚") + private String applicationStatus; + /**浣跨敤鍗曚綅瀹や富绠$瀛�*/ + @ApiModelProperty(value = "浣跨敤鍗曚綅瀹や富绠$瀛�") + private String departHeaderSignature; + /**浣跨敤鍗曚綅瀹や富绠$瀛楁椂闂�*/ + @ApiModelProperty(value = "浣跨敤鍗曚綅瀹や富绠$瀛楁椂闂�") + private Date departHeaderSignatureTime; + /**浣跨敤鍗曚綅瀹や富绠℃剰瑙�*/ + @ApiModelProperty(value = "浣跨敤鍗曚綅瀹や富绠℃剰瑙�") + private String departHeaderSignatureComment; + /**浣跨敤鍗曚綅閮ㄤ富绠$瀛�*/ + @ApiModelProperty(value = "浣跨敤鍗曚綅閮ㄤ富绠$瀛�") + private String departLeaderSignature; + /**浣跨敤鍗曚綅閮ㄤ富绠$瀛楁椂闂�*/ + @ApiModelProperty(value = "浣跨敤鍗曚綅閮ㄤ富绠$瀛楁椂闂�") + private Date departLeaderSignatureTime; + /**浣跨敤鍗曚綅閮ㄤ富绠$瀛�*/ + @ApiModelProperty(value = "浣跨敤鍗曚綅閮ㄤ富绠$瀛�") + private String departLeaderSignatureComment; + /**HF缂栫爜*/ + @ApiModelProperty(value = "HF缂栫爜") + private String hfCode; +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusDeactivateDetail.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusDeactivateDetail.java new file mode 100644 index 0000000..c63655c --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusDeactivateDetail.java @@ -0,0 +1,55 @@ +package org.jeecg.modules.eam.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.util.Date; + +/** + * @Description: 鍋滅敤鍔犲伐璁惧鐢宠鍗曟槑缁� + * @Author: jeecg-boot + * @Date: 2025-07-09 + * @Version: V1.0 + */ +@Data +@TableName("eam_technical_status_deactivate_detail") +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@ApiModel(value="eam_technical_status_deactivate_detail瀵硅薄", description="鍋滅敤鍔犲伐璁惧鐢宠鍗曟槑缁�") +public class EamTechnicalStatusDeactivateDetail { + + /**涓婚敭*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "涓婚敭") + private String id; + /**鍒涘缓浜�*/ + @ApiModelProperty(value = "鍒涘缓浜�") + private String createBy; + /**鍒涘缓鏃堕棿*/ + @ApiModelProperty(value = "鍒涘缓鏃堕棿") + private Date createTime; + /**鏇存柊浜�*/ + @ApiModelProperty(value = "鏇存柊浜�") + private String updateBy; + /**鏇存柊鏃堕棿*/ + @ApiModelProperty(value = "鏇存柊鏃堕棿") + private Date updateTime; + /**璁惧ID*/ + @ApiModelProperty(value = "璁惧ID") + private String equipmentId; + /**鍋滅敤鍘熷洜*/ + @ApiModelProperty(value = "鍋滅敤鍘熷洜") + private String deactivateReason; + /**鍋滅敤鏃堕暱*/ + @ApiModelProperty(value = "鍋滅敤鏃堕暱") + private java.math.BigDecimal deactivateDuration; + /**鍋滅敤鏃堕暱鍗曚綅;澶┿�佹湀銆佸勾*/ + @ApiModelProperty(value = "鍋滅敤鏃堕暱鍗曚綅;澶┿�佹湀銆佸勾") + private String deactivateDurationUnit; +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationApplication.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationApplication.java new file mode 100644 index 0000000..d0f9f8d --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationApplication.java @@ -0,0 +1,91 @@ +package org.jeecg.modules.eam.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.util.Date; + +/** + * @Description: 鍔犲伐璁惧鎶�鏈壌瀹氱敵璇� + * @Author: jeecg-boot + * @Date: 2025-07-09 + * @Version: V1.0 + */ +@Data +@TableName("eam_technical_status_evaluation_application") +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@ApiModel(value="eam_technical_status_evaluation_application瀵硅薄", description="鍔犲伐璁惧鎶�鏈壌瀹氱敵璇�") +public class EamTechnicalStatusEvaluationApplication { + + /**涓婚敭*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "涓婚敭") + private String id; + /**鍒涘缓浜�*/ + @ApiModelProperty(value = "鍒涘缓浜�") + private String createBy; + /**鍒涘缓鏃堕棿*/ + @ApiModelProperty(value = "鍒涘缓鏃堕棿") + private Date createTime; + /**鏇存柊浜�*/ + @ApiModelProperty(value = "鏇存柊浜�") + private String updateBy; + /**鏇存柊鏃堕棿*/ + @ApiModelProperty(value = "鏇存柊鏃堕棿") + private Date updateTime; + /**鍒犻櫎鏍囪*/ + @ApiModelProperty(value = "鍒犻櫎鏍囪") + private Integer delFlag; + /**鐢宠鍗曞彿*/ + @ApiModelProperty(value = "鐢宠鍗曞彿") + private String applicationOrderNum; + /**鐢宠浜�*/ + @ApiModelProperty(value = "鐢宠浜�") + private String applicant; + /**鐢宠閮ㄩ棬*/ + @ApiModelProperty(value = "鐢宠閮ㄩ棬") + private String factoryOrgCode; + /**鐢宠鏃ユ湡*/ + @ApiModelProperty(value = "鐢宠鏃ユ湡") + private Date applyDate; + /**鐢宠鍗曠姸鎬�;寰呮彁浜ゃ�佸緟鍗曚綅瀹ょ骇棰嗗瀹℃牳銆佺敓浜ц澶囩鐞嗕富绠″鏍搞�佸緟淇濋殰閮ㄩ瀵煎鏍搞�佸凡浣滃簾銆佸凡瀹屾垚*/ + @ApiModelProperty(value = "鐢宠鍗曠姸鎬�;寰呮彁浜ゃ�佸緟鍗曚綅瀹ょ骇棰嗗瀹℃牳銆佺敓浜ц澶囩鐞嗕富绠″鏍搞�佸緟淇濋殰閮ㄩ瀵煎鏍搞�佸凡浣滃簾銆佸凡瀹屾垚") + private String applicationStatus; + /**鐢宠鍗曚綅瀹ょ骇棰嗗绛惧瓧*/ + @ApiModelProperty(value = "鐢宠鍗曚綅瀹ょ骇棰嗗绛惧瓧") + private String departHeaderSignature; + /**鐢宠鍗曚綅瀹ょ骇棰嗗绛惧瓧鏃堕棿*/ + @ApiModelProperty(value = "鐢宠鍗曚綅瀹ょ骇棰嗗绛惧瓧鏃堕棿") + private Date departHeaderSignatureTime; + /**鐢宠鍗曚綅瀹ょ骇棰嗗鎰忚*/ + @ApiModelProperty(value = "鐢宠鍗曚綅瀹ょ骇棰嗗鎰忚") + private String departHeaderComment; + /**鐢熶骇璁惧绠$悊涓荤绛惧瓧*/ + @ApiModelProperty(value = "鐢熶骇璁惧绠$悊涓荤绛惧瓧") + private String productionHeaderSignature; + /**鐢熶骇璁惧绠$悊涓荤绛惧瓧鍥涗欢*/ + @ApiModelProperty(value = "鐢熶骇璁惧绠$悊涓荤绛惧瓧鍥涗欢") + private Date productionHeaderSignatureTime; + /**鐢熶骇璁惧绠$悊涓荤鎰忚*/ + @ApiModelProperty(value = "鐢熶骇璁惧绠$悊涓荤鎰忚") + private String productionHeaderComment; + /**鐢熶骇淇濋殰閮ㄩ瀵肩瀛�*/ + @ApiModelProperty(value = "鐢熶骇淇濋殰閮ㄩ瀵肩瀛�") + private String productionSupportSignature; + /**鐢熶骇淇濋殰閮ㄩ瀵肩瀛楁椂闂�*/ + @ApiModelProperty(value = "鐢熶骇淇濋殰閮ㄩ瀵肩瀛楁椂闂�") + private Date productionSupportSignatureTime; + /**鐢熶骇淇濋殰閮ㄩ瀵兼剰瑙�*/ + @ApiModelProperty(value = "鐢熶骇淇濋殰閮ㄩ瀵兼剰瑙�") + private String productionSupportComment; + /**HF缂栫爜*/ + @ApiModelProperty(value = "HF缂栫爜") + private String hfCode; +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrder.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrder.java new file mode 100644 index 0000000..93424a1 --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrder.java @@ -0,0 +1,133 @@ +package org.jeecg.modules.eam.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.util.Date; + +/** + * @Description: 鎶�鏈姸鎬侀壌瀹氬伐鍗� + * @Author: jeecg-boot + * @Date: 2025-07-09 + * @Version: V1.0 + */ +@Data +@TableName("eam_technical_status_evaluation_order") +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@ApiModel(value="eam_technical_status_evaluation_order瀵硅薄", description="鎶�鏈姸鎬侀壌瀹氬伐鍗�") +public class EamTechnicalStatusEvaluationOrder { + + /**涓婚敭*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "涓婚敭") + private String id; + /**鍒涘缓浜�*/ + @ApiModelProperty(value = "鍒涘缓浜�") + private String createBy; + /**鍒涘缓鏃堕棿*/ + @ApiModelProperty(value = "鍒涘缓鏃堕棿") + private Date createTime; + /**鏇存柊浜�*/ + @ApiModelProperty(value = "鏇存柊浜�") + private String updateBy; + /**鏇存柊鏃堕棿*/ + @ApiModelProperty(value = "鏇存柊鏃堕棿") + private Date updateTime; + /**鍒犻櫎鏍囪*/ + @ApiModelProperty(value = "鍒犻櫎鏍囪") + private Integer delFlag; + /**宸ュ崟鍙�*/ + @ApiModelProperty(value = "宸ュ崟鍙�") + private String orderNum; + /**璁惧ID*/ + @ApiModelProperty(value = "璁惧ID") + private String equipmentId; + /**瑙勮寖ID*/ + @ApiModelProperty(value = "瑙勮寖ID") + private String standardId; + /**璁″垝閴村畾鏃ユ湡;鎻愬墠70澶╃敓鎴愬伐鍗�*/ + @ApiModelProperty(value = "璁″垝閴村畾鏃ユ湡;鎻愬墠70澶╃敓鎴愬伐鍗�") + private Date evaluationDate; + /**閿佸畾宸ュ崟鏃ユ湡;鎻愬墠55澶╅攣瀹氬伐鍗�*/ + @ApiModelProperty(value = "閿佸畾宸ュ崟鏃ユ湡;鎻愬墠55澶╅攣瀹氬伐鍗�") + private Date freezeOrderDate; + /**宸ュ崟杩囨湡鏃ユ湡;鍒版湡鏈仛鐩存帴杩囨湡锛屽苟淇敼璁惧鎶�鏈姸鎬佷负绂佺敤*/ + @ApiModelProperty(value = "宸ュ崟杩囨湡鏃ユ湡;鍒版湡鏈仛鐩存帴杩囨湡锛屽苟淇敼璁惧鎶�鏈姸鎬佷负绂佺敤") + private Date orderExpirationDate; + /**瀹為檯寮�濮嬫椂闂�*/ + @ApiModelProperty(value = "瀹為檯寮�濮嬫椂闂�") + private Date actualStartTime; + /**瀹為檯缁撴潫鏃堕棿*/ + @ApiModelProperty(value = "瀹為檯缁撴潫鏃堕棿") + private Date actualEndTime; + /**閴村畾浜�*/ + @ApiModelProperty(value = "閴村畾浜�") + private String evaluator; + /**閴村畾鐘舵��;寰呴壌瀹氥�侀壌瀹氫腑銆佺淮淇涓讳换绛惧瓧銆佸伐鑹轰汉鍛樼瀛椼�佹妧鏈富绠$瀛椼�佽澶囨楠屽憳绛惧瓧銆佸凡瀹屾垚銆佸凡閿佸畾銆佸彉鏇翠腑銆佸凡杩囨湡*/ + @ApiModelProperty(value = "閴村畾鐘舵��;寰呴壌瀹氥�侀壌瀹氫腑銆佺淮淇涓讳换绛惧瓧銆佸伐鑹轰汉鍛樼瀛椼�佹妧鏈富绠$瀛椼�佽澶囨楠屽憳绛惧瓧銆佸凡瀹屾垚銆佸凡閿佸畾銆佸彉鏇翠腑銆佸凡杩囨湡") + private String evaluationStatus; + /**鍒涘缓鏂瑰紡*/ + @ApiModelProperty(value = "鍒涘缓鏂瑰紡") + private String creationMethod; + /**瀹夊叏瑁呯疆妫�鏌ョ粨鏋�;鏄�佸惁*/ + @ApiModelProperty(value = "瀹夊叏瑁呯疆妫�鏌ョ粨鏋�;鏄�佸惁") + private String safetyEquipmentCheckResult; + /**绮惧害鍙傛暟妫�鏌ョ粨鏋�;鏄�佸惁銆佹棤*/ + @ApiModelProperty(value = "绮惧害鍙傛暟妫�鏌ョ粨鏋�;鏄�佸惁銆佹棤") + private String precisionCheckResult; + /**鍔熻兘鐘舵�佹鏌ョ粨鏋�;鏄�佸惁*/ + @ApiModelProperty(value = "鍔熻兘鐘舵�佹鏌ョ粨鏋�;鏄�佸惁") + private String functionalCheckResult; + /**鍏朵粬妫�鏌ョ粨鏋�;鏄�佸惁銆佹棤*/ + @ApiModelProperty(value = "鍏朵粬妫�鏌ョ粨鏋�;鏄�佸惁銆佹棤") + private String otherCheckResult; + /**缁翠慨瀹や富浠荤瀛�*/ + @ApiModelProperty(value = "缁翠慨瀹や富浠荤瀛�") + private String repairManagerSignature; + /**缁翠慨瀹や富浠荤瀛楁椂闂�*/ + @ApiModelProperty(value = "缁翠慨瀹や富浠荤瀛楁椂闂�") + private Date repairManagerSignatureTime1; + /**璇曚欢妫�鏌ョ粨鏋�;鍚堟牸銆佷笉鍚堟牸*/ + @ApiModelProperty(value = "璇曚欢妫�鏌ョ粨鏋�;鍚堟牸銆佷笉鍚堟牸") + private String sampleCheckResult; + /**宸ヨ壓鍛樼瀛�*/ + @ApiModelProperty(value = "宸ヨ壓鍛樼瀛�") + private String processTechnicianSignature; + /**宸ヨ壓鍛樼瀛楁椂闂�*/ + @ApiModelProperty(value = "宸ヨ壓鍛樼瀛楁椂闂�") + private Date processTechnicianSignatureTime; + /**閴村畾缁撴灉;鍚堟牸銆侀檺鐢ㄣ�佺鐢�*/ + @ApiModelProperty(value = "閴村畾缁撴灉;鍚堟牸銆侀檺鐢ㄣ�佺鐢�") + private String evaluationResult; + /**闄怽绂佺敤鍘熷洜(澶氶��);瀹夊叏瑁呯疆銆佽澶囧姛鑳姐�佺簿搴︺�佽瘯浠躲�佸叾浠�*/ + @ApiModelProperty(value = "闄�/绂佺敤鍘熷洜(澶氶��);瀹夊叏瑁呯疆銆佽澶囧姛鑳姐�佺簿搴︺�佽瘯浠躲�佸叾浠�") + private String evaluationReason; + /**璁惧妫�鏌ヤ汉绛惧瓧*/ + @ApiModelProperty(value = "璁惧妫�鏌ヤ汉绛惧瓧") + private String inspectorSignature; + /**璁惧妫�鏌ヤ汉绛惧瓧鏃堕棿*/ + @ApiModelProperty(value = "璁惧妫�鏌ヤ汉绛惧瓧鏃堕棿") + private Date inspectorSignatureTime; + /**闄勫綍A HF缂栫爜*/ + @ApiModelProperty(value = "闄勫綍A HF缂栫爜") + private String hfCodeA; + /**闄勫綍B HF缂栫爜*/ + @ApiModelProperty(value = "闄勫綍B HF缂栫爜") + private String hfCodeB; + /**闄勫綍C HF缂栫爜*/ + @ApiModelProperty(value = "闄勫綍C HF缂栫爜") + private String hfCodeC; + /**闄勫綍D HF缂栫爜*/ + @ApiModelProperty(value = "闄勫綍D HF缂栫爜") + private String hfCodeD; + /**澶囨敞*/ + @ApiModelProperty(value = "澶囨敞") + private String remark; +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrderChange.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrderChange.java new file mode 100644 index 0000000..766489c --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrderChange.java @@ -0,0 +1,97 @@ +package org.jeecg.modules.eam.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.util.Date; + +/** + * @Description: 鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇� + * @Author: jeecg-boot + * @Date: 2025-07-09 + * @Version: V1.0 + */ +@Data +@TableName("eam_technical_status_evaluation_order_change") +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@ApiModel(value="eam_technical_status_evaluation_order_change瀵硅薄", description="鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇�") +public class EamTechnicalStatusEvaluationOrderChange { + + /**涓婚敭*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "涓婚敭") + private String id; + /**鍒涘缓浜�*/ + @ApiModelProperty(value = "鍒涘缓浜�") + private String createBy; + /**鍒涘缓鏃堕棿*/ + @ApiModelProperty(value = "鍒涘缓鏃堕棿") + private Date createTime; + /**鏇存柊浜�*/ + @ApiModelProperty(value = "鏇存柊浜�") + private String updateBy; + /**鏇存柊鏃堕棿*/ + @ApiModelProperty(value = "鏇存柊鏃堕棿") + private Date updateTime; + /**鍒犻櫎鏍囪*/ + @ApiModelProperty(value = "鍒犻櫎鏍囪") + private Integer delFlag; + /**宸ュ崟ID*/ + @ApiModelProperty(value = "宸ュ崟ID") + private String orderId; + /**鍙樻洿鍗曞彿*/ + @ApiModelProperty(value = "鍙樻洿鍗曞彿") + private String changeOrderNum; + /**鐢宠浜�*/ + @ApiModelProperty(value = "鐢宠浜�") + private String applicant; + /**鐢宠閮ㄩ棬*/ + @ApiModelProperty(value = "鐢宠閮ㄩ棬") + private String factoryOrgCode; + /**鐢宠鏃ユ湡*/ + @ApiModelProperty(value = "鐢宠鏃ユ湡") + private Date applyDate; + /**鍙樻洿鐘舵��;寰呮彁浜ゃ�佸緟涓荤瀹℃牳銆佸緟閮ㄩ棬纭銆佸緟淇濋殰閮ㄧ‘璁ゃ�佸凡浣滃簾銆佸凡瀹屾垚*/ + @ApiModelProperty(value = "鍙樻洿鐘舵��;寰呮彁浜ゃ�佸緟涓荤瀹℃牳銆佸緟閮ㄩ棬纭銆佸緟淇濋殰閮ㄧ‘璁ゃ�佸凡浣滃簾銆佸凡瀹屾垚") + private String changeStatus; + /**鍙樻洿鍘熷洜;鐢熶骇浠诲姟鎬ユ棤娉曞仠鏈恒�佽澶囨晠闅滄澶勪簬缁翠慨鐘舵�併�佽澶囧凡鎶ュ簾銆佽澶囧ぇ淇�佹惉杩併�佹敼閫�*/ + @ApiModelProperty(value = "鍙樻洿鍘熷洜;鐢熶骇浠诲姟鎬ユ棤娉曞仠鏈恒�佽澶囨晠闅滄澶勪簬缁翠慨鐘舵�併�佽澶囧凡鎶ュ簾銆佽澶囧ぇ淇�佹惉杩併�佹敼閫�") + private String applyReason; + /**鍙樻洿閴村畾鏃ユ湡*/ + @ApiModelProperty(value = "鍙樻洿閴村畾鏃ユ湡") + private Date deferredMaintenanceDate; + /**涓荤棰嗗绛惧瓧*/ + @ApiModelProperty(value = "涓荤棰嗗绛惧瓧") + private String equipmentManagerSignature; + /**涓荤棰嗗绛惧瓧鏃堕棿*/ + @ApiModelProperty(value = "涓荤棰嗗绛惧瓧鏃堕棿") + private Date equipmentManagerSignatureTime; + /**閮ㄩ棬棰嗗绛惧瓧;鏍规嵁鍙樻洿鍘熷洜绫诲瀷鍖哄垎涓嶅悓鐨勪汉瀹℃壒*/ + @ApiModelProperty(value = "閮ㄩ棬棰嗗绛惧瓧;鏍规嵁鍙樻洿鍘熷洜绫诲瀷鍖哄垎涓嶅悓鐨勪汉瀹℃壒") + private String departManagerSignature; + /**閮ㄩ棬棰嗗绛惧瓧鏃堕棿*/ + @ApiModelProperty(value = "閮ㄩ棬棰嗗绛惧瓧鏃堕棿") + private Date departManagerSignatureTime; + /**閮ㄩ棬棰嗗鎰忚*/ + @ApiModelProperty(value = "閮ㄩ棬棰嗗鎰忚") + private String departManagerComment; + /**鐢熶骇淇濋殰閮ㄩ瀵肩瀛�*/ + @ApiModelProperty(value = "鐢熶骇淇濋殰閮ㄩ瀵肩瀛�") + private String productionSupportSignature; + /**鐢熶骇淇濋殰閮ㄩ瀵肩瀛楁椂闂�*/ + @ApiModelProperty(value = "鐢熶骇淇濋殰閮ㄩ瀵肩瀛楁椂闂�") + private Date productionSupportSignatureTime; + /**鐢熶骇淇濋殰閮ㄩ瀵兼剰瑙�*/ + @ApiModelProperty(value = "鐢熶骇淇濋殰閮ㄩ瀵兼剰瑙�") + private String productionSupportComment; + /**HF缂栫爜*/ + @ApiModelProperty(value = "HF缂栫爜") + private String hfCode; +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrderDetail.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrderDetail.java new file mode 100644 index 0000000..3d27910 --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationOrderDetail.java @@ -0,0 +1,73 @@ +package org.jeecg.modules.eam.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +import java.util.Date; + +/** + * @Description: 鎶�鏈姸鎬侀壌瀹氬伐鍗曟槑缁� + * @Author: jeecg-boot + * @Date: 2025-07-09 + * @Version: V1.0 + */ +@Data +@TableName("eam_technical_status_evaluation_order_detail") +@EqualsAndHashCode(callSuper = false) +@Accessors(chain = true) +@ApiModel(value="eam_technical_status_evaluation_order_detail瀵硅薄", description="鎶�鏈姸鎬侀壌瀹氬伐鍗曟槑缁�") +public class EamTechnicalStatusEvaluationOrderDetail { + + /**涓婚敭*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "涓婚敭") + private String id; + /**鍒涘缓浜�*/ + @ApiModelProperty(value = "鍒涘缓浜�") + private String createBy; + /**鍒涘缓鏃堕棿*/ + @ApiModelProperty(value = "鍒涘缓鏃堕棿") + private Date createTime; + /**鏇存柊浜�*/ + @ApiModelProperty(value = "鏇存柊浜�") + private String updateBy; + /**鏇存柊鏃堕棿*/ + @ApiModelProperty(value = "鏇存柊鏃堕棿") + private Date updateTime; + /**搴忓彿*/ + @ApiModelProperty(value = "搴忓彿") + private Integer itemCode; + /**妫�鏌ュ垎绫�;绮惧害妫�鏌ャ�佸畨鍏ㄨ缃鏌ャ�佸叾浠栨鏌�*/ + @ApiModelProperty(value = "妫�鏌ュ垎绫�;绮惧害妫�鏌ャ�佸畨鍏ㄨ缃鏌ャ�佸叾浠栨鏌�") + private String checkCategory; + /**妫�鏌ラ」鐩�*/ + @ApiModelProperty(value = "妫�鏌ラ」鐩�") + private String itemName; + /**鍏佸樊鍊�;绮惧害妫�鏌ュ睍绀�*/ + @ApiModelProperty(value = "鍏佸樊鍊�;绮惧害妫�鏌ュ睍绀�") + private String toleranceValue; + /**妫�鏌ュ瓙椤圭洰;绮惧害妫�鏌ュ睍绀猴紝鍙互涓虹┖*/ + @ApiModelProperty(value = "妫�鏌ュ瓙椤圭洰;绮惧害妫�鏌ュ睍绀猴紝鍙互涓虹┖") + private String subItemName; + /**瀹夊叏瑁呯疆妫�鏌ョ粨鏋�;鏄�佸惁銆佹棤*/ + @ApiModelProperty(value = "瀹夊叏瑁呯疆妫�鏌ョ粨鏋�;鏄�佸惁銆佹棤") + private String safetyEquipmentCheckResult; + /**鍏朵粬妫�鏌ョ粨鏋�*/ + @ApiModelProperty(value = "鍏朵粬妫�鏌ョ粨鏋�") + private String otherCheckResult; + /**绮惧害妫�楠岀粨鏋�*/ + @ApiModelProperty(value = "绮惧害妫�楠岀粨鏋�") + private java.math.BigDecimal precisionCheckResult; + /**缁翠慨浜�/绮惧害妫�鏌ヨ�呯瀛�*/ + @ApiModelProperty(value = "缁翠慨浜�/绮惧害妫�鏌ヨ�呯瀛�") + private String repairmanSignature; + /**缁翠慨浜�/绮惧害妫�鏌ヨ�呯瀛楁椂闂�*/ + @ApiModelProperty(value = "缁翠慨浜�/绮惧害妫�鏌ヨ�呯瀛楁椂闂�") + private Date repairmanSignatureTime; +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusChangeDetailMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusChangeDetailMapper.java new file mode 100644 index 0000000..228c4c5 --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusChangeDetailMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.eam.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.eam.entity.EamTechnicalStatusChangeDetail; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 鎶�鏈姸鎬佸彉鏇寸敵璇锋槑缁� + * @Author: jeecg-boot + * @Date: 2025-07-09 + * @Version: V1.0 + */ +public interface EamTechnicalStatusChangeDetailMapper extends BaseMapper<EamTechnicalStatusChangeDetail> { + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusChangeMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusChangeMapper.java new file mode 100644 index 0000000..d54ff02 --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusChangeMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.eam.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.eam.entity.EamTechnicalStatusChange; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 鎶�鏈姸鎬佸彉鏇寸敵璇� + * @Author: jeecg-boot + * @Date: 2025-07-09 + * @Version: V1.0 + */ +public interface EamTechnicalStatusChangeMapper extends BaseMapper<EamTechnicalStatusChange> { + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusDeactivateDetailMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusDeactivateDetailMapper.java new file mode 100644 index 0000000..8086042 --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusDeactivateDetailMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.eam.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.eam.entity.EamTechnicalStatusDeactivateDetail; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 鍋滅敤鍔犲伐璁惧鐢宠鍗曟槑缁� + * @Author: jeecg-boot + * @Date: 2025-07-09 + * @Version: V1.0 + */ +public interface EamTechnicalStatusDeactivateDetailMapper extends BaseMapper<EamTechnicalStatusDeactivateDetail> { + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusDeactivateMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusDeactivateMapper.java new file mode 100644 index 0000000..fb7583e --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusDeactivateMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.eam.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.eam.entity.EamTechnicalStatusDeactivate; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 鍋滅敤鍔犲伐璁惧鐢宠鍗� + * @Author: jeecg-boot + * @Date: 2025-07-09 + * @Version: V1.0 + */ +public interface EamTechnicalStatusDeactivateMapper extends BaseMapper<EamTechnicalStatusDeactivate> { + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusEvaluationApplicationMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusEvaluationApplicationMapper.java new file mode 100644 index 0000000..609faa6 --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusEvaluationApplicationMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.eam.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationApplication; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 鍔犲伐璁惧鎶�鏈壌瀹氱敵璇� + * @Author: jeecg-boot + * @Date: 2025-07-09 + * @Version: V1.0 + */ +public interface EamTechnicalStatusEvaluationApplicationMapper extends BaseMapper<EamTechnicalStatusEvaluationApplication> { + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusEvaluationOrderChangeMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusEvaluationOrderChangeMapper.java new file mode 100644 index 0000000..bb6b255 --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusEvaluationOrderChangeMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.eam.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrderChange; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇� + * @Author: jeecg-boot + * @Date: 2025-07-09 + * @Version: V1.0 + */ +public interface EamTechnicalStatusEvaluationOrderChangeMapper extends BaseMapper<EamTechnicalStatusEvaluationOrderChange> { + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusEvaluationOrderDetailMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusEvaluationOrderDetailMapper.java new file mode 100644 index 0000000..6e265a6 --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusEvaluationOrderDetailMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.eam.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrderDetail; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 鎶�鏈姸鎬侀壌瀹氬伐鍗曟槑缁� + * @Author: jeecg-boot + * @Date: 2025-07-09 + * @Version: V1.0 + */ +public interface EamTechnicalStatusEvaluationOrderDetailMapper extends BaseMapper<EamTechnicalStatusEvaluationOrderDetail> { + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusEvaluationOrderMapper.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusEvaluationOrderMapper.java new file mode 100644 index 0000000..ac044df --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamTechnicalStatusEvaluationOrderMapper.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.eam.mapper; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrder; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 鎶�鏈姸鎬侀壌瀹氬伐鍗� + * @Author: jeecg-boot + * @Date: 2025-07-09 + * @Version: V1.0 + */ +public interface EamTechnicalStatusEvaluationOrderMapper extends BaseMapper<EamTechnicalStatusEvaluationOrder> { + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusChangeDetailMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusChangeDetailMapper.xml new file mode 100644 index 0000000..cfb2dd3 --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusChangeDetailMapper.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="org.jeecg.modules.eam.mapper.EamTechnicalStatusChangeDetailMapper"> + +</mapper> \ No newline at end of file diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusChangeMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusChangeMapper.xml new file mode 100644 index 0000000..afba5d8 --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusChangeMapper.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="org.jeecg.modules.eam.mapper.EamTechnicalStatusChangeMapper"> + +</mapper> \ No newline at end of file diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusDeactivateDetailMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusDeactivateDetailMapper.xml new file mode 100644 index 0000000..730966a --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusDeactivateDetailMapper.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="org.jeecg.modules.eam.mapper.EamTechnicalStatusDeactivateDetailMapper"> + +</mapper> \ No newline at end of file diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusDeactivateMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusDeactivateMapper.xml new file mode 100644 index 0000000..e743456 --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusDeactivateMapper.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="org.jeecg.modules.eam.mapper.EamTechnicalStatusDeactivateMapper"> + +</mapper> \ No newline at end of file diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusEvaluationApplicationMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusEvaluationApplicationMapper.xml new file mode 100644 index 0000000..f5516bf --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusEvaluationApplicationMapper.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="org.jeecg.modules.eam.mapper.EamTechnicalStatusEvaluationApplicationMapper"> + +</mapper> \ No newline at end of file diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusEvaluationOrderChangeMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusEvaluationOrderChangeMapper.xml new file mode 100644 index 0000000..ff407ce --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusEvaluationOrderChangeMapper.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="org.jeecg.modules.eam.mapper.EamTechnicalStatusEvaluationOrderChangeMapper"> + +</mapper> \ No newline at end of file diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusEvaluationOrderDetailMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusEvaluationOrderDetailMapper.xml new file mode 100644 index 0000000..65f6438 --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusEvaluationOrderDetailMapper.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="org.jeecg.modules.eam.mapper.EamTechnicalStatusEvaluationOrderDetailMapper"> + +</mapper> \ No newline at end of file diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusEvaluationOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusEvaluationOrderMapper.xml new file mode 100644 index 0000000..a472323 --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamTechnicalStatusEvaluationOrderMapper.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +<mapper namespace="org.jeecg.modules.eam.mapper.EamTechnicalStatusEvaluationOrderMapper"> + +</mapper> \ No newline at end of file diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusChangeDetailService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusChangeDetailService.java new file mode 100644 index 0000000..11a5a07 --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusChangeDetailService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.eam.service; + +import org.jeecg.modules.eam.entity.EamTechnicalStatusChangeDetail; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 鎶�鏈姸鎬佸彉鏇寸敵璇锋槑缁� + * @Author: jeecg-boot + * @Date: 2025-07-09 + * @Version: V1.0 + */ +public interface IEamTechnicalStatusChangeDetailService extends IService<EamTechnicalStatusChangeDetail> { + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusChangeService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusChangeService.java new file mode 100644 index 0000000..4799006 --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusChangeService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.eam.service; + +import org.jeecg.modules.eam.entity.EamTechnicalStatusChange; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 鎶�鏈姸鎬佸彉鏇寸敵璇� + * @Author: jeecg-boot + * @Date: 2025-07-09 + * @Version: V1.0 + */ +public interface IEamTechnicalStatusChangeService extends IService<EamTechnicalStatusChange> { + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusDeactivateDetailService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusDeactivateDetailService.java new file mode 100644 index 0000000..a55357e --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusDeactivateDetailService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.eam.service; + +import org.jeecg.modules.eam.entity.EamTechnicalStatusDeactivateDetail; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 鍋滅敤鍔犲伐璁惧鐢宠鍗曟槑缁� + * @Author: jeecg-boot + * @Date: 2025-07-09 + * @Version: V1.0 + */ +public interface IEamTechnicalStatusDeactivateDetailService extends IService<EamTechnicalStatusDeactivateDetail> { + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusDeactivateService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusDeactivateService.java new file mode 100644 index 0000000..ef420bd --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusDeactivateService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.eam.service; + +import org.jeecg.modules.eam.entity.EamTechnicalStatusDeactivate; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 鍋滅敤鍔犲伐璁惧鐢宠鍗� + * @Author: jeecg-boot + * @Date: 2025-07-09 + * @Version: V1.0 + */ +public interface IEamTechnicalStatusDeactivateService extends IService<EamTechnicalStatusDeactivate> { + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationApplicationService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationApplicationService.java new file mode 100644 index 0000000..eafcee6 --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationApplicationService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.eam.service; + +import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationApplication; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 鍔犲伐璁惧鎶�鏈壌瀹氱敵璇� + * @Author: jeecg-boot + * @Date: 2025-07-09 + * @Version: V1.0 + */ +public interface IEamTechnicalStatusEvaluationApplicationService extends IService<EamTechnicalStatusEvaluationApplication> { + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationOrderChangeService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationOrderChangeService.java new file mode 100644 index 0000000..203fa1c --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationOrderChangeService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.eam.service; + +import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrderChange; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇� + * @Author: jeecg-boot + * @Date: 2025-07-09 + * @Version: V1.0 + */ +public interface IEamTechnicalStatusEvaluationOrderChangeService extends IService<EamTechnicalStatusEvaluationOrderChange> { + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationOrderDetailService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationOrderDetailService.java new file mode 100644 index 0000000..21cc765 --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationOrderDetailService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.eam.service; + +import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrderDetail; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 鎶�鏈姸鎬侀壌瀹氬伐鍗曟槑缁� + * @Author: jeecg-boot + * @Date: 2025-07-09 + * @Version: V1.0 + */ +public interface IEamTechnicalStatusEvaluationOrderDetailService extends IService<EamTechnicalStatusEvaluationOrderDetail> { + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationOrderService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationOrderService.java new file mode 100644 index 0000000..a0bb6c4 --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationOrderService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.eam.service; + +import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrder; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 鎶�鏈姸鎬侀壌瀹氬伐鍗� + * @Author: jeecg-boot + * @Date: 2025-07-09 + * @Version: V1.0 + */ +public interface IEamTechnicalStatusEvaluationOrderService extends IService<EamTechnicalStatusEvaluationOrder> { + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationStandardDetailService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationStandardDetailService.java index bb8f85b..30f2ca6 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationStandardDetailService.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationStandardDetailService.java @@ -13,7 +13,14 @@ /** * 鏍规嵁瑙勮寖ID鍒犻櫎妫�鏌ラ」 - * @param standardId + * @param standardId 瑙勮寖ID */ void removeByStandardId(String standardId); + + /** + * 鏍规嵁瑙勮寖ID鍒犻櫎妫�鏌ラ」 + * @param standardId 瑙勮寖ID + * @param category 鍒嗙被 + */ + void removeByStandardIdAndCategory(String standardId, String category); } diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationStandardService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationStandardService.java index 6056f42..4e1a8b7 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationStandardService.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationStandardService.java @@ -59,4 +59,18 @@ * @return */ Result<?> importSafetyEquipmentCheck(MultipartFile file); + + /** + * 璁惧绮惧害瀵煎叆 + * @param file + * @return + */ + Result<?> importPrecisionCheck(MultipartFile file); + + /** + * 鍏朵粬妫�鏌ュ鍏� + * @param file + * @return + */ + Result<?> importOtherCheck(MultipartFile file); } diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusChangeDetailServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusChangeDetailServiceImpl.java new file mode 100644 index 0000000..11ebd24 --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusChangeDetailServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.eam.service.impl; + +import org.jeecg.modules.eam.entity.EamTechnicalStatusChangeDetail; +import org.jeecg.modules.eam.mapper.EamTechnicalStatusChangeDetailMapper; +import org.jeecg.modules.eam.service.IEamTechnicalStatusChangeDetailService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 鎶�鏈姸鎬佸彉鏇寸敵璇锋槑缁� + * @Author: jeecg-boot + * @Date: 2025-07-09 + * @Version: V1.0 + */ +@Service +public class EamTechnicalStatusChangeDetailServiceImpl extends ServiceImpl<EamTechnicalStatusChangeDetailMapper, EamTechnicalStatusChangeDetail> implements IEamTechnicalStatusChangeDetailService { + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusChangeServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusChangeServiceImpl.java new file mode 100644 index 0000000..6738de7 --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusChangeServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.eam.service.impl; + +import org.jeecg.modules.eam.entity.EamTechnicalStatusChange; +import org.jeecg.modules.eam.mapper.EamTechnicalStatusChangeMapper; +import org.jeecg.modules.eam.service.IEamTechnicalStatusChangeService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 鎶�鏈姸鎬佸彉鏇寸敵璇� + * @Author: jeecg-boot + * @Date: 2025-07-09 + * @Version: V1.0 + */ +@Service +public class EamTechnicalStatusChangeServiceImpl extends ServiceImpl<EamTechnicalStatusChangeMapper, EamTechnicalStatusChange> implements IEamTechnicalStatusChangeService { + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusDeactivateDetailServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusDeactivateDetailServiceImpl.java new file mode 100644 index 0000000..dcac698 --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusDeactivateDetailServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.eam.service.impl; + +import org.jeecg.modules.eam.entity.EamTechnicalStatusDeactivateDetail; +import org.jeecg.modules.eam.mapper.EamTechnicalStatusDeactivateDetailMapper; +import org.jeecg.modules.eam.service.IEamTechnicalStatusDeactivateDetailService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 鍋滅敤鍔犲伐璁惧鐢宠鍗曟槑缁� + * @Author: jeecg-boot + * @Date: 2025-07-09 + * @Version: V1.0 + */ +@Service +public class EamTechnicalStatusDeactivateDetailServiceImpl extends ServiceImpl<EamTechnicalStatusDeactivateDetailMapper, EamTechnicalStatusDeactivateDetail> implements IEamTechnicalStatusDeactivateDetailService { + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusDeactivateServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusDeactivateServiceImpl.java new file mode 100644 index 0000000..0aabdba --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusDeactivateServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.eam.service.impl; + +import org.jeecg.modules.eam.entity.EamTechnicalStatusDeactivate; +import org.jeecg.modules.eam.mapper.EamTechnicalStatusDeactivateMapper; +import org.jeecg.modules.eam.service.IEamTechnicalStatusDeactivateService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 鍋滅敤鍔犲伐璁惧鐢宠鍗� + * @Author: jeecg-boot + * @Date: 2025-07-09 + * @Version: V1.0 + */ +@Service +public class EamTechnicalStatusDeactivateServiceImpl extends ServiceImpl<EamTechnicalStatusDeactivateMapper, EamTechnicalStatusDeactivate> implements IEamTechnicalStatusDeactivateService { + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationApplicationServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationApplicationServiceImpl.java new file mode 100644 index 0000000..a33d873 --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationApplicationServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.eam.service.impl; + +import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationApplication; +import org.jeecg.modules.eam.mapper.EamTechnicalStatusEvaluationApplicationMapper; +import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationApplicationService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 鍔犲伐璁惧鎶�鏈壌瀹氱敵璇� + * @Author: jeecg-boot + * @Date: 2025-07-09 + * @Version: V1.0 + */ +@Service +public class EamTechnicalStatusEvaluationApplicationServiceImpl extends ServiceImpl<EamTechnicalStatusEvaluationApplicationMapper, EamTechnicalStatusEvaluationApplication> implements IEamTechnicalStatusEvaluationApplicationService { + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderChangeServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderChangeServiceImpl.java new file mode 100644 index 0000000..774fecb --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderChangeServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.eam.service.impl; + +import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrderChange; +import org.jeecg.modules.eam.mapper.EamTechnicalStatusEvaluationOrderChangeMapper; +import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationOrderChangeService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 鎶�鏈姸鎬侀壌瀹氬伐鍗曞彉鏇� + * @Author: jeecg-boot + * @Date: 2025-07-09 + * @Version: V1.0 + */ +@Service +public class EamTechnicalStatusEvaluationOrderChangeServiceImpl extends ServiceImpl<EamTechnicalStatusEvaluationOrderChangeMapper, EamTechnicalStatusEvaluationOrderChange> implements IEamTechnicalStatusEvaluationOrderChangeService { + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderDetailServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderDetailServiceImpl.java new file mode 100644 index 0000000..01e52fc --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderDetailServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.eam.service.impl; + +import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrderDetail; +import org.jeecg.modules.eam.mapper.EamTechnicalStatusEvaluationOrderDetailMapper; +import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationOrderDetailService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 鎶�鏈姸鎬侀壌瀹氬伐鍗曟槑缁� + * @Author: jeecg-boot + * @Date: 2025-07-09 + * @Version: V1.0 + */ +@Service +public class EamTechnicalStatusEvaluationOrderDetailServiceImpl extends ServiceImpl<EamTechnicalStatusEvaluationOrderDetailMapper, EamTechnicalStatusEvaluationOrderDetail> implements IEamTechnicalStatusEvaluationOrderDetailService { + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java new file mode 100644 index 0000000..59d55ff --- /dev/null +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationOrderServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.eam.service.impl; + +import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrder; +import org.jeecg.modules.eam.mapper.EamTechnicalStatusEvaluationOrderMapper; +import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationOrderService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 鎶�鏈姸鎬侀壌瀹氬伐鍗� + * @Author: jeecg-boot + * @Date: 2025-07-09 + * @Version: V1.0 + */ +@Service +public class EamTechnicalStatusEvaluationOrderServiceImpl extends ServiceImpl<EamTechnicalStatusEvaluationOrderMapper, EamTechnicalStatusEvaluationOrder> implements IEamTechnicalStatusEvaluationOrderService { + +} diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardDetailServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardDetailServiceImpl.java index 9710cd8..623c25f 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardDetailServiceImpl.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardDetailServiceImpl.java @@ -25,4 +25,13 @@ wrapper.eq(EamTechnicalStatusEvaluationStandardDetail::getStandardId, standardId); this.getBaseMapper().delete(wrapper); } + + @Override + @Transactional(rollbackFor = Exception.class) + public void removeByStandardIdAndCategory(String standardId, String category) { + LambdaQueryWrapper<EamTechnicalStatusEvaluationStandardDetail> wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(EamTechnicalStatusEvaluationStandardDetail::getStandardId, standardId); + wrapper.eq(EamTechnicalStatusEvaluationStandardDetail::getCheckCategory, category); + this.getBaseMapper().delete(wrapper); + } } diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardServiceImpl.java index 4c8d7b6..8bb7a21 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardServiceImpl.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardServiceImpl.java @@ -28,7 +28,6 @@ import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationStandardDetail; import org.jeecg.modules.eam.mapper.EamTechnicalStatusEvaluationStandardMapper; import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationStandardRequest; -import org.jeecg.modules.eam.request.ImportException; import org.jeecg.modules.eam.service.IEamEquipmentService; import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationStandardDetailService; import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationStandardService; @@ -342,7 +341,7 @@ builder.append(paragraph.getText().trim()); } }); - if (!checkImportCategory(builder.toString(), TechnicalStatusEvaluationCheckCategoryEnum.SAFETY_EQUIPMENT_CHECK)) { + if (checkImportCategory(builder.toString(), TechnicalStatusEvaluationCheckCategoryEnum.SAFETY_EQUIPMENT_CHECK)) { return Result.error(fileName + ":姝ゆ枃浠朵笉绗﹀悎瀹夊叏瑁呯疆妫�鏌ユā鏉胯鑼冿紝璇锋鏌ワ紒"); } //鑾峰彇璁惧淇℃伅 @@ -350,7 +349,7 @@ //鏌ョ湅鏄惁鏈夋璁惧鍚敤鐨勮鑼冧俊鎭� EamTechnicalStatusEvaluationStandard originalStandard = checkDuplicate(equipment.getId(), null); if (originalStandard != null && TechnicalStatusEvaluationStandardEnum.ENABLE.name().equals(originalStandard.getStandardStatus())) { - return Result.error(fileName + ":姝よ澶囩殑瀹夊叏瑁呯疆妫�鏌ラ」宸叉坊鍔狅紝璇疯繘琛岀紪杈戞垨鍗囩増锛�"); + return Result.error(fileName + ":姝よ澶囧凡瀛樺湪鍚敤鐨勮鑼冿紝璇疯繘琛岀紪杈戞垨鍗囩増锛�"); } //鑾峰彇妫�鏌ラ」淇℃伅 List<EamTechnicalStatusEvaluationStandardDetail> detailList = extractSafetyEquipmentCheckItems(tables); @@ -365,6 +364,9 @@ detailList.forEach(standardDetail -> { standardDetail.setStandardId(originalStandard.getId()); }); + //鍏堝垹闄わ紝鍚庢坊鍔� + standardDetailService.removeByStandardIdAndCategory(originalStandard.getId(), TechnicalStatusEvaluationCheckCategoryEnum.SAFETY_EQUIPMENT_CHECK.name()); + //閲嶆柊娣诲姞 standardDetailService.saveBatch(detailList); }else { String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.TECHNICAL_STATUS_EVALUATION_STANDARD_CODE_RULE); @@ -379,12 +381,9 @@ request.setTableDetailList(detailList); this.addEamTechnicalStatusEvaluationStandard(request); } - } catch (ImportException e) { - log.error(e.getMessage(), e); - return Result.error(fileName + ":" + e.getMessage() + "锛�"); } catch (Exception e) { log.error(e.getMessage(), e); - return Result.error(fileName + ":绯荤粺閿欒-" + e.getMessage() + "锛�"); + return Result.error(fileName + ":" + e.getMessage() + "锛�"); } } else { return Result.error(fileName + ":鏂囦欢鏍煎紡閿欒,鏃犳硶瑙f瀽锛�"); @@ -393,16 +392,170 @@ return Result.OK(fileName + ":瀵煎叆鎴愬姛锛�"); } + @Override + @Transactional(rollbackFor = Exception.class) + public Result<?> importPrecisionCheck(MultipartFile file) { + String fileName = file.getOriginalFilename(); + if (StringUtils.isBlank(fileName)) { + return Result.error(fileName + ":鏂囦欢鏍煎紡閿欒,鏃犳硶瑙f瀽锛�"); + } + String fileSuffix = FileUtil.getFileSuffix(fileName); + //鍙敮鎸� .docx 鐨剋ord鏂囨。 + if ("docx".equals(fileSuffix)) { + try (XWPFDocument doc = new XWPFDocument(file.getInputStream())) { + List<XWPFParagraph> paragraphs = doc.getParagraphs(); + List<XWPFTable> tables = doc.getTables(); + if (CollectionUtil.isEmpty(paragraphs) || CollectionUtil.isEmpty(tables)) { + return Result.error(fileName + ":姝ゆ枃浠朵笉绗﹀悎璁惧绮惧害妫�鏌ユā鏉胯鑼冿紝璇锋鏌ワ紒"); + } + //鑾峰彇鏂囦欢鏍囬 + StringBuilder builder = new StringBuilder(); + paragraphs.forEach(paragraph -> { + if (StringUtils.isNotBlank(paragraph.getText())) { + builder.append(paragraph.getText().trim()); + } + }); + if (checkImportCategory(builder.toString(), TechnicalStatusEvaluationCheckCategoryEnum.PRECISION_CHECK)) { + return Result.error(fileName + ":姝ゆ枃浠朵笉绗﹀悎璁惧绮惧害妫�鏌ユā鏉胯鑼冿紝璇锋鏌ワ紒"); + } + //鑾峰彇璁惧淇℃伅 + EamEquipment equipment = extractEquipmentInfo(tables.get(0)); + //鏌ョ湅鏄惁鏈夋璁惧鍚敤鐨勮鑼冧俊鎭� + EamTechnicalStatusEvaluationStandard originalStandard = checkDuplicate(equipment.getId(), null); + if (originalStandard != null && TechnicalStatusEvaluationStandardEnum.ENABLE.name().equals(originalStandard.getStandardStatus())) { + return Result.error(fileName + ":姝よ澶囧凡瀛樺湪鍚敤鐨勮鑼冿紝璇疯繘琛岀紪杈戞垨鍗囩増锛�"); + } + //鑾峰彇妫�鏌ラ」淇℃伅 + List<EamTechnicalStatusEvaluationStandardDetail> detailList = extractPrecisionCheckItems(tables); + if(CollectionUtil.isEmpty(detailList)){ + return Result.error(fileName + ":鏈В鏋愬埌妫�鏌ラ」鍐呭锛岃妫�鏌ワ紒"); + } + if(originalStandard != null) { + //宸插瓨鍦ㄦ妧鏈姸鎬侀壌瀹氳鑼�,涓旇鑼冪姸鎬佷负宸叉彁浜� + originalStandard.setHasPrecisionCheck(CommonConstant.STATUS_1); + originalStandard.setStandardStatus(TechnicalStatusEvaluationStandardEnum.WAIT_SUBMIT.name()); + super.getBaseMapper().updateById(originalStandard); + detailList.forEach(standardDetail -> { + standardDetail.setStandardId(originalStandard.getId()); + }); + //鍏堝垹闄わ紝鍚庢坊鍔� + standardDetailService.removeByStandardIdAndCategory(originalStandard.getId(), TechnicalStatusEvaluationCheckCategoryEnum.PRECISION_CHECK.name()); + //閲嶆柊娣诲姞 + standardDetailService.saveBatch(detailList); + }else { + String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.TECHNICAL_STATUS_EVALUATION_STANDARD_CODE_RULE); + //鏂板鎶�鏈姸鎬侀壌瀹氳鑼� + EamTechnicalStatusEvaluationStandardRequest request = new EamTechnicalStatusEvaluationStandardRequest(); + request.setEquipmentId(equipment.getId()); + request.setHasSafetyEquipmentCheck(CommonConstant.STATUS_0); + request.setHasOtherCheck(CommonConstant.STATUS_0); + request.setHasPrecisionCheck(CommonConstant.STATUS_1); + request.setStandardCode(codeSeq); + request.setStandardName(equipment.getEquipmentName() + "鎶�鏈姸鎬侀壌瀹氳鑼�"); + request.setTableDetailList(detailList); + this.addEamTechnicalStatusEvaluationStandard(request); + } + } catch (Exception e) { + log.error(e.getMessage(), e); + return Result.error(fileName + ":" + e.getMessage() + "锛�"); + } + } else { + return Result.error(fileName + ":鏂囦欢鏍煎紡閿欒,鏃犳硶瑙f瀽锛�"); + } + + return Result.OK(fileName + ":瀵煎叆鎴愬姛锛�"); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Result<?> importOtherCheck(MultipartFile file) { + String fileName = file.getOriginalFilename(); + if (StringUtils.isBlank(fileName)) { + return Result.error(fileName + ":鏂囦欢鏍煎紡閿欒,鏃犳硶瑙f瀽锛�"); + } + String fileSuffix = FileUtil.getFileSuffix(fileName); + //鍙敮鎸� .docx 鐨剋ord鏂囨。 + if ("docx".equals(fileSuffix)) { + try (XWPFDocument doc = new XWPFDocument(file.getInputStream())) { + List<XWPFParagraph> paragraphs = doc.getParagraphs(); + List<XWPFTable> tables = doc.getTables(); + if (CollectionUtil.isEmpty(paragraphs) || CollectionUtil.isEmpty(tables)) { + return Result.error(fileName + ":姝ゆ枃浠朵笉绗﹀悎瀹夊叏瑁呯疆妫�鏌ユā鏉胯鑼冿紝璇锋鏌ワ紒"); + } + //鑾峰彇鏂囦欢鏍囬 + StringBuilder builder = new StringBuilder(); + paragraphs.forEach(paragraph -> { + if (StringUtils.isNotBlank(paragraph.getText())) { + builder.append(paragraph.getText().trim()); + } + }); + if (checkImportCategory(builder.toString(), TechnicalStatusEvaluationCheckCategoryEnum.OTHER_CHECK)) { + return Result.error(fileName + ":姝ゆ枃浠朵笉绗﹀悎鍏朵粬妫�鏌ユā鏉胯鑼冿紝璇锋鏌ワ紒"); + } + //鑾峰彇璁惧淇℃伅 + EamEquipment equipment = extractEquipmentInfo(tables.get(0)); + //鏌ョ湅鏄惁鏈夋璁惧鍚敤鐨勮鑼冧俊鎭� + EamTechnicalStatusEvaluationStandard originalStandard = checkDuplicate(equipment.getId(), null); + if (originalStandard != null && TechnicalStatusEvaluationStandardEnum.ENABLE.name().equals(originalStandard.getStandardStatus())) { + return Result.error(fileName + ":姝よ澶囧凡瀛樺湪鍚敤鐨勮鑼冿紝璇疯繘琛岀紪杈戞垨鍗囩増锛�"); + } + //鑾峰彇妫�鏌ラ」淇℃伅 + List<EamTechnicalStatusEvaluationStandardDetail> detailList = extractOtherCheckItems(tables); + if(CollectionUtil.isEmpty(detailList)){ + return Result.error(fileName + ":鏈В鏋愬埌妫�鏌ラ」鍐呭锛岃妫�鏌ワ紒"); + } + if(originalStandard != null) { + //宸插瓨鍦ㄦ妧鏈姸鎬侀壌瀹氳鑼�,涓旇鑼冪姸鎬佷负宸叉彁浜� + originalStandard.setHasOtherCheck(CommonConstant.STATUS_1); + originalStandard.setStandardStatus(TechnicalStatusEvaluationStandardEnum.WAIT_SUBMIT.name()); + super.getBaseMapper().updateById(originalStandard); + detailList.forEach(standardDetail -> { + standardDetail.setStandardId(originalStandard.getId()); + }); + //鍏堝垹闄わ紝鍚庢坊鍔� + standardDetailService.removeByStandardIdAndCategory(originalStandard.getId(), TechnicalStatusEvaluationCheckCategoryEnum.OTHER_CHECK.name()); + //閲嶆柊娣诲姞 + standardDetailService.saveBatch(detailList); + }else { + String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.TECHNICAL_STATUS_EVALUATION_STANDARD_CODE_RULE); + //鏂板鎶�鏈姸鎬侀壌瀹氳鑼� + EamTechnicalStatusEvaluationStandardRequest request = new EamTechnicalStatusEvaluationStandardRequest(); + request.setEquipmentId(equipment.getId()); + request.setHasSafetyEquipmentCheck(CommonConstant.STATUS_0); + request.setHasOtherCheck(CommonConstant.STATUS_1); + request.setHasPrecisionCheck(CommonConstant.STATUS_0); + request.setStandardCode(codeSeq); + request.setStandardName(equipment.getEquipmentName() + "鎶�鏈姸鎬侀壌瀹氳鑼�"); + request.setTableDetailList(detailList); + this.addEamTechnicalStatusEvaluationStandard(request); + } + } catch (Exception e) { + log.error(e.getMessage(), e); + return Result.error(fileName + ":" + e.getMessage() + "锛�"); + } + } else { + return Result.error(fileName + ":鏂囦欢鏍煎紡閿欒,鏃犳硶瑙f瀽锛�"); + } + + return Result.OK(fileName + ":瀵煎叆鎴愬姛锛�"); + } + + /** + * 妫�鏌ュ鍏ユ枃浠跺垎绫绘槸鍚﹀尮閰� + * @param title 鏍囬娈佃惤瀛楃涓� + * @param category 鍒嗙被 + * @return true 涓嶅尮閰嶏紝 false 鍖归厤 + */ private boolean checkImportCategory(String title, TechnicalStatusEvaluationCheckCategoryEnum category) { switch (category) { case SAFETY_EQUIPMENT_CHECK: - return title.contains("瀹夊叏瑁呯疆妫�鏌�"); + return !title.contains("瀹夊叏瑁呯疆妫�鏌�"); case PRECISION_CHECK: - return title.contains("绮惧害妫�鏌ュ崟"); + return !title.contains("绮惧害妫�鏌ュ崟"); case OTHER_CHECK: - return title.contains("鍏朵粬妫�鏌�"); + return !title.contains("鍏朵粬妫�鏌�"); } - return false; + return true; } @@ -448,7 +601,6 @@ * 鎻愬彇瀹夊叏瑁呯疆妫�鏌ユ槑缁� */ private List<EamTechnicalStatusEvaluationStandardDetail> extractSafetyEquipmentCheckItems(List<XWPFTable> tableList) { - List<EamTechnicalStatusEvaluationStandardDetail> items = new ArrayList<>(); EamTechnicalStatusEvaluationStandardDetail item = null; //瑙f瀽绗竴涓〃鏍硷紝甯﹁澶囦俊鎭� @@ -481,4 +633,107 @@ } return items; } + + /** + * 鎻愬彇鍏朵粬妫�鏌ラ」鏄庣粏鍐呭 + * @param tables + * @return + */ + private List<EamTechnicalStatusEvaluationStandardDetail> extractOtherCheckItems(List<XWPFTable> tables) { + List<EamTechnicalStatusEvaluationStandardDetail> items = new ArrayList<>(); + EamTechnicalStatusEvaluationStandardDetail item = null; + //瑙f瀽绗竴涓〃鏍硷紝甯﹁澶囦俊鎭� + XWPFTable table = tables.get(0); + for (int i = 0; i < table.getNumberOfRows(); i++) { + XWPFTableRow row = table.getRow(i); + if (row == null || CollectionUtil.isEmpty(row.getTableCells()) || row.getTableCells().size() < 2) { + //璇诲彇鍒扮┖row鍊� + continue; + } + //妫�鏌ユ槸鍚﹀埌妫�鏌ラ」搴忓彿 + String firstCell = row.getCell(0).getText().trim(); + Integer itemCode = null; + try { + itemCode = Integer.parseInt(firstCell); + } catch (NumberFormatException e) { + //涓嶆槸妫�鏌ラ」鍐呭锛岃烦杩囨琛� + continue; + } + //鑾峰彇绗簩涓崟鍏冩牸 + String secondCell = row.getCell(1).getText().trim(); + //濡傛灉杩欎竴琛屼负搴忓彿鍒欒В鏋愭暣琛� + if (StringUtils.isNotBlank(secondCell)) { + item = new EamTechnicalStatusEvaluationStandardDetail(); + item.setItemCode(itemCode); + item.setItemName(secondCell); + item.setCheckCategory(TechnicalStatusEvaluationCheckCategoryEnum.OTHER_CHECK.name()); + items.add(item); + } + } + return items; + } + + private List<EamTechnicalStatusEvaluationStandardDetail> extractPrecisionCheckItems(List<XWPFTable> tables) { + List<EamTechnicalStatusEvaluationStandardDetail> items = new ArrayList<>(); + EamTechnicalStatusEvaluationStandardDetail item = null; + //瑙f瀽绗竴涓〃鏍硷紝甯﹁澶囦俊鎭� + XWPFTable table = tables.get(0); + for (int i = 0; i < table.getNumberOfRows(); i++) { + XWPFTableRow row = table.getRow(i); + if (row == null || CollectionUtil.isEmpty(row.getTableCells()) || row.getTableCells().size() < 2) { + //璇诲彇鍒扮┖row鍊� + continue; + } + //妫�鏌ユ槸鍚﹀埌妫�鏌ラ」搴忓彿 + String firstCell = row.getCell(0).getText().trim(); + Integer itemCode = null; + try { + itemCode = Integer.parseInt(firstCell); + } catch (NumberFormatException e) { + //涓嶆槸妫�鏌ラ」鍐呭锛岃烦杩囨琛� + if(item == null) { + continue; + }else { + itemCode = item.getItemCode(); + } + } + //鑾峰彇绗簩涓崟鍏冩牸 + String itemName = row.getCell(1).getText().trim(); + if(StringUtils.isBlank(itemName)) { + if(item != null) { + itemName = item.getItemName(); + }else { + continue; + } + } + String subItemName = null; + String toleranceValue = null; + if(row.getTableCells().size() == 4) { + toleranceValue = row.getCell(2).getText().trim(); + }else if(row.getTableCells().size() == 5) { + subItemName = row.getCell(2).getText().trim(); + toleranceValue = row.getCell(3).getText().trim(); + }else { + continue; + } + if(StringUtils.isBlank(toleranceValue)) { + //鍏佸樊鍊间笉瀛樺湪锛岃烦杩� + if(item != null) { + toleranceValue = item.getToleranceValue(); + }else { + continue; + } + } + //鎷艰鏄庣粏鏁版嵁 + item = new EamTechnicalStatusEvaluationStandardDetail(); + item.setItemCode(itemCode); + item.setItemName(itemName); + item.setSubItemName(subItemName); + item.setToleranceValue(toleranceValue); + item.setCheckCategory(TechnicalStatusEvaluationCheckCategoryEnum.PRECISION_CHECK.name()); + items.add(item); + } + return items; + } + } -- Gitblit v1.9.3