From f8b044e9cda85e4bf08ac61ca0c3d9b170cc84e1 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Fri, 25 Nov 2022 17:41:18 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E5=BA=93=E5=AD=98=E5=85=BB?=
 =?UTF-8?q?=E6=8A=A4=E8=AE=B0=E5=BD=95=E5=92=8C=E8=AF=A6=E6=83=85=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventory/InvMAOrderDetailController.java |  4 +-
 .../inventory/InvMAOrderDetailResponse.java   | 15 +++++++
 .../impl/InvMAOrderDetailServiceImpl.java     |  2 +-
 .../inventory/impl/InvMAOrderServiceImpl.java |  2 +-
 .../inventory/InvMaintenanceOrderDao.xml      | 12 +++---
 .../InvMaintenanceOrderDetailDao.xml          | 42 +++++++++++--------
 6 files changed, 50 insertions(+), 27 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvMAOrderDetailController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvMAOrderDetailController.java
index 366b86e6..3e905834 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvMAOrderDetailController.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvMAOrderDetailController.java
@@ -45,7 +45,7 @@ public class InvMAOrderDetailController {
         PageSimpleResponse<InvMAOrderDetailResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
         pageSimpleResponse.setList(pageInfo.getList());
-        return ResultVOUtils.success();
+        return ResultVOUtils.success(pageSimpleResponse);
     }
 
     /**
@@ -55,7 +55,7 @@ public class InvMAOrderDetailController {
      * @param bindingResult
      * @return
      */
-    @PostMapping("/inv/MA/order/detail/addOrderDetail")
+    @PostMapping(" /inv/MA/order/detail/addOrderDetail")
     public BaseResponse addOrderDetail(@RequestBody InvMaintenanceOrderDetailEntity invMaintenanceOrderDetailEntity, BindingResult bindingResult) {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvMAOrderDetailResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvMAOrderDetailResponse.java
index 539eed0f..1dc36119 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvMAOrderDetailResponse.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvMAOrderDetailResponse.java
@@ -14,4 +14,19 @@ public class InvMAOrderDetailResponse extends InvMaintenanceOrderDetailEntity {
      */
     private String productName;
 
+    /**
+     * 规格型号
+     */
+    private String ggxh;
+
+    /**
+     * 注册/备案凭证号
+     */
+    private String zczbhhzbapzbh;
+
+    /**
+     * 生产厂家
+     */
+    private String ylqxzcrbarmc;
+
 }
diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvMAOrderDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvMAOrderDetailServiceImpl.java
index acf910c9..08d4e42e 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvMAOrderDetailServiceImpl.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvMAOrderDetailServiceImpl.java
@@ -44,7 +44,7 @@ public class InvMAOrderDetailServiceImpl implements InvMAOrderDetailService {
         if (null == filterInvMAOrderDetailRequest) {
             return Collections.emptyList();
         }
-        if (null == filterInvMAOrderDetailRequest.getPage() && null == filterInvMAOrderDetailRequest.getLimit()) {
+        if (null != filterInvMAOrderDetailRequest.getPage() && null != filterInvMAOrderDetailRequest.getLimit()) {
             PageHelper.offsetPage((filterInvMAOrderDetailRequest.getPage() - 1) * filterInvMAOrderDetailRequest.getLimit(), filterInvMAOrderDetailRequest.getLimit());
         }
         return invMAOrderDetailDao.filterList(filterInvMAOrderDetailRequest);
diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvMAOrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvMAOrderServiceImpl.java
index 82022af4..cbd3cbc3 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvMAOrderServiceImpl.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvMAOrderServiceImpl.java
@@ -68,7 +68,7 @@ public class InvMAOrderServiceImpl implements InvMAOrderService {
         //设置状态为草稿
         invMaintenanceOrder.setStatus(0);
         invMAOrderDao.insert(invMaintenanceOrder);
-        return ResultVOUtils.success(invMaintenanceOrder.getOrderId());
+        return ResultVOUtils.success(invMaintenanceOrder);
     }
 
     @Override
diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvMaintenanceOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvMaintenanceOrderDao.xml
index 6251a0f8..daf7eaf7 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvMaintenanceOrderDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvMaintenanceOrderDao.xml
@@ -195,22 +195,22 @@
                  left join inv_space on ma.invSpaceCode = inv_space.code
         <where>
             <if test="id != null">
-                AND id = #{id}
+                AND ma.id = #{id}
             </if>
             <if test="orderId != null and orderId != ''">
-                AND orderId = #{orderId}
+                AND ma.orderId = #{orderId}
             </if>
             <if test="invWarehouseCode != null and invWarehouseCode != ''">
-                AND invWarehouseCode = #{invWarehouseCode}
+                AND ma.invWarehouseCode = #{invWarehouseCode}
             </if>
             <if test="invSpaceCode != null and invSpaceCode != ''">
-                AND invSpaceCode = #{invSpaceCode}
+                AND ma.invSpaceCode = #{invSpaceCode}
             </if>
             <if test="status != null">
-                AND status = #{status}
+                AND ma.status = #{status}
             </if>
         </where>
-        order by updateTime desc
+        order by ma.updateTime desc
     </select>
 
     <select id="selectByOrderId" resultMap="BaseResultMap">
diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvMaintenanceOrderDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvMaintenanceOrderDetailDao.xml
index 3a2cc3b1..681f72b2 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvMaintenanceOrderDetailDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvMaintenanceOrderDetailDao.xml
@@ -201,27 +201,35 @@
     </select>
 
     <select id="filterList" resultType="com.glxp.api.admin.res.inventory.InvMAOrderDetailResponse">
-        select mad.id,
-               orderIdFk,
-               code,
-               productId,
-               nameCode,
-               batchNo,
-               produceDate,
-               expireDate,
-               count,
-               maintenanceStatus,
-               deviceStatus,
-               remark,
-               basic_products.cpmctymc productName
-        from inv_maintenance_order_detail mad
-                 left join basic_udirel on mad.productId = basic_udirel.id
-                 left join basic_products on basic_products.uuid = basic_udirel.uuid
+        SELECT mad.id,
+               mad.orderIdFk,
+               mad.CODE,
+               mad.productId,
+               mad.nameCode,
+               mad.batchNo,
+               mad.produceDate,
+               mad.expireDate,
+               mad.count,
+               mad.maintenanceStatus,
+               mad.deviceStatus,
+               mad.remark,
+               basic_products.cpmctymc productName,
+               ip.ggxh,
+               basic_products.zczbhhzbapzbh,
+               basic_products.ylqxzcrbarmc
+        FROM inv_maintenance_order_detail mad
+                 left join inv_maintenance_order ma on mad.orderIdFk = ma.orderId
+                 LEFT JOIN basic_udirel ON mad.productId = basic_udirel.id
+                 LEFT JOIN basic_products ON basic_products.uuid = basic_udirel.uuid
+                 left join inv_product_detail ipd on ipd.productIdFk = mad.productId
+            and ipd.invWarehouseCode = ma.invWarehouseCode and ipd.invSpaceCode = ma.invSpaceCode
+                 left join inv_product ip on ipd.productIdFk = ip.relIdFk and ip.batchNo = ipd.batchNo
         <where>
             <if test="orderIdFk != null and orderIdFk != ''">
-                AND orderIdFk = #{orderIdFk}
+                AND mad.orderIdFk = #{orderIdFk}
             </if>
         </where>
+        group by mad.code
     </select>
 
     <select id="selectByOrderIdAndCode" resultMap="BaseResultMap">