Merge remote-tracking branch 'origin/master'

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/service/impl/BizDeptServiceImpl.java

@@ -149,6 +149,9 @@ public class BizDeptServiceImpl implements IBizDeptService {
         if (docIds.stream().anyMatch(Objects::isNull)) {
             throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001, "文档ID列表中包含空值");
         }
+        //先删除全量数据
+        bizDocDeptService.remove(new LambdaQueryWrapper<BizDocDeptPO>().eq(BizDocDeptPO::getDeptId, deptId));
+        //再插入
         List<BizDocDeptPO> bizDocDeptPOS = docIds.stream().map(docId->{
                     BizDocDeptPO bizDocDeptPO = new BizDocDeptPO();
                     bizDocDeptPO.setDocId(docId);
@@ -157,10 +160,9 @@ public class BizDeptServiceImpl implements IBizDeptService {
                 }).collect(Collectors.toList());
         bizDocDeptService.saveOrUpdateBatch(bizDocDeptPOS);
         //修改 宣教文档关联个数
-        Integer count = Optional.ofNullable(bizDeptPO.getMissionDocCount()).orElse(0);
-        return baseRepository.update(null,
+         return baseRepository.update(null,
                 new LambdaUpdateWrapper<BizDeptPO>()
-                        .set(BizDeptPO::getMissionDocCount, count + bizDocDeptPOS.size())
+                        .set(BizDeptPO::getMissionDocCount, bizDocDeptPOS.size())
                         .eq(BizDeptPO::getId, deptId)) != 0;
     }
 
@@ -185,6 +187,9 @@ public class BizDeptServiceImpl implements IBizDeptService {
         if (questionGroupIds.stream().anyMatch(Objects::isNull)) {
             throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001, "问卷组ID列表中包含空值");
         }
+        //先删除全量数据
+        bizQuestionDeptService.remove(new LambdaQueryWrapper<BizQuestionDeptPO>().eq(BizQuestionDeptPO::getDeptId, deptId));
+        //再插入
         List<BizQuestionDeptPO> collect = questionGroupIds.stream().map(questionGroupId -> {
             BizQuestionDeptPO bizQuestionDeptPO = new BizQuestionDeptPO();
             bizQuestionDeptPO.setDeptId(deptId);
@@ -192,11 +197,9 @@ public class BizDeptServiceImpl implements IBizDeptService {
             return bizQuestionDeptPO;
         }).collect(Collectors.toList());
         bizQuestionDeptService.saveOrUpdateBatch(collect);
-
-        Integer count = Optional.ofNullable(bizDeptPO.getQuestionCount()).orElse(0);
         return baseRepository.update(null,
                 new LambdaUpdateWrapper<BizDeptPO>()
-                        .set(BizDeptPO::getQuestionCount,count + collect.size())
+                        .set(BizDeptPO::getQuestionCount, collect.size())
                         .eq(BizDeptPO::getId, deptId)) != 0;
     }
 

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/service/impl/BizMissionDocServiceImpl.java

@@ -301,6 +301,9 @@ public class BizMissionDocServiceImpl  implements IBizMissionDocService {
      */
     @Override
     public List<BizDeptUnlinkDocVO> queryAllUnlink(BizDeptUnlinkDocQueryDTO source) {
+        if(Objects.isNull(source.getIsLink())){
+            source.setIsLink(Boolean.TRUE);
+        }
         return baseRepository.queryAllUnlink(source);
     }
 

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/service/impl/BizQuestionGroupServiceImpl.java

@@ -314,6 +314,9 @@ public class BizQuestionGroupServiceImpl implements IBizQuestionGroupService {
      */
     @Override
     public List<BizDeptUnlinkQuestionVO> queryAllUnlink(BizDeptUnlinkQuestionQueryDTO source) {
+        if(Objects.isNull(source.getIsLink())){
+            source.setIsLink(Boolean.TRUE);
+        }
         return baseRepository.queryAllUnlink(source);
     }
 

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/web/controller/BizMissionDocController.java

@@ -23,6 +23,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Collection;
+import java.util.List;
 
 /**
  * 宣教文档控制器
@@ -104,8 +105,7 @@ public class BizMissionDocController extends BaseController{
     @PostMapping("/query/unlink")
     @OperateLog
     @SaCheckPermission("common:missionDoc:queryAll")
-    public TableDataInfo<BizDeptUnlinkDocVO> queryAllUnlink(@RequestBody BizDeptUnlinkDocQueryDTO source) {
-        startPage();
-        return getDataTable(bizMissionDocService.queryAllUnlink(source));
+    public CommonResult<List<BizDeptUnlinkDocVO>> queryAllUnlink(@RequestBody BizDeptUnlinkDocQueryDTO source) {
+        return CommonResult.success(bizMissionDocService.queryAllUnlink(source));
     }
 }

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/web/controller/BizQuestionGroupController.java

@@ -104,9 +104,8 @@ public class BizQuestionGroupController extends BaseController{
     @PostMapping("/query/unlink")
     @OperateLog
     @SaCheckPermission("common:questionGroup:queryAll")
-    public TableDataInfo<BizDeptUnlinkQuestionVO> queryAllUnlink(@RequestBody BizDeptUnlinkQuestionQueryDTO source) {
-        startPage();
-        return getDataTable(bizQuestionGroupService.queryAllUnlink(source));
+    public  CommonResult<List<BizDeptUnlinkQuestionVO>> queryAllUnlink(@RequestBody BizDeptUnlinkQuestionQueryDTO source) {
+        return CommonResult.success(bizQuestionGroupService.queryAllUnlink(source));
     }
 
     @ApiOperationSupport(author = "lf",order = 6)

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/web/dto/BizDeptUnlinkDocQueryDTO.java

@@ -20,4 +20,7 @@ public class BizDeptUnlinkDocQueryDTO {
 
     @ApiModelProperty(value = "宣教文档名称", position = 2)
     private String condition;
+
+    @ApiModelProperty(value = "是否关联", position = 3)
+    private Boolean isLink;
 }

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/web/dto/BizDeptUnlinkQuestionQueryDTO.java

@@ -20,4 +20,7 @@ public class BizDeptUnlinkQuestionQueryDTO {
 
     @ApiModelProperty(value = "宣教文档名称",position = 2)
     private String condition;
+
+    @ApiModelProperty(value = "是否关联",position = 3)
+    private Boolean isLink;
 }

tr-modules/tr-module-smartFollowUp/src/main/resources/mapper/smart/BizMissionDocMapper.xml

@@ -174,8 +174,15 @@
             <if test="query.condition != null and query.condition != ''">
                 and bmd.title like concat('%',#{query.condition,jdbcType=VARCHAR},'%')
             </if>
-            <if test="query.deptId != null and query.deptId != ''">
-                and (bdd.dept_id != #{query.deptId } or bdd.dept_id is null)
+            <if test="!query.isLink">
+                <if test="query.deptId != null and query.deptId != ''">
+                    and (bdd.dept_id != #{query.deptId } or bdd.dept_id is null)
+                </if>
+            </if>
+            <if test="query.isLink">
+                <if test="query.deptId != null and query.deptId != ''">
+                    and bdd.dept_id = #{query.deptId }
+                </if>
             </if>
         </where>
     </select>

tr-modules/tr-module-smartFollowUp/src/main/resources/mapper/smart/BizQuestionGroupMapper.xml

@@ -48,8 +48,15 @@
         LEFT JOIN biz_question_dept bqd ON bqg.ID = bqd.question_group_id
         <where>
             and bqg.name is not null
-            <if test="query.deptId != null and query.deptId != '' ">
-                AND (bqd.dept_id != #{query.deptId} or bqd.dept_id is null)
+            <if test="!query.isLink">
+                <if test="query.deptId != null and query.deptId != '' ">
+                    AND (bqd.dept_id != #{query.deptId} or bqd.dept_id is null)
+                </if>
+            </if>
+            <if test="query.isLink">
+                <if test="query.deptId != null and query.deptId != '' ">
+                    AND bqd.dept_id = #{query.deptId}
+                </if>
             </if>
             <if test="query.condition != null and query.condition != '' ">
                 AND bqg.name LIKE CONCAT('%',#{query.condition},'%')