超期处罚

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportArchive/service/CwProjectReportArchiveDetailService.java

@@ -93,33 +93,41 @@ public class CwProjectReportArchiveDetailService extends ServiceImpl<CwProjectRe
             for (CwProjectReportArchiveDetailDTO info : records) {
                 //如果归档日期为空，则表示该报告还未归档
                 if(null == info.getAuditDate()){
-                    //如果归档日期差大于60天，表示超期未归档
-                    if(info.getArchiveDay()>60){
+                    //如果归档日期差大于30天，表示超期未归档
+                    if(info.getArchiveDay()>=30){
                         info.setStatus("超期未归档");
-                        long n = (info.getArchiveDay()) / 60;
+                        long n = (info.getArchiveDay()) / 30;
+                        long yu = (info.getArchiveDay()) % 30;
+                        if (yu>0){
+                            n+=1;
+                        }
                         String money = Long.toString(n * 200);
-                        info.setOverdueDay(String.valueOf(info.getArchiveDay() - 60));
+                        info.setOverdueDay(String.valueOf(info.getArchiveDay()));
                         info.setFineMoney(money);
                     }else{
-                        //如果归档日期差小于等于60天，表示暂时未归档
+                        //如果归档日期差小于等于30天，表示暂时未归档
                         info.setStatus("暂时未归档");
-                        info.setOverdueDay(String.valueOf(info.getArchiveDay() - 60));
+                        info.setOverdueDay(String.valueOf(info.getArchiveDay()));
                         info.setFineMoney("0");
                     }
                 } else {
                     //如果归档日期不为空，则表示该报告已归档
 
-                    //如果归档日期差大于60天，表示已超期归档
-                    if(info.getArchiveDay()>60){
+                    //如果归档日期差大于30天，表示已超期归档
+                    if(info.getArchiveDay()>=30){
                         info.setStatus("已超期归档");
-                        long n = (info.getArchiveDay()) / 60;
+                        long n = (info.getArchiveDay()) / 30;
+                        long yu = (info.getArchiveDay()) % 30;
+                        if (yu>0){
+                            n+=1;
+                        }
                         String money = Long.toString(n * 200);
-                        info.setOverdueDay(String.valueOf(info.getArchiveDay() - 60));
+                        info.setOverdueDay(String.valueOf(info.getArchiveDay() ));
                         info.setFineMoney(money);
                     }else{
-                        //如果归档日期差小于等于60天，表示已按时归档
+                        //如果归档日期差小于等于30天，表示已按时归档
                         info.setStatus("已按时归档");
-                        info.setOverdueDay(String.valueOf(info.getArchiveDay() - 60));
+                        info.setOverdueDay(String.valueOf(info.getArchiveDay()));
                         info.setFineMoney("0");
                     }
                 }

jeeplus-modules/jeeplus-finance/src/main/java/com/jeeplus/finance/projectReportArchive/service/CwProjectReportArchiveService.java

@@ -222,33 +222,41 @@ public class CwProjectReportArchiveService extends ServiceImpl<CwProjectReportAr
             for (CwProjectReportArchiveDTO info : records) {
                 //如果归档日期为空，则表示该报告还未归档
                 if(null == info.getAuditDate()){
-                    //如果归档日期差大于60天，表示超期未归档
-                    if(info.getArchiveDay()>60){
+                    //如果归档日期差大于30天，表示超期未归档
+                    if(info.getArchiveDay()>=30){
                         info.setArchiveSta("超期未归档");
-                        long n = (info.getArchiveDay()) / 60;
+                        long n = (info.getArchiveDay()) / 30;
+                        long yu = (info.getArchiveDay()) % 30;
+                        if (yu>0){
+                            n+=1;
+                        }
                         String money = Long.toString(n * 200);
-                        info.setOverdueDay(String.valueOf(info.getArchiveDay() - 60));
+                        info.setOverdueDay(String.valueOf(info.getArchiveDay() ));
                         info.setFineMoney(money);
                     }else{
-                        //如果归档日期差小于等于60天，表示暂时未归档
+                        //如果归档日期差小于等于30天，表示暂时未归档
                         info.setArchiveSta("暂时未归档");
-                        info.setOverdueDay(String.valueOf(info.getArchiveDay() - 60));
+                        info.setOverdueDay(String.valueOf(info.getArchiveDay() ));
                         info.setFineMoney("0");
                     }
                 } else {
                     //如果归档日期不为空，则表示该报告已归档
 
-                    //如果归档日期差大于60天，表示已超期归档
-                    if(info.getArchiveDay()>60){
+                    //如果归档日期差大于30天，表示已超期归档
+                    if(info.getArchiveDay()>=30){
                         info.setArchiveSta("已超期归档");
-                        long n = (info.getArchiveDay()) / 60;
+                        long n = (info.getArchiveDay()) / 30;
+                        long yu = (info.getArchiveDay()) % 30;
+                        if (yu>0){
+                            n+=1;
+                        }
                         String money = Long.toString(n * 200);
-                        info.setOverdueDay(String.valueOf(info.getArchiveDay() - 60));
+                        info.setOverdueDay(String.valueOf(info.getArchiveDay() ));
                         info.setFineMoney(money);
                     }else{
-                        //如果归档日期差小于等于60天，表示已按时归档
+                        //如果归档日期差小于等于30天，表示已按时归档
                         info.setArchiveSta("已按时归档");
-                        info.setOverdueDay(String.valueOf(info.getArchiveDay() - 60));
+                        info.setOverdueDay(String.valueOf(info.getArchiveDay() ));
                         info.setFineMoney("0");
                     }
                 }