feat: 监督报告 update 2

hnqz-common/hnqz-common-core/src/main/java/com/qunzhixinxi/hnqz/common/core/util/PdfUtils.java

@@ -83,7 +83,7 @@ public final class PdfUtils {
         PdfWriter writer;
         Font font;
 
-        int numberColumns = 13;
+        int numberColumns = 14;
 
         if (pageSize == null) {
             pageSize = PageSize.A4;

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/WmSupervisionManager.java

@@ -1527,7 +1527,7 @@ public class WmSupervisionManager {
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd");
         Object[][] datas = new Object[taskSupervisions.size() + 2][];
         for (int i = 0; i < datas.length; ++i) {
-            datas[i] = new Object[i == 0 ? 1 : 13];
+            datas[i] = new Object[i == 0 ? 1 : 14];
             if (i == 0) {
                 datas[0][0] = "2024 年第 四 季度 " + service.getName() + " 服务监督结果（监督人：" + user.getRealName() + "，服务总数：" + taskIds.size() + "，本人监督数：" + supIds.size() + " ）";
                 continue;
@@ -1536,17 +1536,18 @@ public class WmSupervisionManager {
             if (i == 1) {
                 datas[1][0] = "服务ID";
                 datas[1][1] = "服务类型";
-                datas[1][2] = "服务供应商公司名称";
-                datas[1][3] = "代表名称";
-                datas[1][4] = "产品名称";
-                datas[1][5] = "生产企业";
-                datas[1][6] = "执行包名称";
-                datas[1][7] = "监督周期";
-                datas[1][8] = "监督结果";
-                datas[1][9] = "监督意见";
-                datas[1][10] = "部门负责人意见";
-                datas[1][11] = "分管领导意见";
-                datas[1][12] = "监督时间";
+                datas[1][2] = "服务项目积分（单价）";
+                datas[1][3] = "服务供应商公司名称";
+                datas[1][4] = "代表名称";
+                datas[1][5] = "产品名称";
+                datas[1][6] = "生产企业";
+                datas[1][7] = "执行包名称";
+                datas[1][8] = "执行包周期";
+                datas[1][9] = "监督结果";
+                datas[1][10] = "监督意见";
+                datas[1][11] = "部门负责人意见";
+                datas[1][12] = "分管领导意见";
+                datas[1][13] = "监督时间";
                 continue;
             }
 
@@ -1568,19 +1569,25 @@ public class WmSupervisionManager {
                     datas[i][j] = wmTask != null ? taskTypeMap.get(wmTask.getTaskTypeId()) : "";
                 }
 
-                // 服务供应商名称
+                // 服务单价
                 if (j == 2) {
+                    WmTask wmTask = tid2EntityMap.get(wmTaskSupervision.getTaskId().toString());
+                    datas[i][j] = wmTask != null ? wmTask.getScore().toString() : "";
+                }
+
+                // 服务供应商名称
+                if (j == 3) {
                     datas[i][j] = service.getName();
                 }
 
                 // 代表名称
-                if (j == 3) {
+                if (j == 4) {
                     WmTask wmTask = tid2EntityMap.get(wmTaskSupervision.getTaskId().toString());
                     datas[i][j] = wmTask != null ? userMap.get(Integer.parseInt(wmTask.getTaskUserId())) : "";
                 }
 
                 // 产品名称
-                if (j == 4) {
+                if (j == 5) {
                     WmTask wmTask = tid2EntityMap.get(wmTaskSupervision.getTaskId().toString());
                     WmScorePackage scorePackage = pkgMap.get(wmTask.getScorePackageId());
                     String drugId = scorePackage.getDrugtable()[0];
@@ -1591,7 +1598,7 @@ public class WmSupervisionManager {
                 }
 
                 // 生产企业
-                if (j == 5) {
+                if (j == 6) {
                     WmTask wmTask = tid2EntityMap.get(wmTaskSupervision.getTaskId().toString());
                     WmScorePackage scorePackage = pkgMap.get(wmTask.getScorePackageId());
                     String drugId = scorePackage.getDrugtable()[0];
@@ -1600,32 +1607,32 @@ public class WmSupervisionManager {
                 }
 
                 // 执行包名称
-                if (j == 6) {
+                if (j == 7) {
                     WmTask wmTask = tid2EntityMap.get(wmTaskSupervision.getTaskId().toString());
                     WmScorePackage scorePackage = pkgMap.get(wmTask.getScorePackageId());
                     datas[i][j] = scorePackage.getScorePackageName();
                 }
 
                 // 周期
-                if (j == 7) {
+                if (j == 8) {
                     WmTask wmTask = tid2EntityMap.get(wmTaskSupervision.getTaskId().toString());
                     WmScorePackage scorePackage = pkgMap.get(wmTask.getScorePackageId());
                     datas[i][j] = String.format("%s至%s", formatter.format(scorePackage.getStartTime()), formatter.format(scorePackage.getEndTime()));
                 }
 
                 // 监督结果
-                if (j == 8) {
+                if (j == 9) {
                     datas[i][j] = wmTaskSupervision.getSupervisionResult() ? "通过" : "不通过";
                 }
 
                 // 监督意见
-                if (j == 9) {
+                if (j == 10) {
                     datas[i][j] = wmTaskSupervision.getRemarks();
                 }
 
 
                 // 部门负责人意见
-                if (j == 10) {
+                if (j == 11) {
                     List<WmTaskSupervisionAdvice> supervisionAdvices = advices.get(wmTaskSupervision.getSupervisionId());
                     if (CollUtil.isNotEmpty(supervisionAdvices)) {
                         WmTaskSupervisionAdvice advice = supervisionAdvices.get(0);
@@ -1638,7 +1645,7 @@ public class WmSupervisionManager {
                 }
 
                 // 分管领导意见
-                if (j == 11) {
+                if (j == 12) {
                     List<WmTaskSupervisionAdvice> supervisionAdvices = advices.get(wmTaskSupervision.getSupervisionId());
                     if (CollUtil.isNotEmpty(supervisionAdvices) && supervisionAdvices.size() > 1) {
                         WmTaskSupervisionAdvice advice = supervisionAdvices.get(1);
@@ -1649,7 +1656,7 @@ public class WmSupervisionManager {
                 }
 
                 // 监督时间
-                if (j == 12) {
+                if (j == 13) {
                     datas[i][j] = formatter.format(wmTaskSupervision.getCreateTime().toLocalDate());
 
                 }