bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新购接口优化

This commit is contained in:
sxu 2024-11-15 15:38:12 +08:00
parent 40b5c43c55
commit 6181dc542c
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/mapper/PurchaseCheckDetailsMapper.java
View File

@ -84,7 +84,9 @@ public interface PurchaseCheckDetailsMapper {
*/ */
int batchUpdateDetailsTaskStatus(@Param("taskId") Long taskId, @Param("newTaskStatus") Integer newTaskStatus, @Param("checkResult") String checkResult); int batchUpdateDetailsTaskStatus(@Param("taskId") Long taskId, @Param("newTaskStatus") Integer newTaskStatus, @Param("checkResult") String checkResult);
int updatePurchaseDetails(PurchaseCheckDetails details); // int updatePurchaseDetails(PurchaseCheckDetails details);
int updatePurchaseDetails4Check(PurchaseCheckDetails details);
int getCountOfNoneThisStatus(@Param("taskId") Long taskId, @Param("status") Integer status); int getCountOfNoneThisStatus(@Param("taskId") Long taskId, @Param("status") Integer status);

6
bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java
View File

@ -249,13 +249,13 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
if (!CollectionUtils.isEmpty(codeList) && codeList.size() > 0) { if (!CollectionUtils.isEmpty(codeList) && codeList.size() > 0) {
for (PurchaseCheckDetails details : codeList) { for (PurchaseCheckDetails details : codeList) {
details.setStatus(PurchaseTaskStatusEnum.TO_BIND.getStatus()); details.setStatus(PurchaseTaskStatusEnum.TO_BIND.getStatus());
updateCount += purchaseCheckDetailsMapper.updatePurchaseDetails(details); updateCount += purchaseCheckDetailsMapper.updatePurchaseDetails4Check(details);
} }
} }
if (!CollectionUtils.isEmpty(numList) && numList.size() > 0) { if (!CollectionUtils.isEmpty(numList) && numList.size() > 0) {
for (PurchaseCheckDetails details : numList) { for (PurchaseCheckDetails details : numList) {
details.setStatus(PurchaseTaskStatusEnum.TO_STORE.getStatus()); details.setStatus(PurchaseTaskStatusEnum.TO_STORE.getStatus());
updateCount += purchaseCheckDetailsMapper.updatePurchaseDetails(details); updateCount += purchaseCheckDetailsMapper.updatePurchaseDetails4Check(details);
} }
} }
// // 维护tm_task的状态，但因为新购任务中的物资可以部分流转，所以汇总的状态失去意义，不再维护 // // 维护tm_task的状态，但因为新购任务中的物资可以部分流转，所以汇总的状态失去意义，不再维护
@ -287,7 +287,7 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
} else if (MaTypeManageTypeEnum.NUMBER_DEVICE.getTypeId().equals(details.getManageType())) { } else if (MaTypeManageTypeEnum.NUMBER_DEVICE.getTypeId().equals(details.getManageType())) {
details.setStatus(PurchaseTaskStatusEnum.TO_STORE.getStatus()); details.setStatus(PurchaseTaskStatusEnum.TO_STORE.getStatus());
} }
result = purchaseCheckDetailsMapper.updatePurchaseDetails(details) > 0 ? AjaxResult.success("detail验证成功") : AjaxResult.error("details无验证信息"); result = purchaseCheckDetailsMapper.updatePurchaseDetails4Check(details) > 0 ? AjaxResult.success("detail验证成功") : AjaxResult.error("details无验证信息");
} }
// // 维护tm_task的状态，但因为新购任务中的物资可以部分流转，所以汇总的状态失去意义，不再维护 // // 维护tm_task的状态，但因为新购任务中的物资可以部分流转，所以汇总的状态失去意义，不再维护
// int count = purchaseCheckDetailsMapper.getCountOfNoneThisStatus(taskId, PurchaseTaskStatusEnum.TO_CHECK.getStatus()); // int count = purchaseCheckDetailsMapper.getCountOfNoneThisStatus(taskId, PurchaseTaskStatusEnum.TO_CHECK.getStatus());

19
bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml
View File

@ -316,11 +316,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
task_id = #{taskId} task_id = #{taskId}
</update> </update>
<update id="updatePurchaseDetails"> <!-- <update id="updatePurchaseDetails">-->
<!-- update-->
<!-- purchase_check_details-->
<!-- set-->
<!-- `status` = #{status}, check_result = #{checkResult}, check_num = purchase_num-->
<!-- where-->
<!-- 1=1-->
<!-- <if test="taskId != null">-->
<!-- and task_id = #{taskId}-->
<!-- </if>-->
<!-- <if test="typeId != null">-->
<!-- and type_id = #{typeId}-->
<!-- </if>-->
<!-- </update>-->
<update id="updatePurchaseDetails4Check">
update update
purchase_check_details purchase_check_details
set set
`status` = #{status}, check_result = #{checkResult} `status` = #{status}, check_result = #{checkResult}, check_num = purchase_num
where where
1=1 1=1
<if test="taskId != null"> <if test="taskId != null">