Parcourir la source

bug 时间问题

hongchuangyanfa il y a 3 ans
Parent
commit
d2551c2ac8

Fichier diff supprimé car celui-ci est trop grand
+ 325 - 305
blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExcelTabController.java


+ 1 - 1
blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeMapper.java

@@ -24,7 +24,7 @@ public interface WbsTreeMapper extends BaseMapper<WbsTree> {
 
     List<WbsNodeTableVO> selectByNodeTable(@Param("id") String id);
 
-    List<WbsNodeTableVO> selectByNodeTableByExcel(@Param("id") String id,@Param("projectid") String projectid);
+    List<WbsNodeTableVO> selectByNodeTableByExcel(@Param("id") String id,@Param("projectid") String projectid,@Param("liunxId") String liunxId);
 
     List<String> selectByElementsTotal(@Param("ids") List<String> ids);
 

+ 1 - 1
blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeMapper.xml

@@ -339,7 +339,7 @@
             wt.table_type AS tableType,
             wt.`status` AS isCreateTable ,
             wt.table_owner as tableOwner,
-            wt.is_link_table,
+            IF(wt.excel_id = #{liunxId}, IF(is_link_table=2,2,1), 1) as is_link_table,
             wt.init_table_name as "initTableName",
             wt.parent_id AS "parentId",
             wt.wbs_id AS "wbsId",

+ 1 - 1
blade-service/blade-manager/src/main/java/org/springblade/manager/service/IWbsTreeService.java

@@ -28,7 +28,7 @@ public interface IWbsTreeService extends BaseService<WbsTree> {
 
     List<WbsNodeTableVO> selectByNodeTable(String id);
 
-    List<WbsNodeTableVO> selectByNodeTableByExcel(String id,String projectid);
+    List<WbsNodeTableVO> selectByNodeTableByExcel(String id,String projectid,String liunxId);
 
     boolean removeTableById(String id);
 

+ 2 - 2
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeServiceImpl.java

@@ -391,8 +391,8 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
     }
 
     @Override
-    public List<WbsNodeTableVO> selectByNodeTableByExcel(String id, String projectid) {
-        return wbsTreeMapper.selectByNodeTableByExcel(id, projectid);
+    public List<WbsNodeTableVO> selectByNodeTableByExcel(String id, String projectid,String liunxId) {
+        return wbsTreeMapper.selectByNodeTableByExcel(id, projectid,liunxId);
     }
 
     @Override

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff