1

web/Djy.Common/Common.xml

@@ -1688,6 +1688,11 @@
             是否是开发环境
             </summary>
         </member>
+        <member name="P:Common.Entity.WebConfig.IsReport">
+            <summary>
+            是否report
+            </summary>
+        </member>
         <member name="P:Common.Entity.WebConfig.WebName">
             <summary>
             站点名称

web/djy.Model/Report/DS_ReportTemplate.cs

@@ -23,5 +23,7 @@ namespace djy.Model.Report
 
 
         public int SendType { get; set; }
+
+        public string SendObj { get; set; }
     }
 }

web/djy.Service/Report/ReportService.cs

@@ -149,6 +149,10 @@ namespace djy.Service.Report
                     DbBus.Get(DbList.DSDB).Insert(report).ExecuteAffrows();
                     Gid = report.GID;
                 }
+                if (DbBus.Get(DbList.DSDB).Select<DS_Report>().Where(x => x.GID==Gid).ToOne().IsBook==true) {
+
+                    return "该模板已经订阅过了";
+                }
                 ////订阅
                 var fin = new FinanceService();
                 var templist = DbBus.Get(DbList.DSDB).Select<DS_ReportTemplate>(). 
@@ -157,6 +161,7 @@ namespace djy.Service.Report
                 {
                     SENDUSERID = user.GID,
                     LURURENID = user.GID,
+                    MBLNO= "1",
                     CtnrCount = 1,
                     CtnrInfo = string.Empty,
                     BSTYPE = 17,
@@ -180,11 +185,12 @@ namespace djy.Service.Report
                 {
                     SENDUSERID = user.GID,
                     LURURENID = user.GID,
+                    MBLNO = "1",
                     CtnrCount = 1,
                     CtnrInfo = string.Empty,
                     BSTYPE = 17,
                     SENDTYPE = templist.SendType,
-                    BSNO = Gid,
+                    BSNO = Gid, 
                 }, 1);
                 return "订阅成功！";
             }
@@ -216,6 +222,7 @@ namespace djy.Service.Report
                     {
                         SENDUSERID = item.UserID,
                         LURURENID = item.UserID,
+                        MBLNO = "1",
                         CtnrCount = 1,
                         CtnrInfo = string.Empty,
                         BSTYPE = 17,
@@ -240,6 +247,7 @@ namespace djy.Service.Report
                         {
                             SENDUSERID = item.UserID,
                             LURURENID = item.UserID,
+                            MBLNO = "1",
                             CtnrCount = 1,
                             CtnrInfo = string.Empty,
                             BSTYPE = 17,

web/djy_Report/.config/dotnet-tools.json

@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-ef": {
+      "version": "6.0.7",
+      "commands": [
+        "dotnet-ef"
+      ]
+    }
+  }
+}

web/djy_Report/Properties/PublishProfiles/FolderProfile.pubxml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <DeleteExistingFiles>false</DeleteExistingFiles>
+    <ExcludeApp_Data>false</ExcludeApp_Data>
+    <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
+    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+    <LastUsedPlatform>Any CPU</LastUsedPlatform>
+    <PublishProvider>FileSystem</PublishProvider>
+    <PublishUrl>bin\Release\net5.0\publish\</PublishUrl>
+    <WebPublishMethod>FileSystem</WebPublishMethod>
+    <SiteUrlToLaunchAfterPublish />
+    <TargetFramework>net5.0</TargetFramework>
+    <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
+    <ProjectGuid>a201194b-42ca-41bf-8123-7db5d332c940</ProjectGuid>
+    <SelfContained>false</SelfContained>
+  </PropertyGroup>
+</Project>

web/djy_Report/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <_PublishTargetUrl>C:\Project\DJYAMS\djyweb_ams\web\djy_Report\bin\Release\net5.0\publish\</_PublishTargetUrl>
+    <History>True|2022-07-28T08:35:31.2753071Z;True|2022-07-26T15:37:57.8232926+08:00;True|2022-07-26T15:35:18.3536046+08:00;True|2022-07-26T15:13:31.6562730+08:00;True|2022-07-26T15:13:15.8782954+08:00;True|2022-07-26T14:45:37.8959227+08:00;True|2022-07-26T14:36:32.2119163+08:00;True|2022-07-25T13:50:19.3527775+08:00;</History>
+  </PropertyGroup>
+</Project>

web/djy_Report/djy_Report.csproj.user

@@ -3,5 +3,6 @@
   <PropertyGroup>
     <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
     <Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
+    <NameOfLastUsedPublishProfile>C:\Project\DJYAMS\djyweb_ams\web\djy_Report\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
   </PropertyGroup>
 </Project>