Merge branch 'master' of https://gitee.com/frane-yang/SGGL_CWCEC

SGGL/BLL/BaseInfo/TrainTypeService.cs

@@ -21,7 +21,7 @@ namespace BLL
         {
             return Funs.DB.Base_TrainType.FirstOrDefault(e => e.TrainTypeId == trainTypeId);
         }
-        
+
         /// <summary>
         /// 添加培训类型
         /// </summary>
@@ -34,6 +34,7 @@ namespace BLL
                 TrainTypeId = trainType.TrainTypeId,
                 TrainTypeCode = trainType.TrainTypeCode,
                 TrainTypeName = trainType.TrainTypeName,
+                TrainType = trainType.TrainType,
                 Remark = trainType.Remark,
                 IsAboutSendCard = trainType.IsAboutSendCard,
                 IsRepeat = trainType.IsRepeat
@@ -54,6 +55,7 @@ namespace BLL
             {
                 newTrainType.TrainTypeCode = trainType.TrainTypeCode;
                 newTrainType.TrainTypeName = trainType.TrainTypeName;
+                newTrainType.TrainType = trainType.TrainType;
                 newTrainType.Remark = trainType.Remark;
                 newTrainType.IsAboutSendCard = trainType.IsAboutSendCard;
                 newTrainType.IsRepeat = trainType.IsRepeat;
@@ -92,7 +94,7 @@ namespace BLL
         {
             return (from x in Funs.DB.Base_TrainType orderby x.TrainTypeCode select x).ToList();
         }
-        
+
         /// <summary>
         /// 获取关联人员发卡的培训类型列表
         /// </summary>

SGGL/BLL/CQMS/Comprehensive/InspectionEquipmentService.cs

@@ -79,6 +79,7 @@ namespace BLL
                        x.AttachUrl,
                        x.Attribute,
                        x.RemarkCode,
+                       x.Unit,
                        x.UsedPlace,
                        x.EquipmentNO
                    };
@@ -128,6 +129,7 @@ namespace BLL
             newInspectionEquipment.Specifications = inspectionEquipment.Specifications;
             newInspectionEquipment.Supplier = inspectionEquipment.Supplier;
             newInspectionEquipment.Counts = inspectionEquipment.Counts;
+            newInspectionEquipment.Unit = inspectionEquipment.Unit;
             newInspectionEquipment.SamplingCount = inspectionEquipment.SamplingCount;
             newInspectionEquipment.SamplingResult = inspectionEquipment.SamplingResult;
             newInspectionEquipment.InspectionDate = inspectionEquipment.InspectionDate;
@@ -163,6 +165,7 @@ namespace BLL
                 newInspectionEquipment.Specifications = inspectionEquipment.Specifications;
                 newInspectionEquipment.Supplier = inspectionEquipment.Supplier;
                 newInspectionEquipment.Counts = inspectionEquipment.Counts;
+                newInspectionEquipment.Unit = inspectionEquipment.Unit;
                 newInspectionEquipment.SamplingCount = inspectionEquipment.SamplingCount;
                 newInspectionEquipment.SamplingResult = inspectionEquipment.SamplingResult;
                 newInspectionEquipment.InspectionDate = inspectionEquipment.InspectionDate;

SGGL/BLL/Common/Const.cs

@@ -3089,6 +3089,10 @@ namespace BLL
         /// 全厂地下管网完成情况导入模版文件原始的虚拟路径
         /// </summary>
         public const string UndergroundPipeCompletionTemplateUrl = "File\\Excel\\DataIn\\全厂地下管网完成情况导入模板.xls";
+        /// <summary>
+        /// 施工进度报表模板
+        /// </summary>
+        public const string JDReportTemplateUrl = "File\\Word\\JDGL\\施工进度报表.docx";
         #endregion
 
         #region 绩效考核模板文件路径

SGGL/BLL/OpenService/GetDataService.cs

@@ -272,8 +272,8 @@ namespace BLL
             {
                 try
                 {
-                    DateTime dateS = DateTime.Now.AddMonths(-3);
-                    dateS = Funs.GetNewDateTimeOrNow(DateTime.Now.AddMonths(-3).Year + "-" + DateTime.Now.AddMonths(-3).Month + "-01");
+                    DateTime dateS = DateTime.Now.AddMonths(-6);
+                    dateS = Funs.GetNewDateTimeOrNow(DateTime.Now.AddMonths(-6).Year + "-" + DateTime.Now.AddMonths(-6).Month + "-01");
                     var getNums = from x in db.SitePerson_PersonInOutNumber
                                   where x.ProjectId == projectId  && x.InOutDate >= dateS
                                   orderby x.InOutDate