a

abc

6 天以前 dfbfc696e52e0515acec278b060e7eef35c1de65

a

 PPMX.Entity/Master/MapDepart.cs

@@ -18,8 +18,8 @@
        [SugarColumn(ColumnName = "Reason")]
        public string Reason { get; set; }

        [SugarColumn(ColumnName = "Type")]
        public string Type { get; set; }
        [SugarColumn(ColumnName = "IsVoluntarily")]
        public int IsVoluntarily { get; set; }

        [SugarColumn(ColumnName = "IsEnable")]
        public int IsEnable { get; set; }

 PPMX.Entity/Master/MapPositionExtend.cs

@@ -18,8 +18,8 @@
        [SugarColumn(ColumnName = "FullName")]
        public string FullName { get; set; }

        [SugarColumn(ColumnName = "Type")]
        public string Type { get; set; }
        [SugarColumn(ColumnName = "IsOffice")]
        public int IsOffice { get; set; }

        [SugarColumn(ColumnName = "IsManager")]
        public string IsManager { get; set; }

 PPMX.Logic/Master/AgeLogic.cs

@@ -73,6 +73,10 @@
                return db.Updateable<MapAge>(model).UpdateColumns(it => new
                {
                    it.FullName,
                    it.IndexBegin,
                    it.IndexEnd,
                    it.IsEmp,
                    it.IsManager,
                }).ExecuteCommand();
            }
        }

 PPMX.Logic/Master/AreaLogic.cs

@@ -16,7 +16,7 @@
        {
            using (var db = GetInstance())
            {
                return db.Queryable<MapGroup>().InSingle(primaryKey);
                return db.Queryable<MapArea>().InSingle(primaryKey);
            }
        }

@@ -27,7 +27,7 @@
            {
                using (var db = GetInstance())
                {
                    var data = db.Queryable<MapGroup>()
                    var data = db.Queryable<MapArea>()
                        .WhereIF(!string.IsNullOrEmpty(keyWord), it => (it.FullName.Contains(keyWord)))
                        .WhereIF(status == 0 || status == 1, it => (it.IsEnable == status))
                        .OrderBy(it => it.Id, OrderByType.Asc);
@@ -45,15 +45,15 @@
            return receive;
        }

        public int Insert(MapGroup model)
        public int Insert(MapArea model)
        {
            using (var db = GetInstance())
            {
                if (db.Queryable<MapGroup>().Where(x => x.FullName.Equals(model.FullName)).Any())
                if (db.Queryable<MapArea>().Where(x => x.FullName.Equals(model.FullName)).Any())
                {
                    model = db.Queryable<MapGroup>().Where(x => x.FullName.Equals(model.FullName)).First();
                    model = db.Queryable<MapArea>().Where(x => x.FullName.Equals(model.FullName)).First();
                    model.IsEnable = 1;
                    return db.Updateable<MapGroup>(model).UpdateColumns(it => new
                    return db.Updateable<MapArea>(model).UpdateColumns(it => new
                    {
                        it.IsEnable,
                    }).ExecuteCommand();
@@ -61,16 +61,16 @@
                else
                {
                    model.IsEnable = 1;
                    return db.Insertable<MapGroup>(model).ExecuteCommand();
                    return db.Insertable<MapArea>(model).ExecuteCommand();
                }
            }
        }

        public int Update(MapGroup model)
        public int Update(MapArea model)
        {
            using (var db = GetInstance())
            {
                return db.Updateable<MapGroup>(model).UpdateColumns(it => new
                return db.Updateable<MapArea>(model).UpdateColumns(it => new
                {
                    it.FullName,
                }).ExecuteCommand();
@@ -81,9 +81,9 @@
        {
            using (var db = GetInstance())
            {
                MapGroup model = db.Queryable<MapGroup>().InSingle(primaryKey);
                MapArea model = db.Queryable<MapArea>().InSingle(primaryKey);
                model.IsEnable = 0;
                return db.Updateable<MapGroup>(model).UpdateColumns(it => new
                return db.Updateable<MapArea>(model).UpdateColumns(it => new
                {
                    it.IsEnable,
                }).ExecuteCommand();

 PPMX.Logic/Master/DepartLogic.cs

@@ -16,7 +16,7 @@
        {
            using (var db = GetInstance())
            {
                return db.Queryable<MapGroup>().InSingle(primaryKey);
                return db.Queryable<MapDepart>().InSingle(primaryKey);
            }
        }

@@ -27,8 +27,8 @@
            {
                using (var db = GetInstance())
                {
                    var data = db.Queryable<MapGroup>()
                        .WhereIF(!string.IsNullOrEmpty(keyWord), it => (it.FullName.Contains(keyWord)))
                    var data = db.Queryable<MapDepart>()
                        .WhereIF(!string.IsNullOrEmpty(keyWord), it => (it.Reason.Contains(keyWord)))
                        .WhereIF(status == 0 || status == 1, it => (it.IsEnable == status))
                        .OrderBy(it => it.Id, OrderByType.Asc);
                    receive.Code = 0;
@@ -45,15 +45,15 @@
            return receive;
        }

        public int Insert(MapGroup model)
        public int Insert(MapDepart model)
        {
            using (var db = GetInstance())
            {
                if (db.Queryable<MapGroup>().Where(x => x.FullName.Equals(model.FullName)).Any())
                if (db.Queryable<MapDepart>().Where(x => x.Reason.Equals(model.Reason)).Any())
                {
                    model = db.Queryable<MapGroup>().Where(x => x.FullName.Equals(model.FullName)).First();
                    model = db.Queryable<MapDepart>().Where(x => x.Reason.Equals(model.Reason)).First();
                    model.IsEnable = 1;
                    return db.Updateable<MapGroup>(model).UpdateColumns(it => new
                    return db.Updateable<MapDepart>(model).UpdateColumns(it => new
                    {
                        it.IsEnable,
                    }).ExecuteCommand();
@@ -61,18 +61,19 @@
                else
                {
                    model.IsEnable = 1;
                    return db.Insertable<MapGroup>(model).ExecuteCommand();
                    return db.Insertable<MapDepart>(model).ExecuteCommand();
                }
            }
        }

        public int Update(MapGroup model)
        public int Update(MapDepart model)
        {
            using (var db = GetInstance())
            {
                return db.Updateable<MapGroup>(model).UpdateColumns(it => new
                return db.Updateable<MapDepart>(model).UpdateColumns(it => new
                {
                    it.FullName,
                    it.Reason,
                    it.IsVoluntarily,
                }).ExecuteCommand();
            }
        }
@@ -81,9 +82,9 @@
        {
            using (var db = GetInstance())
            {
                MapGroup model = db.Queryable<MapGroup>().InSingle(primaryKey);
                MapDepart model = db.Queryable<MapDepart>().InSingle(primaryKey);
                model.IsEnable = 0;
                return db.Updateable<MapGroup>(model).UpdateColumns(it => new
                return db.Updateable<MapDepart>(model).UpdateColumns(it => new
                {
                    it.IsEnable,
                }).ExecuteCommand();

 PPMX.Logic/Master/EducationLogic.cs

@@ -16,7 +16,7 @@
        {
            using (var db = GetInstance())
            {
                return db.Queryable<MapGroup>().InSingle(primaryKey);
                return db.Queryable<MapEducation>().InSingle(primaryKey);
            }
        }

@@ -27,7 +27,7 @@
            {
                using (var db = GetInstance())
                {
                    var data = db.Queryable<MapGroup>()
                    var data = db.Queryable<MapEducation>()
                        .WhereIF(!string.IsNullOrEmpty(keyWord), it => (it.FullName.Contains(keyWord)))
                        .WhereIF(status == 0 || status == 1, it => (it.IsEnable == status))
                        .OrderBy(it => it.Id, OrderByType.Asc);
@@ -45,15 +45,15 @@
            return receive;
        }

        public int Insert(MapGroup model)
        public int Insert(MapEducation model)
        {
            using (var db = GetInstance())
            {
                if (db.Queryable<MapGroup>().Where(x => x.FullName.Equals(model.FullName)).Any())
                if (db.Queryable<MapEducation>().Where(x => x.FullName.Equals(model.FullName)).Any())
                {
                    model = db.Queryable<MapGroup>().Where(x => x.FullName.Equals(model.FullName)).First();
                    model = db.Queryable<MapEducation>().Where(x => x.FullName.Equals(model.FullName)).First();
                    model.IsEnable = 1;
                    return db.Updateable<MapGroup>(model).UpdateColumns(it => new
                    return db.Updateable<MapEducation>(model).UpdateColumns(it => new
                    {
                        it.IsEnable,
                    }).ExecuteCommand();
@@ -61,16 +61,16 @@
                else
                {
                    model.IsEnable = 1;
                    return db.Insertable<MapGroup>(model).ExecuteCommand();
                    return db.Insertable<MapEducation>(model).ExecuteCommand();
                }
            }
        }

        public int Update(MapGroup model)
        public int Update(MapEducation model)
        {
            using (var db = GetInstance())
            {
                return db.Updateable<MapGroup>(model).UpdateColumns(it => new
                return db.Updateable<MapEducation>(model).UpdateColumns(it => new
                {
                    it.FullName,
                }).ExecuteCommand();
@@ -81,9 +81,9 @@
        {
            using (var db = GetInstance())
            {
                MapGroup model = db.Queryable<MapGroup>().InSingle(primaryKey);
                MapEducation model = db.Queryable<MapEducation>().InSingle(primaryKey);
                model.IsEnable = 0;
                return db.Updateable<MapGroup>(model).UpdateColumns(it => new
                return db.Updateable<MapEducation>(model).UpdateColumns(it => new
                {
                    it.IsEnable,
                }).ExecuteCommand();

 PPMX.Logic/Master/EmployTypeLogic.cs

@@ -16,7 +16,7 @@
        {
            using (var db = GetInstance())
            {
                return db.Queryable<MapGroup>().InSingle(primaryKey);
                return db.Queryable<MapEmployType>().InSingle(primaryKey);
            }
        }

@@ -27,7 +27,7 @@
            {
                using (var db = GetInstance())
                {
                    var data = db.Queryable<MapGroup>()
                    var data = db.Queryable<MapEmployType>()
                        .WhereIF(!string.IsNullOrEmpty(keyWord), it => (it.FullName.Contains(keyWord)))
                        .WhereIF(status == 0 || status == 1, it => (it.IsEnable == status))
                        .OrderBy(it => it.Id, OrderByType.Asc);
@@ -45,15 +45,15 @@
            return receive;
        }

        public int Insert(MapGroup model)
        public int Insert(MapEmployType model)
        {
            using (var db = GetInstance())
            {
                if (db.Queryable<MapGroup>().Where(x => x.FullName.Equals(model.FullName)).Any())
                if (db.Queryable<MapEmployType>().Where(x => x.FullName.Equals(model.FullName)).Any())
                {
                    model = db.Queryable<MapGroup>().Where(x => x.FullName.Equals(model.FullName)).First();
                    model = db.Queryable<MapEmployType>().Where(x => x.FullName.Equals(model.FullName)).First();
                    model.IsEnable = 1;
                    return db.Updateable<MapGroup>(model).UpdateColumns(it => new
                    return db.Updateable<MapEmployType>(model).UpdateColumns(it => new
                    {
                        it.IsEnable,
                    }).ExecuteCommand();
@@ -61,16 +61,16 @@
                else
                {
                    model.IsEnable = 1;
                    return db.Insertable<MapGroup>(model).ExecuteCommand();
                    return db.Insertable<MapEmployType>(model).ExecuteCommand();
                }
            }
        }

        public int Update(MapGroup model)
        public int Update(MapEmployType model)
        {
            using (var db = GetInstance())
            {
                return db.Updateable<MapGroup>(model).UpdateColumns(it => new
                return db.Updateable<MapEmployType>(model).UpdateColumns(it => new
                {
                    it.FullName,
                }).ExecuteCommand();
@@ -81,9 +81,9 @@
        {
            using (var db = GetInstance())
            {
                MapGroup model = db.Queryable<MapGroup>().InSingle(primaryKey);
                MapEmployType model = db.Queryable<MapEmployType>().InSingle(primaryKey);
                model.IsEnable = 0;
                return db.Updateable<MapGroup>(model).UpdateColumns(it => new
                return db.Updateable<MapEmployType>(model).UpdateColumns(it => new
                {
                    it.IsEnable,
                }).ExecuteCommand();

 PPMX.Logic/Master/PositionExtendLogic.cs

@@ -16,7 +16,7 @@
        {
            using (var db = GetInstance())
            {
                return db.Queryable<MapGroup>().InSingle(primaryKey);
                return db.Queryable<MapPositionExtend>().InSingle(primaryKey);
            }
        }

@@ -27,7 +27,7 @@
            {
                using (var db = GetInstance())
                {
                    var data = db.Queryable<MapGroup>()
                    var data = db.Queryable<MapPositionExtend>()
                        .WhereIF(!string.IsNullOrEmpty(keyWord), it => (it.FullName.Contains(keyWord)))
                        .WhereIF(status == 0 || status == 1, it => (it.IsEnable == status))
                        .OrderBy(it => it.Id, OrderByType.Asc);
@@ -45,15 +45,15 @@
            return receive;
        }

        public int Insert(MapGroup model)
        public int Insert(MapPositionExtend model)
        {
            using (var db = GetInstance())
            {
                if (db.Queryable<MapGroup>().Where(x => x.FullName.Equals(model.FullName)).Any())
                if (db.Queryable<MapPositionExtend>().Where(x => x.FullName.Equals(model.FullName)).Any())
                {
                    model = db.Queryable<MapGroup>().Where(x => x.FullName.Equals(model.FullName)).First();
                    model = db.Queryable<MapPositionExtend>().Where(x => x.FullName.Equals(model.FullName)).First();
                    model.IsEnable = 1;
                    return db.Updateable<MapGroup>(model).UpdateColumns(it => new
                    return db.Updateable<MapPositionExtend>(model).UpdateColumns(it => new
                    {
                        it.IsEnable,
                    }).ExecuteCommand();
@@ -61,18 +61,20 @@
                else
                {
                    model.IsEnable = 1;
                    return db.Insertable<MapGroup>(model).ExecuteCommand();
                    return db.Insertable<MapPositionExtend>(model).ExecuteCommand();
                }
            }
        }

        public int Update(MapGroup model)
        public int Update(MapPositionExtend model)
        {
            using (var db = GetInstance())
            {
                return db.Updateable<MapGroup>(model).UpdateColumns(it => new
                return db.Updateable<MapPositionExtend>(model).UpdateColumns(it => new
                {
                    it.FullName,
                    it.IsOffice,
                    it.IsManager,
                }).ExecuteCommand();
            }
        }
@@ -81,9 +83,9 @@
        {
            using (var db = GetInstance())
            {
                MapGroup model = db.Queryable<MapGroup>().InSingle(primaryKey);
                MapPositionExtend model = db.Queryable<MapPositionExtend>().InSingle(primaryKey);
                model.IsEnable = 0;
                return db.Updateable<MapGroup>(model).UpdateColumns(it => new
                return db.Updateable<MapPositionExtend>(model).UpdateColumns(it => new
                {
                    it.IsEnable,
                }).ExecuteCommand();

 PPMX.Logic/Master/WageLevelLogic.cs

@@ -16,7 +16,7 @@
        {
            using (var db = GetInstance())
            {
                return db.Queryable<MapGroup>().InSingle(primaryKey);
                return db.Queryable<MapWageLevel>().InSingle(primaryKey);
            }
        }

@@ -27,7 +27,7 @@
            {
                using (var db = GetInstance())
                {
                    var data = db.Queryable<MapGroup>()
                    var data = db.Queryable<MapWageLevel>()
                        .WhereIF(!string.IsNullOrEmpty(keyWord), it => (it.FullName.Contains(keyWord)))
                        .WhereIF(status == 0 || status == 1, it => (it.IsEnable == status))
                        .OrderBy(it => it.Id, OrderByType.Asc);
@@ -45,15 +45,15 @@
            return receive;
        }

        public int Insert(MapGroup model)
        public int Insert(MapWageLevel model)
        {
            using (var db = GetInstance())
            {
                if (db.Queryable<MapGroup>().Where(x => x.FullName.Equals(model.FullName)).Any())
                if (db.Queryable<MapWageLevel>().Where(x => x.FullName.Equals(model.FullName)).Any())
                {
                    model = db.Queryable<MapGroup>().Where(x => x.FullName.Equals(model.FullName)).First();
                    model = db.Queryable<MapWageLevel>().Where(x => x.FullName.Equals(model.FullName)).First();
                    model.IsEnable = 1;
                    return db.Updateable<MapGroup>(model).UpdateColumns(it => new
                    return db.Updateable<MapWageLevel>(model).UpdateColumns(it => new
                    {
                        it.IsEnable,
                    }).ExecuteCommand();
@@ -61,16 +61,16 @@
                else
                {
                    model.IsEnable = 1;
                    return db.Insertable<MapGroup>(model).ExecuteCommand();
                    return db.Insertable<MapWageLevel>(model).ExecuteCommand();
                }
            }
        }

        public int Update(MapGroup model)
        public int Update(MapWageLevel model)
        {
            using (var db = GetInstance())
            {
                return db.Updateable<MapGroup>(model).UpdateColumns(it => new
                return db.Updateable<MapWageLevel>(model).UpdateColumns(it => new
                {
                    it.FullName,
                }).ExecuteCommand();
@@ -81,9 +81,9 @@
        {
            using (var db = GetInstance())
            {
                MapGroup model = db.Queryable<MapGroup>().InSingle(primaryKey);
                MapWageLevel model = db.Queryable<MapWageLevel>().InSingle(primaryKey);
                model.IsEnable = 0;
                return db.Updateable<MapGroup>(model).UpdateColumns(it => new
                return db.Updateable<MapWageLevel>(model).UpdateColumns(it => new
                {
                    it.IsEnable,
                }).ExecuteCommand();