冲突合并

24Hour/Controllers/Common/LawyerArchivesController.cs

@@ -235,10 +235,11 @@ namespace _24Hour.Controllers.Common
             return result;
         }
         /// <summary>
-        /// 从2.0系统查询案件信息（未完成）
+        /// 从2.0系统查询案件信息（假数据）
         /// </summary>
         /// <param name="info"></param>
         /// <returns></returns>
+        /// <remarks>接口，还没有确定好这个接口返回的数据的具体格式</remarks>
         [HttpGet]
         [Route("QueryCaseFromtwenty")]
         public Task<Result> QueryCaseFromtwenty(string? bmsah, string? name, string? casename)
@@ -255,10 +256,11 @@ namespace _24Hour.Controllers.Common
             return Task.FromResult(result);
         }
         /// <summary>
-        /// 从2.0系统查询卷宗信息（未完成）
+        /// 从2.0系统查询卷宗信息（假数据）
         /// </summary>
         /// <param name="info"></param>
         /// <returns></returns>
+        /// <remarks>数据的返回格式已确定，内容时真实数据经过修改的</remarks>
         [HttpGet]
         [Route("QueryFileFromtwenty")]
         public async Task<Result> QueryFileFromtwenty(string bmsah)

24Hour/datajson.txt

@@ -19,7 +19,7 @@
             "dwbm": "410503",
             "jzwj": [
                 {
-                    "wjxh": "ea369fdb834848e1a49208e4e361e6c8",
+                    "wjxh": "ea369fdb834848e1a49208e4e361e6c1",
                     "mlbh": "8bf38deea0ad2955f04a5cb48954296a",
                     "ywjlj": "http://127.0.0.1:8081/dzjzzz-service/api/dzjzzz/dzjzzzYxJzjbxx/preview?filePath=410503/2023/5336948dde9dd62f383baa2768e598b1/df9e2cdf751c45c797e31ef5324d4940/c83ec40d60206ac19ad69bfc966d6724/c83ec40d60206ac19ad69bfc966d6724.jpg&ccbz=5336948dde9dd62f383baa2768e598b1",
                     "sltwjlj": "http://127.0.0.1:8081/dzjzzz-service/api/dzjzzz/dzjzzzYxJzjbxx/preview?filePath=410503/2023/5336948dde9dd62f383baa2768e598b1/df9e2cdf751c45c797e31ef5324d4940/c83ec40d60206ac19ad69bfc966d6724/c83ec40d60206ac19ad69bfc966d6724_small_ocr.jpg&ccbz=5336948dde9dd62f383baa2768e598b1",
@@ -39,7 +39,7 @@
                     "bsbh": "0b675a539c234a8f97c4563b2cd9524d"
                 },
  {
-                    "wjxh": "ea369fdb834848e1a49208e4e361e6c8",
+                    "wjxh": "ea369fdb834848e1a49208e4e361e6c2",
                     "mlbh": "8bf38deea0ad2955f04a5cb48954296a",
                     "ywjlj": "http://127.0.0.1:8081/dzjzzz-service/api/dzjzzz/dzjzzzYxJzjbxx/preview?filePath=410503/2023/5336948dde9dd62f383baa2768e598b1/df9e2cdf751c45c797e31ef5324d4940/c83ec40d60206ac19ad69bfc966d6724/c83ec40d60206ac19ad69bfc966d6724.jpg&ccbz=5336948dde9dd62f383baa2768e598b1",
                     "sltwjlj": "http://127.0.0.1:8081/dzjzzz-service/api/dzjzzz/dzjzzzYxJzjbxx/preview?filePath=410503/2023/5336948dde9dd62f383baa2768e598b1/df9e2cdf751c45c797e31ef5324d4940/c83ec40d60206ac19ad69bfc966d6724/c83ec40d60206ac19ad69bfc966d6724_small_ocr.jpg&ccbz=5336948dde9dd62f383baa2768e598b1",
@@ -59,7 +59,7 @@
                     "bsbh": "0b675a539c234a8f97c4563b2cd9524d"
                 },
  {
-                    "wjxh": "ea369fdb834848e1a49208e4e361e6c8",
+                    "wjxh": "ea369fdb834848e1a49208e4e361e6c3",
                     "mlbh": "8bf38deea0ad2955f04a5cb48954296a",
                     "ywjlj": "http://127.0.0.1:8081/dzjzzz-service/api/dzjzzz/dzjzzzYxJzjbxx/preview?filePath=410503/2023/5336948dde9dd62f383baa2768e598b1/df9e2cdf751c45c797e31ef5324d4940/c83ec40d60206ac19ad69bfc966d6724/c83ec40d60206ac19ad69bfc966d6724.jpg&ccbz=5336948dde9dd62f383baa2768e598b1",
                     "sltwjlj": "http://127.0.0.1:8081/dzjzzz-service/api/dzjzzz/dzjzzzYxJzjbxx/preview?filePath=410503/2023/5336948dde9dd62f383baa2768e598b1/df9e2cdf751c45c797e31ef5324d4940/c83ec40d60206ac19ad69bfc966d6724/c83ec40d60206ac19ad69bfc966d6724_small_ocr.jpg&ccbz=5336948dde9dd62f383baa2768e598b1",
@@ -92,7 +92,7 @@
             "dwbm": "410503",
             "jzwj": [
                 {
-                    "wjxh": "ea369fdb834848e1a49208e4e361e6c8",
+                    "wjxh": "ea369fdb834848e1a49208e4e361e6c4",
                     "mlbh": "8bf38deea0ad2955f04a5cb48954296a",
                     "ywjlj": "http://127.0.0.1:8081/dzjzzz-service/api/dzjzzz/dzjzzzYxJzjbxx/preview?filePath=410503/2023/5336948dde9dd62f383baa2768e598b1/df9e2cdf751c45c797e31ef5324d4940/c83ec40d60206ac19ad69bfc966d6724/c83ec40d60206ac19ad69bfc966d6724.jpg&ccbz=5336948dde9dd62f383baa2768e598b1",
                     "sltwjlj": "http://127.0.0.1:8081/dzjzzz-service/api/dzjzzz/dzjzzzYxJzjbxx/preview?filePath=410503/2023/5336948dde9dd62f383baa2768e598b1/df9e2cdf751c45c797e31ef5324d4940/c83ec40d60206ac19ad69bfc966d6724/c83ec40d60206ac19ad69bfc966d6724_small_ocr.jpg&ccbz=5336948dde9dd62f383baa2768e598b1",
@@ -112,7 +112,7 @@
                     "bsbh": "0b675a539c234a8f97c4563b2cd9524d"
                 },
  {
-                    "wjxh": "ea369fdb834848e1a49208e4e361e6c8",
+                    "wjxh": "ea369fdb834848e1a49208e4e361e6c5",
                     "mlbh": "8bf38deea0ad2955f04a5cb48954296a",
                     "ywjlj": "http://127.0.0.1:8081/dzjzzz-service/api/dzjzzz/dzjzzzYxJzjbxx/preview?filePath=410503/2023/5336948dde9dd62f383baa2768e598b1/df9e2cdf751c45c797e31ef5324d4940/c83ec40d60206ac19ad69bfc966d6724/c83ec40d60206ac19ad69bfc966d6724.jpg&ccbz=5336948dde9dd62f383baa2768e598b1",
                     "sltwjlj": "http://127.0.0.1:8081/dzjzzz-service/api/dzjzzz/dzjzzzYxJzjbxx/preview?filePath=410503/2023/5336948dde9dd62f383baa2768e598b1/df9e2cdf751c45c797e31ef5324d4940/c83ec40d60206ac19ad69bfc966d6724/c83ec40d60206ac19ad69bfc966d6724_small_ocr.jpg&ccbz=5336948dde9dd62f383baa2768e598b1",
@@ -132,7 +132,7 @@
                     "bsbh": "0b675a539c234a8f97c4563b2cd9524d"
                 },
  {
-                    "wjxh": "ea369fdb834848e1a49208e4e361e6c8",
+                    "wjxh": "ea369fdb834848e1a49208e4e361e6c6",
                     "mlbh": "8bf38deea0ad2955f04a5cb48954296a",
                     "ywjlj": "http://127.0.0.1:8081/dzjzzz-service/api/dzjzzz/dzjzzzYxJzjbxx/preview?filePath=410503/2023/5336948dde9dd62f383baa2768e598b1/df9e2cdf751c45c797e31ef5324d4940/c83ec40d60206ac19ad69bfc966d6724/c83ec40d60206ac19ad69bfc966d6724.jpg&ccbz=5336948dde9dd62f383baa2768e598b1",
                     "sltwjlj": "http://127.0.0.1:8081/dzjzzz-service/api/dzjzzz/dzjzzzYxJzjbxx/preview?filePath=410503/2023/5336948dde9dd62f383baa2768e598b1/df9e2cdf751c45c797e31ef5324d4940/c83ec40d60206ac19ad69bfc966d6724/c83ec40d60206ac19ad69bfc966d6724_small_ocr.jpg&ccbz=5336948dde9dd62f383baa2768e598b1",
@@ -152,7 +152,7 @@
                     "bsbh": "0b675a539c234a8f97c4563b2cd9524d"
                 },
  {
-                    "wjxh": "ea369fdb834848e1a49208e4e361e6c8",
+                    "wjxh": "ea369fdb834848e1a49208e4e361e6c7",
                     "mlbh": "8bf38deea0ad2955f04a5cb48954296a",
                     "ywjlj": "http://127.0.0.1:8081/dzjzzz-service/api/dzjzzz/dzjzzzYxJzjbxx/preview?filePath=410503/2023/5336948dde9dd62f383baa2768e598b1/df9e2cdf751c45c797e31ef5324d4940/c83ec40d60206ac19ad69bfc966d6724/c83ec40d60206ac19ad69bfc966d6724.jpg&ccbz=5336948dde9dd62f383baa2768e598b1",
                     "sltwjlj": "http://127.0.0.1:8081/dzjzzz-service/api/dzjzzz/dzjzzzYxJzjbxx/preview?filePath=410503/2023/5336948dde9dd62f383baa2768e598b1/df9e2cdf751c45c797e31ef5324d4940/c83ec40d60206ac19ad69bfc966d6724/c83ec40d60206ac19ad69bfc966d6724_small_ocr.jpg&ccbz=5336948dde9dd62f383baa2768e598b1",