From 0ae08310fefc08031cb4f08a2f6b93f9e9d781cc Mon Sep 17 00:00:00 2001
From: wenwj <‘1106994300@qq.com>
Date: 星期一, 14 四月 2025 13:00:15 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanMapper.xml | 4 ++--
aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsGasPipingPlanController.java | 12 ++++++------
aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanController.java | 11 ++++++-----
aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartRouteStatController.java | 8 ++++----
aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanTempController.java | 2 +-
5 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartRouteStatController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartRouteStatController.java
index bb687d3..29ae807 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartRouteStatController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartRouteStatController.java
@@ -38,7 +38,7 @@
/**
* 鏌ヨ闆朵欢缁熻琛ㄥ垪琛�
*/
- @RequiresPermissions("ApsPartRouteStat:ApsPartRouteStat:list")
+ @RequiresPermissions("apsPartRouteStat:list")
@GetMapping("/list")
public TableDataInfo list(ApsPartRouteStat apsPartRouteStat)
{
@@ -63,7 +63,7 @@
/**
* 鑾峰彇闆朵欢缁熻琛ㄨ缁嗕俊鎭�
*/
- @RequiresPermissions("ApsPartRouteStat:ApsPartRouteStat:query")
+ @RequiresPermissions("apsPartRouteStat:query")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id)
{
@@ -73,7 +73,7 @@
/**
* 鏂板闆朵欢缁熻琛�
*/
- @RequiresPermissions("ApsPartRouteStat:ApsPartRouteStat:add")
+ @RequiresPermissions("apsPartRouteStat:add")
@Log(title = "闆朵欢缁熻琛�", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ApsPartRouteStat apsPartRouteStat)
@@ -93,7 +93,7 @@
/**
* 鍒犻櫎闆朵欢缁熻琛�
*/
- @RequiresPermissions("ApsPartRouteStat:ApsPartRouteStat:remove")
+ @RequiresPermissions("apsPartRouteStat:remove")
@Log(title = "闆朵欢缁熻琛�", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanController.java
index 308fb5e..e1b9694 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanController.java
@@ -29,7 +29,7 @@
* @date 2025-04-08
*/
@RestController
-@RequestMapping("/ApsPlatePlan")
+@RequestMapping("/apsPlatePlan")
public class ApsPlatePlanController extends BaseController {
@Autowired
private IApsPlatePlanService apsPlatePlanService;
@@ -38,7 +38,7 @@
/**
* 鏌ヨ閽ｉ噾璁″垝绠＄悊鍒楄〃
*/
- @RequiresPermissions("ApsPlatePlan:ApsPlatePlan:list")
+ @RequiresPermissions("apsPlatePlan:list")
@GetMapping("/list")
public TableDataInfo list(ApsPlatePlan apsPlatePlan) {
//startPage();
@@ -63,7 +63,7 @@
/**
* 瀵煎嚭閽ｉ噾璁″垝绠＄悊鍒楄〃
*/
-// @RequiresPermissions("ApsPlatePlan:ApsPlatePlan:export")
+ @RequiresPermissions("apsPlatePlan:export")
@Log(title = "閽ｉ噾璁″垝绠＄悊", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ApsPlatePlan apsPlatePlan) {
@@ -123,7 +123,7 @@
/**
* 淇敼閽ｉ噾璁″垝绠＄悊
*/
-// @RequiresPermissions("ApsPlatePlan:ApsPlatePlan:edit")
+ @RequiresPermissions("apsPlatePlan:edit")
@Log(title = "閽ｉ噾璁″垝绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ApsPlatePlan apsPlatePlan) {
@@ -146,6 +146,7 @@
* @return
* @throws Exception
*/
+ @RequiresPermissions("apsPlatePlan:import")
@PostMapping("/importData")
public AjaxResult importData(MultipartFile file) throws Exception {
ExcelUtil<ApsPlatePlanTemp> util = new ExcelUtil<ApsPlatePlanTemp>(ApsPlatePlanTemp.class);
@@ -163,7 +164,7 @@
* @param planTemp 鍖呭惈閮ㄥ垎璁″垝淇℃伅鐨勪复鏃跺璞★紝鐢ㄤ簬纭璁″垝
* @return 杩斿洖鎿嶄綔缁撴灉鐨凙jaxResult瀵硅薄
*/
- @GetMapping("/confirmPart")
+ @PostMapping("/confirmPart")
public AjaxResult confirmPart(ApsPlatePlanTemp planTemp) {
return toAjax(apsPlatePlanService.confirmPlan(planTemp));
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanTempController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanTempController.java
index 7d62aa7..2bae436 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanTempController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanTempController.java
@@ -29,7 +29,7 @@
* @date 2025-04-08
*/
@RestController
-@RequestMapping("/ApsPlatePlanTemp")
+@RequestMapping("/apsPlatePlanTemp")
public class ApsPlatePlanTempController extends BaseController
{
@Autowired
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsGasPipingPlanController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsGasPipingPlanController.java
index 921ea13..aa886be 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsGasPipingPlanController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsGasPipingPlanController.java
@@ -39,7 +39,7 @@
/**
* 鏌ヨ姘斾綋绠¤矾璁″垝绠＄悊鍒楄〃
*/
- @RequiresPermissions("gasPiping:gasPiping:list")
+ @RequiresPermissions("gasPiping:list")
@GetMapping("/list")
public TableDataInfo list(ApsGasPipingPlan apsGasPipingPlan)
{
@@ -65,7 +65,7 @@
/**
* 瀵煎嚭姘斾綋绠¤矾璁″垝绠＄悊鍒楄〃
*/
- @RequiresPermissions("gasPiping:gasPiping:export")
+ @RequiresPermissions("gasPiping:export")
@Log(title = "姘斾綋绠¤矾璁″垝绠＄悊", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ApsGasPipingPlan apsGasPipingPlan)
@@ -105,7 +105,7 @@
/**
* 鑾峰彇姘斾綋绠¤矾璁″垝绠＄悊璇︾粏淇℃伅
*/
- @RequiresPermissions("gasPiping:gasPiping:query")
+ @RequiresPermissions("gasPiping:query")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id)
{
@@ -115,7 +115,7 @@
/**
* 鏂板姘斾綋绠¤矾璁″垝绠＄悊
*/
- @RequiresPermissions("gasPiping:gasPiping:add")
+ @RequiresPermissions("gasPiping:add")
@Log(title = "姘斾綋绠¤矾璁″垝绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ApsGasPipingPlan apsGasPipingPlan)
@@ -126,7 +126,7 @@
/**
* 淇敼姘斾綋绠¤矾璁″垝绠＄悊
*/
- @RequiresPermissions("gasPiping:gasPiping:edit")
+ @RequiresPermissions("gasPiping:edit")
@Log(title = "姘斾綋绠¤矾璁″垝绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ApsGasPipingPlan apsGasPipingPlan)
@@ -137,7 +137,7 @@
/**
* 鍒犻櫎姘斾綋绠¤矾璁″垝绠＄悊
*/
- @RequiresPermissions("gasPiping:gasPiping:remove")
+ @RequiresPermissions("gasPiping:remove")
@Log(title = "姘斾綋绠¤矾璁″垝绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids)
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanMapper.xml
index 99a5f42..5decb6a 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanMapper.xml
@@ -54,9 +54,9 @@
<if test="weekCycle != null and weekCycle != ''"> and week_cycle like concat('%', #{weekCycle}, '%')</if>
<if test="mainPartNumber != null and mainPartNumber != ''"> and main_part_number like concat('%', #{mainPartNumber}, '%')</if>
<if test="mainPartDrawingNumber != null and mainPartDrawingNumber != ''"> and main_part_drawing_number like concat('%', #{mainPartDrawingNumber}, '%')</if>
- <if test="customer != null and customer != ''"> and customer like concat('%', #{customer}, '%')</if>
+ <if test="customer != null and customer != ''"> and customer like '%' || #{customer} || '%'</if>
<if test="businessType != null and businessType != ''"> and business_type = #{businessType}</if>
- <if test="documentNumber != null and documentNumber != ''"> and document_number like concat('%', #{documentNumber}, '%')</if>
+ <if test="documentNumber != null and documentNumber != ''"> and document_number like '%'|| #{documentNumber}|| '%'</if>
<if test="requirementType != null and requirementType != ''"> and requirement_type like concat('%', #{requirementType}, '%')</if>
<if test="documentStatus != null and documentStatus != ''"> and document_status = #{documentStatus}</if>
<if test="itemNumber != null and itemNumber != ''"> and item_number like concat('%', #{itemNumber}, '%')</if>
--
Gitblit v1.9.3