diff --git a/.collaboration b/.collaboration index 80f0f46d..92986b76 100644 --- a/.collaboration +++ b/.collaboration @@ -9,47 +9,17 @@ }, { "ModuleName": "Table/FGC_订单记录", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-16T21:14:00.7477663+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\FGC_页面模板文件夹\\联动页\\FGC_订单记录.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "Table/FGC_订单明细表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-16T21:14:00.7477687+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\FGC_页面模板文件夹\\联动页\\FGC_订单明细表.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "Table/FGC_商品表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-16T21:14:00.7477712+08:00", "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\FGC_页面模板文件夹\\联动页\\FGC_商品表.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -166,16 +136,7 @@ }, { "ModuleName": "TableView/人员工时统计视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-16T21:36:36.1603709+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\工时\\人员工时统计视图.json" - ] + "ModuleType": 23 }, { "ModuleName": "Table/任务工时表", @@ -215,137 +176,47 @@ }, { "ModuleName": "TableView/用户信息视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-16T21:14:00.7477791+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/用户组织关系视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-16T21:14:00.747781+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户组织关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/用户角色关系视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-16T21:14:00.7477826+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\用户角色关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/组织信息视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-16T21:14:00.7477841+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\组织信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/组织级别视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-16T21:14:00.7477863+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\组织级别视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色信息视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-16T21:14:00.7477884+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色信息视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色分类关系视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-16T21:14:00.7477901+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色分类关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色拥有权限视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-16T21:14:00.7477914+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色拥有权限视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { "ModuleName": "TableView/角色组织关系视图", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-16T21:14:00.7477929+08:00", "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\用户\\角色组织关系视图.json", - "ForguncyDB.sqlite3" - ], "ExclusiveType": 0 }, { @@ -378,16 +249,7 @@ }, { "ModuleName": "Table/汇报子表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-16T21:09:43.0883283+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\汇报\\汇报子表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Tables/收益", @@ -419,16 +281,7 @@ }, { "ModuleName": "Table/付款凭证表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-16T21:14:00.7477987+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\财务\\付款凭证表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Pages/内建手机页面", @@ -892,19 +745,7 @@ }, { "ModuleName": "PCPage/汇报详情", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-16T20:40:14.4003858+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\汇报\\汇报详情.json", - "Pages\\汇报\\汇报详情.rd", - "Pages\\484d3ed119274a60bf32f15d178cf60.json", - "Pages\\484d3ed119274a60bf32f15d178cf60.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/汇报详情预览", @@ -1184,17 +1025,7 @@ }, { "ModuleName": "ApplicationSetting", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-16T20:28:35.0789183+08:00", - "ModuleType": 8, - "ToRemoveFiles": [ - "ApplicationSettings.json", - "favicon.ico" - ] + "ModuleType": 8 }, { "ModuleName": "Theme", @@ -1542,19 +1373,7 @@ }, { "ModuleName": "Upload", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-16T21:14:00.7482597+08:00", - "ModuleType": 26, - "ToRemoveFiles": [ - "Upload\\485a297c-1ba3-42a6-afe8-c2409d9f01fe_app-logo2.png", - "Upload\\485a297c-1ba3-42a6-afe8-c2409d9f01fe_app-logo2.small.png", - "Upload\\a78dd055-76a1-433b-b6a1-70cff99fd6fb_app-logo2.png", - "Upload\\a78dd055-76a1-433b-b6a1-70cff99fd6fb_app-logo2.small.png" - ] + "ModuleType": 26 }, { "ModuleName": "PublishConfiguration", @@ -1562,39 +1381,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-16T21:50:58.2830748+08:00", - "ModuleType": 40, - "ToRemoveFiles": [ - "Plugin\\Echarts图表-10_0_1_0.zip", - "Plugin\\Editormd-6_0_102_0.zip", - "Plugin\\Forguncy.CustomMenu.zip", - "Plugin\\Forguncy.PassListviewDataCommand.zip", - "Plugin\\JSON 序列化和反序列化-10_0_1_0.zip", - "Plugin\\JSON数据源-10_0_1_0.zip", - "Plugin\\Notiflix-9_0_103_0(1).zip", - "Plugin\\PC组件包-ElementPlus-10_0_1_0.zip", - "Plugin\\SqlServerWrapper.zip", - "Plugin\\Tiny富文本编辑器-10_0_1_0.zip", - "Plugin\\xTools快速开发工具包-9_0_4_0.zip", - "Plugin\\加载动画-10_0_1_0.zip", - "Plugin\\增强关闭页面-9_0_6.zip", - "Plugin\\复制到剪贴板-7_0_3_0.zip", - "Plugin\\客户端缓存操作工具库-8_0_0_0.zip", - "Plugin\\富文本编辑器-10_0_1_0.zip", - "Plugin\\对象与集合操作工具-8_0_0_0(1).zip", - "Plugin\\支持预览的附件上传-10_0_1_0.zip", - "Plugin\\文心一言-10_0_1_0.zip", - "Plugin\\甘特图-10_0_1_0.zip", - "Plugin\\用户管理命令 V2-10_0_1_0.zip", - "Plugin\\表格报表-10_0_1_0.zip", - "Plugin\\设置当前行命令-10_0_1_0.zip", - "Plugin\\设置焦点命令-10_0_1_0.zip" - ] + "ModuleType": 40 }, { "ModuleName": "PublishSetting", @@ -1642,16 +1429,7 @@ }, { "ModuleName": "ServerCommand/AI自动编写汇报", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-16T18:40:51.4645859+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\汇报\\AI自动编写汇报.json" - ] + "ModuleType": 15 }, { "ModuleName": "PCPage/项目版本管理", @@ -1667,43 +1445,19 @@ }, { "ModuleName": "Table/message_test", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-16T21:14:00.7477957+08:00", "ModuleType": 7, "ExclusiveType": 0 }, { "ModuleName": "ServerCommand/测试GPT", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-16T20:09:30.2293131+08:00", "ModuleType": 15 }, { "ModuleName": "PCPage/日报助手", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-16T20:45:45.9976613+08:00", "ModuleType": 1 }, { "ModuleName": "ServerCommand/AI生成日报详情", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-04-16T20:49:53.3894292+08:00", "ModuleType": 15 } ] \ No newline at end of file diff --git a/ApplicationSettings.json b/ApplicationSettings.json index 6ea051f5..1421ccd4 100644 --- a/ApplicationSettings.json +++ b/ApplicationSettings.json @@ -4,7 +4,12 @@ }, "ShareCommandContainers": [], "ListviewLoadingIndicatorSettings": {}, - "GlobalProperties": [], + "GlobalProperties": [ + { + "Name": "全局配置", + "Value": "{\"AI提示词1\":\"我将发给你一个记录着某人一天工作内容的数据，为JSON字符串，请你尝试解读它，内容中的[汇报类型]分为`日报`和`计划`。\\n- 日报指的是昨日工作内容的总结；\\n- 计划指的是今日计划工作安排；\\n请你使用为我编写一篇简要的工作日报，对于日报结构和要求如下：\\n标题为固定格式：YYYY年MM年DD月-某某工作日报\\n内容包含两个主题：昨日工作总结、今日工作计划\\n每个主题下的内容从JSON中总结，可以适当润色，但不可过度偏离源数据中的工作内容,所用工时在内容后面用括号备注，如：(1h)；\"}" + } + ], "WebSitePort": 26489, "UserServicePort": 20913, "BpmServerSchemaId": "b29232ad-8f53-4d10-87f3-3af0bf8b4aa6", diff --git a/ForguncyDB.sqlite3 b/ForguncyDB.sqlite3 index d2a98c5c..4b4eda36 100644 Binary files a/ForguncyDB.sqlite3 and b/ForguncyDB.sqlite3 differ diff --git a/Pages/484d3ed119274a60bf32f15d178cf60.json b/Pages/484d3ed119274a60bf32f15d178cf60.json index 4eebeaf8..ae76f7d9 100644 --- a/Pages/484d3ed119274a60bf32f15d178cf60.json +++ b/Pages/484d3ed119274a60bf32f15d178cf60.json @@ -901,7 +901,7 @@ "MethodName": "ExecuteCommand" } ], - "ID": "c48e0a62-b149-4b54-87e6-2858183e0f9d" + "ID": "72808d34-0d35-4b0c-844d-a126daef0126" }, { "CommandList": [ @@ -915,7 +915,7 @@ "MethodName": "ExecuteCommand" } ], - "ID": "cae46f44-28ce-4a2b-8134-757fde08013f" + "ID": "2f6ef102-f11d-409c-813c-3b3c857c94d4" } ] } @@ -1131,4 +1131,4 @@ "PaperSize": {}, "Margin": {} } -}//mwDVsybxWMZ1WBYqJwTiV2IO1Lopjpi9FQf94XykN6s8auA+cJYnrpnoI7i2w1MW7gNFmXPzRGDYJOsTmoy1jCLPnfmlp9Ag3XjAIMeSiPU3n2whhVUwMKBIbqo8AI0yyrEcin9y2M3fuzy6bMY3cd+wu39uG3ifb1W7doh66keMq+g8ag0e7JKiHcjSYgoaIBvw6vDBtmEMMdAtdKOKmZmiEJBRKvgwyI2YvCrlYTQovZkqdcm4jkoYAAUUUtj6BSZDtLSQMHVJeSn0winyEWv2TZWmOwnGV0BLCU8PjRP3Ne/Gse6yMlYAkM5T/QjPA1iqGTiKbmzTJFP+yFWWWte2o26ww2C6nkNg4C51Krnfy6LFgf9EkQfVEzehCjy1H0klouvBBlGKBBmRIMhl0zevyYJRvosXtw9rki1Li2XxqLH9Jqi6juaiBv+Ic4ftk+1HXmGTbLoeUZJkVe6OnckY33dxXtsXaPjxwP22jHmjf3lBypNZ+1NGuayB9+V4MxDGfUL2lLWqZuOc6hPgscavw4Ule3IMDF447ZIr04e/k/gtFqMnR8xYgQOoFUANcJDL5WLLbW06lYSjBIT76n4Hvz5B7GTWeTCrgwytL02EREri854oqFexr0+cHUxtXHlOnNkjdn7FALl/JZnoeoPr2OlxZu3+v+h4meBY1mRs6HY6FYEX0reLY7cxhddiapcmBKZmVRzEJVJhA/FWthPU8v4ISCHCozKohHrJ9hLvy/5CNhID0Otn9Kbzy090aE+CoLBp9VnxasJQAlB1IDfIT65xIfEbdcFcuATRzkpbwfSVtMhR3qUyBOrXlMTjvlO6/H2Y+cfI8rLwWeFDNOW0yjJkRmEvjDh5ZG2WAIKeQuwOKY5D+XbNq4L9CTDvF+blaeYcvncizeUBbW8dbQ==|920 \ No newline at end of file +}//VkyUTj+Jg8ZNCDDlVcRntGXgqPmJj5UOug2qxZS5vrfrfVwGC2IBeXmQo6uB0kT4RABZninu8IwFiFEj04snz0Xr1iQlMFAN/Bf4lqe1QW30+K2em1P/LSjNJhfhS6ZWO0SBpgDEw/mMjNpnBDytP/E7eRn2dnrxieifSc8IrJMo89EIrJivQyOP08+usEdXHEH1ES+LisgSz9CeRR3n6BpUnELXHuw/JHOGd02DBlGBh+w/DOgObD6hg/Ki7+10psx42vCByHrw74A1HXtzTAg/8rc64XOdmWUM0jqcnxa2nT6x26tF5H+jgZUvjL8t7yw6Oc3UVanA6o0tEcVSK1lE/Li40hhp+OGGJa7LukDBvyzLyktl/p0OQMOK1RNwF6V8sIN9S8S2/rhXdAJMBgLrLOBgCEVi/WYako4JU8MptQDp31iMPnfDn7chLz1k5HOfeD6wR3EnBtvP5k6vQkp3/P6CysL9m5+LbTfi0WZ7nYZOgPJeYs4rjNBQo8amVgUWzJU5SeRlRYZlYeCx/6GkwCZUYO1KYG8YfTCJmVUZ1vw0k1s6asahJ2kmeD7isNka5+PfrNlP9s9OIrzYENsT5V6k94iDAyq5S7YDhv79m39aP+4Q5vYXhPYWGuq4lvWYSQvzZ+mz1YbkpICAPdcq8B4xuqtz/3eTuH2kAQKlT21iFBrxr/J91WXgJsAFF09gyGCOGOWHUFn1BZl5CGoHb+vV/0HxzS2WFnLfvSh3zgTQFa8lJZD1SKYQy1El9MlL6qj57jWXVFdS8rJJGDPWdxJFh9KbpSEudajOmeW34X2ojPFPDtcTUb/jHb/FtkRgztvnM9GhAvbNh9hTvUS9S2+JSif1lRoYJcyzhKu3CpwgoIWbfgfdrDnqKDmFhznLSQrTIYKHldJt1wklPg==|920 \ No newline at end of file diff --git a/Pages/汇报/日报助手.json b/Pages/汇报/日报助手.json new file mode 100644 index 00000000..6ae060b4 --- /dev/null +++ b/Pages/汇报/日报助手.json @@ -0,0 +1,630 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 77.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 31.0, + "Mode": 1 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 38.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "18": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "19": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "IsHidden": true + } + } + }, + "InLogicalVisibleIndexes": [ + 19 + ], + "Count": 20, + "DefaultSize": 32.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "17": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "18": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "19": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + } + }, + "Count": 20, + "DefaultSize": 32.0 + }, + "Values": { + "4,1": "生成", + "17,10": "重新生成", + "17,15": "确认内容", + "19,6": "%CurrentUser.FullName%" + }, + "AttachInfos": { + "1,1": { + "CellType": { + "$type": "ElementUI.InputCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 4, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "textarea", + "resize": "vertical" + } + }, + "4,1": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "Title": "加载中" + }, + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=日报助手!B2,日报助手!B5" + }, + "PropertyType": 0, + "Value": false + } + ] + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "AI生成日报详情", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "汇报人", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=日报助手!汇报人" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "汇报日期", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=日报助手!日期" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "汇报内容", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=日报助手!B2" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "ReturnPropertiesTo": [ + { + "ResultPropertyName": "日报JSON", + "ResultTo": { + "SerializeProperty": "日报JSON" + } + } + ], + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=code" + } + ] + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=日报JSON" + } + ] + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "JsonDataSource.ImportJsonDataToListviewCommand, JsonDataSource", + "Listview": "表格1", + "ListviewColumnInfos": [ + { + "ListViewColumnCell": "汇报类型", + "PropertyName": "type" + }, + { + "ListViewColumnCell": "汇报内容", + "PropertyName": "content" + }, + { + "ListViewColumnCell": "工时", + "PropertyName": "time" + } + ], + "SourceCell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=日报助手!日报JSON" + }, + "SampleJson": "[\r\n {\r\n \"type\": \"日报\",\r\n \"content\": \"今天和报价系统部门做了沟通，了解了关于成本的细节\",\r\n \"time\": 120\r\n },\r\n {\r\n \"type\": \"日报\",\r\n \"content\": \"对发票标准版系统进行了升级\",\r\n \"time\": 0\r\n },\r\n {\r\n \"type\": \"日报\",\r\n \"content\": \"研究了时间轮插件，并进行了测试\",\r\n \"time\": 120\r\n },\r\n {\r\n \"type\": \"计划\",\r\n \"content\": \"继续测试时间轮插件\",\r\n \"time\": 0\r\n },\r\n {\r\n \"type\": \"计划\",\r\n \"content\": \"更新发票标准版系统的离线发布文件，并部署到测试服务器\",\r\n \"time\": 0\r\n },\r\n {\r\n \"type\": \"计划\",\r\n \"content\": \"完善PMS\",\r\n \"time\": 60\r\n }\r\n ]" + }, + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=日报助手!msg" + } + } + ], + "ID": "5a76d1c7-dcf6-46ce-a8a4-a665b849d626" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "FunctionName": "info", + "Title": "温馨提示", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=日报助手!msg" + }, + "BtnText": "知道了" + } + ], + "ID": "9feacc86-15a8-4fe2-8e90-377848fa11cf" + } + ] + } + ], + "ID": "c1c208a6-04e4-4471-8822-6b373c76bc89" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "FunctionName": "warning", + "Title": "温馨提示", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=日报助手!msg" + }, + "BtnText": "知道了" + } + ], + "ID": "c7f03c5b-4d3f-4040-a0cd-6b1dc3718dbd" + } + ] + }, + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=日报助手!B2,日报助手!B5" + }, + "PropertyType": 0, + "Value": true + } + ] + }, + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中" + } + ], + "Text": "生成", + "TemplateKey": "_RS_Main1" + } + }, + "6,1": { + "ListViewInfo": { + "Name": "表格1", + "TableName": "汇报子表", + "RowIndex": 6, + "ColumnIndex": 1, + "RowCount": 10, + "ColumnCount": 18, + "TopCondition": null, + "ListViewStyleName": "_RS_NewFashionListStyle2", + "ShowColumnHeaderInDesigner": true, + "ShowEditStatusIcon": true, + "UseSimpleBar": true, + "ColumnOperation": 2, + "CommitType": 1, + "DoNotLoadDataWhenLoadPage": true + } + }, + "7,1": { + "NameUsedInJavaScript": "汇报类型", + "BindingInfo": { + "TableName": "汇报子表", + "ColumnName": "汇报类型", + "GUID": "a216d4ff-b341-4f26-b0c8-a7745ed4f72a" + } + }, + "7,6": { + "NameUsedInJavaScript": "汇报内容", + "BindingInfo": { + "TableName": "汇报子表", + "ColumnName": "汇报内容", + "GUID": "8175c621-b9cc-4910-bf7e-e98e706e3b25" + } + }, + "7,14": { + "NameUsedInJavaScript": "工时", + "BindingInfo": { + "TableName": "汇报子表", + "ColumnName": "工时", + "GUID": "4577bb67-3180-45f3-95de-02e02b9e50ef" + } + }, + "17,10": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateListviewCommand, ServerDesignerCommon", + "ListviewName": "表格1", + "UpdateType": 2, + "UpdateRowType": 2 + }, + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=日报助手!B2" + }, + "Value": "%Null%" + } + ] + } + ], + "Text": "重新生成", + "TemplateKey": "_RS_Information3" + } + }, + "17,15": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "PassListviewDataCommand.PassListviewDataCommand, PassListviewDataCommand", + "PassValueItems": [ + { + "SourceCell": "汇报类型", + "TargetCell": "汇报类型" + }, + { + "SourceCell": "汇报内容", + "TargetCell": "汇报内容" + }, + { + "SourceCell": "工时", + "TargetCell": "工时" + } + ], + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=日报助手!B8" + }, + "Target": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!B8" + } + }, + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon" + } + ], + "Text": "确认内容", + "TemplateKey": "_RS_Main1" + } + } + }, + "StyleDatas": { + "Styles": [ + { + "FontFamily": 0 + }, + { + "FontSize": 13.333333333333332 + }, + { + "FontFamily": 0, + "Formatter": 1 + } + ], + "Types": { + "Strs": [ + "Body", + "[AUTO]General" + ] + }, + "CellStyles": { + "4,1": 0, + "6,1": 1, + "6,6": 1, + "6,14": 1, + "7,1": 1, + "7,6": 1, + "7,14": 1, + "17,10": 2, + "17,11": 0, + "17,12": 0, + "17,13": 0 + }, + "SheetStyle": { + "FontFamily": 0 + } + }, + "Spans": [ + "19,1,1,5", + "4,1,1,18", + "17,15,1,4", + "17,10,1,4", + "8,1,8,18", + "1,1,2,18", + "19,6,1,5", + "7,1,1,5", + "7,6,1,8", + "7,14,1,5", + "6,1,1,5", + "6,6,1,8", + "6,14,1,5" + ], + "PageInfo": { + "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + }, + "RowBreakLines": [], + "RepeatRangeSettings": [] + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + }, + "CustomNames": [ + { + "Name": "日期", + "Formula": "日报助手!$B$20" + }, + { + "Name": "汇报人", + "Formula": "日报助手!$G$20" + } + ] +}//++G/vx89i5Xhq7K+HiCyRHnqNjTOVqR25MY75zI0P6lC4pHzu7El1CdWogC5WO7tfUN4rqhwgFkHs1nCPGd9tdCxeZ3sI6Wt2cUZqpFeONzsWUY9odMGYdtAgtiFObDBxP+8oSgffyuj4uc+lgmEmn4IFsTzJf9qf7XvD57ruI9Ka1JATTpWYWJtcFYGanTeciRdTS3Qvl8gcShOMtW1meakudmGqMFVYqhbBauikVmynaC4O+o2m7dCuGYAfazizsNCyuDns7pOzChqaPLgi4YO/Mw8++M38sXMqM7CdI2GExsGmtPQzZSyC02gcEUKytoO2DS8KmboH15SmCtZy9QxV/cVLeCzsnOt56KwlXErKfrXSLAVYbIh9kg8IfamafSo8PjAzp5uwFPwHru1aAoZvSNhZ02QNlHyaX2EHuKqOdbsACjEu2MH56UJv6lv9TUJhQNZlA17IC81F9Wl6EpIcaxFwlAVPw4rk7zHSsZ+lsSCsb/5GwrZbi9xf+1aim6rFIW2zonZPml0x4X/8nqWFaLFp9PDbgGBcJ+HetMrtklZNSY9z706gZdqc+mf6I9oNNdly87gRzhSehZ7ezhUgi3hHmzdNhSMx2T0eRIp5meQYc7wI0I55TrNML4PH3pcakoMi9zDH7IObKBIaV6Yx1JGcDGQ+1esWA4N4YTb2Q+d80YYKzc1b06Aaz8x1NWIMwQVJK0iky00FhgWV/h56GAxGqJz0c4gz7uJOLwE6csETcNxyTKH50Ix54CVsr7TnuIyxZc3KWW2D7aKbZ54pVQmVHRdULFptPjZp40fmTjCWzHspK/GunelPAjx//Qn2IWW3eDlVXPB3BfU7Lvnd9I+9uDVYgMurbcAv/wX6DfVUSoRUmbP0GtDntf8InYFgS4qPwNXeMDf+Pp37g==|920 \ No newline at end of file diff --git a/Pages/汇报/日报助手.rd b/Pages/汇报/日报助手.rd new file mode 100644 index 00000000..f434cef7 --- /dev/null +++ b/Pages/汇报/日报助手.rd @@ -0,0 +1,15 @@ +{ + "PageType": 0, + "ColumnCount": 20, + "RowCount": 20, + "CustomNames": [ + { + "Name": "日期", + "Formula": "日报助手!$B$20" + }, + { + "Name": "汇报人", + "Formula": "日报助手!$G$20" + } + ] +} \ No newline at end of file diff --git a/Pages/汇报/汇报详情.json b/Pages/汇报/汇报详情.json index dddf71ce..0ec08b0e 100644 --- a/Pages/汇报/汇报详情.json +++ b/Pages/汇报/汇报详情.json @@ -224,10 +224,12 @@ "9,15": "关闭", "9,19": "保存", "11,7": "新增一行", - "11,13": "%CurrentUser.UserName%" + "11,13": "%CurrentUser.UserName%", + "11,16": "%CurrentUser.FullName%" }, "Formulas": { - "9,19": "IF(汇报ID>0,\"更新\",\"提交\")" + "9,19": "IF(汇报ID>0,\"更新\",\"提交\")", + "4,24": "TEXT(汇报日期,\"YYYY年MM月DD日-\"&用户全名&\"工作日报\")&CHAR(10)&\"昨日工作：\"&CHAR(10)&CHAR(10)&CHAR(10)&\"今日计划：\"&CHAR(10)&CHAR(10)" }, "AttachInfos": { "1,4": { @@ -293,6 +295,31 @@ "TemplateKey": "Gost" } }, + "1,21": { + "CellType": { + "$type": "Forguncy.ImageCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "日报助手", + "PassValues": [ + { + "Source": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报详情!汇报日期" + }, + "TargetCell": { + "SerializeProperty": "=日报助手!日期" + } + } + ] + } + ], + "ToolTip": "AI助手", + "Size": 24, + "ImagePath": "成功.svg" + } + }, "1,26": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", @@ -453,7 +480,7 @@ ] } ], - "ID": "c46b7e04-3638-4181-8318-56de5bc86ab7" + "ID": "ebdebbff-23b6-4cc0-89af-5e0135845151" }, { "CommandList": [ @@ -468,12 +495,12 @@ "BtnText": "知道了" } ], - "ID": "f403d8df-4715-4f96-ab5c-4cf305a8e3f0" + "ID": "170c99f7-8e1b-418a-9df1-612c24718fc9" } ] } ], - "ID": "8b9329b2-5c31-4bc3-b2a8-5234a755365c" + "ID": "40c52b13-79e9-4702-8e82-ffbb991597c5" }, { "CommandList": [ @@ -483,12 +510,12 @@ "Message": "请先填写工作内容" } ], - "ID": "7555af20-30a4-46ce-8f19-6a9b6e8f2d0b" + "ID": "252c8a8a-e8f7-48e9-9cca-9b5facb8fc1a" } ] } ], - "ID": "48b82486-d458-4940-9223-a1e8a5332227" + "ID": "aec91fd1-c2f1-4a62-b6a0-a1d29e9eb426" }, { "CommandList": [ @@ -498,7 +525,7 @@ "Message": "请先保存后再试" } ], - "ID": "52174e6c-d89f-4caf-b508-8cf6780dd6ce" + "ID": "54ca4f05-afbc-4b7f-a184-edd833b0c48a" } ] } @@ -521,23 +548,7 @@ "GUID": "010bf853-5439-4277-ab42-49232a158f40" }, "CellType": { - "$type": "TinyRichEditor.TinyRichEditorCellType, TinyRichEditor", - "UIPermissions": [ - { - "Scope": 4, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ], - "ShowMenuBars": false, - "ShowToolBars": false + "$type": "HtmlRichEditor.HtmlRichEditor, HtmlRichEditor" } }, "5,11": { @@ -730,7 +741,8 @@ "CommandList": [ { "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", - "Title": "提交中" + "Title": "提交中", + "VBalidate": true }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -825,7 +837,7 @@ "ReloadData": true } ], - "ID": "e3d2bf11-1f3d-4150-9722-037e8c5753ab" + "ID": "e74fee6f-d3ad-4608-9fe0-ae528118c9f7" }, { "CommandList": [ @@ -835,12 +847,12 @@ "Message": "该日期已存在汇报，请前往列表中进行更新。" } ], - "ID": "bfe246af-3556-490a-afbf-199326138793" + "ID": "f1e16a87-4c0d-4b51-b2b1-42b9a11766fd" } ] } ], - "ID": "61c24a52-1caf-40e4-8eca-2b1310b9c7c0" + "ID": "0cba311f-843f-4a42-b7cf-6d0091a712a7" }, { "CommandList": [ @@ -923,7 +935,7 @@ "ReloadData": true } ], - "ID": "715c09bb-37a2-4f23-84fb-3bc86b5a71e3" + "ID": "af3dd6a8-415e-44de-9efb-debb2c8b7dba" }, { "CommandList": [ @@ -933,12 +945,12 @@ "Message": "该日期已存在汇报，请前往列表中进行更新。" } ], - "ID": "821cc767-f308-4cfa-b9d1-f603185b6046" + "ID": "e2f73e60-0f01-4bf0-8ada-a695d0b97d0b" } ] } ], - "ID": "27f457dd-4a29-4f9c-b2c0-c1a63c4854ec" + "ID": "15455a5d-d07f-4cc6-be86-3f6dc7af1b53" } ] } @@ -1158,8 +1170,6 @@ "11,12": 0, "11,13": 1, "11,16": 11, - "11,17": 11, - "11,18": 11, "11,19": 1, "11,20": 1 }, @@ -1180,6 +1190,7 @@ "1,16,1,2", "1,7,1,8", "1,24,1,2", + "11,16,1,3", "4,24,6,3" ], "PageInfo": { @@ -1224,7 +1235,7 @@ ] } ], - "ID": "0f14ec57-535a-418f-9174-237a49f7e0ed" + "ID": "cc5d109b-543d-4052-acdb-216b41f1ca63" } ] } @@ -1262,6 +1273,10 @@ { "Name": "汇报日期", "Formula": "汇报详情!$H$2" + }, + { + "Name": "用户全名", + "Formula": "汇报详情!$Q$12" } ] -}//lUzvJYxOcO+kIlmpCJ1DaEosbkaQalMKrlLFB2Rr0H5V+Mhk3GTOUf2GWlGDjStxEirFdgf/Vr3bmSUSHosQU+pL+patbaLsPDmkylXUAPYUi4qpTWpMdIdfK5PzDL753qIOJtu+lTw5K5aZtJ88wlIzTngQFO67m8Ovi8iNAxlAXkhd6uvZ2GM7COjw2bR1S7zv/LI7SXDE6ffAVY3hp2KMX9jJdK9aU88xq0Mc3QntWdzTeRyF4ywrBENuYDwUcRGo/i4veGp5FvSA6g8Ji3Mljq8dzVMsFDro35FR+KRUZtDppJWlcCWVZ0m+YlylLhAqo6CpaUWO16Jz0DgKPCew4CQg1V0BSE+qbPi2siqvbCQN/seDLGCrrVRF8fjtx+K+UXcXhL295PMGgMHpdSJX2dJt4vrYocX474Sac9ghp5G5ATJeM17YIKMhawuhjn35Uw3RQtOU1VMijBZq2AD4QgsqJ1qbjQBoOA6GnllNDLKAZ3S7l59MJVs/jBrFE9qEI4QyTJ3bnx8K+jGVPAtKyXmy6LORGHopqmgAHa9Psvm8nyGOikIWg61uSxrgdl24sPQatet8pyTrmQ+g5ohZegNtHnmPC4xMWtYWh50ultNKsO67On0beEgKfYDO3N4uiOsWkfTB1TbhK+rnDdhjRFWca6DGH5mVceRTFYgZGlyS3sD9KLw3lWgDi5ywmmWLHESUJ43YMqfDR7ZeJCbahjWPqNJmFkXO4mSAmvRQofO86qLUDL5lcrQvKNdpCrrYrEIGTbaiHyaJ0j0pyqxdXfG+OmsKxWLezaJtEeMEdRw8y44+gBjM7BlWeLT2tz2xL682KiVCxwgDDf07YVcBsSI+tSdE+l/sHbP1QOhJflOqQ2ybZ119JAKN6ju7cE6BBrLbba8B6X2VJGYHog==|920 \ No newline at end of file +}//xVgHtuHppQV22BH3kVkSKbXwzKZ5Gp4+Yjb/+DIxRNkC/Ts3027uyMzQ0ZmHqXtPGXioergHZ0SfVuiAFLNI4oGTJrjg1mcHQgXHyAJ1pWWcysfhx3NxSQx4boOrUOV+IX7wH+7Ah6dQn/evmKdY8ugX28caH86LPAasJ0krDqVAL5QOROHijYDfWv66VpuGXJS1FozXA/iGS38hprn8HfaXf1tABBpS5JLfsIcDKNey34NTfJg5rQ6YhZ8yQo/1Lenh84vMbRCnWyNS6k78pKHxd/XnF+8f/JpVgOY9GwwZGdSODi8X0E7i96H7VmC4dC/6umC2eGQ0i+rXWxCh5EtbKlZTh1b9W4KHQ+CJFjDAeg1TO0d1G+y9NzBhktIRs9/Nqzmtu2sb461eWMVB+qC4rMPMeeHg1qm75GBQO3BG6Ap7VfzAWdNk+had3ke1iBi+gkBGaUv3IiQkWr06DuMkmZKFHpG1UK5d4O+OLFq6CniCZV5pRh/c+x/wBHMu9w+5oc7cUg2x6uVworpka/9k5oSiG2k2+9hznWIUSXoYMoIYCTUDTPAjJXiHVghA+zRxU+njEpYMeVkYGpBdfwKvBBeeLJAHZ4bUpN5oHpafkXsGC5zkBtcv35qG1bpEkmz/HSL+aPrQdJ9lQdEsIdmhxaSgo41DDWazNTFVomAJxLCdRq4Wpnl/OstAgD9OJd9qY09gw9DJ/OYkCPG5MKAchvL9+DwYPX5oR9h5/Zy88ApToXMyKf76A5G1ljWMLx8R/eiMSJCtLZBs6TKwlsYmpPZxf1Uqs8InNxVRvG8mR3efsaaZJYBUa0q5pXH/2yMECMww0tmgr43fCTRvimVQEut95m0Y6ZYChvN4e0HjrO1r0fIMjbL23VN0kRH2lhfosWSnmVpwoiFHjz/eqQ==|920 \ No newline at end of file diff --git a/Pages/汇报/汇报详情.rd b/Pages/汇报/汇报详情.rd index 1d92898c..977ee97a 100644 --- a/Pages/汇报/汇报详情.rd +++ b/Pages/汇报/汇报详情.rd @@ -3,7 +3,8 @@ "ColumnCount": 28, "RowCount": 12, "Formulas": { - "9,19": "IF(汇报ID>0,\"更新\",\"提交\")" + "9,19": "IF(汇报ID>0,\"更新\",\"提交\")", + "4,24": "TEXT(汇报日期,\"YYYY年MM月DD日-\"&用户全名&\"工作日报\")&CHAR(10)&\"昨日工作：\"&CHAR(10)&CHAR(10)&CHAR(10)&\"今日计划：\"&CHAR(10)&CHAR(10)" }, "CustomNames": [ { @@ -17,6 +18,10 @@ { "Name": "汇报日期", "Formula": "汇报详情!$H$2" + }, + { + "Name": "用户全名", + "Formula": "汇报详情!$Q$12" } ] } \ No newline at end of file diff --git a/Plugin/OPENAIFORGUNCY.zip b/Plugin/OPENAIFORGUNCY.zip new file mode 100644 index 00000000..d01cbf15 Binary files /dev/null and b/Plugin/OPENAIFORGUNCY.zip differ diff --git a/Plugin/文心一言-10_0_1_0.zip b/Plugin/文心一言-10_0_1_0.zip deleted file mode 100644 index 01513395..00000000 Binary files a/Plugin/文心一言-10_0_1_0.zip and /dev/null differ diff --git a/ServerCommands/汇报/AI生成日报详情.json b/ServerCommands/汇报/AI生成日报详情.json new file mode 100644 index 00000000..78d6ac16 --- /dev/null +++ b/ServerCommands/汇报/AI生成日报详情.json @@ -0,0 +1,508 @@ +{ + "Name": "AI生成日报详情", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.SaveLoad.PostRequestTriggerSaveData, ServerDesignerCommon", + "Permission": { + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + } + }, + "Parameters": [ + { + "Name": "汇报人", + "DataValidationInfo": { + "IgnoreBlank": false + }, + "TestData": "夏超" + }, + { + "Name": "汇报日期", + "DataValidationInfo": { + "IgnoreBlank": false + }, + "TestData": "2024-04-16" + }, + { + "Name": "汇报内容", + "DataValidationInfo": { + "IgnoreBlank": false + }, + "TestData": "今天和报价系统部门做了沟通，了解了关于成本的细节，2小时；\r\n另外针对旭升的需求，对发票标准版系统进行了升级；\r\n抽空研究了一下时间轮的插件，做了一些测试，花了2小时；\r\n今天计划：\r\n继续测试时间轮插件、把发票标准版系统的离线发布文件更新以下，让恃舷部署到测试服务器\r\n把PMS抽空完善一下，预计1小时" + } + ], + "InvokeTriggerTestData": { + "UserName": "Administrator" + } + } + ], + "Commands": [ + { + "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", + "OutParamaterName": "聊天记录" + }, + { + "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit", + "OperationParamaterPairs": [ + { + "Name": "role", + "Value": "user" + }, + { + "Name": "content", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报内容" + } + } + ], + "OutParamaterName": "我的消息" + }, + { + "$type": "CollectionOperationKit.ServerSideArrayOp, CollectionOperationKit", + "InParamater": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=聊天记录" + }, + "Operation": 4, + "OperationParamaterAName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=我的消息" + }, + "OutParamaterName": "聊天记录" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "获取返回数据", + "ID": "2d5721f5d57e4f99bf86c95b7ba87b44" + }, + { + "$type": "OPENAIFORGUNCY.Completions, OPENAIFORGUNCY", + "URL": "https://oa.api2d.net", + "APIKEY": "fk211858-C6yKrsealBkvHao04yT9Ypg6GR0NVPyh", + "IsDataSource": "json", + "MessageJSON": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=聊天记录" + }, + "Parameter": { + "Model": 43, + "Number": 1, + "Temperature": 1.0, + "TopP": 1.0, + "MaxTokens": 3000, + "SystemContent": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"我稍后将发送一篇关于工作日报的内容，汇报人为：\"&汇报人&\"汇报日期为：\"&汇报日期&\"请帮我将工作内容帮我整理成结构化标准数据，我用来写入数据表，通过调用[生成日报数据]命令来想我传递结果参数。\"" + }, + "Response_format": "text" + }, + "OpenTools": true, + "Tools": [ + { + "$type": "OPENAIFORGUNCY.FunctionCallObj, OPENAIFORGUNCY", + "Name": "CreateReportData", + "Description": "通过一段自然语言文本，生成结构化的日报数据，用于写到数据表。", + "Properties": [ + { + "$type": "OPENAIFORGUNCY.PropertiesObj, OPENAIFORGUNCY", + "Name": "reportList", + "PropertiesType": 4, + "Description": "工作日报数据数组，每一个成员都代表一项工作数据", + "Properties": [], + "Items": { + "Name": "工作日报数据对象", + "PropertiesType": 3, + "Description": "工作日报数据对象，包含工作日报的各个属性和值", + "Required": "type,content", + "Properties": [ + { + "$type": "OPENAIFORGUNCY.PropertiesObj, OPENAIFORGUNCY", + "Name": "type", + "Description": "日报代表对昨日工作的汇报，计划为今日还未执行的计划", + "Enum": "日报,计划", + "Properties": [] + }, + { + "$type": "OPENAIFORGUNCY.PropertiesObj, OPENAIFORGUNCY", + "Name": "content", + "Description": "指具体某一项工作内容，你可以进行适当润色，对所耗时长的内容请放置time参数里，这里需要删掉。", + "Properties": [] + }, + { + "$type": "OPENAIFORGUNCY.PropertiesObj, OPENAIFORGUNCY", + "Name": "time", + "PropertiesType": 2, + "Description": "某一项工作内容的工作时长，单位为小时,不可自行推测和修改，如果内容中没有就为空。", + "Properties": [] + } + ] + } + } + ], + "Required": "type,content", + "CallFunctionCommand": { + "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", + "Commands": [ + { + "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", + "LoopInfo": { + "$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon", + "LoopCount": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=参数对象.reportList" + }, + "LoopItemParamName": "Item" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "汇报子表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "汇报子表", + "ColumnName": "汇报ID", + "GUID": "39d1011f-77d2-4106-b28c-a0b3bcadaebf" + }, + "Value": "1" + }, + { + "BindingInfo": { + "TableName": "汇报子表", + "ColumnName": "汇报类型", + "GUID": "8168f28d-1cd9-4747-92ac-ccb24b01cbf7" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.type" + } + }, + { + "BindingInfo": { + "TableName": "汇报子表", + "ColumnName": "汇报内容", + "GUID": "7cd850b0-866e-4b35-b100-d7619a225767" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.content" + } + }, + { + "BindingInfo": { + "TableName": "汇报子表", + "ColumnName": "工时", + "GUID": "5867bc71-06f3-4adb-93e2-9cb407b6929a" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.time" + } + }, + { + "BindingInfo": { + "TableName": "汇报子表", + "ColumnName": "关联任务", + "GUID": "fb41bf88-a680-4215-851f-53cb228334c4" + }, + "Value": "1" + }, + { + "BindingInfo": { + "TableName": "汇报子表", + "ColumnName": "关联项目", + "GUID": "d8b6a211-6d0c-4826-9474-748a3de364f6" + }, + "Value": "1" + } + ] + } + ], + "Disabled": true + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "ok", + "CustomReturns": [ + { + "ReturnPropertyName": "日报JSON" + } + ], + "Disabled": true + } + ], + "ParamProperties": { + "arguments": "参数对象" + } + } + } + ], + "ResultTo": "result" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "第一条消息", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=result.choices.0.delta" + }, + "ID": "76606e9f5c17475389f1432aada4e34d" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=第一条消息.tool_calls" + } + }, + "value": "%Null%", + "compareType": 1 + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=第一条消息.tool_calls.Count" + } + }, + "value": "0", + "compareType": 2 + } + ] + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "第一条命令", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=第一条消息.tool_calls.0.function" + }, + "ID": "71cc339549c14ef6ab89d4df1ab33791" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=第一条命令.name" + } + }, + "value": "CreateReportData" + }, + "CommandList": [ + { + "$type": "JsonUtilityCommand.JsonDeserializeCommand, JsonUtilityCommand", + "JsonString": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=第一条命令.arguments" + }, + "SampleJson": "{\r\n \"reportList\": [\r\n {\r\n \"type\": \"日报\",\r\n \"content\": \"今天和报价系统部门做了沟通，了解了关于成本的细节\",\r\n \"time\": 120\r\n },\r\n {\r\n \"type\": \"日报\",\r\n \"content\": \"对发票标准版系统进行了升级\",\r\n \"time\": 0\r\n },\r\n {\r\n \"type\": \"日报\",\r\n \"content\": \"研究了时间轮插件，并进行了测试\",\r\n \"time\": 120\r\n },\r\n {\r\n \"type\": \"计划\",\r\n \"content\": \"继续测试时间轮插件\",\r\n \"time\": 0\r\n },\r\n {\r\n \"type\": \"计划\",\r\n \"content\": \"更新发票标准版系统的离线发布文件，并部署到测试服务器\",\r\n \"time\": 0\r\n },\r\n {\r\n \"type\": \"计划\",\r\n \"content\": \"完善PMS\",\r\n \"time\": 60\r\n }\r\n ]\r\n}", + "ToParameter": "arguments" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "reportList", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=arguments.reportList" + }, + "ID": "6fba4b5f2a574cf08a7c6c685c9ddacf" + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "生成完毕", + "CustomReturns": [ + { + "ReturnPropertyName": "日报JSON", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=reportList" + } + } + ] + } + ], + "ID": "300a6ec6-53fa-4905-b7f1-0012908a7e0b" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=第一条消息.content" + }, + "CustomReturns": [ + { + "ReturnPropertyName": "日报JSON" + } + ] + } + ], + "ID": "dfbd1700-2f8a-4b7b-b463-6dccbebebb89" + } + ] + } + ], + "ID": "d956f9c6-8745-4ebf-a734-e51ac0b16884" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=第一条消息.content" + }, + "CustomReturns": [ + { + "ReturnPropertyName": "日报JSON" + } + ] + } + ], + "ID": "fe995339-bbde-4a48-8025-c9b547f90a85" + } + ] + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=result" + } + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "回复消息", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=result.choices.0.delta.content" + }, + "ID": "36dd5c08a29d413d999efba0c51c84bf" + }, + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "汇报记录表", + "ShowConfirm": false, + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "ID", + "GUID": "bcf306d3-379f-40af-bfb6-b7898ba65c7b" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=汇报人" + } + }, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "汇报记录表", + "ColumnName": "概要", + "GUID": "26feda8c-de81-4844-8447-3ca697c4f505" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=第一条消息" + } + } + ] + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "生成完成", + "CustomReturns": [ + { + "ReturnPropertyName": "日报JSON", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=第一条消息" + } + } + ] + } + ], + "ID": "e3ba3945-2a3b-4f3e-9d79-1a1468b184e5" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=返回结果.error_code" + }, + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=返回结果.error_msg" + }, + "CustomReturns": [ + { + "ReturnPropertyName": "日报JSON" + } + ] + } + ], + "ID": "57d738ed-67d2-4d6b-b0fa-addd60807fd5" + } + ], + "Disabled": true + } + ], + "ReturnProperties": [ + { + "Name": "日报JSON" + } + ] +} \ No newline at end of file diff --git a/ServerCommands/汇报/AI自动编写汇报.json b/ServerCommands/汇报/AI自动编写汇报.json index 09730c47..5c5878ea 100644 --- a/ServerCommands/汇报/AI自动编写汇报.json +++ b/ServerCommands/汇报/AI自动编写汇报.json @@ -25,7 +25,8 @@ "Name": "汇报ID", "DataValidationInfo": { "IgnoreBlank": false - } + }, + "TestData": "1" } ], "InvokeTriggerTestData": { @@ -77,7 +78,16 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "5339ecfdc77b41249074743a5495e641" + "ID": "e777d0a6268f4e639a936c5658147d64" + }, + { + "$type": "JsonUtilityCommand.JsonDeserializeCommand, JsonUtilityCommand", + "JsonString": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=全局配置" + }, + "SampleJson": "{\"AI提示词1\":\"我将发给你一个记录着某人一天工作内容的数据，为JSON字符串，请你尝试解读它，内容中的[汇报类型]分为`日报`和`计划`。\\n- 日报指的是昨日工作内容的总结；\\n- 计划指的是今日计划工作安排；\\n请你使用为我编写一篇简要的工作日报，对于日报结构和要求如下：\\n标题为固定格式：YYYY年MM年DD月-某某工作日报\\n内容包含两个主题：昨日工作总结、今日工作计划\\n每个主题下的内容从JSON中总结，可以适当润色，但不可过度偏离源数据中的工作内容；\"}", + "ToParameter": "全局配置JSON" }, { "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", @@ -201,7 +211,7 @@ "Name": "content", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=\"我将发给你一个JSON字符串，它是某个人在某天的工作内容清单，内容中的[汇报类型]分为`日报`和`计划`，日报指的是昨日工作内容的总结，计划指的是今日计划工作安排。请你使用纯文本为我编写一篇简要的工作日报，禁止使用Markdown或其他语言格式来进行排版，内容如下：\"&CHAR(10)&汇报数据文本" + "SerializeProperty": "=汇报数据文本" } } ], @@ -221,16 +231,28 @@ "OutParamaterName": "聊天记录" }, { - "$type": "WenxinQianfanAI.WenxinQianfanAICommand, WenxinQianfanAI", - "ClientId": "wvAnHBgnYnvcXKt3S9xPeLZF", - "ClientSecret": "yw60qYsGrCzLmuZkLoatEcKdpMzJzFuT", - "ModelType": "completions_pro", - "Messages": { + "$type": "OPENAIFORGUNCY.Completions, OPENAIFORGUNCY", + "URL": "https://oa.api2d.net", + "APIKEY": "fk211858-C6yKrsealBkvHao04yT9Ypg6GR0NVPyh", + "IsDataSource": "json", + "MessageJSON": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=聊天记录" }, - "Functions": [], - "ReturnParam": "返回结果" + "Parameter": { + "Model": 43, + "Number": 1, + "Temperature": 1.0, + "TopP": 1.0, + "MaxTokens": 3000, + "SystemContent": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=全局配置JSON.AI提示词1" + }, + "Response_format": "text" + }, + "Tools": [], + "ResultTo": "result" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -242,13 +264,22 @@ "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", "ParamObject": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=返回结果.result" + "SerializeProperty": "=result" } }, "value": "%Null%", "compareType": 1 }, "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "回复消息", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=result.choices.0.delta.content" + }, + "ID": "95a0adfcd0154562a30ddff9790d7ab9" + }, { "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", "TableName": "汇报记录表", @@ -271,11 +302,11 @@ "BindingInfo": { "TableName": "汇报记录表", "ColumnName": "概要", - "GUID": "08d5591d-fbe5-43fe-957c-daa7b3a4890f" + "GUID": "6e19f144-087e-4d4c-bb08-5b87b45dd518" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=返回结果.result" + "SerializeProperty": "=回复消息" } } ] @@ -289,13 +320,13 @@ "ReturnPropertyName": "生成文本", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=返回结果.result" + "SerializeProperty": "=回复消息" } } ] } ], - "ID": "df4fd3e5-b643-455a-998b-a652a91ed5a3" + "ID": "9731e3f4-249b-4d04-896a-b5d56770ef37" }, { "CommandList": [ @@ -316,7 +347,7 @@ ] } ], - "ID": "9011af6f-e681-403e-b74a-716e9c238862" + "ID": "31f43036-644c-4ca2-8fd9-66d6a590c3f3" } ] } diff --git a/ServerCommands/汇报/测试GPT.json b/ServerCommands/汇报/测试GPT.json new file mode 100644 index 00000000..7f83658c --- /dev/null +++ b/ServerCommands/汇报/测试GPT.json @@ -0,0 +1,99 @@ +{ + "Name": "测试GPT", + "Enabled": true, + "Triggers": [ + { + "$type": "Forguncy.SaveLoad.PostRequestTriggerSaveData, ServerDesignerCommon", + "Permission": { + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + } + }, + "InvokeTriggerTestData": { + "UserName": "Administrator" + } + } + ], + "Commands": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "message", + "TableValue": { + "TableName": "message_test", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "message_test", + "ColumnName": "role", + "GUID": "505116a7-fdae-4ca2-94b1-a29180637f99" + }, + "ColumnName": "role" + }, + { + "BindingInfo": { + "TableName": "message_test", + "ColumnName": "content", + "GUID": "77897b37-cd72-4378-ab4b-cb7ce9427308" + }, + "ColumnName": "content" + } + ] + }, + "ID": "41ece15fbbed44c8985d08e04b04ccd1" + }, + { + "$type": "OPENAIFORGUNCY.Completions, OPENAIFORGUNCY", + "URL": "https://oa.api2d.net", + "APIKEY": "fk211858-C6yKrsealBkvHao04yT9Ypg6GR0NVPyh", + "IsDataSource": "json", + "MessageJSON": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=message" + }, + "Parameter": { + "Model": 43, + "Number": 1, + "Temperature": 1.0, + "TopP": 1.0, + "MaxTokens": 1000, + "SystemContent": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=\"我将发给你一个JSON字符串，它是某个人在某天的工作内容清单，内容中的[汇报类型]分为`日报`和`计划`，日报指的是昨日工作内容的总结，计划指的是今日计划工作安排。请你使用纯文本为我编写一篇简要的工作日报\"" + }, + "Response_format": "text" + }, + "Tools": [ + { + "$type": "OPENAIFORGUNCY.FunctionCallObj, OPENAIFORGUNCY", + "Name": "GetWorkTimeData", + "Description": "如果用户要求获取某人的工时（工作时长）数据请调用此命令", + "Properties": [ + { + "$type": "OPENAIFORGUNCY.PropertiesObj, OPENAIFORGUNCY", + "Name": "项目", + "Description": "要查询的目标人姓名", + "Properties": [] + } + ] + } + ], + "ResultTo": "result" + } + ], + "ReturnProperties": [ + { + "Name": "生成文本" + } + ] +} \ No newline at end of file diff --git a/Tables/工时/人员工时统计视图.json b/Tables/工时/人员工时统计视图.json index d8f09c0a..b120c122 100644 --- a/Tables/工时/人员工时统计视图.json +++ b/Tables/工时/人员工时统计视图.json @@ -37,13 +37,6 @@ "Name": "上报工时", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, - { - "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", - "DatabaseColumnType": "float", - "MaxLength": -1, - "Name": "剩余工时", - "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" - }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "float", @@ -87,18 +80,6 @@ "Name": "总上报工时", "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, - { - "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon", - "BindingInfo": { - "TableName": "人员工时统计视图", - "ColumnName": "剩余工时", - "GUID": "6c47fb4f-9e81-43e6-89f4-f9876c3b82dd" - }, - "AggregateFunction": 4, - "DataColumnName": "剩余工时", - "Name": "总剩余工时", - "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" - }, { "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon", "BindingInfo": { @@ -117,7 +98,7 @@ "ConnectionId": "业务表", "SourceTableName": "人员工时统计视图", "SourceTableSchema": "dbo", - "CreateViewSql": "SELECT\r\n[执行人],\r\nCAST([日期] as date) 日期,\r\nSUM([计划工时]) AS 计划工时,\r\nSUM([实际工时]) AS 实际工时,\r\nSUM([上报工时]) AS 上报工时,\r\nSUM([剩余工时]) AS 剩余工时,\r\nSUM([计算提成]) AS 计算提成\r\nFROM [View_任务工时统计] t\r\nGROUP BY\r\n[执行人],\r\n[日期]", + "CreateViewSql": "SELECT\r\n[执行人],\r\nCAST([日期] as date) 日期,\r\nSUM([计划工时]) AS 计划工时,\r\nSUM([实际工时]) AS 实际工时,\r\nSUM([上报工时]) AS 上报工时,\r\nSUM([计算提成]) AS 计算提成\r\nFROM [View_任务工时统计] t\r\nGROUP BY\r\n[执行人],\r\n[日期]", "ViewInfo": { "ViewName": "人员工时统计视图", "IsUpdatable": true, diff --git a/Tables/汇报/message_test.json b/Tables/汇报/message_test.json new file mode 100644 index 00000000..dc2b9bd3 --- /dev/null +++ b/Tables/汇报/message_test.json @@ -0,0 +1,50 @@ +{ + "Name": "message_test", + "Columns": [ + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "Required": true, + "Unique": true, + "AutoIncrement": true, + "DatabaseColumnType": "System.Int64", + "MaxLength": -1, + "Name": "ID", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "System.String", + "Name": "role", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "Name": "content", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", + "Name": "FGC_Creator" + }, + { + "$type": "Forguncy.SaveLoad.DateExtraBingingColumnSaveData, ServerDesignerCommon", + "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", + "Name": "FGC_CreateDate" + }, + { + "$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", + "Name": "FGC_LastModifier" + }, + { + "$type": "Forguncy.SaveLoad.DateExtraBingingColumnSaveData, ServerDesignerCommon", + "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", + "Name": "FGC_LastModifyDate" + } + ], + "PrimaryKey": [ + "ID" + ], + "Indexes": [] +} \ No newline at end of file diff --git a/Tables/财务/付款凭证表.json b/Tables/财务/付款凭证表.json index b3d72be5..6a5d1e8b 100644 --- a/Tables/财务/付款凭证表.json +++ b/Tables/财务/付款凭证表.json @@ -58,24 +58,28 @@ { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "nvarchar", + "MaxLength": -1, "Name": "收款人", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "nvarchar", + "MaxLength": -1, "Name": "户名", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "nvarchar", + "MaxLength": -1, "Name": "卡号", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DatabaseColumnType": "nvarchar", + "MaxLength": -1, "Name": "开户行", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" },