Merge branch 'master' of http://118.178.224.202:3000/ewide/zsxt_nbzs_h5

.gitignore

@@ -0,0 +1,9 @@
+bin/
+obj/
+*.user
+/Publish
+/packages
+.vs
+Logs/
+Upload
+dbsettings.Development.json

Ewide.NbzsZheliban/Entity/DataBase/PoliciesRegulations.cs

@@ -0,0 +1,183 @@
+	//----------PoliciesRegulations开始----------
+    
+	using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+//using System.Data.Entity.ModelConfiguration;
+using Ewide.NbzsZheliban.Entity;
+using System.Runtime.Serialization;
+	namespace Ewide.NbzsZheliban.Entity
+	{	
+        /// <summary>
+        /// 数据表实体类：PoliciesRegulations 
+        /// </summary>
+		[Table("PoliciesRegulations")]
+        public partial class PoliciesRegulations: BaseEntity        {    
+		                    /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+				[Key]
+								[Column("ID")]   
+				[DataMember]  
+			    public Guid ID  {get;set;}   
+                                /// <summary>
+                /// 项目id 关联Projects表ID
+                /// </summary>    
+				
+				[Display(Name="项目id 关联Projects表ID")]   
+								[Column("ProjectID")]   
+				[DataMember]  
+			    public Guid? ProjectID  {get;set;}   
+                                /// <summary>
+                /// 项目名称
+                /// </summary>    
+				
+				[Display(Name="项目名称")]   
+								[Column("ProjectName")]   
+				[DataMember]  
+			    public string ProjectName  {get;set;}   
+                                /// <summary>
+                /// 所属区域ID
+                /// </summary>    
+				
+				[Display(Name="所属区域ID")]   
+								[Column("AreaID")]   
+				[DataMember]  
+			    public Guid? AreaID  {get;set;}   
+                                /// <summary>
+                /// 所属区域
+                /// </summary>    
+				
+				[Display(Name="所属区域")]   
+								[Column("Area")]   
+				[DataMember]  
+			    public string Area  {get;set;}   
+                                /// <summary>
+                /// 标题
+                /// </summary>    
+				
+				[Display(Name="标题")]   
+								[Column("Title")]   
+				[DataMember]  
+			    public string Title  {get;set;}   
+                                /// <summary>
+                /// 征文内容
+                /// </summary>    
+				
+				[Display(Name="征文内容")]   
+								[Column("Contents")]   
+				[DataMember]  
+			    public string Contents  {get;set;}   
+                                /// <summary>
+                /// 是否公开
+                /// </summary>    
+				
+				[Display(Name="是否公开")]   
+								[Column("IsPublic")]   
+				[DataMember]  
+			    public bool IsPublic  {get;set;}   
+                                /// <summary>
+                /// 发布时间
+                /// </summary>    
+				
+				[Display(Name="发布时间")]   
+								[Column("PublicTime")]   
+				[DataMember]  
+			    public DateTime? PublicTime  {get;set;}   
+                                /// <summary>
+                /// 使用截止时间
+                /// </summary>    
+				
+				[Display(Name="使用截止时间")]   
+								[Column("PublicTimeEnd")]   
+				[DataMember]  
+			    public DateTime? PublicTimeEnd  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("CreateUserName")]   
+				[DataMember]  
+			    public string CreateUserName  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("UpdateTime")]   
+				[DataMember]  
+			    public DateTime? UpdateTime  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("UpdateUserId")]   
+				[DataMember]  
+			    public Guid? UpdateUserId  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("UpdateUserName")]   
+				[DataMember]  
+			    public string UpdateUserName  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("Remark")]   
+				[DataMember]  
+			    public string Remark  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("Files")]   
+				[DataMember]  
+			    public string Files  {get;set;}   
+                 
+		  }
+
+		  /**
+            /// <summary>
+            /// 数据表实体类Map：PoliciesRegulations 
+            /// </summary>
+            public class PoliciesRegulationsMap : EntityTypeConfiguration<PoliciesRegulations>
+			{
+                public PoliciesRegulationsMap()
+                {
+					this.ToTable("PoliciesRegulations");
+												this.HasKey(t => t.ID);
+													 this.Property(t => t.ProjectID).HasColumnName("ProjectID");
+													 this.Property(t => t.ProjectName).HasColumnName("ProjectName");
+													 this.Property(t => t.AreaID).HasColumnName("AreaID");
+													 this.Property(t => t.Area).HasColumnName("Area");
+													 this.Property(t => t.Title).HasColumnName("Title");
+													 this.Property(t => t.Contents).HasColumnName("Contents");
+													 this.Property(t => t.IsPublic).HasColumnName("IsPublic");
+													 this.Property(t => t.PublicTime).HasColumnName("PublicTime");
+													 this.Property(t => t.PublicTimeEnd).HasColumnName("PublicTimeEnd");
+													 this.Property(t => t.CreateTime).HasColumnName("CreateTime");
+													 this.Property(t => t.CreateUserId).HasColumnName("CreateUserId");
+													 this.Property(t => t.CreateUserName).HasColumnName("CreateUserName");
+													 this.Property(t => t.UpdateTime).HasColumnName("UpdateTime");
+													 this.Property(t => t.UpdateUserId).HasColumnName("UpdateUserId");
+													 this.Property(t => t.UpdateUserName).HasColumnName("UpdateUserName");
+													 this.Property(t => t.Remark).HasColumnName("Remark");
+													 this.Property(t => t.Files).HasColumnName("Files");
+													 this.Property(t => t.Sort).HasColumnName("Sort").IsRequired();
+										}
+			}**/
+
+	}
+
+	//----------PoliciesRegulations结束----------
+
+	

Ewide.NbzsZheliban/Entity/DataBase/zjzwfwTickets.cs

@@ -0,0 +1,98 @@
+	//----------zjzwfwTickets开始----------
+    
+	using System;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+//using System.Data.Entity.ModelConfiguration;
+using Ewide.NbzsZheliban.Entity;
+using System.Runtime.Serialization;
+	namespace Ewide.NbzsZheliban.Entity
+	{	
+        /// <summary>
+        /// 数据表实体类：zjzwfwTickets 
+        /// </summary>
+		[Table("zjzwfwTickets")]
+        public partial class zjzwfwTickets: BaseEntity        {    
+		                    /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("ID")]   
+				[DataMember]  
+			    public string ID  {get;set;}   
+                                /// <summary>
+                /// 无描述
+                /// </summary>    
+				
+				[Display(Name="无描述")]   
+								[Column("Ticket")]   
+				[DataMember]  
+			    public string Ticket  {get;set;}   
+                                /// <summary>
+                /// 姓名
+                /// </summary>    
+				
+				[Display(Name="姓名")]   
+								[Column("UserName")]   
+				[DataMember]  
+			    public string UserName  {get;set;}   
+                                /// <summary>
+                /// 身份证号码
+                /// </summary>    
+				
+				[Display(Name="身份证号码")]   
+								[Column("IdCardNo")]   
+				[DataMember]  
+			    public string IdCardNo  {get;set;}   
+                                /// <summary>
+                /// 创建时间
+                /// </summary>    
+				
+				[Display(Name="创建时间")]   
+								[Column("CreateTime")]   
+				[DataMember]  
+			    public DateTime? CreateTime  {get;set;}   
+                                /// <summary>
+                /// 到期时间 默认1小时到期
+                /// </summary>    
+				
+				[Display(Name="到期时间 默认1小时到期")]   
+								[Column("ExpireTime")]   
+				[DataMember]  
+			    public DateTime? ExpireTime  {get;set;}   
+                                /// <summary>
+                /// 原始文本
+                /// </summary>    
+				
+				[Display(Name="原始文本")]   
+								[Column("OriginalResponse")]   
+				[DataMember]  
+			    public string OriginalResponse  {get;set;}   
+                 
+		  }
+
+		  /**
+            /// <summary>
+            /// 数据表实体类Map：zjzwfwTickets 
+            /// </summary>
+            public class zjzwfwTicketsMap : EntityTypeConfiguration<zjzwfwTickets>
+			{
+                public zjzwfwTicketsMap()
+                {
+					this.ToTable("zjzwfwTickets");
+												 this.Property(t => t.ID).HasColumnName("ID").IsRequired();
+													 this.Property(t => t.Ticket).HasColumnName("Ticket");
+													 this.Property(t => t.UserName).HasColumnName("UserName");
+													 this.Property(t => t.IdCardNo).HasColumnName("IdCardNo");
+													 this.Property(t => t.CreateTime).HasColumnName("CreateTime");
+													 this.Property(t => t.ExpireTime).HasColumnName("ExpireTime");
+													 this.Property(t => t.OriginalResponse).HasColumnName("OriginalResponse");
+										}
+			}**/
+
+	}
+
+	//----------zjzwfwTickets结束----------
+
+	

Ewide.NbzsZheliban/Entity/Extends/H5IndexPrjModel.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -33,6 +34,7 @@ namespace Ewide.NbzsZheliban.Entity.Extends
         /// 项目信息
         /// </summary>
         public List<H5IndexPrjModel> PrjList { get; set; }
+        public PoliciesRegulations PoliciesRegulationsLists { get; set; }
     }
     public class H5IndexPrjModel
     {
@@ -41,6 +43,8 @@ namespace Ewide.NbzsZheliban.Entity.Extends
         /// 区域
         /// </summary>
         public string Area { get; set; }
+        [Newtonsoft.Json.JsonIgnore]
+        public string AreaID { get; set; }
         /// <summary>
         /// 征收部门
         /// </summary>
@@ -66,4 +70,18 @@ namespace Ewide.NbzsZheliban.Entity.Extends
         /// </summary>
         public object BcxyList { get; set; }
     }
+    public class PoliciesRegulations
+    {
+        public int TotalCount { get; set; }
+        public List<PoliciesRegulation> List { get; set; }
+    }
+    public class PoliciesRegulation
+    {
+
+        public Guid ID { get; set; }
+        public string Title { get; set; }
+        public string Contents { get; set; }
+        public DateTime? PublicTime { get; set; }
+        public string Area { get; set; }
+    }
 }

Ewide.NbzsZheliban/Entity/SqlModelTpl.cs

@@ -17,3 +17,5 @@
  
 
 
+
+ 

Ewide.NbzsZheliban/Entity/SqlModelTpl.tt

@@ -16,7 +16,7 @@
 	string tableClass="";
     //所有表名称
     //string sqlGetTable = "SELECT Name FROM SysObjects Where XType='U' ORDER BY Name";
-    DataTable dt = GetDataTable(new List<string> { "Projects","InvestigateTable","NonResidentialInvestigateTable","InvestigateTable_Assessment","NonInvestigateTable_Assessment","NonResidentialAgreement","ResidentialAgreement" });
+    DataTable dt = GetDataTable(new List<string> { "Projects","InvestigateTable","NonResidentialInvestigateTable","InvestigateTable_Assessment","NonInvestigateTable_Assessment","NonResidentialAgreement","ResidentialAgreement","PoliciesRegulations","zjzwfwTickets" });
 	//DataTable dtRelationTable = GetRelationTable();
     //所有表信息
 	string selectQuery ="select syscolumns.name,systypes.name,syscolumns.length from syscolumns,systypes where syscolumns.xusertype=systypes.xusertype and syscolumns.id=object_id('@tableName')";
@@ -52,7 +52,8 @@ using System.Runtime.Serialization;
         public partial class <#= tableClass #><# if(objType=="U"){#>: BaseEntity<#}else{#>: BaseEntity<#}#>
         {    
 		    <#
-			List<string> listBaseColumn = new List<string>{"Id","UNID","CreateTime","CreateUserId","LastUpdateTime","IsDeleted","Sort"};
+			//List<string> listBaseColumn = new List<string>{"Id","UNID","CreateTime","CreateUserId","LastUpdateTime","IsDeleted","Sort"};
+			List<string> listBaseColumn = new List<string>{};
             foreach (DataRow dr in datacloumn.Rows)
             {
 				string columnName=GetFormColumnName(dr["columnname"].ToString(),tableClass);

Ewide.NbzsZheliban/Service/DataService.cs

@@ -29,18 +29,8 @@ namespace Ewide.NbzsZheliban.Service
             db = repository.Context;
             _jsonSerializer = jsonSerializer;
         }
-        /// <summary>
+        private JObject GetInfoByTicket(string ticket)
-        /// 被征收人关联的项目列表
-        /// </summary>
-        /// <param name="args"></param>
-        /// <returns></returns>
-        [HttpPost("/project/list")]
-        [Microsoft.AspNetCore.Authorization.AllowAnonymous]
-        public async Task<dynamic> PrjList([FromBody] JObject args)
         {
-            #region 票据
-            var ticket = args.GetJsonValue("ticket", isThrowExp: true);
-            //var ticket = Request.Query["ticket"];
             if (!string.IsNullOrWhiteSpace(ticket))
             {
                 var time = DateTime.Now.ToString("yyyyMMddHHmmss");
@@ -88,10 +78,27 @@ namespace Ewide.NbzsZheliban.Service
                 }
                 if (userinfoObj["result"].Value<int>() != 0)
                     throw Oops.Oh($"ticket接口返回值有误,[{tickerRsltStr}]");
-                var cardno = userinfoObj["idnum"].ToString();
+                var temp1 = db.Insertable<zjzwfwTickets>(new zjzwfwTickets
-                var username = userinfoObj["username"].ToString();
+                {
-
+                    ID = Guid.NewGuid().ToString(),
-                #endregion
+                    Ticket = ticket,
+                    IdCardNo = userinfoObj["idnum"].ToString(),
+                    UserName = userinfoObj["username"].ToString(),
+                    ExpireTime = DateTime.Now.AddHours(1),
+                    CreateTime = DateTime.Now,
+                    OriginalResponse = userinfoRsltStr
+                }).ExecuteCommand();
+                if (temp1 <= 0)
+                    throw Oops.Oh("出现异常,请联系管理员");
+                return userinfoObj;
+            }
+            else
+            {
+                throw Oops.Oh("无效访问");
+            }
+        }
+        private async Task<H5IndexModel> GetInfoByCardNoAsync(string cardno, string username)
+        {
             //var cardno = args.GetJsonValue("cardno", isThrowExp: true);
             //住宅调查表
             var list_zz_dcb = await db.Ado.SqlQueryAsync<Dcbs>("select ID dcbId,ProjectId PrjId from InvestigateTable b where b.ExpropriatedCardNo=@ExpropriatedCardNo", new List<SugarParameter> { new SugarParameter("ExpropriatedCardNo", cardno, System.Data.DbType.String) }.ToArray());
@@ -100,30 +107,56 @@ namespace Ewide.NbzsZheliban.Service
             //调查表集合
             var list_dcbs = list_zz_dcb.Concat(list_fzz_dcb);
             //项目列表
-                var list_projects = await db.Ado.SqlQueryAsync<H5IndexPrjModel>("select a.ID Prjid,a.area,a.HouseAcquisitionDepartment as zsbm,a.CollectDecisionNo1 as year,(isnull(a.CollectDecisionNoHeadName,'')+'['+cast(a.CollectDecisionNo1 as varchar)+']'+ isnull(cast(a.CollectDecisionNo2 as varchar),'')+'号') zsjdh,dbo.get_current_state(a.ID) CurrentState from Projects a where ID in ('" + string.Join("','", list_dcbs.Select(p => p.PrjId)) + "') ");
+            var list_projects = await db.Ado.SqlQueryAsync<H5IndexPrjModel>("select a.ID Prjid,a.area,a.AreaID,a.HouseAcquisitionDepartment as zsbm,a.CollectDecisionNo1 as year,(isnull(a.CollectDecisionNoHeadName,'')+'['+cast(a.CollectDecisionNo1 as varchar)+']'+ isnull(cast(a.CollectDecisionNo2 as varchar),'')+'号') zsjdh,dbo.get_current_state(a.ID) CurrentState from Projects a where ID in ('" + string.Join("','", list_dcbs.Select(p => p.PrjId)) + "') ");
             //分户评估
             var InvestigateTableID_param = "'" + string.Join("','", list_dcbs.Select(p => p.dcbId)) + "'";
             var list_fhpgs = await db.Ado.SqlQueryAsync<Fhpgs>("select   e.ProjectId as PrjId ,d.AssessmentNo,e.HouseAddress,d.countValue from InvestigateTable_Assessment d inner join InvestigateTable e on d.InvestigateTableId=e.ID where d.InvestigateTableID in ( " + InvestigateTableID_param + " ) union all select e.ProjectId as PrjId ,AssessmentNo, e.HouseAddress, d.countValue from NonInvestigateTable_Assessment d inner join NonResidentialInvestigateTable e on d.NonInvestigateTableID = e.ID where d.NonInvestigateTableID in ( " + InvestigateTableID_param + " ) ;");
             //补偿协议 
             var list_bcxys = await db.Ado.SqlQueryAsync<Bcxy>("select isnull(d.CollectDecisionNoHeadName,'')+isnull(d.No1,'')+'-'+isnull(d.No2,'')+(case when (d.No3 is null or d.No3 = '') then '' else ('-'+d.No3) end ) XyNo,d.SwitchProductionWay,e.HouseAddress,d.SummationShouldCompensateMoney,e.ProjectId as PrjId from ResidentialAgreement d inner join InvestigateTable e on d.InvestigateTableId=e.ID where d.InvestigateTableID in ( " + InvestigateTableID_param + " ) union all select isnull(d.CollectDecisionNoHeadName, '') + isnull(d.No2, '') + '-' + isnull(d.No3, '') XyNo , d.SwitchProductionWay, e.HouseAddress, d.SummationShouldCompensateMoney, e.ProjectId as PrjId from NonResidentialAgreement d inner join NonResidentialInvestigateTable e on d.NonInvestigateTableID = e.ID where d.NonInvestigateTableID in ( " + InvestigateTableID_param + " ); ");
-
+            //政策
+            var list_PoliciesRegulations = await db.Queryable<Entity.PoliciesRegulations>().ToListAsync();
+            var listAreas = new List<Guid?>
+                {
+                    Guid.Parse("B2A0291C-84C7-4D86-A6D5-CB9FCCF4A2D8")
+                };
             list_projects.ForEach(p =>
             {
                 p.FhpgList = list_fhpgs.Where(a => a.PrjId == p.PrjId);
                 p.BcxyList = list_bcxys.Where(a => a.PrjId == p.PrjId);
+                listAreas.Add(Guid.Parse(p.AreaID));
             });
+            var listPr = list_PoliciesRegulations.Where(a => listAreas.Contains(a.AreaID)).Select(b => new PoliciesRegulation
+            {
+                ID = b.ID,
+                Contents = b.Contents,
+                PublicTime = b.PublicTime,
+                Title = b.Title,
+                Area = b.Area
+            }).ToList();
             H5IndexModel h5IndexModel = new()
             {
                 PrjList = list_projects,
                 IdCard = cardno,
-                    UserName = username
+                UserName = username,
+                PoliciesRegulationsLists = new Entity.Extends.PoliciesRegulations { List = listPr, TotalCount = listPr.Count }
             };
             return h5IndexModel;
         }
-            else
+        /// <summary>
+        /// 被征收人关联的项目列表
+        /// </summary>
+        /// <param name="args"></param>
+        /// <returns></returns>
+        [HttpPost("/project/list")]
+        [Microsoft.AspNetCore.Authorization.AllowAnonymous]
+        public async Task<dynamic> PrjList([FromBody] JObject args)
         {
-                throw Oops.Oh("无效访问");
+            var ticket = args.GetJsonValue("ticket", isThrowExp: true);
-            }
+            //var ticket = Request.Query["ticket"]; 
+            var userinfoObj = GetInfoByTicket(ticket);
+            var cardno = userinfoObj["idnum"].ToString();
+            var username = userinfoObj["username"].ToString();
+            return await GetInfoByCardNoAsync(cardno, username);
         }
         /// <summary>
         /// 被征收人关联的项目列表
@@ -136,35 +169,7 @@ namespace Ewide.NbzsZheliban.Service
         {
             var cardno = "341203199206303411";
             var username = "张三丰";
-
+            return await GetInfoByCardNoAsync(cardno, username);
-            //var cardno = args.GetJsonValue("cardno", isThrowExp: true);
-            //住宅调查表
-            var list_zz_dcb = await db.Ado.SqlQueryAsync<Dcbs>("select ID dcbId,ProjectId PrjId from InvestigateTable b where b.ExpropriatedCardNo=@ExpropriatedCardNo", new List<SugarParameter> { new SugarParameter("ExpropriatedCardNo", cardno, System.Data.DbType.String) }.ToArray());
-            //非住宅调查表
-            var list_fzz_dcb = await db.Ado.SqlQueryAsync<Dcbs>("select ID dcbId,ProjectId PrjId from NonResidentialInvestigateTable b where b.PropertyRightCardNo=@ExpropriatedCardNo", new List<SugarParameter> { new SugarParameter("ExpropriatedCardNo", cardno, System.Data.DbType.String) }.ToArray());
-            //调查表集合
-            var list_dcbs = list_zz_dcb.Concat(list_fzz_dcb);
-            //项目列表
-            var list_projects = await db.Ado.SqlQueryAsync<H5IndexPrjModel>("select a.ID Prjid,a.area,a.HouseAcquisitionDepartment as zsbm,a.CollectDecisionNo1 as year,(isnull(a.CollectDecisionNoHeadName,'')+'['+cast(a.CollectDecisionNo1 as varchar)+']'+ isnull(cast(a.CollectDecisionNo2 as varchar),'')+'号') zsjdh,dbo.get_current_state(a.ID) CurrentState from Projects a where ID in ('" + string.Join("','", list_dcbs.Select(p => p.PrjId)) + "') ");
-            //分户评估
-            var InvestigateTableID_param = "'" + string.Join("','", list_dcbs.Select(p => p.dcbId)) + "'";
-            var list_fhpgs = await db.Ado.SqlQueryAsync<Fhpgs>("select   e.ProjectId as PrjId ,d.AssessmentNo,e.HouseAddress,d.countValue from InvestigateTable_Assessment d inner join InvestigateTable e on d.InvestigateTableId=e.ID where d.InvestigateTableID in ( " + InvestigateTableID_param + " ) union all select e.ProjectId as PrjId ,AssessmentNo, e.HouseAddress, d.countValue from NonInvestigateTable_Assessment d inner join NonResidentialInvestigateTable e on d.NonInvestigateTableID = e.ID where d.NonInvestigateTableID in ( " + InvestigateTableID_param + " ) ;");
-            //补偿协议 
-            var list_bcxys = await db.Ado.SqlQueryAsync<Bcxy>("select isnull(d.CollectDecisionNoHeadName,'')+isnull(d.No1,'')+'-'+isnull(d.No2,'')+(case when (d.No3 is null or d.No3 = '') then '' else ('-'+d.No3) end ) XyNo,d.SwitchProductionWay,e.HouseAddress,d.SummationShouldCompensateMoney,e.ProjectId as PrjId from ResidentialAgreement d inner join InvestigateTable e on d.InvestigateTableId=e.ID where d.InvestigateTableID in ( " + InvestigateTableID_param + " ) union all select isnull(d.CollectDecisionNoHeadName, '') + isnull(d.No2, '') + '-' + isnull(d.No3, '') XyNo , d.SwitchProductionWay, e.HouseAddress, d.SummationShouldCompensateMoney, e.ProjectId as PrjId from NonResidentialAgreement d inner join NonResidentialInvestigateTable e on d.NonInvestigateTableID = e.ID where d.NonInvestigateTableID in ( " + InvestigateTableID_param + " ); ");
-
-            list_projects.ForEach(p =>
-            {
-                p.FhpgList = list_fhpgs.Where(a => a.PrjId == p.PrjId);
-                p.BcxyList = list_bcxys.Where(a => a.PrjId == p.PrjId);
-            });
-            H5IndexModel h5IndexModel = new()
-            {
-                PrjList = list_projects,
-                IdCard = cardno,
-                UserName = username
-            };
-            return h5IndexModel;
-
         }
     }
 }

Ewide.NbzsZheliban/obj/Debug/net5.0/Ewide.NbzsZheliban.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-fbae486d0767770514b6ba877c8b825b66bbda21
+84fd37caa0c16ac3725555de4dc9cd62ba901214

Ewide.NbzsZheliban/obj/Release/net5.0/Ewide.NbzsZheliban.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-e152e943102a596d81738a7c8388c9d1012f3a29
+45a45ab57f43f74b631fd62aae6c40b3682e1ac4

FrontCode2/sunshine_levy/index.html

@@ -12,6 +12,48 @@
 <body>
   <div id="app"></div>
   <!-- built files will be auto injected -->
+  <script>
+    (function (w, d, s, q, i) {
+      w[q] = w[q] || [];
+      var f = d.getElementsByTagName(s)[0];
+      var j = d.createElement(s);
+      j.async = true;
+      j.id = "beacon-aplus";
+      j.src = "https://d.alicdn.com/alilog/mlog/aplus.js?id=202951085";
+      f.parentNode.insertBefore(j, f);
+    })(window, document, "script", "aplus_queue");
+    aplus_queue.push({
+      action: "aplus.setMetaInfo",
+      arguments: ["aplus-rhost-v", "alog.zjzwfw.gov.cn"]
+    });
+    aplus_queue.push({
+      action: "aplus.setMetaInfo",
+      arguments: ["aplus-rhost-g", "alog.zjzwfw.gov.cn"]
+    });
+    // 这个会落到 app_key 字段上
+    aplus_queue.push({
+      action: "aplus.setMetaInfo",
+      arguments: ["appId", "60506758"]
+    });
+    // 单页应用 或 “单个页面”需异步补充 PV 日志参数还需进行如下埋点：
+    aplus_queue.push({
+      action: "aplus.setMetaInfo",
+      arguments: ["aplus-waiting", "MAN"]
+    });
+    // 单页应用路由切换后 或 在异步获取到 pv 日志所需的参数后再执行 sendPV：
+    aplus_queue.push({
+      action: "aplus.sendPV",
+      arguments: [
+        {
+          is_auto: false
+        },
+        {
+          miniAppId: "2001833218", //'应用开发管理平台-应用 ID
+          miniAppName: "房屋征收"
+        }
+      ]
+    });
+  </script>
 </body>
 
 </html>

FrontCode2/sunshine_levy/src/views/index.vue

@@ -7,28 +7,19 @@
         </div>
         <div>
           <div class="baseInfo">
-            <van-image
+            <van-image :src="require('@/assets/img/renyuanliebiao.png')" class="baseImg" />
-              :src="require('@/assets/img/renyuanliebiao.png')"
-              class="baseImg"
-            />
             <span class="baseFont">被征收人姓名：</span>
             <span class="baseFont">{{ data.userName }}</span>
           </div>
           <div class="baseInfo">
-            <van-image
+            <van-image :src="require('@/assets/img/credentials_icon.png')" class="baseImg" />
-              :src="require('@/assets/img/credentials_icon.png')"
-              class="baseImg"
-            />
             <span class="baseFont">身份证号码：</span>
             <span class="baseFont">{{ data.idCard }}</span>
           </div>
         </div>
         <div>
           <div class="gridBg centerMagin">
-            <van-image
+            <van-image :src="require('@/assets/img/scan.png')" class="gridImg" />
-              :src="require('@/assets/img/scan.png')"
-              class="gridImg"
-            />
             <van-image
               :src="require('@/assets/img/evaluation .png')"
               @click="gotoProject('pg')"
@@ -43,27 +34,18 @@
         </div>
       </div>
       <div class="centerMagin">
-        <van-image
+        <van-image :src="require('@/assets/img/government.png')" class="bigImg" />
-          :src="require('@/assets/img/government.png')"
-          class="bigImg"
-        />
       </div>
       <van-list>
         <div :key="item.prjId" v-for="item in data.prjList">
           <div class="centerMagin">
             <div class="project">
               <div>
-                <van-image
+                <van-image :src="require('@/assets/img/project.png')" class="projectIcon" />
-                  :src="require('@/assets/img/project.png')"
-                  class="projectIcon"
-                />
                 <span class="projectTitle">{{ item.name }}</span>
               </div>
               <div class="projectRight">
-                <van-image
+                <van-image :src="require('@/assets/img/menu_yhxy.png')" class="projectRightIcon" />
-                  :src="require('@/assets/img/menu_yhxy.png')"
-                  class="projectRightIcon"
-                />
                 <span class="projectRightFont">{{ item.currentState }}</span>
               </div>
             </div>
@@ -107,19 +89,18 @@
                     class="projectCenterImg"
                   />
                   <span class="projectCenterFont">征收决定号：</span>
-                  <span class="projectCenterFont" style="color: #3883f1">{{
+                  <span class="projectCenterFont" style="color: #3883f1">
+                    {{
                     item.zsjdh
-                  }}</span>
+                    }}
+                  </span>
                 </div>
               </div>
             </div>
             <div class="centerMagin">
               <div class="assess">
                 <div>
-                  <van-image
+                  <van-image :src="require('@/assets/img/assess_1.png')" class="assessIcon" />
-                    :src="require('@/assets/img/assess_1.png')"
-                    class="assessIcon"
-                  />
                   <span class="assessTitle">分户评估结果</span>
                 </div>
                 <!-- <div>
@@ -127,39 +108,28 @@
                 </div>-->
               </div>
               <van-list>
-                <div
+                <div :key="assess.id" class="assessCenter1" v-for="assess in item.fhpgList">
-                  :key="assess.id"
-                  class="assessCenter1"
-                  v-for="assess in item.fhpgList"
-                >
                   <div class="assessBox">
                     <span class="projectCenterFont">评估报告编号：</span>
-                    <span class="projectCenterFont">
+                    <span class="projectCenterFont">{{ assess.assessmentNo }}</span>
-                      {{ assess.assessmentNo }}
+                  </div>
+                  <div class="assessBox">
+                    <span class="projectCenterFont" style="width: 40%">被征收房屋地址：</span>
+                    <span class="projectCenterFont protocolTitle">
+                      {{
+                      assess.houseAddress
+                      }}
                     </span>
                   </div>
-                  <div class="assessBox">
-                    <span class="projectCenterFont" style="width: 40%"
-                      >被征收房屋地址：</span
-                    >
-                    <span class="projectCenterFont protocolTitle">{{
-                      assess.houseAddress
-                    }}</span>
-                  </div>
                   <div class="assessBox">
                     <span class="projectCenterFont">评估总金额：</span>
-                    <span class="projectTitle" style="color: red"
+                    <span class="projectTitle" style="color: red">¥{{ assess.countValue }}</span>
-                      >¥{{ assess.countValue }}</span
-                    >
                   </div>
                 </div>
               </van-list>
               <div class="assess">
                 <div>
-                  <van-image
+                  <van-image :src="require('@/assets/img/assess_2.png')" class="assessIcon" />
-                    :src="require('@/assets/img/assess_2.png')"
-                    class="assessIcon"
-                  />
                   <span class="assessTitle">补偿协议</span>
                 </div>
                 <!-- <div>
@@ -167,34 +137,33 @@
                 </div>-->
               </div>
               <van-list>
-                <div
+                <div :key="protocol.id" class="assessCenter2" v-for="protocol in item.bcxyList">
-                  :key="protocol.id"
-                  class="assessCenter2"
-                  v-for="protocol in item.bcxyList"
-                >
                   <div class="assessBox">
                     <span class="projectCenterFont">协议编号：</span>
                     <span class="projectCenterFont">{{ protocol.xyNo }}</span>
                   </div>
                   <div class="assessBox">
-                    <span class="projectCenterFont" style="width: 40%"
+                    <span class="projectCenterFont" style="width: 40%">被征收房屋地址：</span>
-                      >被征收房屋地址：</span
+                    <span class="projectCenterFont protocolTitle">
-                    >
+                      {{
-                    <span class="projectCenterFont protocolTitle">{{
                       protocol.houseAddress
-                    }}</span>
+                      }}
+                    </span>
                   </div>
                   <div class="assessBox">
                     <span class="projectCenterFont">补偿方式：</span>
-                    <span class="projectCenterFont">{{
+                    <span class="projectCenterFont">
+                      {{
                       protocol.switchProductionWay
-                    }}</span>
+                      }}
+                    </span>
                   </div>
                   <div class="assessBox">
                     <span class="projectCenterFont">合计补偿资金：</span>
-                    <span class="projectTitle" style="color: red"
+                    <span
-                      >¥{{ protocol.summationShouldCompensateMoney }}</span
+                      class="projectTitle"
-                    >
+                      style="color: red"
+                    >¥{{ protocol.summationShouldCompensateMoney }}</span>
                   </div>
                 </div>
               </van-list>
@@ -203,15 +172,15 @@
         </div>
       </van-list>
       <div class="centerMagin">
-        <van-image
+        <van-image :src="require('@/assets/img/expropriationPolicy.png')" class="bigImg" />
-          :src="require('@/assets/img/expropriationPolicy.png')"
-          class="bigImg"
-        />
       </div>
       <div class="centerMagin">
         <span class="projectTitle" style="color: #202020">征收政策</span>
         <div class="assessBox" style="padding-left: 5px; padding-right: 5px">
-          <span class="font11" style="color: #2c2b2b">共{{ total }}条</span>
+          <span
+            class="font11"
+            style="color: #2c2b2b"
+          >共{{ data.policiesRegulationsLists.totalCount }}条</span>
           <!-- <div>
             <span class="font11">查看全部</span>
             <van-icon color="#1989fa" name="arrow" />
@@ -219,18 +188,19 @@
         </div>
       </div>
       <div class="centerMagin" style="padding-bottom: 20px">
-        <div class="protocolBox" @click="pageJump()">
+        <div @click="pageJump()" class="protocolBox">
-          <van-list :finished="finished" @load="onLoad" v-model="loading">
+          <van-list>
-            <div :key="item.id" class="protocolList" v-for="(item, i) in list">
+            <div
+              :key="item.id"
+              class="protocolList"
+              v-for="(item, i) in data.policiesRegulationsLists.list"
+            >
               <div class="protocolLine" v-if="i != list.length - 1">
                 <div class="font14 protocolTitle">{{ item.title }}</div>
-                <div
+                <div class="assessBox" style="padding-left: 5px; padding-right: 5px">
-                  class="assessBox"
-                  style="padding-left: 5px; padding-right: 5px"
-                >
                   <div>
                     <span class="font11">发布时间：</span>
-                    <span class="font11">{{ item.publish_date }}</span>
+                    <span class="font11">{{ item.publicTime }}</span>
                   </div>
                   <div>
                     <span class="font11">区域：</span>
@@ -240,13 +210,10 @@
               </div>
               <div style="padding-bottom: 10px" v-else>
                 <div class="font14 protocolTitle">{{ item.title }}</div>
-                <div
+                <div class="assessBox" style="padding-left: 5px; padding-right: 5px">
-                  class="assessBox"
-                  style="padding-left: 5px; padding-right: 5px"
-                >
                   <div>
                     <span class="font11">发布时间：</span>
-                    <span class="font11">{{ item.publish_date }}</span>
+                    <span class="font11">{{ item.publicTime }}</span>
                   </div>
                   <div>
                     <span class="font11">区域：</span>
@@ -263,75 +230,22 @@
 </template>
 
 <script>
-import "./home.css";
+import './home.css';
-import { apis } from "@/common/apis";
+import { apis } from '@/common/apis';
-import { token } from "@/common/token";
+import { token } from '@/common/token';
-import request from "@/common/util";
+import request from '@/common/util';
-import { mgop } from "@aligov/jssdk-mgop";
+import { mgop } from '@aligov/jssdk-mgop';
 
 export default {
-  name: "home",
+  name: 'home',
   data() {
     return {
-      // data: {
+      data: {
-      //   userName: '张三丰',
+        policiesRegulationsLists: {
-      //   idCard: '341203199206303411',
+          totalCount: 0,
-      //   prjList: [
-      //     {
-      //       prjId: '936d98a8-2c8f-410f-b126-68a7568f60c4',
-      //       name: '项目名称',
-      //       area: '海曙区',
-      //       zsbm: '宁波市海曙区房屋征收管理服务中心',
-      //       year: 2021.0,
-      //       zsjdh: '海政发[2021]513号',
-      //       currentState: '项目报结',
-      //       fhpgList: [
-      //         {
-      //           prjId: '936d98a8-2c8f-410f-b126-68a7568f60c4',
-      //           id: 'a400583e-ae93-444f-8a20-4c4731b0cc13',
-      //           assessmentNo: '0513',
-      //           houseAddress: '高桥镇',
-      //           countValue: '137654.00',
-      //         },
-      //       ],
-      //       bcxyList: [
-      //         {
-      //           prjId: '936d98a8-2c8f-410f-b126-68a7568f60c4',
-      //           id: 'bf21b302-8059-462d-985f-ce7452c4d5b4',
-      //           xyNo: '海政发2021513-0513-1',
-      //           houseAddress: '高桥镇',
-      //           switchProductionWay: '货币补偿',
-      //           summationShouldCompensateMoney: '137654.00',
-      //         },
-      //       ],
-      //     },
-      //   ],
-      // },
-      data: {},
-      total: "8",
-      list: [
-        {
-          id: 11,
-          area: "全大市",
-          title: "宁波市住房和城乡建设委员会开展关于住房的政策",
-          publish_date: "2021年09月05日"
         },
-        {
-          id: 22,
-          area: "全大市",
-          title: "宁波市住房和城乡建设委员会开展关于住房的政策",
-          publish_date: "2021年09月05日"
       },
-        {
+      // userInfoData: {} // 用户个人信息
-          id: 33,
-          area: "全大市",
-          title: "宁波市住房和城乡建设委员会开展关于住房的政策",
-          publish_date: "2021年09月05日"
-        }
-      ],
-      loading: false,
-      finished: true,
-      userInfoData: {} // 用户个人信息
     };
   },
   created() {
@@ -344,75 +258,31 @@ export default {
     onLoad() {},
     onInit() {
       mgop({
-        api: "mgop.kykj.houseexpropriat.getprjlist", // 必须
+        api: 'mgop.kykj.houseexpropriat.getprjlist', // 必须
-        host: "https://mapi.zjzwfw.gov.cn/",
+        host: 'https://mapi.zjzwfw.gov.cn/',
-        dataType: "JSON",
+        dataType: 'JSON',
-        type: "POST",
+        type: 'POST',
         data: {
-          ticket: this.$route.query.ticket
+          ticket: this.$route.query.ticket,
         },
-        appKey: "es4b8zmz+2001833218+dehllx", // 必须
+        appKey: 'es4b8zmz+2001833218+dehllx', // 必须
-        onSuccess: data => {
+        onSuccess: (data) => {
-          console.log("data", data);
+          console.log('data', data);
           if (data.data && data.data.success == true) {
-            this.data = data.data;
+            debugger;
+            this.data = data.data.data;
             this.setZwUserAplus(this.data.idCard, this.data.userName);
           } else {
-            console.log("用户无数据，不展示");
+            console.log('用户无数据，不展示');
           }
         },
-        onFail: err => {
+        onFail: (err) => {
-          console.log(err, "err");
+          console.log(err, 'err');
+        },
+        onFail: (err) => {
+          console.log(err, 'err');
         },
-        onFail: err => {
-          console.log(err, "err");
-        }
       });
-      let apidata = {
-        success: true,
-        code: 200,
-        message: "请求成功",
-        data: {
-          userName: "张三丰",
-          idCard: "341203199206303411",
-          prjList: [
-            {
-              prjId: "936d98a8-2c8f-410f-b126-68a7568f60c4",
-              name: "项目名称",
-              area: "海曙区",
-              zsbm: "宁波市海曙区房屋征收管理服务中心",
-              year: 2021.0,
-              zsjdh: "海政发[2021]513号",
-              currentState: "项目报结",
-              fhpgList: [
-                {
-                  prjId: "936d98a8-2c8f-410f-b126-68a7568f60c4",
-                  id: "a400583e-ae93-444f-8a20-4c4731b0cc13",
-                  assessmentNo: "0513",
-                  houseAddress: "高桥镇",
-                  countValue: "137654.00"
-                }
-              ],
-              bcxyList: [
-                {
-                  prjId: "936d98a8-2c8f-410f-b126-68a7568f60c4",
-                  id: "bf21b302-8059-462d-985f-ce7452c4d5b4",
-                  xyNo: "海政发2021513-0513-1",
-                  houseAddress: "高桥镇",
-                  switchProductionWay: "货币补偿",
-                  summationShouldCompensateMoney: "137654.00"
-                }
-              ]
-            }
-          ]
-        },
-        extras: null,
-        timestamp: 1631261808797
-      };
-      if (apidata.code == 200) {
-        this.data = apidata.data;
-      }
-      // this.onLogin();
       //获取当前数据
       // apis.getprjdata({ ticket: this.$route.query.ticket }).then((prjdata) => {
       //   debugger;
@@ -422,116 +292,38 @@ export default {
       // });
     },
     gotoProject(type) {
-      this.$router.push({ name: "projectSelect", params: { type: type } });
+      this.$router.push({ name: 'projectSelect', params: { type: type, ticket: this.$route.query.ticket } });
-    },
-    onLogin() {
-      // this.loading = true;
-      let form = { account: "zgbqc", password: "111qqqqq" };
-      apis
-        .login(form)
-        .finally(() => {
-          debugger;
-          // this.loading = false;
-        })
-        .then(({ result }) => {
-          token.value = result.token;
-          // this.$root.replace('/');
-          debugger;
-          this.onLoadUserInfo();
-          this.onLoadStatistic();
-        })
-        .catch(err => {
-          debugger;
-          // this.$toast(err);
-        });
-    },
-    onLoadUserInfo() {
-      apis.account().then(({ result }) => {
-        for (let key in result) {
-          if (this.user.hasOwnProperty(key)) {
-            this.user[key] = result[key];
-          }
-        }
-      });
     },
     onLoadStatistic() {
       apis.projectStatistics().then(({ result }) => {
         this.statistics = result;
       });
     },
-    padStart(num, n) {
-      var tbl = [];
-      var len = n - num.toString().length;
-      if (len <= 0) return num;
-      if (!tbl[len]) tbl[len] = new Array(len + 1).join("0");
-      return tbl[len] + num;
-    },
     // 页面跳转
     pageJump() {
-      this.$router.push("/policyInfo");
+      this.$router.push('/policyInfo');
     },
     setZwUserAplus(Userid, userName) {
       // 设置用户信息埋点
       aplus_queue.push({
-        action: "aplus.setMetaInfo",
+        action: 'aplus.setMetaInfo',
-        arguments: ["_hold", "BLOCK"]
+        arguments: ['_hold', 'BLOCK'],
       });
       aplus_queue.push({
-        action: "aplus.setMetaInfo",
+        action: 'aplus.setMetaInfo',
-        arguments: ["_user_nick", userName] // this.userInfoData.username],
+        arguments: ['_user_nick', userName], // this.userInfoData.username],
       });
       aplus_queue.push({
-        action: "aplus.setMetaInfo",
+        action: 'aplus.setMetaInfo',
-        arguments: ["_user_id", Userid]
+        arguments: ['_user_id', Userid],
       });
       aplus_queue.push({
-        action: "aplus.setMetaInfo",
+        action: 'aplus.setMetaInfo',
-        arguments: ["_hold", "START"]
+        arguments: ['_hold', 'START'],
       });
     },
     // 基础信息埋点配置
-    setZwaplus() {
+    setZwaplus() {},
-      (function(w, d, s, q, i) {
-        w[q] = w[q] || [];
-        var f = d.getElementsByTagName(s)[0];
-        var j = d.createElement(s);
-        j.async = true;
-        j.id = "beacon-aplus";
-        j.src = "https://d.alicdn.com/alilog/mlog/aplus.js?id=202951085";
-        f.parentNode.insertBefore(j, f);
-      })(window, document, "script", "aplus_queue");
-      aplus_queue.push({
-        action: "aplus.setMetaInfo",
-        arguments: ["aplus-rhost-v", "alog.zjzwfw.gov.cn"]
-      });
-      aplus_queue.push({
-        action: "aplus.setMetaInfo",
-        arguments: ["aplus-rhost-g", "alog.zjzwfw.gov.cn"]
-      });
-      // 这个会落到 app_key 字段上
-      aplus_queue.push({
-        action: "aplus.setMetaInfo",
-        arguments: ["appId", "60506758"]
-      });
-      // 单页应用 或 “单个页面”需异步补充 PV 日志参数还需进行如下埋点：
-      aplus_queue.push({
-        action: "aplus.setMetaInfo",
-        arguments: ["aplus-waiting", "MAN"]
-      });
-      // 单页应用路由切换后 或 在异步获取到 pv 日志所需的参数后再执行 sendPV：
-      aplus_queue.push({
-        action: "aplus.sendPV",
-        arguments: [
-          {
-            is_auto: false
   },
-          {
-            miniAppId: "2001833218", //'应用开发管理平台-应用 ID
-            miniAppName: "房屋征收"
-          }
-        ]
-      });
-    }
-  }
 };
 </script>

FrontCode2/sunshine_levy/src/views/project/index.vue

@@ -99,6 +99,7 @@ export default {
       ],
       loading: false,
       finished: true,
+      ticket: '',
     };
   },
   created() {
@@ -114,14 +115,18 @@ export default {
       //   this.data = result;
       // });
       this.type = this.$route.params.type;
+      this.ticket = this.$route.params.ticket;
     },
     gotoDetail(id) {
       if (this.type == 'pg') {
         // 评估结果页面
-        this.$router.push({ name: 'reportCompensate', params: { projectid: id, type: this.type } });
+        this.$router.push({
+          name: 'reportCompensate',
+          params: { projectid: id, type: this.type, ticket: this.ticket },
+        });
       } else if (this.type == 'xy') {
         // 协议结果页面
-        this.$router.push({ name: 'reportAgreement', params: { projectid: id, type: this.type } });
+        this.$router.push({ name: 'reportAgreement', params: { projectid: id, type: this.type, ticket: this.ticket } });
       }
     },
   },