From c3a981e80973ac52b5988aca62b87409976c6fb1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 18 六月 2026 13:09:28 +0800
Subject: [PATCH] 1.计量器具台账上传附件报错 2.质量拉的数据不对（未明确） 3.计量器具台账逾期的做标红提醒 4.设备保养定时任务和记录要加上具体的保养内容 5.质量要区分质检规则抽检还是全检，抽检的话是抽多少百分比 6.供应商管理东西太少了，没有资质文件啊这些东西（是不是可以参考pro） 7.采购审批把人从李莹莹改成龙红星
---
src/main/java/com/ruoyi/quality/controller/QualityInspectController.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 52 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java b/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
index be53963..2f19742 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
@@ -2,7 +2,10 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.quality.dto.BatchQuickInspectRequest;
import com.ruoyi.quality.dto.QualityInspectDto;
import com.ruoyi.quality.pojo.QualityInspect;
import com.ruoyi.quality.pojo.QualityInspectFile;
@@ -39,6 +42,7 @@
*/
@PostMapping("/add")
@Operation(summary = "鏂板妫�楠�")
+ @Log(title = "鏂板妫�楠�", businessType = BusinessType.INSERT)
public R<?> add(@RequestBody QualityInspectDto qualityInspectDto) {
return R.ok(qualityInspectService.add(qualityInspectDto));
}
@@ -51,6 +55,7 @@
*/
@DeleteMapping("/del")
@Operation(summary = "鍒犻櫎妫�楠�")
+ @Log(title = "鍒犻櫎妫�楠�", businessType = BusinessType.DELETE)
public R<?> delQualityInspect(@RequestBody List<Integer> ids) {
if (CollectionUtils.isEmpty(ids)) {
return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
@@ -80,6 +85,7 @@
*/
@GetMapping("/{id}")
@Operation(summary = "妫�楠岃鎯�")
+ @Log(title = "妫�楠岃鎯�", businessType = BusinessType.OTHER)
public R<?> QualityInspectDetail(@PathVariable("id") Integer id) {
return R.ok(qualityInspectService.getDetailById(id));
}
@@ -92,6 +98,7 @@
*/
@PostMapping("/update")
@Operation(summary = "淇敼妫�楠�")
+ @Log(title = "淇敼妫�楠�", businessType = BusinessType.UPDATE)
public R<?> update(@RequestBody QualityInspectDto qualityInspectDto) {
return R.ok(qualityInspectService.updateQualityInspect(qualityInspectDto));
}
@@ -105,6 +112,7 @@
*/
@GetMapping("/listPage")
@Operation(summary = "鍒嗛〉鏌ヨ妫�楠�")
+ @Log(title = "鍒嗛〉鏌ヨ妫�楠�", businessType = BusinessType.OTHER)
public R<?> qualityInspectListPage(Page page, QualityInspectDto qualityInspect) {
return R.ok(qualityInspectService.qualityInspectListPage(page, qualityInspect));
}
@@ -117,20 +125,52 @@
*/
@PostMapping("/export")
@Operation(summary = "瀵煎嚭妫�楠�")
+ @Log(title = "瀵煎嚭妫�楠�", businessType = BusinessType.EXPORT)
public void qualityInspectExport(HttpServletResponse response, QualityInspect qualityInspect) {
qualityInspectService.qualityInspectExport(response, qualityInspect);
+ }
+
+ @GetMapping("/export/weilong/{id}")
+ @Operation(summary = "瀵煎嚭浼熼緳妯＄増妫�楠岀粨鏋�")
+ @Log(title = "瀵煎嚭浼熼緳妯＄増妫�楠岀粨鏋�", businessType = BusinessType.EXPORT)
+ public void exportWeiLong(HttpServletResponse response, @PathVariable("id") Long id) {
+ qualityInspectService.exportWeiLong(response, id);
}
/**
* 鎻愪氦
*
- * @param qualityInspect
* @return
*/
+ @GetMapping("/export/baishi/{id}")
+ @Operation(summary = "瀵煎嚭鐧句簨妯＄増妫�楠岀粨鏋�")
+ @Log(title = "瀵煎嚭鐧句簨妯＄増妫�楠岀粨鏋�", businessType = BusinessType.EXPORT)
+ public void exportBaiShi(HttpServletResponse response, @PathVariable("id") Long id) {
+ qualityInspectService.exportBaiShi(response, id);
+ }
+
+ @GetMapping("/export/dali/{id}")
+ @Operation(summary = "瀵煎嚭杈惧埄妯＄増妫�楠岀粨鏋�")
+ @Log(title = "瀵煎嚭杈惧埄妯＄増妫�楠岀粨鏋�", businessType = BusinessType.EXPORT)
+ public void exportDaLi(HttpServletResponse response, @PathVariable("id") Long id) {
+ qualityInspectService.exportDaLi(response, id);
+ }
+
@PostMapping("/submit")
@Operation(summary = "鎻愪氦妫�楠�")
+ @Log(title = "鎻愪氦妫�楠�", businessType = BusinessType.OTHER)
public R<?> submit(@RequestBody QualityInspect qualityInspect) {
return R.ok(qualityInspectService.submit(qualityInspect));
+ }
+
+ /**
+ * 鎵归噺蹇�熸楠岋細鏀寔鍘熸潗鏂欐楠屻�佽繃绋嬫楠屻�佸嚭鍘傛楠�
+ */
+ @PostMapping("/batchQuickInspect")
+ @Operation(summary = "鎵归噺蹇�熸楠�")
+ @Log(title = "鎵归噺蹇�熸楠�", businessType = BusinessType.OTHER)
+ public R<?> batchQuickInspect(@RequestBody BatchQuickInspectRequest request) {
+ return qualityInspectService.batchQuickInspect(request);
}
/**
@@ -141,7 +181,18 @@
*/
@PostMapping("/down")
@Operation(summary = "涓嬭浇妫�楠�")
+ @Log(title = "涓嬭浇妫�楠�", businessType = BusinessType.OTHER)
public void down(HttpServletResponse response, @RequestBody QualityInspect qualityInspect) {
qualityInspectService.down(response, qualityInspect);
}
+
+ /**
+ * 璋冭瘯鎺ュ彛锛氬垎鏋愭ā鏉跨粨鏋�
+ */
+ @GetMapping("/analyzeTemplate")
+ @Operation(summary = "鍒嗘瀽妯℃澘缁撴瀯(璋冭瘯)")
+ public R<?> analyzeTemplate(@RequestParam String template) {
+ String templatePath = "/static/" + template + ".doc";
+ return R.ok(qualityInspectService.analyzeTemplate(templatePath));
+ }
}
--
Gitblit v1.9.3