commit

src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupListController.java

@@ -227,6 +227,8 @@ public class HealthCheckupListController {
         HealthCheckupProject checkupProject = dao.fetch(HealthCheckupProject.class, healthProjectId);
         ActivityUserScope userScope = dao.fetch(ActivityUserScope.class, Cnd.where("groupId", "=", checkupProject.getActivityGroupId()));
         List<ActivityUserScope> userScopeList = new ArrayList<>();
+        List<HealthCheckupUser> healthCheckupUsersToAdd = new ArrayList<>();
+        int successCount = 0;
         for (int i = 0; i < healthCheckupImportTemps.size(); i++) {
             HealthCheckupImportTemp excel = healthCheckupImportTemps.get(i);
             if (StrUtil.isBlank(excel.getLoginName())) {
@@ -256,16 +258,32 @@ public class HealthCheckupListController {
             s.setUserId(user.getId());
             s.setCreator(SecurityUtil.getUserId());
             userScopeList.add(s);
+
+            HealthCheckupUser newHealthUser = new HealthCheckupUser();
+            newHealthUser.setProjectId(healthProjectId);
+            newHealthUser.setUserId(user.getId());
+            newHealthUser.setUserName(user.getUsername());
+            newHealthUser.setSex(user.getSex());
+            newHealthUser.setLoginName(user.getLoginname());
+            newHealthUser.setUnionName(user.getUnionName());
+            newHealthUser.setUnionId(user.getUnionId());
+            newHealthUser.setUnitName(user.getUnitName());
+            newHealthUser.setUnitId(user.getUnitId());
+            healthCheckupUsersToAdd.add(newHealthUser);
+
+            successCount++;
         }
-        ;
+
 
         dao.insert(userScopeList);
+        dao.insert(healthCheckupUsersToAdd);
         // 创建结果集
         ExcelImportRes<HealthCheckupImportTemp> excelImportRes = new ExcelImportRes<>();
         excelImportRes.setTotalRecords(healthCheckupImportTemps.size());
         // 添加错误记录
         excelImportRes.setErrorDetails(healthCheckupImportTemps.stream().filter(s -> StrUtil.isNotBlank(s.getErrMsg())).collect(Collectors.toList()));
         excelImportRes.setFailedCount(excelImportRes.getErrorDetails().size());
+        excelImportRes.setSuccessCount(successCount);
 
         return Result.success(excelImportRes);
     }

src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupSingleController.java

@@ -126,8 +126,8 @@ public class HealthCheckupSingleController {
             add(new ExcelExportEntity("部门", "unitName", 20));
 //            add(new ExcelExportEntity("部门编码", "unitCode", 20));
             add(new ExcelExportEntity("医院", "subjectName", 20));
-            add(new ExcelExportEntity("套餐金额", "packageAmount", 20));
+            add(new ExcelExportEntity("套餐金额", "money", 20));
-            add(new ExcelExportEntity("结算金额", "settlementAmount", 20));
+            add(new ExcelExportEntity("结算金额", "settlementMoney", 20));
             add(new ExcelExportEntity("邮寄地址", "receiveAddress", 50));
         }};
 

src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/service/impl/HealthCheckupSingleServiceImpl.java

@@ -220,6 +220,8 @@ public class HealthCheckupSingleServiceImpl extends BaseServiceImpl<HealthChecku
                         	hcps.optionName subjectName,
                         	hcus.receiveAddress,
                         	hcc.campusName,
+                        	hcpsm.money,
+                        	hcpsm.settlementMoney,
                         	(
                         	SELECT
                         		GROUP_CONCAT( hcps.optionName )
@@ -235,6 +237,7 @@ public class HealthCheckupSingleServiceImpl extends BaseServiceImpl<HealthChecku
                         	LEFT JOIN `vw_user` u ON u.id = hcus.selectUserId
                         	LEFT JOIN `health_checkup_user` hcu ON hcu.userId = hcus.selectUserId and hcu.projectId=@projectId
                         	LEFT JOIN `health_checkup_project_subject` hcps ON hcps.id = hcus.subjectId
+                        	LEFT JOIN `health_checkup_project_subject_money` hcpsm ON hcpsm.projectId = @projectId and hcpsm.subjectId=hcps.id
                         	LEFT JOIN `health_checkup_campus` hcc ON hcc.id = hcus.campus
                         $condition
                         """).setParam("projectId", projectId);

src/main/resources/static/components/plugins/h5/TableList.vue

@@ -21,7 +21,8 @@
           <div style="display: flex;column-gap: 10px"
                :style="{'max-height':img ? '100px':'unset', 'overflow': img ? 'hidden':'unset' }">
             <div class="img-container" v-if="img">
-              <img :src="row[img]" alt="" style="object-fit: cover">
+              <img :src="row[img]" alt="" >
+<!--              <img :src="row[img]" alt="" style="object-fit: cover">-->
             </div>
             <div style="width: 100%">
               <slot :index="index" :row="row"></slot>