From 4db6b399a3810467eec3a244f98ae00d76da969c Mon Sep 17 00:00:00 2001
From: haozq <1611483981@qq.com>
Date: Fri, 15 Nov 2024 19:02:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/bases/controller/PartBackController.java     | 2 +-
 .../business/bases/controller/PartCheckController.java    | 2 +-
 .../business/bases/controller/StatisticsController.java   | 2 +-
 .../com/bonus/gzgqj/business/bases/entity/PartBackVo.java | 2 ++
 .../bonus/gzgqj/business/bases/mapper/PartBackMapper.java | 3 ++-
 .../business/bases/service/UserPartInfoServiceImpl.java   | 2 +-
 src/main/resources/mappers/bases/PartBackMapper.xml       | 8 ++++----
 src/main/resources/mappers/bases/UserPartInfoMapper.xml   | 2 +-
 8 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/bonus/gzgqj/business/bases/controller/PartBackController.java b/src/main/java/com/bonus/gzgqj/business/bases/controller/PartBackController.java
index 89f64d5..0fd3fa8 100644
--- a/src/main/java/com/bonus/gzgqj/business/bases/controller/PartBackController.java
+++ b/src/main/java/com/bonus/gzgqj/business/bases/controller/PartBackController.java
@@ -90,7 +90,7 @@ public class PartBackController {
      * @return
      */
     @GetMapping("getInfoDetailsList")
-    @DecryptAndVerify(decryptedClass = PartBackVo.class)
+    @DecryptAndVerify(decryptedClass = PartBackDetailsVo.class)
     public PageInfo<PartBackDetailsVo> getInfoDetailsList(EncryptedReq<PartBackDetailsVo> dto) {
         PageHelper.startPage(dto.getPageNum(),dto.getPageSize());
         List<PartBackDetailsVo> list = service.getInfoDetailsList(dto.getData());;
diff --git a/src/main/java/com/bonus/gzgqj/business/bases/controller/PartCheckController.java b/src/main/java/com/bonus/gzgqj/business/bases/controller/PartCheckController.java
index c78e31c..cf34d20 100644
--- a/src/main/java/com/bonus/gzgqj/business/bases/controller/PartCheckController.java
+++ b/src/main/java/com/bonus/gzgqj/business/bases/controller/PartCheckController.java
@@ -80,7 +80,7 @@ public class PartCheckController {
      * @return
      */
     @GetMapping("getDetailsByIdList")
-    @DecryptAndVerify(decryptedClass = PartCheckVo.class)
+    @DecryptAndVerify(decryptedClass = PartCheckDetailsVo.class)
     public PageInfo<PartCheckDetailsVo> getDetailsByIdList(EncryptedReq<PartCheckDetailsVo> dto) {
         PageHelper.startPage(dto.getPageNum(),dto.getPageSize());
        List<PartCheckDetailsVo> list = service.getDetailsByIdList(dto.getData());;
diff --git a/src/main/java/com/bonus/gzgqj/business/bases/controller/StatisticsController.java b/src/main/java/com/bonus/gzgqj/business/bases/controller/StatisticsController.java
index 61a914e..e55e731 100644
--- a/src/main/java/com/bonus/gzgqj/business/bases/controller/StatisticsController.java
+++ b/src/main/java/com/bonus/gzgqj/business/bases/controller/StatisticsController.java
@@ -152,7 +152,7 @@ public class StatisticsController {
      * @return
      */
     @GetMapping("getProDetailsPage")
-    @DecryptAndVerify(decryptedClass = ProjectInfoVo.class)
+    @DecryptAndVerify(decryptedClass = PartApplyDetailAppVo.class)
     public PageInfo<PartApplyDetailAppVo> getProDetailsPage(EncryptedReq<PartApplyDetailAppVo> dto) {
         PageHelper.startPage(dto.getPageNum(),dto.getPageSize());
         List<PartApplyDetailAppVo> list = service.getProDetailsPage(dto.getData());;
diff --git a/src/main/java/com/bonus/gzgqj/business/bases/entity/PartBackVo.java b/src/main/java/com/bonus/gzgqj/business/bases/entity/PartBackVo.java
index 49e6b2a..0e84678 100644
--- a/src/main/java/com/bonus/gzgqj/business/bases/entity/PartBackVo.java
+++ b/src/main/java/com/bonus/gzgqj/business/bases/entity/PartBackVo.java
@@ -93,4 +93,6 @@ public class PartBackVo {
     private List<FileUploadVo> fileList;
 
     private String infoMsg;
+
+    private String status;
 }
diff --git a/src/main/java/com/bonus/gzgqj/business/bases/mapper/PartBackMapper.java b/src/main/java/com/bonus/gzgqj/business/bases/mapper/PartBackMapper.java
index cc52d0b..e9ccf8b 100644
--- a/src/main/java/com/bonus/gzgqj/business/bases/mapper/PartBackMapper.java
+++ b/src/main/java/com/bonus/gzgqj/business/bases/mapper/PartBackMapper.java
@@ -3,6 +3,7 @@ package com.bonus.gzgqj.business.bases.mapper;
 import com.bonus.gzgqj.business.bases.entity.PartBackDetailsVo;
 import com.bonus.gzgqj.business.bases.entity.PartBackVo;
 import com.bonus.gzgqj.business.bases.entity.UserPatypeInfo;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
@@ -41,7 +42,7 @@ public interface PartBackMapper {
      */
     int insertBack(PartBackVo vo);
 
-    int insertBackDetails(PartBackVo vo, List<PartBackDetailsVo> list);
+    int insertBackDetails(@Param("param") PartBackVo vo, @Param("list") List<PartBackDetailsVo> list);
 
     /**
      * 分页查询 退料数据
diff --git a/src/main/java/com/bonus/gzgqj/business/bases/service/UserPartInfoServiceImpl.java b/src/main/java/com/bonus/gzgqj/business/bases/service/UserPartInfoServiceImpl.java
index aa6bb38..8133e56 100644
--- a/src/main/java/com/bonus/gzgqj/business/bases/service/UserPartInfoServiceImpl.java
+++ b/src/main/java/com/bonus/gzgqj/business/bases/service/UserPartInfoServiceImpl.java
@@ -67,7 +67,7 @@ public class UserPartInfoServiceImpl {
                 user.setPartId(vo.getPartId());
                 user.setUserId(userId);
                 UserPatypeInfo info=mapper.getInfo(user);
-                info.setGhNum(info.getGhNum()+vo.getBackNum());
+                user.setGhNum(info.getGhNum()+vo.getBackNum());
                 mapper.updateBackData(user);
             }
         }
diff --git a/src/main/resources/mappers/bases/PartBackMapper.xml b/src/main/resources/mappers/bases/PartBackMapper.xml
index cb403c7..aaa9ed0 100644
--- a/src/main/resources/mappers/bases/PartBackMapper.xml
+++ b/src/main/resources/mappers/bases/PartBackMapper.xml
@@ -3,7 +3,7 @@
 <mapper namespace="com.bonus.gzgqj.business.bases.mapper.PartBackMapper" >
 
     <select id="findByPage" resultType="com.bonus.gzgqj.business.bases.entity.PartBackVo">
-        select tpb.id,    tpb.code,   tpb.creator,pu.TELPHONE phone ,tpb.back_num backNum,tpb.user_name userName
+        select tpb.id,    tpb.code,   tpb.creator,pu.TELPHONE phone ,tpb.back_num backNum,tpb.user_name userName,
                tpb.back_day backDay,  tpb.create_time createTime,    tpb.type,    tpb.remark,
                tpb.status,    tpb.updater,     tpb.update_time  updateTime,     tpb.create_id createId
         from t_part_back tpb
@@ -52,8 +52,8 @@
         select
             user_id userId,  part_id partId,part_type partType,
             part_name partName,   part_model partModel,
-            ly_num lyNum,  gh_num ghNum, user_name userName,part_unit  partUnit
-        from tb_user_pa_type_info ppd  where user_id=#{userId}
+            (ly_num-gh_num) lyNum , user_name userName,part_unit  partUnit
+        from tb_user_pa_type_info ppd  where user_id=#{userId} AND   (ly_num-gh_num)>0
         <if test="partType!=null and partType!=''">
             and  ppd.part_type like concat('%',#{partType},'%')
         </if>
@@ -87,7 +87,7 @@
             </if>
     </select>
     <select id="getInfoDetails" resultType="com.bonus.gzgqj.business.bases.entity.PartBackVo">
-        select tpb.id,    tpb.code,   tpb.creator,pu.TELPHONE phone ,tpb.back_num backNum,tpb.user_name userName
+        select tpb.id,    tpb.code,   tpb.creator,pu.TELPHONE phone ,tpb.back_num backNum,tpb.user_name userName,
             tpb.back_day backDay,  tpb.create_time createTime,    tpb.type,    tpb.remark,
                tpb.status,    tpb.updater,     tpb.update_time  updateTime,     tpb.create_id createId
         from t_part_back tpb
diff --git a/src/main/resources/mappers/bases/UserPartInfoMapper.xml b/src/main/resources/mappers/bases/UserPartInfoMapper.xml
index 09746d6..9622c33 100644
--- a/src/main/resources/mappers/bases/UserPartInfoMapper.xml
+++ b/src/main/resources/mappers/bases/UserPartInfoMapper.xml
@@ -10,7 +10,7 @@
                 where user_id=#{userId}  and  part_id=#{partId}
     </update>
     <update id="updateBackData">
-        update   tb_user_pa_type_info set gh_num=#{gh_num}
+        update   tb_user_pa_type_info set gh_num=#{ghNum}
         where user_id=#{userId}  and  part_id=#{partId}
 
     </update>