--no commit message

com.zrqx.newbook/src/main/java/com/zrqx/newbook/bg/service/subject/SelectedSubjectServiceImpl.java

@@ -548,46 +548,37 @@ public class SelectedSubjectServiceImpl extends BaseServiceImpl<SelectedSubject,
     private void saveThriceAuditDetails(SelectedSubject subject, String principal, String principalName,Copyright copyright) {
         ThriceAudit thriceAudit = new ThriceAudit();
         thriceAudit.setSubjectNum(subject.getSubjectNum());
+        thriceAudit.setBookType("1");
         List<ThriceAudit> list = thriceAuditMapper.select(thriceAudit);
-        if (ArrayUtils.empty(list)){
-            BeanUtils.copyProperties(subject, thriceAudit, "id");
-            thriceAudit.setStatus(ThriceAuditEnum.PENDING_PERFECT.getCode());
-            thriceAudit.setPrincipal(principal);
-            thriceAudit.setPricipalName(principalName);
-            thriceAudit.setCreateTime(new Date());
-            thriceAudit.setCreater(subject.getCreater());
-            thriceAudit.setBookType(BookTypeEnum.NEW_BOOK.getCode());
-            thriceAudit.setIncludeTime(subject.getSubjectNum());
-            thriceAudit.setWordCount(subject.getEstimatWordCount());
-            thriceAudit.setPrice(subject.getEstimatPrice());
-            //thriceAudit.setPrintNUm(subject.getEstimatStampCount());
-            thriceAudit.setSeriesOfBooksAuthor(subject.getSerialDutyName());
-            thriceAudit.setCnmarcName(subject.getSeriesName());
-            if (copyright != null){
-                thriceAudit.setProjectName(copyright.getProjectName());
-            }
-            Integer auditId = auditManage.save(thriceAudit);
-            if (auditId == null) {
-                throw new BaseException(
-                        NBErrorEnum.SAVE_AUDIT_FAILED.getErrNum(),
-                        NBErrorEnum.SAVE_AUDIT_FAILED.getErrMsg()
-                );
-            }
-            this.saveThriceAuditLog(subject.getSubjectNum(), auditId);
-        }else{
-            ThriceAudit audit = list.get(0);
-            BeanUtils.copyProperties(subject,audit,"id");
-            audit.setStatus("2-1");//三审列表状态为待完善
-            Integer auditId = auditManage.update(audit);
-            if (auditId == null) {
-                throw new BaseException(
-                        NBErrorEnum.SAVE_AUDIT_FAILED.getErrNum(),
-                        NBErrorEnum.SAVE_AUDIT_FAILED.getErrMsg()
-                );
-            }
-            this.saveThriceAuditLog(subject.getSubjectNum(), auditId);
+        if (ArrayUtils.isNotEmpty(list)){
+            list.forEach(v ->{
+                thriceAuditMapper.delete(v);
+            });
+        }
+        BeanUtils.copyProperties(subject, thriceAudit, "id");
+        thriceAudit.setStatus(ThriceAuditEnum.PENDING_PERFECT.getCode());
+        thriceAudit.setPrincipal(principal);
+        thriceAudit.setPricipalName(principalName);
+        thriceAudit.setCreateTime(new Date());
+        thriceAudit.setCreater(subject.getCreater());
+        thriceAudit.setBookType(BookTypeEnum.NEW_BOOK.getCode());
+        thriceAudit.setIncludeTime(subject.getSubjectNum());
+        thriceAudit.setWordCount(subject.getEstimatWordCount());
+        thriceAudit.setPrice(subject.getEstimatPrice());
+        //thriceAudit.setPrintNUm(subject.getEstimatStampCount());
+        thriceAudit.setSeriesOfBooksAuthor(subject.getSerialDutyName());
+        thriceAudit.setCnmarcName(subject.getSeriesName());
+        if (copyright != null){
+            thriceAudit.setProjectName(copyright.getProjectName());
+        }
+        Integer auditId = auditManage.save(thriceAudit);
+        if (auditId == null) {
+            throw new BaseException(
+                    NBErrorEnum.SAVE_AUDIT_FAILED.getErrNum(),
+                    NBErrorEnum.SAVE_AUDIT_FAILED.getErrMsg()
+            );
         }
-
+        this.saveThriceAuditLog(subject.getSubjectNum(), auditId);
     }
 
     /**
@@ -611,6 +602,10 @@ public class SelectedSubjectServiceImpl extends BaseServiceImpl<SelectedSubject,
     }
 
     private boolean saveFinancial(SelectedSubject subject) {
+        List<Financial> list = financialManage.getBySubjectNum(subject.getSubjectNum());
+        if (ArrayUtils.isNotEmpty(list)){
+            financialManage.deleteList(list);
+        }
         Financial financial = new Financial();
         financial.setSubjectNum(subject.getSubjectNum());
         financial.setBookName(subject.getBookName());