20240423_sun

ruoyi-modules/mz-lnst/src/main/java/com/ruoyi/lnst/controller/ZwywLrJbxxController.java

@@ -127,6 +127,12 @@ public class ZwywLrJbxxController extends BaseController {
         return toAjax(zwywLrJbxxService.insertZwywLrJbxxSb(in), in.getId());
     }
 
+    @Log(title = "老人基本信息", businessType = BusinessType.UPDATE)
+    @PostMapping("/editSb")
+    public AjaxResult editSb(@Validated @RequestBody InLnstLrxx zwywLrJbxx) {
+        return toAjax(zwywLrJbxxService.updateZwywLrJbxxSb(zwywLrJbxx));
+    }
+
     @RequiresPermissions("lnst:lrxx:edit")
     @Log(title = "老人基本信息", businessType = BusinessType.UPDATE)
     @PostMapping("/sh")

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

@@ -46,6 +46,8 @@ public interface IZwywLrJbxxService
 
     public int insertZwywLrJbxxSb(InLnstLrxx zwywLrJbxx);
 
+    public int updateZwywLrJbxxSb(InLnstLrxx zwywLrJbxx);
+
     public int sh(InLnstShxx shxx);
 
     public int ty(InLnstLrxx lrxx);

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

@@ -60,16 +60,23 @@ public class YlServer {
 //        }
 //        System.out.println( YlServer.httpsRequest(YlServer.Map2JSONStr(map)));
 
-        TreeMap<String, Object> lr = new TreeMap<>();
-        lr.put("storeCode", "");
-        lr.put("startDate", "2024-04-22 00:00:00");
-        lr.put("endDate", "2024-04-23 00:00:00");
-        lr.put("transType", "");
-        lr.put("transState", "");
-        lr.put("startRecId", "0");
-        TreeMap<String, Object> map = YlServer.publicSupport(ResourceUtil.getConfigByName("yl.syncYc"), null,
-                null, lr);
+        TreeMap<String, Object> store = new TreeMap<>();
+        store.put("storeCode", "0003");
+        store.put("state", "1");
+        TreeMap<String, Object> map = YlServer.publicSupport(ResourceUtil.getConfigByName("yl.mdzt"), "10002253",
+                null, store);
         System.out.println(YlServer.httpsRequest(YlServer.Map2JSONStr(map)));
+
+//        TreeMap<String, Object> lr = new TreeMap<>();
+//        lr.put("storeCode", "");
+//        lr.put("startDate", "2024-04-22 00:00:00");
+//        lr.put("endDate", "2024-04-23 00:00:00");
+//        lr.put("transType", "");
+//        lr.put("transState", "");
+//        lr.put("startRecId", "0");
+//        TreeMap<String, Object> map = YlServer.publicSupport(ResourceUtil.getConfigByName("yl.syncYc"), null,
+//                null, lr);
+//        System.out.println(YlServer.httpsRequest(YlServer.Map2JSONStr(map)));
         // 人脸采集状态同步
 //        TreeMap<String, Object> lr = new TreeMap<>();
 //        lr.put("memberCode", "1100302372");

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

@@ -344,6 +344,24 @@ public class ZwywLrJbxxServiceImpl implements IZwywLrJbxxService {
         return res;
     }
 
+    @Transactional
+    @Override
+    public int updateZwywLrJbxxSb(InLnstLrxx zwywLrJbxx) {
+        // 微信端自主申报被拒绝后再次修改专用修改
+        // 自主申报待审核
+        zwywLrJbxx.setLzzt("8");
+        InLnstShxx shxx = new InLnstShxx();
+        BeanUtil.copyProperties(zwywLrJbxx, shxx, new CopyOptions().ignoreNullValue());
+        // 微信端自主申报必须审核
+        shxx.setSqyy("老人自主申报");
+        shxx.setId(IdUtils.simpleUUID());
+        shxx.setLrId(zwywLrJbxx.getId());
+        shxx.setSqsj(DateUtils.dateTimeNow());
+        shxx.setLzzt(zwywLrJbxx.getLzzt());
+        insertShxx(shxx);
+        return zwywLrJbxxMapper.updateById(zwywLrJbxx);
+    }
+
     @Transactional
     @Override
     public int insertZwywLrJbxxWeb(InLnstLrxx zwywLrJbxx) {