20250110_sun

ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/domain/GljtSqLr.java

@@ -314,4 +314,8 @@ public class GljtSqLr extends BaseEntity
     private String sqbfys;
 
     private String sqbfje;
+
+    private String fzjg;
+
+    private String isImport;
 }

ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/domain/GljtSqLrHi.java

@@ -322,4 +322,8 @@ public class GljtSqLrHi extends BaseEntity
     private String sqbfys;
 
     private String sqbfje;
+
+    private String fzjg;
+
+    private String isImport;
 }

ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/domain/GljtSqSq.java

@@ -308,4 +308,8 @@ public class GljtSqSq extends BaseEntity
     private String sqbfys;
 
     private String sqbfje;
+
+    private String fzjg;
+
+    private String isImport;
 }

ruoyi-modules/mz-gljt/src/main/java/com/ruoyi/gljt/service/impl/GljtJkzkServiceImpl.java

@@ -84,10 +84,15 @@ public class GljtJkzkServiceImpl implements IGljtJkzkService
         if (StringUtils.isEmpty(gljtJkzk.getLrId())) {
             throw new ServiceException("老人不能为空");
         }
-        if (StringUtils.equals(gljtJkzk.getStatus(), "0")) {
+        if (StringUtils.equals(gljtJkzk.getKz3(), "0")) {
             GljtSqLr lr = gljtSqLrMapper.selectById(gljtJkzk.getLrId());
             if (ObjectUtils.isEmpty(lr)) throw new ServiceException("未查询到该老人");
             GljtSqLr up = new GljtSqLr();
+            if (StringUtils.equals(lr.getIsImport(), "1")) {
+                lr.setSqrZjzm(gljtJkzk.getKz1());
+                lr.setSqrZjbm(gljtJkzk.getKz2());
+                lr.setTx(gljtJkzk.getHtzp());
+            }
             up.setId(lr.getId());
             up.setJkzkDjzt("0");
             gljtSqLrMapper.updateById(up);
@@ -104,6 +109,21 @@ public class GljtJkzkServiceImpl implements IGljtJkzkService
     @Override
     public int updateGljtJkzk(GljtJkzk gljtJkzk)
     {
+        if (StringUtils.equals(gljtJkzk.getKz3(), "0")) {
+            gljtJkzk.setKz7(SecurityUtils.getUsername());
+            gljtJkzk.setKz8(SecurityUtils.getUserUnitName());
+            GljtSqLr lr = gljtSqLrMapper.selectById(gljtJkzk.getLrId());
+            if (ObjectUtils.isEmpty(lr)) throw new ServiceException("未查询到该老人");
+            GljtSqLr up = new GljtSqLr();
+            if (StringUtils.equals(lr.getIsImport(), "1")) {
+                lr.setSqrZjzm(gljtJkzk.getKz1());
+                lr.setSqrZjbm(gljtJkzk.getKz2());
+                lr.setTx(gljtJkzk.getHtzp());
+            }
+            up.setId(lr.getId());
+            up.setJkzkDjzt("0");
+            gljtSqLrMapper.updateById(up);
+        }
         return gljtJkzkMapper.updateById(gljtJkzk);
     }