Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe

APT.MicroApi/APT.SC.WebApi/Controllers/Api/LRController/6LawController.cs

@@ -566,6 +566,13 @@ namespace APT.LR.WebApi.Controllers.Api
                         item.CREATER_ID = LoginID;
                         item.CREATE_TIME = dtNow;
                     }
+                    else
+                    {
+                        item.NAME = modelCheck.NAME;
+                        item.LAW_STATUS = modelCheck.LAW_STATUS;
+                        item.UPDATE_TIME = modelCheck.UPDATE_TIME;
+                        item.EXECUTE_TIME = modelCheck.EXECUTE_TIME;
+                    }
                     listLaw.Add(item);
                 }
 
@@ -588,6 +595,11 @@ namespace APT.LR.WebApi.Controllers.Api
                         item.CREATER_ID = LoginID;
                         item.CREATE_TIME = dtNow;
                     }
+                    else
+                    {
+                        item.NAME = modelCheckType.NAME;
+                        item.CODE = modelCheckType.CODE;
+                    }
                     listLawType.Add(item);
                 }
 
@@ -606,6 +618,14 @@ namespace APT.LR.WebApi.Controllers.Api
                         item.CREATER_ID = LoginID;
                         item.CREATE_TIME = dtNow;
                     }
+                    else
+                    {
+                        item.EXECUTE_TIME = modelVersion.EXECUTE_TIME;
+                        item.UPDATE_TIME = modelVersion.UPDATE_TIME;
+                        item.VERSION_NUM = modelVersion.VERSION_NUM;
+                        item.VERSION_STATUS = modelVersion.VERSION_STATUS;
+                        item.ENTER_TIME = modelVersion.ENTER_TIME;
+                    }
                     listLawVersion.Add(item);
                 }
 
@@ -619,11 +639,16 @@ namespace APT.LR.WebApi.Controllers.Api
                     {
                         modelVersionFile = null;
                     }
-                    if (modelVersion == null)
+                    if (modelVersionFile == null)
                     {
                         item.CREATER_ID = LoginID;
                         item.CREATE_TIME = dtNow;
                     }
+                    else
+                    {
+                        item.IMG_FILE_ID = modelVersionFile.IMG_FILE_ID;
+                        item.VERSION_ID = modelVersionFile.VERSION_ID;
+                    }
                     listFiles.Add(item);
                 }
                 foreach (var item in Nav_ImgFile)
@@ -641,6 +666,14 @@ namespace APT.LR.WebApi.Controllers.Api
                         item.CREATER_ID = LoginID;
                         item.CREATE_TIME = dtNow;
                     }
+                    else
+                    {
+                        item.FILE_PATH = modelImgFile.FILE_PATH;
+                        item.FILE_NAME = modelImgFile.FILE_NAME;
+                        item.FILE_TYPE = modelImgFile.FILE_TYPE;
+                        item.FILE_ID = modelImgFile.FILE_ID;
+                        item.SRC_ID = modelImgFile.SRC_ID;
+                    }
                     listImgFile.Add(item);
                 }
 
@@ -659,6 +692,14 @@ namespace APT.LR.WebApi.Controllers.Api
                         item.CREATER_ID = LoginID;
                         item.CREATE_TIME = dtNow;
                     }
+                    else
+                    {
+                        item.FILE_PATH = modelFile.FILE_PATH;
+                        item.FILE_NAME = modelFile.FILE_NAME;
+                        item.FILE_TYPE = modelFile.FILE_TYPE;
+                        item.FILE_DATA = modelFile.FILE_DATA;
+                        item.IS_TEMPORARY_FILE = modelFile.IS_TEMPORARY_FILE;
+                    }
                     listFile.Add(item);
                 }
                 #endregion

APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SETestController.cs

@@ -807,6 +807,20 @@ namespace APT.SE.WebApi.Controllers.Api
                         item.CREATER_ID = LoginID;
                         item.CREATE_TIME = dtNow;
                     }
+                    else
+                    {
+                        item.NAME = modelTestSync.NAME;
+                        item.TYPE = modelTestSync.TYPE;
+                        item.OPTION_A = modelTestSync.OPTION_A;
+                        item.OPTION_B = modelTestSync.OPTION_B;
+                        item.OPTION_C = modelTestSync.OPTION_C;
+                        item.OPTION_D = modelTestSync.OPTION_D;
+                        item.OPTION_E = modelTestSync.OPTION_E;
+                        item.ANSWER = modelTestSync.ANSWER;
+                        item.USAGE = modelTestSync.USAGE;
+                        item.TRAINNAME = modelTestSync.TRAINNAME;
+                        item.MineType = modelTestSync.MineType;
+                    }
                     listTestSync.Add(item);
                 }
 
@@ -825,6 +839,11 @@ namespace APT.SE.WebApi.Controllers.Api
                         item.CREATER_ID = LoginID;
                         item.CREATE_TIME = dtNow;
                     }
+                    else
+                    {
+                        item.TEST_ID = modelPointSync.TEST_ID;
+                        item.POINT_ID = modelPointSync.POINT_ID;
+                    }
                     listPointSync.Add(item);
                 }
 
@@ -843,6 +862,12 @@ namespace APT.SE.WebApi.Controllers.Api
                         item.CREATER_ID = LoginID;
                         item.CREATE_TIME = dtNow;
                     }
+                    else
+                    {
+                        item.NAME = modelPointEnumSync.NAME;
+                        item.CODE = modelPointEnumSync.CODE;
+                        item.TYPE = modelPointEnumSync.TYPE;
+                    }
                     listPointEnumSync.Add(item);
                 }