试验-规范管理-符号名称改为子级才去拼接

blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/StandardInfo.java

@@ -1,5 +1,6 @@
 package org.springblade.business.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
@@ -91,4 +92,10 @@ public class StandardInfo {
      */
     @ApiModelProperty(value = "修改人", hidden = true)
     private Long updateUser;
+
+    /**
+     * 符号名称
+     */
+    @TableField(exist = false)
+    private String symbolName;
 }

blade-service/blade-business/src/main/java/org/springblade/business/controller/StandardInfoController.java

@@ -46,8 +46,8 @@ public class StandardInfoController {
      */
     @GetMapping("page")
     @ApiOperation(value = "分页查询所有数据", notes = "传入分页对象和高级查询对象")
-    public R<IPage<StandardInfoDtoVo>> selectAll(Query query, StandardInfo standardInfo) {
-        IPage<StandardInfoDtoVo> page = this.uStandardInfoService.selectMyPage(query, standardInfo);
+    public R<IPage<StandardInfoDTO>> selectAll(Query query, StandardInfo standardInfo) {
+        IPage<StandardInfoDTO> page = this.uStandardInfoService.selectMyPage(query, standardInfo);
         return R.data(page);
     }
 

blade-service/blade-business/src/main/java/org/springblade/business/mapper/StandardInfoMapper.java

@@ -20,7 +20,7 @@ import java.util.List;
 */
 public interface StandardInfoMapper extends BaseMapper<StandardInfo> {
 
-    IPage<StandardInfoDtoVo> selectMyPage(Page<StandardInfoDtoVo> page, @Param("query") StandardInfo standardInfo);
+    IPage<StandardInfoDTO> selectMyPage(Page<StandardInfoDTO> page, @Param("query") StandardInfo standardInfo);
 
     StandardInfoDTO selectMyOne(@Param("id") Long id);
 

blade-service/blade-business/src/main/java/org/springblade/business/mapper/StandardInfoMapper.xml

@@ -16,7 +16,7 @@
         <result property="updateTime" column="update_time"/>
         <result property="updateUser" column="update_user"/>
     </resultMap>
-    <resultMap id="BaseResultPageMap" type="org.springblade.business.vo.StandardInfoDtoVo">
+    <resultMap id="BaseResultPageMap" type="org.springblade.business.dto.StandardInfoDTO">
         <id property="id" column="id"/>
         <result property="name" column="name"/>
         <result property="symbol" column="symbol"/>
@@ -28,7 +28,6 @@
         <result property="createUser" column="create_user"/>
         <result property="updateTime" column="update_time"/>
         <result property="updateUser" column="update_user"/>
-        <result property="symbolName" column="symbolName"/>
         <collection property="info" ofType="org.springblade.business.entity.StandardInfo" select="findByParentId" column="{parentId=id}">
         </collection>
     </resultMap>
@@ -40,7 +39,7 @@
     </sql>
     <select id="selectMyPage" resultMap="BaseResultPageMap">
         SELECT
-            <include refid="Base_Column_List"/>,concat(symbol,name) symbolName
+            <include refid="Base_Column_List"/>
         FROM
             u_standard_info
         <where>
@@ -63,7 +62,7 @@
     </select>
     <select id="selectMyOne" resultMap="BaseResultPageMap">
         SELECT
-            <include refid="Base_Column_List"/>,concat(symbol,name) symbolName
+            <include refid="Base_Column_List"/>
         FROM
             u_standard_info
         WHERE
@@ -72,7 +71,7 @@
     </select>
     <select id="findByParentId" resultType="org.springblade.business.entity.StandardInfo">
         select
-            <include refid="Base_Column_List"/>
+            <include refid="Base_Column_List"/>,concat(symbol,name) symbolName
         FROM
             u_standard_info
         WHERE

blade-service/blade-business/src/main/java/org/springblade/business/service/StandardInfoService.java

@@ -20,7 +20,7 @@ import java.util.List;
 */
 public interface StandardInfoService extends IService<StandardInfo> {
 
-    IPage<StandardInfoDtoVo> selectMyPage(Query query, StandardInfo standardInfo);
+    IPage<StandardInfoDTO> selectMyPage(Query query, StandardInfo standardInfo);
 
     StandardInfoDTO selectOne(Long id);
 

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/UStandardInfoServiceImpl.java

@@ -56,8 +56,8 @@ public class UStandardInfoServiceImpl extends ServiceImpl<StandardInfoMapper, St
 
 
     @Override
-    public IPage<StandardInfoDtoVo> selectMyPage(Query query, StandardInfo standardInfo) {
-        return baseMapper.selectMyPage(new Page<StandardInfoDtoVo>(query.getCurrent(), query.getSize()), standardInfo);
+    public IPage<StandardInfoDTO> selectMyPage(Query query, StandardInfo standardInfo) {
+        return baseMapper.selectMyPage(new Page<StandardInfoDTO>(query.getCurrent(), query.getSize()), standardInfo);
     }
 
     @Override
@@ -178,7 +178,11 @@ public class UStandardInfoServiceImpl extends ServiceImpl<StandardInfoMapper, St
                     uStandardInfoJoin.setCreateUser(user.getUserId());
                     saveData.add(uStandardInfoJoin);
                 }
+                //先删除之前的关联关系
+                standardInfoJoinService.remove(Wrappers.<StandardInfoJoin>lambdaQuery()
+                        .eq(StandardInfoJoin::getStandardInfoLeftId,leftId));
             }
+            //新增
             return standardInfoJoinService.saveBatch(saveData);
         } catch (Exception e) {
             e.printStackTrace();
@@ -202,6 +206,9 @@ public class UStandardInfoServiceImpl extends ServiceImpl<StandardInfoMapper, St
                     f.setCreateUser(user.getUserId());
                 });
                 saveData.addAll(rightIds);
+                //删除之前的关联关系
+                standardInfoPrivateJoinService.remove(Wrappers.<StandardInfoPrivateJoin>lambdaQuery()
+                        .eq(StandardInfoPrivateJoin::getStandardInfoId,leftId));
             }
             return standardInfoPrivateJoinService.saveBatch(saveData);
         } catch (Exception e) {