更换报告号功能提交

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/mapper/CwProjectReportReviewMapper.java

@@ -74,5 +74,5 @@ public interface CwProjectReportReviewMapper extends BaseMapper<CwProjectReview>
      * @param replaceNumber
      * @param id
      */
-    void updateNumberById(@Param("replaceNumber") String replaceNumber, @Param("id") String id);
+    Integer updateNumberById(@Param("replaceNumber") String replaceNumber, @Param("id") String id);
 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReport/service/CwProjectReportNumberApplyService.java

@@ -328,19 +328,24 @@ public class CwProjectReportNumberApplyService extends ServiceImpl<CwProjectRepo
                                     //根据最新的replaceNumber查询该报告号是否存在
                                     ReportNoDto projectReportByNumber = reviewMapper.getProjectReportByNumber(replaceNumber);
                                     if (ObjectUtil.isEmpty(projectReportByNumber)){
-                                        numberReplaceDTO.setReplaceNo(replaceNumber);
-                                        //重新赋值
-                                        replaceDTOArrayList.add(numberReplaceDTO);
                                         //修改报告号
                                         ReportNoDto reportNoDto = reviewMapper.getProjectReportByNumber(dto.getReportNo());
                                         if (ObjectUtil.isNotEmpty(reportNoDto)){
-                                            reviewMapper.updateNumberById(replaceNumber,reportNoDto.getId());
+                                            Integer result = reviewMapper.updateNumberById(replaceNumber, reportNoDto.getId());
+                                            if(result == 1){
+                                                numberReplaceDTO.setReplaceNo(replaceNumber);
+                                            }
+                                            break;
+                                        }else{
                                             break;
                                         }
 
                                     }
                                     anInt++;
                                 } while (true);
+
+                                //重新赋值
+                                replaceDTOArrayList.add(numberReplaceDTO);
                             }
                             break;
                         case "苏兴会咨字":   //咨字
@@ -355,18 +360,24 @@ public class CwProjectReportNumberApplyService extends ServiceImpl<CwProjectRepo
                                     //根据最新的replaceNumber查询该报告号是否存在
                                     ReportNoDto projectReportByNumber = reviewMapper.getProjectReportByNumber(replaceNumber);
                                     if (ObjectUtil.isEmpty(projectReportByNumber)){
-                                        numberReplaceDTO.setReplaceNo(replaceNumber);
-                                        //重新赋值
-                                        replaceDTOArrayList.add(numberReplaceDTO);
                                         //修改报告号
                                         ReportNoDto reportNoDto = reviewMapper.getProjectReportByNumber(dto.getReportNo());
                                         if (ObjectUtil.isNotEmpty(reportNoDto)){
-                                            reviewMapper.updateNumberById(replaceNumber,reportNoDto.getId());
+                                            Integer result = reviewMapper.updateNumberById(replaceNumber, reportNoDto.getId());
+                                            if(result == 1){
+                                                numberReplaceDTO.setReplaceNo(replaceNumber);
+                                            }
+                                            break;
+                                        }else{
                                             break;
                                         }
+
                                     }
                                     anInt++;
                                 } while (true);
+
+                                //重新赋值
+                                replaceDTOArrayList.add(numberReplaceDTO);
                             }
                             break;
                         case "苏兴会审字":   //审字
@@ -381,18 +392,24 @@ public class CwProjectReportNumberApplyService extends ServiceImpl<CwProjectRepo
                                     //根据最新的replaceNumber查询该报告号是否存在
                                     ReportNoDto projectReportByNumber = reviewMapper.getProjectReportByNumber(replaceNumber);
                                     if (ObjectUtil.isEmpty(projectReportByNumber)){
-                                        numberReplaceDTO.setReplaceNo(replaceNumber);
-                                        //重新赋值
-                                        replaceDTOArrayList.add(numberReplaceDTO);
                                         //修改报告号
                                         ReportNoDto reportNoDto = reviewMapper.getProjectReportByNumber(dto.getReportNo());
                                         if (ObjectUtil.isNotEmpty(reportNoDto)){
-                                            reviewMapper.updateNumberById(replaceNumber,reportNoDto.getId());
+                                            Integer result = reviewMapper.updateNumberById(replaceNumber, reportNoDto.getId());
+                                            if(result == 1){
+                                                numberReplaceDTO.setReplaceNo(replaceNumber);
+                                            }
+                                            break;
+                                        }else{
                                             break;
                                         }
+
                                     }
                                     anInt++;
                                 } while (true);
+
+                                //重新赋值
+                                replaceDTOArrayList.add(numberReplaceDTO);
                             }
                             break;
                         case "苏兴会验字":   //验字
@@ -407,18 +424,24 @@ public class CwProjectReportNumberApplyService extends ServiceImpl<CwProjectRepo
                                     //根据最新的replaceNumber查询该报告号是否存在
                                     ReportNoDto projectReportByNumber = reviewMapper.getProjectReportByNumber(replaceNumber);
                                     if (ObjectUtil.isEmpty(projectReportByNumber)){
-                                        numberReplaceDTO.setReplaceNo(replaceNumber);
-                                        //重新赋值
-                                        replaceDTOArrayList.add(numberReplaceDTO);
                                         //修改报告号
                                         ReportNoDto reportNoDto = reviewMapper.getProjectReportByNumber(dto.getReportNo());
                                         if (ObjectUtil.isNotEmpty(reportNoDto)){
-                                            reviewMapper.updateNumberById(replaceNumber,reportNoDto.getId());
+                                            Integer result = reviewMapper.updateNumberById(replaceNumber, reportNoDto.getId());
+                                            if(result == 1){
+                                                numberReplaceDTO.setReplaceNo(replaceNumber);
+                                            }
+                                            break;
+                                        }else{
                                             break;
                                         }
+
                                     }
                                     anInt++;
                                 } while (true);
+
+                                //重新赋值
+                                replaceDTOArrayList.add(numberReplaceDTO);
                             }
                             break;
                         case "苏兴会特字":   //特字
@@ -433,18 +456,24 @@ public class CwProjectReportNumberApplyService extends ServiceImpl<CwProjectRepo
                                     //根据最新的replaceNumber查询该报告号是否存在
                                     ReportNoDto projectReportByNumber = reviewMapper.getProjectReportByNumber(replaceNumber);
                                     if (ObjectUtil.isEmpty(projectReportByNumber)){
-                                        numberReplaceDTO.setReplaceNo(replaceNumber);
-                                        //重新赋值
-                                        replaceDTOArrayList.add(numberReplaceDTO);
                                         //修改报告号
                                         ReportNoDto reportNoDto = reviewMapper.getProjectReportByNumber(dto.getReportNo());
                                         if (ObjectUtil.isNotEmpty(reportNoDto)){
-                                            reviewMapper.updateNumberById(replaceNumber,reportNoDto.getId());
+                                            Integer result = reviewMapper.updateNumberById(replaceNumber, reportNoDto.getId());
+                                            if(result == 1){
+                                                numberReplaceDTO.setReplaceNo(replaceNumber);
+                                            }
+                                            break;
+                                        }else{
                                             break;
                                         }
+
                                     }
                                     anInt++;
                                 } while (true);
+
+                                //重新赋值
+                                replaceDTOArrayList.add(numberReplaceDTO);
                             }
                             break;
                     }