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 getInfoDetailsList(EncryptedReq dto) { PageHelper.startPage(dto.getPageNum(),dto.getPageSize()); List 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 getDetailsByIdList(EncryptedReq dto) { PageHelper.startPage(dto.getPageNum(),dto.getPageSize()); List 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 getProDetailsPage(EncryptedReq dto) { PageHelper.startPage(dto.getPageNum(),dto.getPageSize()); List 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 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 list); + int insertBackDetails(@Param("param") PartBackVo vo, @Param("list") List 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 @@