抗原异常上报导入bug修改

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/YcsbController.java

@@ -111,17 +111,6 @@ public class YcsbController extends BaseController
             } else if ("1".equals(ycsbExport.getCheckCard())) {
                 ycsbExport.setCheckCard("正确");
             }
-            if (StringUtils.isNotEmpty(ycsbExport.getKyResult())) {
-                if ("1".equals(ycsbExport.getKyResult())) {
-                    ycsbExport.setKyResult("正常");
-                } else {
-                    ycsbExport.setKyResult("异常");
-                }
-            } else {
-                ycsbExport.setKyResult("异常");
-            }
-
-
         }
         util.exportExcel(response, list, "抗原异常上报数据");
     }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/YcsbServiceImpl.java

@@ -221,16 +221,9 @@ public class YcsbServiceImpl implements IYcsbService
                 } else if ("否".equals(ycsb.getHasAcid())) {
                     ycsb.setHasAcid("1");
                 }
-                if (StringUtils.isNotEmpty(ycsb.getKyResult())) {
-                    if ("正常".equals(ycsb.getKyResult())) {
-                        ycsb.setKyResult("1");
-                    } else {
-                        ycsb.setKyResult("0");
-                    }
-                } else {
+                if (StringUtils.isEmpty(ycsb.getKyResult())) {
                     ycsb.setKyResult("0");
                 }
-
                 String createBy = DataUtils.getValue(ycsb.getArea(), ycsb.getStreet(), ycsb.getCommittee());
                 if ("null".equals(createBy)) {
                     throw new ServiceException("所选居住地、街道、社区不存在");
@@ -238,6 +231,7 @@ public class YcsbServiceImpl implements IYcsbService
                 ycsb.setCreateBy(createBy);
                 ycsb.setCreateTime(DateUtils.getNowDate());
                 if (ycsbList.size() > 0) {
+                    ycsb.setId(ycsbList.get(0).getId());
                     ycsbMapper.updateYcsb(ycsb);
                     continue;
                 }

ruoyi-system/src/main/resources/mapper/system/YcsbMapper.xml

@@ -108,7 +108,8 @@
         where id = #{id}
     </select>
     <select id="selectYcsbByCard" resultType="com.ruoyi.system.domain.Ycsb">
-        <include refid="selectYcsbVo"/>
+        SELECT id, card_no
+        FROM ycsb
         where del_flag = '0' and card_no = #{cardNo}
         <if test="id != null">and id != #{id}</if>
     </select>
@@ -197,6 +198,8 @@
         where id = #{id}
     </update>
 
+
+
     <delete id="deleteYcsbById" parameterType="Long">
         delete
         from ycsb