Merge branch '20250407_sun' of sckj/mz-cloud into master

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

@@ -167,4 +167,7 @@ public class GljtJkzk extends BaseEntity
 
     @TableField(exist = false)
     private String nd;
+
+    @TableField(exist = false)
+    private String replace;
 }

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

@@ -202,6 +202,11 @@ public class GljtJkzkServiceImpl implements IGljtJkzkService
         GljtQxpz pz = gljtQxpzMapper.selectOne(new LambdaQueryWrapper<GljtQxpz>()
                 .likeRight(GljtQxpz::getXzqh, lr.getXzqh().substring(0, 6)));
         if (ObjectUtils.isEmpty(pz)) throw new ServiceException("该区县尚未配置高龄津贴");
+        if (!ObjectUtils.isEmpty(gljtJkzkMapper.selectOne(new LambdaQueryWrapper<GljtJkzk>()
+                .eq(GljtJkzk::getSfzh, SecurityUtils.sm4encrypt_ECB(EncryptionUtils.key, gljtJkzk.getSfzh()))
+                .eq(GljtJkzk::getKz3, "1")))) {
+            throw new ServiceException("该老人存在尚未审核的健康状况，请勿重复提交");
+        }
         if (StringUtils.isNotEmpty(pz.getKz4())) {
             kz4(pz.getKz4(), gljtJkzk);
         }
@@ -243,7 +248,9 @@ public class GljtJkzkServiceImpl implements IGljtJkzkService
                 gljtJkzk.setKz8(SecurityUtils.getUserUnitName());
             }
             GljtSqLr up = new GljtSqLr();
-            up.setTx(gljtJkzk.getHtzp());
+            if (StringUtils.equals(gljtJkzk.getReplace(), "1")) {
+                up.setTx(gljtJkzk.getHtzp());
+            }
             up.setId(lr.getId());
             up.setJkzkDjzt("0");
             gljtSqLrMapper.updateById(up);
@@ -287,10 +294,8 @@ public class GljtJkzkServiceImpl implements IGljtJkzkService
         if (StringUtils.equals(gljtJkzk.getKz4(), ExamineStatus.YES.getCode())) {
             gljtJkzk.setKz3("0");
             GljtSqLr up = new GljtSqLr();
-            if (StringUtils.equals(lr.getIsImport(), "1")) {
-                lr.setSqrZjzm(gljtJkzk.getKz1());
-                lr.setSqrZjbm(gljtJkzk.getKz2());
-                lr.setTx(gljtJkzk.getHtzp());
+            if (StringUtils.equals(gljtJkzk.getReplace(), "1")) {
+                up.setTx(gljtJkzk.getHtzp());
             }
             up.setId(lr.getId());
             up.setJkzkDjzt("0");

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

@@ -193,7 +193,7 @@ public class GljtPcffServiceImpl implements IGljtPcffService {
         List<String> lrIdList = jfxxList.stream().map(GljtJfxx::getLrId).distinct().collect(Collectors.toList());
         BigDecimal all = BigDecimal.ZERO;
         for (GljtJfxx jfxx: jfxxList) {
-            all = all.add(new BigDecimal(jfxx.getFfje()));
+            all = all.add(new BigDecimal(jfxx.getFfje()).compareTo(BigDecimal.ZERO) > 0 ? new BigDecimal(jfxx.getFfje()) : BigDecimal.ZERO);
         }
         gljtPcff.setFfrs(String.valueOf(lrIdList.size()));
         gljtPcff.setFfje(all.toString());
@@ -303,7 +303,7 @@ public class GljtPcffServiceImpl implements IGljtPcffService {
                     BigDecimal sum = BigDecimal.ZERO;
                     List<String> ffjeList = lrList.stream().map(GljtJfxx::getFfje).collect(Collectors.toList());
                     for (String f: ffjeList) {
-                        sum = sum.add(new BigDecimal(f));
+                        sum = sum.add(new BigDecimal(f).compareTo(BigDecimal.ZERO) > 0 ? new BigDecimal(f) : BigDecimal.ZERO);
                     }
                     String ffje = sum.toString();
                     String btbz = StringUtils.join(lrList.stream().map(GljtJfxx::getBtbz).distinct().collect(Collectors.toList()), ",");
@@ -319,7 +319,7 @@ public class GljtPcffServiceImpl implements IGljtPcffService {
             }
             BigDecimal all = BigDecimal.ZERO;
             for (GljtPcffJfxx jfxx: inList) {
-                all = all.add(new BigDecimal(jfxx.getFfje()));
+                all = all.add(new BigDecimal(jfxx.getFfje()).compareTo(BigDecimal.ZERO) > 0 ? new BigDecimal(jfxx.getFfje()) : BigDecimal.ZERO);
             }
             if (CollectionUtils.isNotEmpty(inList)) {
                 gljtPcffJfxxMapper.batchInsert(inList);
@@ -368,7 +368,7 @@ public class GljtPcffServiceImpl implements IGljtPcffService {
         List<String> lrIdList = jfxxList1.stream().map(GljtJfxx::getLrId).distinct().collect(Collectors.toList());
         BigDecimal all = BigDecimal.ZERO;
         for (GljtJfxx jfxx: jfxxList1) {
-            all = all.add(new BigDecimal(jfxx.getFfje()));
+            all = all.add(new BigDecimal(jfxx.getFfje()).compareTo(BigDecimal.ZERO) > 0 ? new BigDecimal(jfxx.getFfje()) : BigDecimal.ZERO);
         }
         gljtPcff.setFfrs(String.valueOf(lrIdList.size()));
         gljtPcff.setFfje(all.toString());
@@ -391,7 +391,7 @@ public class GljtPcffServiceImpl implements IGljtPcffService {
         List<String> lrIdList = jfxxList1.stream().map(GljtJfxx::getLrId).distinct().collect(Collectors.toList());
         BigDecimal all = BigDecimal.ZERO;
         for (GljtJfxx jfxx: jfxxList1) {
-            all = all.add(new BigDecimal(jfxx.getFfje()));
+            all = all.add(new BigDecimal(jfxx.getFfje()).compareTo(BigDecimal.ZERO) > 0 ? new BigDecimal(jfxx.getFfje()) : BigDecimal.ZERO);
         }
         gljtPcff.setFfrs(String.valueOf(lrIdList.size()));
         gljtPcff.setFfje(all.toString());
@@ -460,7 +460,7 @@ public class GljtPcffServiceImpl implements IGljtPcffService {
                             .reduce(BigDecimal.ZERO, BigDecimal::add);
                     BigDecimal zj = zjList.stream().map(d -> new BigDecimal(d.getFfje()))
                             .reduce(BigDecimal.ZERO, BigDecimal::add);
-                    BigDecimal all = df.add(bf).add(zj);
+                    BigDecimal all = df.add(bf);
                     dfsum = dfsum.add(df);
                     bfsum = bfsum.add(bf);
                     zjsum = zjsum.add(zj);

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

@@ -470,7 +470,7 @@ public class GljtQxpzServiceImpl implements IGljtQxpzService
         long totalCount = 0L;
         BigDecimal totalAmount = BigDecimal.ZERO;
 
-        for (String key : Arrays.asList("dqff", "bf", "zj", "plzj")) {
+        for (String key : Arrays.asList("dqff", "bf", "plzj")) {
             Map<String, Object> typeStats = (Map<String, Object>) stats.get(key);
             totalCount += (Long) typeStats.get("count");
             totalAmount = totalAmount.add((BigDecimal) typeStats.get("amount"));
@@ -488,7 +488,7 @@ public class GljtQxpzServiceImpl implements IGljtQxpzService
         long totalCount = 0L;
         BigDecimal totalAmount = BigDecimal.ZERO;
 
-        for (String key : Arrays.asList("df", "bf", "zj", "plzj")) {
+        for (String key : Arrays.asList("df", "bf", "plzj")) {
             Map<String, Object> typeStats = (Map<String, Object>) stats.get(key);
             totalCount += (Long) typeStats.get("count");
             totalAmount = totalAmount.add((BigDecimal) typeStats.get("amount"));

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

@@ -413,6 +413,10 @@ public class GljtSqLrServiceImpl implements IGljtSqLrService
     @Override
     public int insertGljtSqLr(GljtSqLr gljtSqLr)
     {
+        if (ObjectUtils.isNotEmpty(gljtSqLrMapper.selectOne(new LambdaQueryWrapper<GljtSqLr>().eq(GljtSqLr::getSqrZjhm,
+                SecurityUtils.sm4encrypt_ECB(EncryptionUtils.key, gljtSqLr.getSqrZjhm()))))) {
+            throw new ServiceException("申请人证件号码重复，已经存在该老人");
+        }
         return gljtSqLrMapper.insert(gljtSqLr);
     }
 
@@ -451,6 +455,12 @@ public class GljtSqLrServiceImpl implements IGljtSqLrService
     @Override
     public int updateGljtSqLr(GljtSqLr gljtSqLr)
     {
+        if (StringUtils.isNotEmpty(gljtSqLr.getSqrZjhm())) {
+            if (ObjectUtils.isNotEmpty(gljtSqLrMapper.selectOne(new LambdaQueryWrapper<GljtSqLr>().eq(GljtSqLr::getSqrZjhm,
+                    SecurityUtils.sm4encrypt_ECB(EncryptionUtils.key, gljtSqLr.getSqrZjhm()))))) {
+                throw new ServiceException("申请人证件号码重复，已经存在该老人");
+            }
+        }
         return gljtSqLrMapper.updateById(gljtSqLr);
     }
 

ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/service/impl/YlServer.java

@@ -39,6 +39,7 @@ public class YlServer {
 //        object2.put("dlhma", "15143018065");
 //        object2.put("dlhmb", "15143018066");
 //        object2.put("jtfs", "99");𠮷
+        System.out.println("啊鼎折覆餗");
         System.out.println(SecurityUtils.sm4encrypt_ECB("1234567887654321", "220303193502090211"));
         System.out.println(SecurityUtils.sm4decrypt_ECB("1234567887654321", "4D1WZKsp8E6bGRj7wqu+KQ=="));
 //        LnstMchnt mchnt = new LnstMchnt();