Преглед изворни кода

修改bug:
应付账款,业务员账户,银行卡驳回重新提交之后,审核不通过这里不显示了

jiakai пре 3 месеци
родитељ
комит
e1e821b493

+ 13 - 8
tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserServiceImpl.java

@@ -889,13 +889,18 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                         .eq(SysUserJzgInfoBankCard::getUserInfoId, sysUserJzgInfo.getId())
                         .eq(SysUserJzgInfoBankCard::getSystemCode, systemCode)
                         .eq(SysUserJzgInfoBankCard::getAuditStatus, 2));
+        // 重新提交需要再多加一条数据,不能修改原来那条数据的状态,原来那条数据不能动
         if (rejectBankCard != null) {
-            sysUserJzgInfoBankCardVo.setId(rejectBankCard.getId());
-            BeanUtils.copyProperties(sysUserJzgInfoBankCardVo, rejectBankCard);
-
-            rejectBankCard.setFileId(fileId);
-            rejectBankCard.setAuditStatus(0);
-            rejectBankCard.setSystemCode(systemCode);
+            SysUserJzgInfoBankCard sysUserJzgInfoBankCard = BeanUtil.copyProperties(rejectBankCard, SysUserJzgInfoBankCard.class);
+
+            sysUserJzgInfoBankCard.setId(IdGenerate.nextId());
+            sysUserJzgInfoBankCard.setFileId(fileId);
+            sysUserJzgInfoBankCard.setAuditStatus(0);
+            sysUserJzgInfoBankCard.setSystemCode(systemCode);
+            // 审核时间、审核人要设置为空
+            sysUserJzgInfoBankCard.setRemark(null);
+            sysUserJzgInfoBankCard.setAuditBy(null);
+            sysUserJzgInfoBankCard.setAuditTime(null);
             // 设置为默认卡
             if (sysUserJzgInfoBankCardVo.isDefault()) {
                 List<SysUserJzgInfoBankCard> defaultList = sysUserJzgInfoBankCardService
@@ -905,11 +910,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                     card.setDefault(false);
                     sysUserJzgInfoBankCardService.updateById(card);
                 }
-                rejectBankCard.setDefault(true);
+                sysUserJzgInfoBankCard.setDefault(true);
             }
 
             // 更新驳回的银行卡
-            sysUserJzgInfoBankCardService.updateById(rejectBankCard);
+            sysUserJzgInfoBankCardService.save(sysUserJzgInfoBankCard);
             // 添加重新提交记录
             SysUserJzgInfoBankCardRecord record = new SysUserJzgInfoBankCardRecord(rejectBankCard.getId(), "驳回后重新提交");
             record.setStatus("0");