Merge remote-tracking branch 'origin/master'

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/dto/BizQuestionGroupDTO.java

@@ -8,6 +8,8 @@ import cn.tr.core.validation.Update;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.checkerframework.checker.units.qual.A;
+
 import javax.validation.constraints.*;
 
 /**
@@ -32,10 +34,15 @@ public class BizQuestionGroupDTO extends BaseDTO  {
     @ApiModelProperty(value = "问卷类型", position = 3)
     private String type;
 
-    @ApiModelProperty("术后推送间隔（小时）")
+    @ApiModelProperty(value = "术后推送间隔（小时）",position = 4)
     private Integer interval;
 
-    @ApiModelProperty("术后推送频率(次)")
+    @ApiModelProperty(value = "术后推送频率(次)",position = 5)
     private Integer frequency;
 
+    @ApiModelProperty(value = "拉取squareID", position = 6)
+    private String squareId;
+
+    @ApiModelProperty(value = "是否分享",position = 7)
+    private Boolean isShare;
 }

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/po/BizMissionDocPO.java

@@ -81,4 +81,7 @@ public class BizMissionDocPO extends TenantPO {
     @TableField(updateStrategy = FieldStrategy.NEVER,fill = FieldFill.INSERT, jdbcType = JdbcType.VARCHAR)
     private Integer deleted;
 
+    @ApiModelProperty(value = "是否分享",position = 20)
+    private Boolean isShare;
+
 }

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/po/BizQuestionGroupPO.java

@@ -51,4 +51,7 @@ public class BizQuestionGroupPO extends TenantPO {
 
     @ApiModelProperty(value = "拉取广场ID", position = 7)
     private String squareId;
+
+    @ApiModelProperty(value = "是否分享", position = 8)
+    private Boolean isShare;
 }

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

@@ -10,11 +10,11 @@ import cn.tr.core.exception.ServiceException;
 import cn.tr.core.exception.TRExcCode;
 import cn.tr.core.strategy.LoginUserStrategy;
 import cn.tr.core.utils.JsonUtils;
-import cn.tr.module.smart.common.enums.ClinicPhaseEnums;
 import cn.tr.module.smart.common.dto.BizMissionDocAndSquareCoverDTO;
 import cn.tr.module.smart.common.dto.BizMissionDocDTO;
 import cn.tr.module.smart.common.dto.BizMissionDocJsonDTO;
 import cn.tr.module.smart.common.dto.BizMissionDocQueryDTO;
+import cn.tr.module.smart.common.enums.ClinicPhaseEnums;
 import cn.tr.module.smart.common.mapper.BizMissionDocMapper;
 import cn.tr.module.smart.common.mapper.BizMissionDocSquareMapper;
 import cn.tr.module.smart.common.po.*;
@@ -27,16 +27,17 @@ import cn.tr.module.smart.wx.dto.BizWxKnowledgeDocQueryDTO;
 import cn.tr.module.smart.wx.dto.BizWxMissionDocQueryDTO;
 import cn.tr.module.smart.wx.dto.BizWxQueryDTO;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.*;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * 宣教文档Service接口实现类
@@ -134,6 +135,7 @@ public class BizMissionDocServiceImpl  implements IBizMissionDocService {
         String MD5 = DigestUtil.md5Hex(JsonUtils.toJsonString(bizMissionDocJsonDTO));
         bizMissionDocPO.setMd5(MD5);
         bizMissionDocPO.setVersion(1);
+        bizMissionDocPO.setIsShare(false);
         return  baseRepository.insert(bizMissionDocPO) !=0;
 
     }
@@ -192,13 +194,15 @@ public class BizMissionDocServiceImpl  implements IBizMissionDocService {
             newBizMissionDocSquarePO.setOwner(bizMissionDocPO.getCreateBy());
             newBizMissionDocSquarePO.setHospitalDocId(bizMissionDocPO.getId());
             newBizMissionDocSquarePO.setCitationCount(0);
-            return bizMissionDocSquareRepository.insert(newBizMissionDocSquarePO) != 0;
+            bizMissionDocSquareRepository.insert(newBizMissionDocSquarePO);
         } else {
             newBizMissionDocSquarePO.setId(bizMissionDocSquarePO.getId());
             newBizMissionDocSquarePO.setUpdateBy(currentUserId);
             newBizMissionDocSquarePO.setUpdateTime(new Date());
-            return bizMissionDocSquareRepository.updateBizMissionDocSquareById(newBizMissionDocSquarePO) != 0;
+            bizMissionDocSquareRepository.updateBizMissionDocSquareById(newBizMissionDocSquarePO);
         }
+        return baseRepository.update(null, new LambdaUpdateWrapper<BizMissionDocPO>()
+                .set(BizMissionDocPO::getIsShare, true).eq(BizMissionDocPO::getId, id)) != 0;
     }
 
     /**

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

@@ -20,12 +20,9 @@ import cn.tr.module.smart.common.po.BizQuestionSquarePO;
 import cn.tr.module.smart.common.repository.BizQuestionGroupRepository;
 import cn.tr.module.smart.common.repository.BizQuestionGroupSquareRepository;
 import cn.tr.module.smart.common.repository.BizQuestionRepository;
-import cn.tr.module.smart.common.repository.BizQuestionSquareRepository;
 import cn.tr.module.smart.common.service.IBizQuestionGroupService;
-import cn.tr.module.sys.oauth2.LoginTypeConstant;
-import cn.tr.plugin.security.context.LoginUserContextHolder;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -108,6 +105,7 @@ public class BizQuestionGroupServiceImpl implements IBizQuestionGroupService {
         Map<String, Object> stringObjectMap = BeanUtil.beanToMap(source, MD5_FIELDS);
         bizQuestionGroupPO.setVersion(1);
         bizQuestionGroupPO.setMd5(DigestUtil.md5Hex(stringObjectMap.toString()));
+        bizQuestionGroupPO.setIsShare(false);
         baseRepository.insert(bizQuestionGroupPO);
         return BizQuestionGroupMapper.INSTANCE.convertDto(bizQuestionGroupPO);
     }
@@ -170,7 +168,7 @@ public class BizQuestionGroupServiceImpl implements IBizQuestionGroupService {
                 .eq(BizQuestionGroupSquarePO::getHospitalGroupId, id)
                 .eq(BizQuestionGroupSquarePO::getTenantId, tenantId));
         BizQuestionGroupSquarePO newBizQuestionGroupSquarePO = BizQuestionGroupSquareMapper.INSTANCE.convertPO(bizQuestionGroupPO);
-        if(ObjectUtil.isNull(bizQuestionGroupSquarePO)){
+        if (ObjectUtil.isNull(bizQuestionGroupSquarePO)) {
             newBizQuestionGroupSquarePO.setCitationCount(0);
             bizQuestionGroupSquareRepository.insert(newBizQuestionGroupSquarePO);
             List<BizQuestionSquarePO> bizQuestionSquarePoList = bizQuestionPOS.stream().map(bizQuestionPO -> {
@@ -178,23 +176,25 @@ public class BizQuestionGroupServiceImpl implements IBizQuestionGroupService {
                 bizQuestionSquarePO.setGroupId(newBizQuestionGroupSquarePO.getId());
                 return bizQuestionSquarePO;
             }).collect(Collectors.toList());
-            return  bizQuestionSquareServiceImpl.saveOrUpdateBatch(bizQuestionSquarePoList);
-        }else {
-            Date newDate  = new Date();
+            bizQuestionSquareServiceImpl.saveOrUpdateBatch(bizQuestionSquarePoList);
+        } else {
+            Date newDate = new Date();
             newBizQuestionGroupSquarePO.setId(bizQuestionGroupSquarePO.getId());
             newBizQuestionGroupSquarePO.setUpdateBy(currentUserId);
             newBizQuestionGroupSquarePO.setUpdateTime(newDate);
             bizQuestionGroupSquareRepository.updateById(newBizQuestionGroupSquarePO);
             //每个问卷题目太多意义对应太麻烦，所以先删除再添加
             bizQuestionSquareServiceImpl.remove(new LambdaQueryWrapper<BizQuestionSquarePO>()
-                    .in(BizQuestionSquarePO::getGroupId,bizQuestionGroupSquarePO.getId()));
+                    .in(BizQuestionSquarePO::getGroupId, bizQuestionGroupSquarePO.getId()));
             List<BizQuestionSquarePO> bizQuestionSquarePoList = bizQuestionPOS.stream().map(bizQuestionPO -> {
                 BizQuestionSquarePO bizQuestionSquarePO = BizQuestionSquareMapper.INSTANCE.convertQuestionSquarePO(bizQuestionPO);
                 bizQuestionSquarePO.setGroupId(newBizQuestionGroupSquarePO.getId());
                 return bizQuestionSquarePO;
             }).collect(Collectors.toList());
-            return  bizQuestionSquareServiceImpl.saveOrUpdateBatch(bizQuestionSquarePoList);
+            bizQuestionSquareServiceImpl.saveOrUpdateBatch(bizQuestionSquarePoList);
         }
+        return baseRepository.update(null, new LambdaUpdateWrapper<BizQuestionGroupPO>()
+                .set(BizQuestionGroupPO::getIsShare, true).eq(BizQuestionGroupPO::getId, bizQuestionGroupPO.getId())) != 0;
     }
 
     /**

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/wx/controller/vo/BizDeptAndDocVO.java

@@ -53,4 +53,9 @@ public class BizDeptAndDocVO {
     @ApiModelProperty(value = "文档创建时间", position = 11)
     private Date createTime;
 
+    @ApiModelProperty(value = "是否分享",position = 12)
+    private Boolean isShare;
+
+    @ApiModelProperty(value = "广场ID",position = 13)
+    private String squareDocId;
 }

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

@@ -129,7 +129,9 @@
         bmd.create_time as create_time,
         bmd.create_by as create_by,
         bmd.update_time as update_time,
-        bmd.update_by as update_by
+        bmd.update_by as update_by,
+        bmd.is_share as isShare,
+        bmd.square_doc_id as squareDocId
         from biz_doc_dept bdd
         join biz_mission_doc bmd on
         bdd.doc_id = bmd.id