From b80fffb8f7444475236ab92de11defeb21f1b473 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Mon, 17 Feb 2025 09:14:57 +0800
Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E6=B3=A8?=
 =?UTF-8?q?=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/req/dev/DeviceRepairApplyDetailDiagnosisParam.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/glxp/api/req/dev/DeviceRepairApplyDetailDiagnosisParam.java b/src/main/java/com/glxp/api/req/dev/DeviceRepairApplyDetailDiagnosisParam.java
index 5daeb6725..1a0564449 100644
--- a/src/main/java/com/glxp/api/req/dev/DeviceRepairApplyDetailDiagnosisParam.java
+++ b/src/main/java/com/glxp/api/req/dev/DeviceRepairApplyDetailDiagnosisParam.java
@@ -22,9 +22,9 @@ public class DeviceRepairApplyDetailDiagnosisParam {
     @NotBlank(message = "诊断信息不能为空")
     String diagnosisInfo;
 
-    String diagnosisLivePath;
+    String diagnosisLivePath;//现场图片路径
 
-    Boolean innerFlag;
+    Boolean innerFlag;//是否需要维修
 
     Long repairUserId;
 

From 7962389b62d5ecb53467c87d13268698bdfd1030 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Mon, 17 Feb 2025 11:15:11 +0800
Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/controller/purchase/PurApplyController.java  | 8 +++++---
 .../api/service/dev/impl/DeviceRepairServiceImpl.java     | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java
index e04849ab0..aa719956b 100644
--- a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java
+++ b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java
@@ -456,8 +456,7 @@ public class PurApplyController {
     public BaseResponse detailList(PurApplyDetailRequest purApplyDetailRequest) {
 
         List<PurOrderDetailResponse> purApplyDetailEntities = purApplyDetailService.joinQueryList(purApplyDetailRequest);
-        PageInfo<PurOrderDetailResponse> pageInfo;
-        pageInfo = new PageInfo<>(purApplyDetailEntities);
+        PageInfo<PurOrderDetailResponse> pageInfo  = new PageInfo<>(purApplyDetailEntities);
         PageSimpleResponse<PurOrderDetailResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(purApplyDetailEntities);
@@ -475,7 +474,10 @@ public class PurApplyController {
     public BaseResponse getDetailList(PurApplyDetailRequest purApplyDetailRequest) {
         List<PurOrderDetailResponse> list = purApplyDetailService.getDetailList(purApplyDetailRequest);
         PageInfo<PurOrderDetailResponse> pageInfo = new PageInfo<>(list);
-        return ResultVOUtils.page(pageInfo);
+        PageSimpleResponse<PurOrderDetailResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(list);
+        return ResultVOUtils.success(pageSimpleResponse);
     }
 
     /**
diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairServiceImpl.java
index 22d1578dc..ea72b557f 100644
--- a/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairServiceImpl.java
@@ -85,7 +85,7 @@ public class DeviceRepairServiceImpl extends ServiceImpl<DeviceRepairMapper, Dev
                 .set(DeviceRepairEntity::getServiceLivePath, deviceRepairEntity.getServiceLivePath())
                 .set(DeviceRepairEntity::getUpdateTime,LocalDateTime.now())
                 .eq(DeviceRepairEntity::getId, repairId)
-                .eq(DeviceRepairEntity::getCreateUserId, user.getId())
+//                .eq(DeviceRepairEntity::getCreateUserId, user.getId())
                 .eq(DeviceRepairEntity::getFinishFlag, false)
         );
         if (updated && entity.getApplyId() != null) {

From c011c43435af8ebf25f35b5066743adc3327e32b Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Mon, 17 Feb 2025 11:23:28 +0800
Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/mapper/purchase/PurApplyDetailDao.xml      | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml b/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml
index 2eb8e3053..7229f04c5 100644
--- a/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml
+++ b/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml
@@ -118,7 +118,15 @@
     </insert>
 
     <select id="selectPurApplyDetailList" resultType="com.glxp.api.res.purchase.PurOrderDetailResponse">
-        SELECT pur_apply_detail.*,
+        SELECT
+        pur_apply_detail.id,
+        pur_apply_detail.orderIdFk,
+        pur_apply_detail.productId,
+        pur_apply_detail.productName,
+        pur_apply_detail.count,
+        pur_apply_detail.supId,
+        pur_apply_detail.zczbhhzbapzbh,
+        pur_apply_detail.destinyId,
                pur_apply.billNo,
                basic_products.ggxh spec,
                basic_products.nameCode,

From 4d471322d2574ce69c6f8aa648887a5ed904e93e Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Tue, 25 Feb 2025 11:08:15 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BC=98=E5=85=88=E5=90=8D=E5=AD=97=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mybatis/mapper/inv/invProductDao.xml       | 2 +-
 src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mybatis/mapper/inv/invProductDao.xml b/src/main/resources/mybatis/mapper/inv/invProductDao.xml
index 5498a5690..48b5fad2b 100644
--- a/src/main/resources/mybatis/mapper/inv/invProductDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/invProductDao.xml
@@ -117,7 +117,7 @@
             </if>
         </where>
         GROUP BY ip.relIdFk, ip.batchNo, ip.supId, ip.price
-        order by ip.updateTime desc
+        order by bp.cpmctymc,ip.updateTime desc
     </select>
 
     <select id="stockStatistics" resultType="com.glxp.api.res.inv.InvProductResponse">
diff --git a/src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml b/src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml
index 0ed90fdb3..8580b4086 100644
--- a/src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml
@@ -84,7 +84,7 @@
             </if>
         </where>
         GROUP BY ipp.relId, ipp.batchNo
-        order by ipp.updateTime desc
+        order by bp.cpmctymc,ipp.updateTime desc
     </select>
 
     <select id="filterInvProductDetailList" resultType="com.glxp.api.entity.inv.InvProductDetailEntity"