档案抽检评分小数

blade-service-api/blade-archive-api/src/main/java/org/springblade/archive/entity/ArchiveExpertScore.java

@@ -52,21 +52,21 @@ public class ArchiveExpertScore extends BaseEntity {
     private String scoreItem;
 
     @ApiModelProperty("完整性")
-    private Integer integrality;
+    private BigDecimal integrality;
 
     @ApiModelProperty("完整性扣分")
-    private Integer integralityDeduction;
+    private BigDecimal integralityDeduction;
 
     @ApiModelProperty("规范性")
-    private Integer normative;
+    private BigDecimal normative;
 
     @ApiModelProperty("规范性扣分")
-    private Integer normativeDeduction;
+    private BigDecimal normativeDeduction;
 
     public ArchiveExpertScore() {
     }
 
-    public ArchiveExpertScore(Long projectId, Integer unitType, String scoreItem, Integer integrality, Integer integralityDeduction, Integer normative, Integer normativeDeduction) {
+    public ArchiveExpertScore(Long projectId, Integer unitType, String scoreItem, BigDecimal integrality, BigDecimal integralityDeduction, BigDecimal normative, BigDecimal normativeDeduction) {
         this.projectId = projectId;
         this.unitType = unitType;
         this.scoreItem = scoreItem;
@@ -76,7 +76,7 @@ public class ArchiveExpertScore extends BaseEntity {
         this.normativeDeduction = normativeDeduction;
     }
 
-    public ArchiveExpertScore(Long projectId, Long conclusionId, Integer unitType, String scoreItem, Integer integrality, Integer integralityDeduction, Integer normative, Integer normativeDeduction) {
+    public ArchiveExpertScore(Long projectId, Long conclusionId, Integer unitType, String scoreItem, BigDecimal integrality, BigDecimal integralityDeduction, BigDecimal normative, BigDecimal normativeDeduction) {
         this.projectId = projectId;
         this.conclusionId = conclusionId;
         this.unitType = unitType;

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchiveExpertConclusionServiceImpl.java

@@ -39,6 +39,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.FileOutputStream;
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.util.ArrayList;
@@ -275,14 +276,16 @@ public class ArchiveExpertConclusionServiceImpl extends BaseServiceImpl<ArchiveE
         }
         vo.setPdfUrl(pdfUrl);
         vo.setList(infos);
+        System.out.println("11111111111");
         //PDF电签
         R<String> visa = eVisaClient.batchEVisa(vo);
         if (visa == null){
             throw new ServiceException("调用电签服务失败");
         }
         if (visa.getCode() == 400){
-            throw new ServiceException(visa.getMsg());
+            throw new ServiceException("调用电签服务失败:"+visa.getMsg());
         }
+        System.out.println(visa);
         //修改状态，插入结论PDF
         conclusion.setTableUrl(visa.getData());
         conclusion.setStatus(2);
@@ -318,7 +321,8 @@ public class ArchiveExpertConclusionServiceImpl extends BaseServiceImpl<ArchiveE
 //        String localFile = "C:\\Users\\泓创研发01\\Desktop\\"+conclusion.getId()+".pdf";
         String localFile = "/www/wwwroot/Users/hongchuangyanfa/Desktop/archiveCheck/"+conclusion.getId()+".pdf";
         //建立一个书写器
-        PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream(localFile));
+        FileOutputStream fileOutputStream = new FileOutputStream(localFile);
+        PdfWriter writer = PdfWriter.getInstance(document,fileOutputStream );
         //页尾
         MyPdfPageHelper helper = new MyPdfPageHelper();
         writer.setPageEvent(helper);
@@ -375,7 +379,7 @@ public class ArchiveExpertConclusionServiceImpl extends BaseServiceImpl<ArchiveE
                 List<ArchiveExpertScore> list = map.get(i);
                 Boolean isMark = false;
                 for (ArchiveExpertScore score : list) {
-                    if (score.getIntegralityDeduction() != 0 || score.getNormativeDeduction() != 0) {
+                    if (score.getIntegralityDeduction().compareTo(BigDecimal.ZERO) != 0 || score.getNormativeDeduction().compareTo(BigDecimal.ZERO) != 0) {
                         isMark = true;
                         break;
                     }
@@ -415,8 +419,8 @@ public class ArchiveExpertConclusionServiceImpl extends BaseServiceImpl<ArchiveE
                 document.add(twoTable);
                 //将数据放入表格中
 
-                int allScore = 0;
-                int allPoints = 0;
+                BigDecimal allScore = BigDecimal.ZERO;
+                BigDecimal allPoints = BigDecimal.ZERO;
                 for (int j = 0; j < list.size(); j++) {
                     PdfPTable dataTable = new PdfPTable(5);
                     dataTable.setWidths(floats);
@@ -428,8 +432,11 @@ public class ArchiveExpertConclusionServiceImpl extends BaseServiceImpl<ArchiveE
                     dataTable.addCell(ItextPdfUtils.pdfTableStyle7(score.getNormative() + "", size13font, 25));
                     dataTable.addCell(ItextPdfUtils.pdfTableStyle7(score.getNormativeDeduction() + "", size13font, 25));
                     document.add(dataTable);
-                    allScore += score.getIntegrality() + score.getNormative();
-                    allPoints += score.getIntegralityDeduction() + score.getNormativeDeduction();
+//                    allScore = score.getIntegrality() + score.getNormative();
+                    allScore = allScore.add(score.getIntegrality()).add(score.getNormative());
+
+//                    allPoints = score.getIntegralityDeduction() + score.getNormativeDeduction();
+                    allPoints = allPoints.add(score.getIntegralityDeduction()).add(score.getNormativeDeduction());
                 }
                 //末尾统计行
                 PdfPTable statRow = new PdfPTable(2);
@@ -437,7 +444,7 @@ public class ArchiveExpertConclusionServiceImpl extends BaseServiceImpl<ArchiveE
                 statRow.setWidthPercentage(widthPercentage);
                 PdfPCell leftCell = ItextPdfUtils.pdfTableStyle7("总得分", size13font, 25);
                 statRow.addCell(leftCell);
-                PdfPCell rightCell = ItextPdfUtils.pdfTableStyle7(allScore - allPoints + "", size13font, 25);
+                PdfPCell rightCell = ItextPdfUtils.pdfTableStyle7(allScore.subtract(allPoints) + "", size13font, 25);
                 statRow.addCell(rightCell);
                 document.add(statRow);
 

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchiveExpertScoreServiceImpl.java

@@ -25,6 +25,7 @@ import org.springframework.stereotype.Service;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -46,29 +47,29 @@ public class ArchiveExpertScoreServiceImpl extends BaseServiceImpl<ArchiveExpert
     public void saveBaseScoreInfo(Long projectId,Long conclusionId) {
         List<ArchiveExpertScore> list = new ArrayList<>();
         //业主
-        list.add(new ArchiveExpertScore(projectId,conclusionId,1,"立项审批",10,null,10,null));
-        list.add(new ArchiveExpertScore(projectId,conclusionId,1,"设计审批文件",7,null,7,null));
-        list.add(new ArchiveExpertScore(projectId,conclusionId,1,"招投标文件",7,null,null,null));
-        list.add(new ArchiveExpertScore(projectId,conclusionId,1,"工程准备文件",5,null,null,null));
-        list.add(new ArchiveExpertScore(projectId,conclusionId,1,"施工文件",4,null,null,null));
-        list.add(new ArchiveExpertScore(projectId,conclusionId,1,"交、竣工文件",8,null,null,null));
-        list.add(new ArchiveExpertScore(projectId,conclusionId,1,"资金管理文件",5,null,null,null));
-        list.add(new ArchiveExpertScore(projectId,conclusionId,1,"照片",4,null,null,null));
+        list.add(new ArchiveExpertScore(projectId,conclusionId,1,"立项审批",new BigDecimal(10),null,new BigDecimal(10),null));
+        list.add(new ArchiveExpertScore(projectId,conclusionId,1,"设计审批文件",new BigDecimal(7),null,new BigDecimal(7),null));
+        list.add(new ArchiveExpertScore(projectId,conclusionId,1,"招投标文件",new BigDecimal(7),null,null,null));
+        list.add(new ArchiveExpertScore(projectId,conclusionId,1,"工程准备文件",new BigDecimal(5),null,null,null));
+        list.add(new ArchiveExpertScore(projectId,conclusionId,1,"施工文件",new BigDecimal(4),null,null,null));
+        list.add(new ArchiveExpertScore(projectId,conclusionId,1,"交、竣工文件",new BigDecimal(8),null,null,null));
+        list.add(new ArchiveExpertScore(projectId,conclusionId,1,"资金管理文件",new BigDecimal(5),null,null,null));
+        list.add(new ArchiveExpertScore(projectId,conclusionId,1,"照片",new BigDecimal(4),null,null,null));
         //监理
-        list.add(new ArchiveExpertScore(projectId,conclusionId,2,"监理机构、制度",3,null,10,null));
-        list.add(new ArchiveExpertScore(projectId,conclusionId,2,"会议纪要、往来文件、监理费用、支付报表、监理日志、总结",10,null,null,null));
-        list.add(new ArchiveExpertScore(projectId,conclusionId,2,"工地试验室资质证书、延期文件、仪器标定证书",3,null,null,null));
-        list.add(new ArchiveExpertScore(projectId,conclusionId,2,"试验资料",6,null,null,null));
-        list.add(new ArchiveExpertScore(projectId,conclusionId,2,"质检资料",6,null,null,null));
-        list.add(new ArchiveExpertScore(projectId,conclusionId,2,"质评资料",6,null,null,null));
-        list.add(new ArchiveExpertScore(projectId,conclusionId,2,"安全资料",3,null,null,null));
-        list.add(new ArchiveExpertScore(projectId,conclusionId,2,"监理指令及回复、旁站记录、巡视记录",9,null,null,null));
-        list.add(new ArchiveExpertScore(projectId,conclusionId,2,"照片",4,null,null,null));
+        list.add(new ArchiveExpertScore(projectId,conclusionId,2,"监理机构、制度",new BigDecimal(3),null,new BigDecimal(10),null));
+        list.add(new ArchiveExpertScore(projectId,conclusionId,2,"会议纪要、往来文件、监理费用、支付报表、监理日志、总结",new BigDecimal(10),null,null,null));
+        list.add(new ArchiveExpertScore(projectId,conclusionId,2,"工地试验室资质证书、延期文件、仪器标定证书",new BigDecimal(3),null,null,null));
+        list.add(new ArchiveExpertScore(projectId,conclusionId,2,"试验资料",new BigDecimal(6),null,null,null));
+        list.add(new ArchiveExpertScore(projectId,conclusionId,2,"质检资料",new BigDecimal(6),null,null,null));
+        list.add(new ArchiveExpertScore(projectId,conclusionId,2,"质评资料",new BigDecimal(6),null,null,null));
+        list.add(new ArchiveExpertScore(projectId,conclusionId,2,"安全资料",new BigDecimal(3),null,null,null));
+        list.add(new ArchiveExpertScore(projectId,conclusionId,2,"监理指令及回复、旁站记录、巡视记录",new BigDecimal(9),null,null,null));
+        list.add(new ArchiveExpertScore(projectId,conclusionId,2,"照片",new BigDecimal(4),null,null,null));
         //施工
-        list.add(new ArchiveExpertScore(projectId,conclusionId,3,"设计变更及竣工图",9,null,null,null));
-        list.add(new ArchiveExpertScore(projectId,conclusionId,3,"施工准备文件",5,null,null,null));
-        list.add(new ArchiveExpertScore(projectId,conclusionId,3,"试验资料（含工地试验室资质证书、仪器标定证书等）",9,null,10,null));
-        list.add(new ArchiveExpertScore(projectId,conclusionId,3,"质检资料",10,null,null,null));
+        list.add(new ArchiveExpertScore(projectId,conclusionId,3,"设计变更及竣工图",new BigDecimal(9),null,null,null));
+        list.add(new ArchiveExpertScore(projectId,conclusionId,3,"施工准备文件",new BigDecimal(5),null,null,null));
+        list.add(new ArchiveExpertScore(projectId,conclusionId,3,"试验资料（含工地试验室资质证书、仪器标定证书等）",new BigDecimal(9),null,new BigDecimal(10),null));
+        list.add(new ArchiveExpertScore(projectId,conclusionId,3,"质检资料",new BigDecimal(10),null,null,null));
         list.add(new ArchiveExpertScore(projectId,conclusionId,3,"路基工程质检资料",null,null,null,null));
         list.add(new ArchiveExpertScore(projectId,conclusionId,3,"路面工程质检资料",null,null,null,null));
         list.add(new ArchiveExpertScore(projectId,conclusionId,3,"隧道工程质检资料",null,null,null,null));
@@ -76,14 +77,14 @@ public class ArchiveExpertScoreServiceImpl extends BaseServiceImpl<ArchiveExpert
         list.add(new ArchiveExpertScore(projectId,conclusionId,3,"交通与安全工程质检资料",null,null,null,null));
         list.add(new ArchiveExpertScore(projectId,conclusionId,3,"机电工程质检资料",null,null,null,null));
         list.add(new ArchiveExpertScore(projectId,conclusionId,3,"房建工程质检资料",null,null,null,null));
-        list.add(new ArchiveExpertScore(projectId,conclusionId,3,"质评资料",5,null,null,null));
-        list.add(new ArchiveExpertScore(projectId,conclusionId,3,"进度进化控制文件",3,null,null,null));
-        list.add(new ArchiveExpertScore(projectId,conclusionId,3,"安全生产、文明施工资料",2,null,null,null));
-        list.add(new ArchiveExpertScore(projectId,conclusionId,3,"施工日志、大事记",3,null,null,null));
-        list.add(new ArchiveExpertScore(projectId,conclusionId,3,"计量支付文件",5,null,null,null));
-        list.add(new ArchiveExpertScore(projectId,conclusionId,3,"会议纪要、往来文件",3,null,null,null));
-        list.add(new ArchiveExpertScore(projectId,conclusionId,3,"照片",3,null,null,null));
-        list.add(new ArchiveExpertScore(projectId,conclusionId,3,"总结",3,null,null,null));
+        list.add(new ArchiveExpertScore(projectId,conclusionId,3,"质评资料",new BigDecimal(5),null,null,null));
+        list.add(new ArchiveExpertScore(projectId,conclusionId,3,"进度进化控制文件",new BigDecimal(3),null,null,null));
+        list.add(new ArchiveExpertScore(projectId,conclusionId,3,"安全生产、文明施工资料",new BigDecimal(2),null,null,null));
+        list.add(new ArchiveExpertScore(projectId,conclusionId,3,"施工日志、大事记",new BigDecimal(3),null,null,null));
+        list.add(new ArchiveExpertScore(projectId,conclusionId,3,"计量支付文件",new BigDecimal(5),null,null,null));
+        list.add(new ArchiveExpertScore(projectId,conclusionId,3,"会议纪要、往来文件",new BigDecimal(3),null,null,null));
+        list.add(new ArchiveExpertScore(projectId,conclusionId,3,"照片",new BigDecimal(3),null,null,null));
+        list.add(new ArchiveExpertScore(projectId,conclusionId,3,"总结",new BigDecimal(3),null,null,null));
         this.saveBatch(list);
     }