diff --git a/.collaboration b/.collaboration index 23d0de1c..8c6598ac 100644 --- a/.collaboration +++ b/.collaboration @@ -250,16 +250,7 @@ }, { "ModuleName": "TableView/任务平行视图", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-20T12:44:30.6045478+08:00", - "ModuleType": 23, - "ToRemoveFiles": [ - "Tables\\任务\\任务平行视图.json" - ] + "ModuleType": 23 }, { "ModuleName": "TableView/子任务视图", @@ -603,19 +594,7 @@ }, { "ModuleName": "PCPage/任务列表", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-20T12:48:23.2469589+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.rd", - "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.json", - "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目负荷子页面", @@ -2271,49 +2250,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-20T12:56:03.5562282+08:00", - "ModuleType": 40, - "ToRemoveFiles": [ - "Plugin\\DingTalkPlugin.zip", - "Plugin\\Echarts图表-10_0_3_0.zip", - "Plugin\\Editormd-6_0_102_0.zip", - "Plugin\\Forguncy.CustomMenu.zip", - "Plugin\\JSON 序列化和反序列化-10_0_2_0.zip", - "Plugin\\JSON数据源-10_0_2_0.zip", - "Plugin\\Lottie动画插图-10_0_2_0(1).zip", - "Plugin\\Notiflix-9_0_103_0.zip", - "Plugin\\OPENAI套件-10_0_3_0(1).zip", - "Plugin\\PC组件包-格友工作室定制版-10_0_2_0.zip", - "Plugin\\ReadLogs.zip", - "Plugin\\SqlServerWrapper.zip", - "Plugin\\Tiny富文本编辑器-10_0_2_0.zip", - "Plugin\\UI操作工具箱-9_0_103_0.zip", - "Plugin\\Unlayer-9_0_103_0(1).zip", - "Plugin\\xTools快速开发工具包-9_0_4_0(1).zip", - "Plugin\\发送HTTP请求命令-10_0_2_0.zip", - "Plugin\\取消当前行-9_0_103_0.zip", - "Plugin\\增强关闭页面-9_0_6.zip", - "Plugin\\复制到剪贴板-7_0_3_0.zip", - "Plugin\\客户端缓存操作工具库-8_0_0_0(1).zip", - "Plugin\\富文本编辑器-10_0_2_0.zip", - "Plugin\\对象与集合操作工具-8_0_0_0(1).zip", - "Plugin\\应用服务器操作工具集合-8_0_3_0.zip", - "Plugin\\异步运行命令-9_0_103_0(1).zip", - "Plugin\\支持预览的附件上传-10_0_2_0.zip", - "Plugin\\服务端缓存操作工具库-8_0_3_0.zip", - "Plugin\\模板引擎操作库-9_0_103_0.zip", - "Plugin\\用户管理命令 V2-10_0_5_0.zip", - "Plugin\\网络操作库-9_0_102_0.zip", - "Plugin\\设置当前行命令-10_0_2_0.zip", - "Plugin\\设置焦点命令-10_0_2_0.zip", - "Plugin\\豪~豪插件合集-7_0_102_0.zip", - "Plugin\\超哥富文本增强工具包-9_0_103_0(1).zip" - ] + "ModuleType": 40 }, { "ModuleName": "PublishSetting", diff --git a/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json b/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json index 9efec89f..507625d6 100644 --- a/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json +++ b/Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json @@ -154,7 +154,7 @@ ] } ], - "ID": "c4022154-9e67-4c15-a0b5-69aa0da85ef1" + "ID": "5ad1ac19-63ea-4cb7-82fd-9cf6c29f7cc4" } ] } @@ -228,7 +228,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "ba35cd7f-3f7a-4694-b9db-b952abdbc05c" + "ID": "43e3af32-0e2b-4f59-87cb-cd74b517c264" }, { "Condition": { @@ -258,7 +258,7 @@ "Message": "复制成功" } ], - "ID": "c5529bdd-0456-42e8-aad2-d67737efec2a" + "ID": "dfbb6b22-d192-4c9d-8634-9b3a84d20650" }, { "Condition": { @@ -335,7 +335,7 @@ "Message": "操作成功" } ], - "ID": "e052f492-d47d-40fa-88b7-29f0fdb43384" + "ID": "b0460bf1-194a-4ee4-b3c0-e3db51c449bb" }, { "CommandList": [ @@ -350,17 +350,17 @@ "BtnText": "知道了" } ], - "ID": "d1b46d06-5e86-4b7f-b1a2-30083ce70f4b" + "ID": "77deaea4-5829-4f6f-b07f-ed682b5d68e6" } ] } ], - "ID": "a71264ec-19cb-4baf-8648-c3b04e3a49d8" + "ID": "48252a27-4123-4cad-8a55-677dcf0476ff" } ] } ], - "ID": "c72b5da1-ec3d-43aa-9cb8-6d532147b150" + "ID": "c8cdb255-5a89-4fcc-85ca-d0c057f7d833" } ] } @@ -455,4 +455,4 @@ "Size": "24,24" } ] -}//7IxLoFoZTO6aSUsMESeIxzosBwx73kHnW16AuG4DgpW/ybA/q2p0FZR+P5iyyThQzjxZ2aM4dpuhi+yJAA4Pka7gBXTYK9nlKtD0kkd0gSNV5V5pO18F65YEj62dWAlibLfgFziDR16gff1Eq66nEwF13OuOTIp1IPmKwizbjtosoM+RMHBNmBlWlx+hPAOcR3OhfJHmeOY2QwqOhh6gb6ne9/kWZSsNKSx6jMJxYoKWpbwue7OHn/aYHdwBhI8tUXpz+cucaAEvnjEaFwec8nNw2wo9RgTqe3RJZhueILcbT4bOY602QDFx3u0+Bjb4KGxeZ8UtnqBVezKybHuugZ5rgVVdSw/OrvZqL3uL1XwinjKfYxRUpGvc/BrYvSr2Mx8wuxoSt4Z65iyOrCE+39R2Ee+Ax4oCSXV2sqKvvdwO+J+a+hoXFBTwnnwbrFtM+mrWUATI3yTj+fQ6lRMSClp3LZeHwdpm4fv3MFvnNWDrqkoTzqdPy0YVD//lAc7LWA7qKX9a6W94bDel0e2aKWeaM8v5+xAvX5oMiBQKYNAlp61vl7vf4/DXjjPIvb2JXuxNZENraF7xJDS6kX+o+SYVNtc88Q+xwggO9dNuV8UeAXZbT7GL0Cbag/51H9rpomSwbgj/4IK4WtVvJKDbyD2bMqC6AK+Q1FtHBRiIVo9T959WhtpO6h7XKIFQx+ZgQrbMni2W+GRW9ZCWbs5AQIiGGp6vCZMJkyfL/jWQLl/nUj7pK90YlgJwYZtjhMbWpQOAUSbgrTixOvt2KS7jOulXSl3y2aapvqxXUgvJQ4oYaJkSyciXBgoiJEe7TCC6cpeiepkHiCQ7/WbBSxQ+cshNXWyzAdv5PQFV+QPfUcpVsHmBbtfbYnikNubXE3Bz2pZt2nOa6eBG3Cecya7dng==|920 \ No newline at end of file +}//yIL+Cyxs8RdfIOy3a5jhLFWIAe8U+dqlAPoXeT1QzZLRJkSVVutjTHMdDm0Q+4ReViEHoCYrDO6cSByG0o4c/SO1Fd5gPMRR5kOcu/2/MgWB72hCAZtpRiO+w8zSwCQ/P1IZLTOgpYXrpeLWK6FLXc7MasW8edAAD2YgEVAI/A2xNqCL7rrNw7a1opOHTIRERXcm5y7nPqkIPs3nZPeetB+TvM1U1Sn29RtWQJ/EMBGoUpULthXBZuBAolElcSApK8NZ8wLtk4dhjIO95tf02GeMBIlTimZWrVAclkImghLu5SgPBNaecM1/9AKBEewDkWL+wJbaO5rKxAQZjKP01pjBZlGbyraNDdyzCAVQ1qN6krndKxjvRupCo79d66WObLabvPJ+S+v9yTboykNCYxZ0uJs9SWINIiQ25Pkq991+TOF27TdJTlyUxf8VhxHzPC33saayPGtKi3fqgYtmb3qoSwnMPpkPEJApikKyjEqGz3NA/OZZu5z6E6GuTXqlGD5XprfWYASvLscMl+GHPGiS347agIxV3orrL4X9p4cYC4ko9ZS6HRlX3wADArmrFS5W2mW25e9KutLv69MkIK1uIoTR5VlJ/gp/68Oy3UIWvaK5OMNcbk70H+ZYDmkMvhrOsy8bt8fCTTQG+PBRLrARRYXAdb8F87HkY8ILI3+muM/6tPmX55LKh5FitDrNkg791k4slfXIHoCTS0myczagdwDzHOU6xT3BSC6BUXhKRpiMVDB/33RiLHVbE6Ih5coYIZh+2/PV0HU5QKwYH7m9U84eFAE6AV+K1Cs4Q+Kb6UjoukA8Nu2xfzYiTbh97UzMZwCVBLzF3hg4ZoLTWzmLaPA61H0A23Xnn/qiEa97ckmNufEAKeJGz1uEdo+FPVl8bPoRvlE1+X18C4VaXw==|920 \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json index 3b630b4e..fd7ea517 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务列表.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务列表.json @@ -660,7 +660,7 @@ } } ], - "ID": "c7513714-820e-44d4-9c94-edd498c85f0d" + "ID": "38653161-b8f5-4da3-beef-c13f7423bfbf" }, { "CommandList": [ @@ -672,12 +672,12 @@ } } ], - "ID": "150ce319-7850-4d6f-80b7-764f8c42fc65" + "ID": "da023572-be11-4b2a-a4fc-b71c9a801c85" } ] } ], - "ID": "3e3a0538-89f7-4e5d-8775-2fe901aad4e6" + "ID": "04d63b99-c31d-49ab-8ca5-1c3ccd527419" } ] }, @@ -742,7 +742,7 @@ "LoadBindingDataOption": 2 } ], - "ID": "0f127183-1283-4ed7-b7b2-aea8958d9993" + "ID": "b48e51c7-9131-4f31-8d00-ebee80a756f5" }, { "CommandList": [ @@ -757,12 +757,12 @@ "BtnText": "知道了" } ], - "ID": "a150a7c2-9a7e-48d2-9f13-cc03b6b8ce1f" + "ID": "ea8f96a3-574e-4f19-96d8-bcc1bb3e6107" } ] } ], - "ID": "084f22b1-a62d-411c-a59f-10a37ed8556d" + "ID": "93eb144e-3fa2-4329-a9d8-bb469257e296" }, { "CommandList": [ @@ -784,12 +784,12 @@ ] } ], - "ID": "59ed428b-0d46-4206-a3a9-c5c34305e76f" + "ID": "d15af25f-dbfd-4629-a895-4581ebe0b2be" } ] } ], - "ID": "a029303b-2a3b-41b6-b699-bd2a8f1d67b3" + "ID": "5cec0774-d2c6-478d-a3c2-cc1d59044f02" }, { "CommandList": [ @@ -804,12 +804,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "459b2c36-8d02-48f9-a09f-a409fa2df3d6" + "ID": "43fe857a-b197-4b42-8432-45a090518da3" } ] } ], - "ID": "976d8752-4ce4-4b5e-b853-cd4785ab2b46" + "ID": "7db733f8-0bde-4035-a6c5-f7878c3e23e4" }, { "CommandList": [ @@ -819,7 +819,7 @@ "Message": "只有该项目管理员可新增任务" } ], - "ID": "5bb6844a-5972-4514-9ffd-2496dcae9ff1" + "ID": "a99c749e-093b-4b3d-8173-d8aa0dac84f9" } ] } @@ -1001,7 +1001,7 @@ "TableName": "任务平行视图", "BindingInfos": [ { - "GUID": "51173019-79f2-493f-a0d0-60ad05c7d2a3", + "GUID": "519c6a0e-9160-4ced-b0e8-0211bbeb059c", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "ID", @@ -1010,7 +1010,7 @@ "ColumnName": "value" }, { - "GUID": "d8f4345d-61c4-4a4e-a657-31073e4bd745", + "GUID": "e5599659-fdde-44fd-857a-428e5f9abe37", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "父任务ID", @@ -1019,7 +1019,7 @@ "ColumnName": "parentValue" }, { - "GUID": "da6daf67-94e8-43b6-9a46-8c9da0788563", + "GUID": "4769e44b-878c-41d3-b86e-807fd5933225", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务状态", @@ -1033,7 +1033,7 @@ "ColumnName": "状态" }, { - "GUID": "72c707ec-e000-4a60-b27f-574edf7cabb0", + "GUID": "f7a07a33-9240-42fd-81cd-02c17449fab0", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务名称", @@ -1042,7 +1042,7 @@ "ColumnName": "任务名称" }, { - "GUID": "0b741c9a-9577-4f67-a452-df318e9efcd3", + "GUID": "7e940598-e013-4a4c-94d1-2e95f9526d9a", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务负责人", @@ -1055,7 +1055,7 @@ "ColumnName": "执行者" }, { - "GUID": "7879e744-2380-418d-b805-ce0557b6910f", + "GUID": "7beb3713-2cf4-4b8b-a8bb-6ffa9e9aedb0", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "开始时间", @@ -1064,7 +1064,7 @@ "ColumnName": "开始时间" }, { - "GUID": "0875155a-d2ea-4335-b7d4-2eced47f79a3", + "GUID": "1b2c438b-01e5-467c-ae2f-947707625348", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "结束时间", @@ -1073,7 +1073,7 @@ "ColumnName": "结束时间" }, { - "GUID": "5a91da93-db4d-4d20-8a06-4b9dee509296", + "GUID": "70cea4bf-9aa1-4385-ae49-d5b653bfd5f3", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "任务预算工时", @@ -1082,7 +1082,7 @@ "ColumnName": "总计划" }, { - "GUID": "b88e434c-5400-4680-84de-caab81d4e1ca", + "GUID": "e0123aa3-6c22-4c2e-9384-0366aa445fa4", "BindingInfo": { "TableName": "任务平行视图", "ColumnName": "本任务可核定工时", @@ -1091,13 +1091,13 @@ "ColumnName": "可核定工时" }, { - "GUID": "0a26ae51-9ecf-4e03-9f7f-54ffc0c8a048", + "GUID": "dbeabb17-1e7c-4408-b98a-438a31e47881", "BindingInfo": { "TableName": "任务平行视图", - "ColumnName": "成员数量", - "GUID": "ade97a69-372a-4e41-a424-629c60a0f34e" + "ColumnName": "任务成员", + "GUID": "e807d0c6-1562-4fa7-b385-55a0864655df" }, - "ColumnName": "成员数量" + "ColumnName": "任务成员" } ], "SqlCondition": { @@ -1192,7 +1192,7 @@ "结束时间", "总计划", "可核定工时", - "成员数量" + "任务成员" ] }, "Columns": [ @@ -1260,9 +1260,8 @@ }, { "$type": "ElementUI.VirtualizedTableColumnSetting, ElementUI", - "DataColumnName": "成员数量", - "Label": "成员数量", - "FormatStr": "0\"人\"", + "DataColumnName": "任务成员", + "Label": "任务成员", "Fixed": "none", "Align": "center", "HeaderAlign": "center" @@ -1427,7 +1426,7 @@ "LoadBindingDataOption": 1 } ], - "ID": "694c8fa5-063f-4243-99a6-b2971df50349" + "ID": "45ee04a8-d64f-4716-8f9e-0a60170c616d" }, { "CommandList": [ @@ -1437,12 +1436,12 @@ "Message": "你尚未成为该任务参与人，不能报工" } ], - "ID": "129e1f5a-20a4-49a8-b422-aa1dfef108a8" + "ID": "9bdabfc9-bb62-4661-8536-21c0f8fec1f1" } ] } ], - "ID": "be3c900e-6f2e-4f9d-926d-d6cf49c3306d" + "ID": "6f7b1c19-7002-40b3-aebf-5dc669e9d732" }, { "Condition": { @@ -1468,7 +1467,7 @@ } } ], - "ID": "dc80b1fd-4b0a-4367-95eb-76d28b1f3fe6" + "ID": "4d307a0c-f3d9-4aef-99ac-3aa6a04b78ff" }, { "CommandList": [ @@ -1507,12 +1506,12 @@ "LoadBindingDataOption": 1 } ], - "ID": "20a0a804-ed77-4e4f-abfd-54468654c60c" + "ID": "511dd2ef-ceb5-466b-8110-896eded82466" } ] } ], - "ID": "e9ff0d4e-67ae-454a-a852-01335823f446" + "ID": "7647a2b8-b86f-4bd9-a66b-2016d94497b4" } ] } @@ -1932,4 +1931,4 @@ "Formula": "任务列表!$I$13" } ] -}//oCxLG6d6IDGnHXVEkhdC7jIhynxbsrEe776a0HiGrX8a9mrmapdWnyD6m8qIV2MF0Tdnq61gwUU6Ca2h2VnVd7ozm8vhedYBD6YOHvqvDUv9i9Dm31h0rpx9mAPZT2QSVaEdRRkX+x+grzR5Wgv/6DWxeCst8eAj2BdM8lP8K3pY1eEZBI6QSaEzul7/a8/NRfwwltIyS63EfickpDJL6wkC5oCuIQtST1nA5eoBCjzGXPh5YBSbptPYp0u9bfrIP7i3DepUH3vUez7wKy1Rhbdtz58B1nppjIPIIGXNsu4I1bhn6mcZznLMSFyJWhTbm8bacw4pojJtR4fIUlXzPOIutnrd5NiHa6EIOx+BxXolbe5FXVXCTgZw+pFUxt+l5muAAz2Q15DSi1v0IzximmxOIFRmB5nGT0Apz5kyR4mJ6iUtHzBMHS7jaLZoiRREqFtSf5VAkij3YEsAcE0dcOvjkwAMkXlH1PCNoeOjcS7ZdxRgxVwgUxCBaDmdw3ikOQlrzqnu2yY+7tx6ea/uxEokLzAduK7gTWEYnrgcjq9w0qXG+Ed45Oi2fWzhMkO7j47YCjo4ponBPwApClgblDCvCbM4P8xCvIEDrSFCV5hAZEsG0gKdQsicvV+uOyQWRkMa+2RzI9BEkHY2qmsWNAhEfGNuONn14abFFvDQn0Atc9g/CBQiVVXL2ENxNILHYbN2n6/qViUuZrqdk/jBkgkCidJihEyRuspFl1wjEod9rMAmaYk0jSAwGFVk8Zf+pxj4AnWKlC6pN+fSTbZHErbZFgBXEMPRzfDSqmIiceC1aH7ofjYDrgvfB6Pz3eNwm+88l1epXpgT0afyZ75+hbEVOOEJDAIqpu5ZWDSIZ3WRcJqvoQfy/0UqcEiP2Vo36zROpwVC+n8UySrdVbVDkw==|920 \ No newline at end of file +}//MuDX+gTzFjlIkIaOLQ4VXVVRU6tXnvNR+KS8ju9Ez/duh9Po2bMY8pJBQBP8APjDnMcpNK60sl7UZIe9OJxYK9LSIckEKDvrXh4MsMdhN3cDnli4bVr2llF+b34grLudwAxx8K5AfFMQLRNUMJkbjxDJ8XtOmeWltEywkDYe6K1TDIooGVgpGvJ2JNgd/LOX4uTpfCzCFxynjUm98LV9/ZKI+8YCCxNYykd9ZCFkkLSAGsdbmhulm9onVdSRE5cPNMXWTQo3tJxjfBAMXu7oIPAKMyGJUb998QUoRNily6lxoMVIEpaGqXyvi+FBh1kyehCSfrJlIQYPxQNDQVzFW1ceiczhopO7nbesjoKSzs5Nf+Cz6Ymcgr10Q1efVHyKaGRPb8WZa5qXpvhj23bKX2BDZR4xECI1cBZ/f3JYLb1uOs7c+1Jt5HqGrG26zeUqPQUf9DeigDMRxAU05RbHOewZC5Dio7ueO9ZaM5XidUL3D/aJduLs4howRA3+k8F876LG7Wb+J55yaE+BDI+O0QMbYtcxa0oWelZRYmlTvwVpInpvY2wY5H2xe2D571ilTMb1+2vspKOZ67ftNxG5rC7dPXVmSzd3aj75B5zMxSj26BjIz5IOHNeCrpxEqn/a9G0xpEWLtpz/nPls9ZTr/ycqzdRHUOV3luhm9bugisAWORffPMCVMsx4ybt+N1Ap8OaSmkH036QMXypZ2AAs+dOY2ZgxU8X9ABfBQOfFKAmX61gFzHE5Qj5PJBT3HiV52xjVsLYcSZ2QZflPfDRnz0WpDAJldc3MpZbh+l76vtSbrOOSm+bb0iY1TMrysJIRPvccnLcEAvOT8ZsEk3KxU5dpVKVhbEApJ+7rm7pXqM5rFYQMSHTyuJXK/lmbTn2GZ0BkNC614VQbE1oCoM1jKA==|920 \ No newline at end of file diff --git a/Plugin/内容编辑器-9_0_103_0.zip b/Plugin/内容编辑器-9_0_103_0.zip new file mode 100644 index 00000000..439281c8 Binary files /dev/null and b/Plugin/内容编辑器-9_0_103_0.zip differ diff --git a/Tables/任务/任务平行视图.json b/Tables/任务/任务平行视图.json index 60976107..b7110011 100644 --- a/Tables/任务/任务平行视图.json +++ b/Tables/任务/任务平行视图.json @@ -9,27 +9,7 @@ "isExternal": true, "detailTables": [ { - "subTableName": "任务平行视图", - "subColumnName": "父任务ID", - "relatedColumnName": "ID" - }, - { - "subTableName": "任务成员视图", - "subColumnName": "任务ID", - "relatedColumnName": "ID" - }, - { - "subTableName": "任务成员表", - "subColumnName": "任务ID", - "relatedColumnName": "ID" - }, - { - "subTableName": "任务进展", - "subColumnName": "任务ID", - "relatedColumnName": "ID" - }, - { - "subTableName": "任务评论表", + "subTableName": "任务工时表", "subColumnName": "任务ID", "relatedColumnName": "ID" }, @@ -39,13 +19,28 @@ "relatedColumnName": "ID" }, { - "subTableName": "任务工时表", + "subTableName": "需求反馈登记表", + "subColumnName": "关联任务", + "relatedColumnName": "ID" + }, + { + "subTableName": "任务成员表", "subColumnName": "任务ID", "relatedColumnName": "ID" }, { - "subTableName": "需求反馈登记表", - "subColumnName": "关联任务", + "subTableName": "任务平行视图", + "subColumnName": "父任务ID", + "relatedColumnName": "ID" + }, + { + "subTableName": "任务评论表", + "subColumnName": "任务ID", + "relatedColumnName": "ID" + }, + { + "subTableName": "任务成员视图", + "subColumnName": "任务ID", "relatedColumnName": "ID" } ] @@ -114,20 +109,6 @@ }, "Value": "%CurrentUser.UserName%" }, - { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "任务平行视图", - "ColumnName": "项目ID", - "GUID": "e8cbf68a-86d8-4cfd-89bc-00ce385c40b2", - "RelationBinding": { - "RelatedTable": "项目平行视图", - "RelatedColumn": "ID", - "DisplayColumn": "项目经理" - } - }, - "Value": "%CurrentUser.UserName%" - }, { "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", "CompareType": 6, @@ -157,6 +138,20 @@ }, "Value": "%CurrentUser.UserName%" }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务平行视图", + "ColumnName": "项目ID", + "GUID": "e8cbf68a-86d8-4cfd-89bc-00ce385c40b2", + "RelationBinding": { + "RelatedTable": "项目平行视图", + "RelatedColumn": "ID", + "DisplayColumn": "项目经理" + } + }, + "Value": "%CurrentUser.UserName%" + }, { "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", "ColumnBindingInfo": { @@ -613,7 +608,7 @@ "DatabaseColumnType": "float", "MaxLength": -1, "Name": "总分配工时", - "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", @@ -667,7 +662,7 @@ "DatabaseColumnType": "int", "MaxLength": -1, "Name": "成员数量", - "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + "ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", @@ -675,7 +670,7 @@ "DatabaseColumnType": "nvarchar", "MaxLength": -1, "Name": "任务成员", - "ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, { "$type": "Forguncy.SaveLoad.FormulaColumnSaveData, ServerDesignerCommon", @@ -726,7 +721,7 @@ "ConnectionId": "业务表", "SourceTableName": "任务平行视图", "SourceTableSchema": "dbo", - "CreateViewSql": "WITH 任务汇总 AS ( \r\n SELECT \r\n t.[ID] AS 任务ID, \r\n t.[父任务ID], \r\n SUM(CASE WHEN w.[工时类型] = '计划' THEN w.[工时] ELSE 0 END) AS 计划工时汇总, \r\n SUM(CASE WHEN w.[工时类型] = '实际' THEN w.[工时] ELSE 0 END) AS 核定工时汇总, \r\n SUM(CASE WHEN w.[工时类型] = '实际' THEN w.[上报工时] ELSE 0 END) AS 实际工时汇总, \r\n SUM(CASE WHEN w.[工时类型] = '实际' THEN w.[时薪单价] * w.[提成系数] * w.[工时] ELSE 0 END) AS 收益汇总 \r\n FROM \r\n [dbo].[任务表] t \r\n LEFT JOIN \r\n [dbo].[任务工时表] w ON t.[ID] = w.[任务ID] \r\n GROUP BY \r\n t.[ID], t.[父任务ID] \r\n), 子任务预算 AS ( \r\n SELECT \r\n t.[父任务ID] AS 任务ID, \r\n SUM(t.[任务预算工时]) AS 子任务预算工时 \r\n FROM \r\n [dbo].[任务表] t \r\n WHERE \r\n t.[父任务ID] IS NOT NULL \r\n GROUP BY \r\n t.[父任务ID] \r\n), 成员统计 AS ( \r\n SELECT \r\n t.[任务ID], \r\n COUNT(DISTINCT t.[任务成员]) AS 成员数量, \r\n STUFF(( \r\n SELECT DISTINCT ',' + tm.[任务成员] \r\n FROM [dbo].[任务成员表] tm \r\n WHERE tm.[任务ID] = t.[任务ID] \r\n FOR XML PATH(''), TYPE).value('.', 'NVARCHAR(MAX)'), 1, 1, '') AS 任务成员 \r\nFROM \r\n [dbo].[任务成员表] t \r\nGROUP BY \r\n t.[任务ID]\r\n) \r\nSELECT \r\n t.*, \r\n CASE WHEN t.[任务状态] >= 1 THEN t.[任务预算工时] ELSE 0 END AS 总分配工时, \r\n CASE WHEN p.[工时分配方式] = 3 THEN ISNULL(w.[核定工时汇总], 0) ELSE ISNULL(w.[计划工时汇总], 0) END + ISNULL(c.[子任务预算工时], 0) AS 本任务已分配工时, \r\n CASE \r\n WHEN p.[工时分配方式] = 3 \r\n THEN CASE \r\n WHEN t.[任务预算工时] - ISNULL(w.[核定工时汇总], 0) - ISNULL(c.[子任务预算工时], 0) < 0 THEN 0 \r\n ELSE t.[任务预算工时] - ISNULL(w.[核定工时汇总], 0) - ISNULL(c.[子任务预算工时], 0) \r\n END \r\n ELSE CASE \r\n WHEN t.[任务预算工时] - ISNULL(w.[计划工时汇总], 0) - ISNULL(c.[子任务预算工时], 0) < 0 THEN 0 \r\n ELSE t.[任务预算工时] - ISNULL(w.[计划工时汇总], 0) - ISNULL(c.[子任务预算工时], 0) \r\n END \r\n END AS 可分配工时, \r\n ISNULL(w.[核定工时汇总], 0) AS 本任务核定工时, \r\n CASE \r\n WHEN p.[工时分配方式] = 3 \r\n THEN CASE \r\n WHEN t.[任务预算工时] - ISNULL(c.[子任务预算工时], 0) - ISNULL(w.[核定工时汇总], 0) < 0 THEN 0 \r\n ELSE t.[任务预算工时] - ISNULL(c.[子任务预算工时], 0) - ISNULL(w.[核定工时汇总], 0) \r\n END \r\n ELSE CASE \r\n WHEN t.[任务预算工时] - ISNULL(c.[子任务预算工时], 0) - ISNULL(w.[计划工时汇总], 0) < 0 THEN 0 \r\n ELSE t.[任务预算工时] - ISNULL(c.[子任务预算工时], 0) - ISNULL(w.[计划工时汇总], 0) \r\n END \r\n END AS 本任务可核定工时, \r\n ISNULL(w.[实际工时汇总], 0) AS 本任务实际工时, \r\n ISNULL(w.[收益汇总], 0) AS 已消耗成本, \r\n ISNULL(m.[成员数量], 0) AS 成员数量, \r\n ISNULL(m.[任务成员], '') AS 任务成员 \r\nFROM \r\n [dbo].[任务表] t \r\nLEFT JOIN \r\n 任务汇总 w ON t.[ID] = w.[任务ID] \r\nLEFT JOIN \r\n 子任务预算 c ON t.[ID] = c.[任务ID] \r\nLEFT JOIN \r\n [dbo].[项目表] p ON t.[项目ID] = p.[ID] \r\nLEFT JOIN \r\n 成员统计 m ON t.[ID] = m.[任务ID];", + "CreateViewSql": "WITH 任务汇总 AS ( \r\n SELECT \r\n t.[ID] AS 任务ID, \r\n t.[父任务ID], \r\n SUM(CASE WHEN w.[工时类型] = '计划' THEN w.[工时] ELSE 0 END) AS 计划工时汇总, \r\n SUM(CASE WHEN w.[工时类型] = '实际' THEN w.[工时] ELSE 0 END) AS 核定工时汇总, \r\n SUM(CASE WHEN w.[工时类型] = '实际' THEN w.[上报工时] ELSE 0 END) AS 实际工时汇总, \r\n SUM(CASE WHEN w.[工时类型] = '实际' THEN w.[时薪单价] * w.[提成系数] * w.[工时] ELSE 0 END) AS 收益汇总 \r\n FROM \r\n [dbo].[任务表] t \r\n LEFT JOIN \r\n [dbo].[任务工时表] w ON t.[ID] = w.[任务ID] \r\n GROUP BY \r\n t.[ID], t.[父任务ID] \r\n), 子任务预算 AS ( \r\n SELECT \r\n t.[父任务ID] AS 任务ID, \r\n SUM(t.[任务预算工时]) AS 子任务预算工时 \r\n FROM \r\n [dbo].[任务表] t \r\n WHERE \r\n t.[父任务ID] IS NOT NULL \r\n GROUP BY \r\n t.[父任务ID] \r\n), 成员统计 AS ( \r\n SELECT \r\n t.[任务ID], \r\n COUNT(DISTINCT t.[任务成员]) AS 成员数量, \r\n STUFF(( \r\n SELECT DISTINCT ',' + tm.[任务成员] \r\n FROM [dbo].[任务成员表] tm \r\n WHERE tm.[任务ID] = t.[任务ID] \r\n FOR XML PATH(''), TYPE).value('.', 'NVARCHAR(MAX)'), 1, 1, '') AS 任务成员 \r\nFROM \r\n [dbo].[任务成员表] t \r\nGROUP BY \r\n t.[任务ID]\r\n) \r\nSELECT \r\n t.*, \r\n CASE WHEN t.[任务状态] >= 1 THEN CAST(t.[任务预算工时] as FLOAT ) ELSE 0 END AS 总分配工时, \r\n CASE WHEN p.[工时分配方式] = 3 THEN ISNULL(w.[核定工时汇总], 0) ELSE ISNULL(w.[计划工时汇总], 0) END + ISNULL(c.[子任务预算工时], 0) AS 本任务已分配工时, \r\n CASE \r\n WHEN p.[工时分配方式] = 3 \r\n THEN CASE \r\n WHEN t.[任务预算工时] - ISNULL(w.[核定工时汇总], 0) - ISNULL(c.[子任务预算工时], 0) < 0 THEN 0 \r\n ELSE t.[任务预算工时] - ISNULL(w.[核定工时汇总], 0) - ISNULL(c.[子任务预算工时], 0) \r\n END \r\n ELSE CASE \r\n WHEN t.[任务预算工时] - ISNULL(w.[计划工时汇总], 0) - ISNULL(c.[子任务预算工时], 0) < 0 THEN 0 \r\n ELSE t.[任务预算工时] - ISNULL(w.[计划工时汇总], 0) - ISNULL(c.[子任务预算工时], 0) \r\n END \r\n END AS 可分配工时, \r\n ISNULL(w.[核定工时汇总], 0) AS 本任务核定工时, \r\n CASE \r\n WHEN p.[工时分配方式] = 3 \r\n THEN CASE \r\n WHEN t.[任务预算工时] - ISNULL(c.[子任务预算工时], 0) - ISNULL(w.[核定工时汇总], 0) < 0 THEN 0 \r\n ELSE t.[任务预算工时] - ISNULL(c.[子任务预算工时], 0) - ISNULL(w.[核定工时汇总], 0) \r\n END \r\n ELSE CASE \r\n WHEN t.[任务预算工时] - ISNULL(c.[子任务预算工时], 0) - ISNULL(w.[计划工时汇总], 0) < 0 THEN 0 \r\n ELSE t.[任务预算工时] - ISNULL(c.[子任务预算工时], 0) - ISNULL(w.[计划工时汇总], 0) \r\n END \r\n END AS 本任务可核定工时, \r\n ISNULL(w.[实际工时汇总], 0) AS 本任务实际工时, \r\n ISNULL(w.[收益汇总], 0) AS 已消耗成本, \r\n ISNULL(m.[成员数量], 0) AS 成员数量, \r\n ISNULL(m.[任务成员], '') AS 任务成员 \r\nFROM \r\n [dbo].[任务表] t \r\nLEFT JOIN \r\n 任务汇总 w ON t.[ID] = w.[任务ID] \r\nLEFT JOIN \r\n 子任务预算 c ON t.[ID] = c.[任务ID] \r\nLEFT JOIN \r\n [dbo].[项目表] p ON t.[项目ID] = p.[ID] \r\nLEFT JOIN \r\n 成员统计 m ON t.[ID] = m.[任务ID];", "ViewInfo": { "ViewName": "任务平行视图", "QueryColumns": [