{"Message":"个人中心增加积分记录表\r\n修复日报自动生成功能","MessageType":2,"Modules":[{"State":1,"Type":1,"Name":"PCPage/项目标题"},{"State":1,"Type":1,"Name":"PCPage/项目菜单"},{"State":1,"Type":1,"Name":"PCPage/汇报管理"},{"State":1,"Type":1,"Name":"PCPage/个人中心"},{"State":1,"Type":3,"Name":"MasterPCPage/FGC_母版页"},{"State":1,"Type":15,"Name":"ServerCommand/根据汇报模板生成内容"},{"State":2,"Type":27,"Name":"ServerCommandPrivate/单日自动生成工作日报"},{"State":1,"Type":1,"Name":"PCPage/开发测试"},{"State":4,"Type":16,"Name":"TaskScheduler/应用部署时"},{"State":2,"Type":21,"Name":"SchedulerTasks/工作汇报"},{"State":4,"Type":16,"Name":"TaskScheduler/每日根据报工自动生成工作日报"},{"State":4,"Type":16,"Name":"TaskScheduler/仓库新增事件"},{"State":1,"Type":7,"Name":"Table/积分记录表"},{"State":4,"Type":16,"Name":"TaskScheduler/项目表新增事件"},{"State":4,"Type":16,"Name":"TaskScheduler/任务表新增事件"},{"State":1,"Type":1,"Name":"PCPage/汇报列表"},{"State":4,"Type":16,"Name":"TaskScheduler/任务表更新事件"},{"State":4,"Type":16,"Name":"TaskScheduler/任务成员表变更事件"},{"State":4,"Type":16,"Name":"TaskScheduler/任务成员表删除事件"},{"State":3,"Type":16,"Name":"TaskScheduler/应用启动时"},{"State":3,"Type":27,"Name":"ServerCommandPrivate/自动生成昨日日报"},{"State":3,"Type":21,"Name":"SchedulerTasks/定时任务"},{"State":3,"Type":21,"Name":"SchedulerTasks/事件任务"},{"State":3,"Type":1,"Name":"PCPage/个人中心-积分列表"},{"State":3,"Type":15,"Name":"ServerCommand/批量生成日报"}],"Version":"v1"}

Pages/汇报/个人日报/汇报列表.json

@@ -436,7 +436,10 @@
                   "ColumnName": "汇报人",
                   "GUID": "6fa809b2-a70d-4bd0-9f9a-f82a47d9dfc4"
                 },
-                "Value": "%CurrentUser.UserName%"
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=汇报管理!汇报人"
+                }
               }
             ]
           },
@@ -529,4 +532,4 @@
       "Formula": "汇报列表!$A$2"
     }
   ]
-}//r1dWP5MnpJaSqLf+6JrsWfZCutW8nI1QwpF8TsTAw3orlbe+qo7hDkZAXfMmYPZDM/A9k70ZnhB1Cng9geochVKtg4RCc5RdhpMjM2+OpRMKu/7W3L7mkDZ6I0tu4i2osK8X/2R66zPv/qs3bGw638eNe3wnZaqxbCf8dP/s4NN6gejg2PTLtJ3DxcICFJJuklVRUFY3kcJpLyTkNNlyKJfL1CVsdNZaiUYDJtWHyzuZ1mcWd8CZF2BqkMKGAuYb6UILyhLH2ZZd/KaCzgncox4OEMU4ONnH2Fmugx9hrr+nLGL57ROlKO9RqfuV+UqznnjmRYlsm34GG7jPQPRDo9TwenjK79xRUiBgKBs210OWjdMxyX3i7zxK0v4P3J7Yo4KNGCVDROb86LmmrZ6QxDxVkLGQ4XuInLJ8Sg/U7aYUt2gdGBHGfjdPPfbUuzWyb/ILvmKa/J1MtjHNmM7jBo/aHKqttbkaVjoGDRd5UrYhb4J0Gm/R0vt3y5N/kTk6WpHXvaNgUjLy9KqAb4f/TmSvjg+lzqHQxA7f7NnGW2ySLSZpNd5ns94GQARh+KHPu/MApKwE/ymZo41q2qUZrvMKcFaj0lAuzJAEiZqng3eSBAKBkJbdPiZ1mwOt3NKQpaMJjOuqTxqdhdab84nLj50SFViArkaXepwhoAO19weXEkZWLMcmKkFCNe5Nd5PFSPRguTAPbZ6iYk4eTNscGGYY7xQH1rdSjpnRzwd/UVrOm+7SwHKCdxYXXRB/b1CO+yF2ZquO6NH19OBNLjIDnAJAgQKXgtYPqMeM0WjTcVZG6uXZSuwnKCq7tNsp7/0ATWvO4rtkg5OIhfODRaaU9vyjTUFvsTxdksccrLDOCf8QSIf+ix0oyBkmbFNFgNDanH63cVpJb9fd54XrC8p9iQ==|920
+}//O507/flFdrGp/ul7g39e0JYDrE9+7qtjYf2jaIl5ioes5h3zt/hDLd87tIiixPfgpYpdhTgaef2klYVywTDCNcAwGbxYvmY1EzQTxdlZ8xiq/GOn6HDN3541onVOe4+kYDSmY/IzEcH8a6aXWrAzHl5lvpvoUrLf9JB96f1Z8rH373qDDh9pWxaFceV1p7k9/sk0sxfy6EUxRjoCM/FxYhiB1pRyCUATADHrIKlQRv7KDWIUG+R2uwWc5M+gmz+5kprUAYiiwqTNH4E/5NWgTcBH4MeWZ4X3Bzx6hVGBPqZZZa/gMamkQzqB7Tq06B/Rdh26P8NTgA4y2FTrSuWf4KwzlN1UznK633PzGtRXVnWPduNPwS0wKI0cU+ytTIyJPG8blOl2DrBXfXCHCPbJv3z7BsUGK9pbV9FZnBdVh5ULQiKf8aLG5USblqNGqyV7oZ7O25yvkzkr6GBnnlo7XHafv0dlaA2zVXt0Wxyr6SldBz0R0PNkj3K3433qk0YifGEt9D5Se6bJWqCpHRhKAToihNH6B55ywxO+gd3Fbd2lpp/Rmlic9Q1c0H+ZyUxpGa7T/dKxoOBIn/IktfSGwCvbiI5E/f6ZOJnA7a1NsDdZYD+KSTByYHe4DT/8qPp/pQCtdxVbdlKKpNkScr67D4ez7vKIuaeIQR+0y/HmfkW9eOx6lJ3+PG2eClpF8BahPBeR/zgVaOu7stglxE/UPyFGzda4LaCoLjJpjMBKG2+0XODz4w1jN9/DExD6hKPfTuPLafv55G7Y4deUV37wbxzK5pvH8iBylJ39a3TAIcuToNIcrmZ91r9oOKZRtSBa93+yugNWx4U/HvxliVxUk0Jd7pQ1wMxaNsxUdE/iS+3u0IH/M8kBnCY6gz5yeZr10af6w1WqRS7sVKl6mq+FDA==|920

Pages/汇报/汇报管理.json

@@ -300,6 +300,7 @@
     "1,6": "日报",
     "3,1": "关键字",
     "5,1": "成员",
+    "5,4": "%CurrentUser.UserName%",
     "5,15": "日期",
     "7,1": "状态",
     "7,15": "对象",
@@ -589,7 +590,7 @@
                                   }
                                 }
                               ],
-                              "ID": "d937f8dc-2e1f-4620-bed5-fedc2606d6ef"
+                              "ID": "79834fbe-6eb7-474c-a6e6-4dcb66dd1bf6"
                             }
                           ]
                         }
@@ -784,7 +785,7 @@
                                   }
                                 }
                               ],
-                              "ID": "841d2fd2-55cb-416c-9067-a68e86a8859c"
+                              "ID": "230ce1d1-860f-469a-b79f-1458cc6c643f"
                             }
                           ]
                         }
@@ -1029,6 +1030,7 @@
             ]
           }
         ],
+        "DefaultValue": "%CurrentUser.UserName%",
         "useBinding": true,
         "options": [
           {
@@ -1057,7 +1059,7 @@
           "TableName": "用户信息视图",
           "BindingInfos": [
             {
-              "GUID": "260c7191-98a0-4f92-a0a5-2f9341a8ab2a",
+              "GUID": "43fb7233-8ee7-4555-8e86-5380764b2545",
               "BindingInfo": {
                 "TableName": "用户信息视图",
                 "ColumnName": "用户名",
@@ -1066,7 +1068,7 @@
               "ColumnName": "value"
             },
             {
-              "GUID": "c1bc1e1b-e8c5-42ff-81cd-0f583a921f42",
+              "GUID": "b98a12a3-7be2-4aad-afc4-bbb64d361484",
               "BindingInfo": {
                 "TableName": "用户信息视图",
                 "ColumnName": "全名",
@@ -1075,6 +1077,32 @@
               "ColumnName": "label"
             }
           ],
+          "SqlCondition": {
+            "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+            "SubConditions": [
+              {
+                "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+                "ColumnBindingInfo": {
+                  "TableName": "用户信息视图",
+                  "ColumnName": "用户名",
+                  "GUID": "4e387139-6329-4032-89d7-8eda78e59436"
+                },
+                "Value": "%CurrentUser.UserName%"
+              },
+              {
+                "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess",
+                "CompareType": 6,
+                "ColumnBindingInfo": {
+                  "TableName": "用户信息视图",
+                  "ColumnName": "组织上级",
+                  "GUID": "05811a2b-88df-4365-8169-ea8aab0958ac"
+                },
+                "Value": "%CurrentUser.UserName%"
+              }
+            ],
+            "RelationType": 1
+          },
+          "NullFormulaValueQueryPolicy": 1,
           "CustomColumns": []
         },
         "placeholder": "请选择",
@@ -1400,15 +1428,6 @@
       "5,2": 3,
       "5,3": 3,
       "5,4": 4,
-      "5,5": 3,
-      "5,6": 3,
-      "5,7": 3,
-      "5,8": 3,
-      "5,9": 3,
-      "5,10": 3,
-      "5,11": 3,
-      "5,12": 3,
-      "5,13": 3,
       "5,14": 3,
       "5,15": 5,
       "5,16": 3,
@@ -1678,12 +1697,12 @@
     "5,15,1,2",
     "5,17,1,12",
     "5,1,1,2",
-    "5,4,1,10",
     "7,1,1,2",
     "7,4,1,10",
     "7,15,1,2",
     "7,17,1,12",
-    "1,6,1,6"
+    "1,6,1,6",
+    "5,4,1,10"
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -1755,4 +1774,4 @@
       "Formula": "汇报管理!$R$8"
     }
   ]
-}//mLUF3nsvbutKSLjm4gZmfijddxo6XyQvmEOhyA1xUoWZYbDu2TuG8c1gR85ykuy89xbpVc+aiUQx51Oe1nYE35R1pPm0vmiIAMVvppXxGoHRSwRb7WhCteikKtv73sxRGVDwMsyamzr7F7SOQ/uFCytOYs9QbZSW7CrxDoBOK96zkK4T5yvMkEHxXwCuNaKJJ/Cg/nd3TgxUe/bJ20jieYrq4Dbb0lZlbT94ScFQx73BiTWz8VxMbA0P6jeXNTjgwHl0chfydWeRl3pCWwvn11sBd84+3qsI/vPqHRG0Z3wUFrpJoqeLOtjyEm5AjPuRtV4/n72PR0zVS4Pa7xhHEoY8ydJDQuhoy1nbWww4KlMQl7/iLo1ShbxrusyPT5M9HpbhaP8xg/hGhq3S/sAeWmVnoKfF118Jt+IWeRC+1Magk6L+9LzhTS3vLdIyP5mjw3QK61RukPDsQq7WTF06J5GXUcO7JK2GEWTDyswap5OVZ+VglGKZZv1D+scPHvjS9iCrHpIrs1MvoUCfjZTRPEqYXJzoMUcKnn7yPpdMHLpB0VucW4jsSj1ccelX1f4UcKSEjtMqKUzqlyV1xJz++WFDc+yM26yFRrEZskOhhv6WruXNgPXpF0sOb5xqb4E6gXFzKM/fUkiFrYY4XQ1EtqDT+Qvm1U3mSWGwlkEOn3+0KFo23rT5kOvJbvlIUEXT5b0nKY8iWnbe89jzK0sgdpw3SIC7ajDkWpSxDEfRpGesUl9Qa6Yt8AYgEJlslLpqGOyFg1DcZFv8p3o7aZFMSvuVVlph1ycaKiDX77p9ldi+HLbEIgmMo+QZDcJSb9IBXQ6a/Mz6S/N+aRd1GPQS9zKgb068KopHD1KcEZc+w6MSse9RRKFE/oVzchSZRkXPmymRbbwD669N3EhmPCTK+g==|920
+}//dBEjGeVQA/yiDxyWjSEPZWtOgnGUurwr9CD6Ssf4WnxAYmhXYkv+C5CtwizSnexKSCyXli/tDCzp31SypVQenfmDZSwCp5dVVDkiYj3qrvUpIvfpsLU3WLbpnBOvTdinnDaZxt8iL1r0W+J9aSyH7zolQnf5qz60nWTwIiGPkgVcnwdqdavW8gLNc7MGnYTgtNNyH3eE0ALaRAtT+ucR/Erd5t3iSSlrcsxe3UdJuX/yOJmqXKqROHUw0zYLkyWSJV2R7ihzq6UbdWLtpEWnckpX0yO4ELLU10yDFpa8d3/AYVEkPsS/0rbA+SMnigp3lrEffKLnoLZVFhQgIGVqKRYz15BPuuoVLGz5tqf//glVGqJnrgGk3xsmvu51YJA9Dx8Bl0bwXYX3WgqgXHjiEt53dUjJwktdmoh+wpydbfEKrxStY3CfGY+e54ZuKCxG+pVwVNIXpGQyGNGEqRnaSOAKP0o3Yu+2+GVqEVtYervsTzxOIMNvuZ5g+iQ/grsyQY89LY/qAw7eZI0GS9l7af+FwUXOM7uf3k4NVUllz3i4USSqnMQD8Mbk0PiR0HHzZ1WimgF5z3Tje2zn4vJNF+SOmJ2NQOtnIn0XuQTH4Whfp+o/zF5qETMtKNpnxSwEQ1ze5niZP65wYKI6JxoirOwAk4iG4d0g87jZe0exuUzsrfx0sC2feOvn6fdM+DS55gXfOGfeaRxACWebI8NJoij8RqwJlyfKMCJsJvIMvuVGFfySmkbaJZxpGZVgOHyI593q24yXouEp8yIb4VeQz9sOf1B6wLtZgmEXgIR4zFL3a4uDcu2gn8Ez32AkfvVdyfDWxRkMt4BtoYYzYTw5A3ZoqG/u6izINcnqT7dSHl/k4+E1rAOtLeXd2FS/VgFtiAz5bqNon6W0VVp+/CxU7Q==|920