Merge remote-tracking branch 'origin/dev_20210330' into dev_20210330

yd-api/src/main/java/com/yd/api/agms/service/impl/AgmsPractitionerServiceImpl.java

@@ -50,6 +50,8 @@ public class AgmsPractitionerServiceImpl implements AgmsPractitionerService {
                 requestVO.getIsActive(),
                 requestVO.getIsActive(),
                 requestVO.getPractitionerFileShares().getPageNum(),
                 requestVO.getPractitionerFileShares().getPageNum(),
                 requestVO.getPractitionerFileShares().getPageSize());
                 requestVO.getPractitionerFileShares().getPageSize());
+        SharePractitionerInfo sharePractitionerInfo = agmsPractitionerDALService.findSharePractitioner(requestVO.getShareCode());
+        responseVO.setSharePractitionerInfo(sharePractitionerInfo);
         responseVO.setPractitionerFileShares(practitionerFileShares);
         responseVO.setPractitionerFileShares(practitionerFileShares);
         responseVO.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
         responseVO.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
         return responseVO;
         return responseVO;

yd-api/src/main/java/com/yd/api/agms/vo/practitioner/PractitionerFileSharingListResponseVO.java

@@ -10,6 +10,8 @@ import java.util.List;
  */
  */
 public class PractitionerFileSharingListResponseVO {
 public class PractitionerFileSharingListResponseVO {
 
 
+    private SharePractitionerInfo sharePractitionerInfo;
+
     private PageInfo<PractitionerFileSharing> practitionerFileShares;
     private PageInfo<PractitionerFileSharing> practitionerFileShares;
 
 
     private CommonResult commonResult;
     private CommonResult commonResult;
@@ -51,10 +53,19 @@ public class PractitionerFileSharingListResponseVO {
         this.commonResult = commonResult;
         this.commonResult = commonResult;
     }
     }
 
 
+    public SharePractitionerInfo getSharePractitionerInfo() {
+        return sharePractitionerInfo;
+    }
+
+    public void setSharePractitionerInfo(SharePractitionerInfo sharePractitionerInfo) {
+        this.sharePractitionerInfo = sharePractitionerInfo;
+    }
+
     @Override
     @Override
     public String toString() {
     public String toString() {
         return "PractitionerFileSharingListResponseVO{" +
         return "PractitionerFileSharingListResponseVO{" +
-                "practitionerFileShares=" + practitionerFileShares +
+                "sharePractitionerInfo=" + sharePractitionerInfo +
+                ", practitionerFileShares=" + practitionerFileShares +
                 ", commonResult=" + commonResult +
                 ", commonResult=" + commonResult +
                 '}';
                 '}';
     }
     }

yd-api/src/main/java/com/yd/api/agms/vo/practitioner/SharePractitionerInfo.java

+package com.yd.api.agms.vo.practitioner;
+
+public class SharePractitionerInfo {
+
+    private Long customerId;
+
+    private Long practitionerId;
+
+    private String mobileNo;
+
+    private String headImagePath;
+
+    private String name;
+
+    private String qrCodePath;
+
+    private String insurerBranchName;
+
+
+    public Long getCustomerId() {
+        return customerId;
+    }
+
+    public void setCustomerId(Long customerId) {
+        this.customerId = customerId;
+    }
+
+    public Long getPractitionerId() {
+        return practitionerId;
+    }
+
+    public void setPractitionerId(Long practitionerId) {
+        this.practitionerId = practitionerId;
+    }
+
+    public String getMobileNo() {
+        return mobileNo;
+    }
+
+    public void setMobileNo(String mobileNo) {
+        this.mobileNo = mobileNo;
+    }
+
+    public String getHeadImagePath() {
+        return headImagePath;
+    }
+
+    public void setHeadImagePath(String headImagePath) {
+        this.headImagePath = headImagePath;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getQrCodePath() {
+        return qrCodePath;
+    }
+
+    public void setQrCodePath(String qrCodePath) {
+        this.qrCodePath = qrCodePath;
+    }
+
+    public String getInsurerBranchName() {
+        return insurerBranchName;
+    }
+
+    public void setInsurerBranchName(String insurerBranchName) {
+        this.insurerBranchName = insurerBranchName;
+    }
+
+    @Override
+    public String toString() {
+        return "SharePractitionerInfo{" +
+                "customerId=" + customerId +
+                ", practitionerId=" + practitionerId +
+                ", mobileNo='" + mobileNo + '\'' +
+                ", headImagePath='" + headImagePath + '\'' +
+                ", name='" + name + '\'' +
+                ", qrCodePath='" + qrCodePath + '\'' +
+                ", insurerBranchName='" + insurerBranchName + '\'' +
+                '}';
+    }
+}

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerArticleServiceImpl.java

@@ -48,10 +48,13 @@ public class PractitionerArticleServiceImpl implements PractitionerArticleServic
         shareTrack.setCreatedBy(-1L);
         shareTrack.setCreatedBy(-1L);
         Long id = requestVO.getId();
         Long id = requestVO.getId();
         if (CommonUtil.isNullOrZero(id)){
         if (CommonUtil.isNullOrZero(id)){
-            shareTrack.setTrackInTime(CommonUtil.stringParseDate(requestVO.getTrackInTime(),"yyyy-MM-dd HH:mm:ss"));
+            String shareCode = shareTrack.getShareCode();
+            Long shareCodeId = aclCustomerObjectShareDALService.findIdByShareCode(shareCode);
+            shareTrack.setShareId(shareCodeId);
+            shareTrack.setTrackInTime(new Date());
             id = aclCustomerObjectShareTrackDALService.save(shareTrack);
             id = aclCustomerObjectShareTrackDALService.save(shareTrack);
         }else {
         }else {
-            shareTrack.setTrackOutTime(CommonUtil.stringParseDate(requestVO.getTrackOutTime(),"yyyy-MM-dd HH:mm:ss"));
+            shareTrack.setTrackOutTime(new Date());
             aclCustomerObjectShareTrackDALService.update(shareTrack);
             aclCustomerObjectShareTrackDALService.update(shareTrack);
         }
         }
         responseVO.setId(id);
         responseVO.setId(id);

yd-api/src/main/java/com/yd/api/practitioner/vo/article/ArticleTrackSaveRequestVO.java

@@ -34,16 +34,6 @@ public class ArticleTrackSaveRequestVO {
     private String imagePath;
     private String imagePath;
 
 
     /**
     /**
-     * 跟踪开始时间
-     */
-    private String trackInTime;
-
-    /**
-     * 跟踪结束时间
-     */
-    private String trackOutTime;
-
-    /**
      * 地域
      * 地域
      */
      */
     private String region;
     private String region;
@@ -131,22 +121,6 @@ public class ArticleTrackSaveRequestVO {
         this.imagePath = imagePath;
         this.imagePath = imagePath;
     }
     }
 
 
-    public String getTrackInTime() {
-        return trackInTime;
-    }
-
-    public void setTrackInTime(String trackInTime) {
-        this.trackInTime = trackInTime;
-    }
-
-    public String getTrackOutTime() {
-        return trackOutTime;
-    }
-
-    public void setTrackOutTime(String trackOutTime) {
-        this.trackOutTime = trackOutTime;
-    }
-
     public String getRegion() {
     public String getRegion() {
         return region;
         return region;
     }
     }

yd-api/src/main/java/com/yd/dal/mapper/agms/AgmsPractitionerMapper.java

@@ -2,6 +2,7 @@ package com.yd.dal.mapper.agms;
 
 
 import com.github.pagehelper.Page;
 import com.github.pagehelper.Page;
 import com.yd.api.agms.vo.practitioner.PractitionerFileSharing;
 import com.yd.api.agms.vo.practitioner.PractitionerFileSharing;
+import com.yd.api.agms.vo.practitioner.SharePractitionerInfo;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 
 
 /**
 /**
@@ -15,4 +16,6 @@ public interface AgmsPractitionerMapper {
      * @return
      * @return
      */
      */
     Page<PractitionerFileSharing> practitionerFileSharingList(@Param("id")Long id,@Param("shareCode") String shareCode,@Param("mdDropOptionIds") Long[] mdDropOptionIds ,@Param("isActive") Integer isActive);
     Page<PractitionerFileSharing> practitionerFileSharingList(@Param("id")Long id,@Param("shareCode") String shareCode,@Param("mdDropOptionIds") Long[] mdDropOptionIds ,@Param("isActive") Integer isActive);
+
+    SharePractitionerInfo findSharePractitioner(String shareCode);
 }
 }

yd-api/src/main/java/com/yd/dal/mapper/customer/AclCustomerObjectShareMapper.java

 package com.yd.dal.mapper.customer;
 package com.yd.dal.mapper.customer;
 
 
 import com.yd.dal.entity.customer.AclCustomerObjectShare;
 import com.yd.dal.entity.customer.AclCustomerObjectShare;
+import org.apache.ibatis.annotations.Param;
 
 
 public interface AclCustomerObjectShareMapper {
 public interface AclCustomerObjectShareMapper {
     int deleteByPrimaryKey(Long id);
     int deleteByPrimaryKey(Long id);
@@ -14,4 +15,6 @@ public interface AclCustomerObjectShareMapper {
     int updateByPrimaryKeySelective(AclCustomerObjectShare record);
     int updateByPrimaryKeySelective(AclCustomerObjectShare record);
 
 
     int updateByPrimaryKey(AclCustomerObjectShare record);
     int updateByPrimaryKey(AclCustomerObjectShare record);
+
+    Long findIdByShareCode(@Param("shareCode") String shareCode);
 }
 }
\ No newline at end of file

yd-api/src/main/java/com/yd/dal/service/agms/AgmsPractitionerDALService.java

@@ -2,6 +2,7 @@ package com.yd.dal.service.agms;
 
 
 import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.PageInfo;
 import com.yd.api.agms.vo.practitioner.PractitionerFileSharing;
 import com.yd.api.agms.vo.practitioner.PractitionerFileSharing;
+import com.yd.api.agms.vo.practitioner.SharePractitionerInfo;
 
 
 /**
 /**
  * @author xxy
  * @author xxy
@@ -16,4 +17,6 @@ public interface AgmsPractitionerDALService {
      * @return 查询结果
      * @return 查询结果
      */
      */
     PageInfo<PractitionerFileSharing> practitionerFileSharingList(Long id ,String shareCode,Long[] mdDropOptionId, Integer isActive, int pageNum, int size);
     PageInfo<PractitionerFileSharing> practitionerFileSharingList(Long id ,String shareCode,Long[] mdDropOptionId, Integer isActive, int pageNum, int size);
+
+    SharePractitionerInfo findSharePractitioner(String shareCode);
 }
 }

yd-api/src/main/java/com/yd/dal/service/agms/impl/AgmsPractitionerDALServiceImpl.java

@@ -4,8 +4,10 @@ import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.PageInfo;
 import com.yd.api.agms.vo.practitioner.PractitionerFileSharing;
 import com.yd.api.agms.vo.practitioner.PractitionerFileSharing;
+import com.yd.api.agms.vo.practitioner.SharePractitionerInfo;
 import com.yd.dal.mapper.agms.AgmsPractitionerMapper;
 import com.yd.dal.mapper.agms.AgmsPractitionerMapper;
 import com.yd.dal.service.agms.AgmsPractitionerDALService;
 import com.yd.dal.service.agms.AgmsPractitionerDALService;
+import com.yd.util.CommonUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
@@ -24,4 +26,12 @@ public class AgmsPractitionerDALServiceImpl implements AgmsPractitionerDALServic
         PageInfo<PractitionerFileSharing> pageInfo = new PageInfo<>(practitionerFileShares);
         PageInfo<PractitionerFileSharing> pageInfo = new PageInfo<>(practitionerFileShares);
         return pageInfo;
         return pageInfo;
     }
     }
+
+    @Override
+    public SharePractitionerInfo findSharePractitioner(String shareCode) {
+        if (CommonUtil.isNullOrBlank(shareCode)){
+            return null;
+        }
+        return mapper.findSharePractitioner(shareCode);
+    }
 }
 }

yd-api/src/main/java/com/yd/dal/service/customer/AclCustomerObjectShareDALService.java

@@ -4,4 +4,6 @@ import com.yd.dal.entity.customer.AclCustomerObjectShare;
 
 
 public interface AclCustomerObjectShareDALService {
 public interface AclCustomerObjectShareDALService {
     Long save(AclCustomerObjectShare objectShare);
     Long save(AclCustomerObjectShare objectShare);
+
+    Long findIdByShareCode(String shareCode);
 }
 }

yd-api/src/main/java/com/yd/dal/service/customer/impl/AclCustomerObjectShareDALServiceImpl.java

@@ -18,4 +18,9 @@ public class AclCustomerObjectShareDALServiceImpl implements AclCustomerObjectSh
         mapper.insertSelective(objectShare);
         mapper.insertSelective(objectShare);
         return objectShare.getId();
         return objectShare.getId();
     }
     }
+
+    @Override
+    public Long findIdByShareCode(String shareCode) {
+        return mapper.findIdByShareCode(shareCode);
+    }
 }
 }

yd-api/src/main/resources/mapper/agms/AgmsPractitionerMapper.xml

@@ -21,6 +21,7 @@
                 left join  ag_md_drop_options o on o.id = s.md_drop_option_id
                 left join  ag_md_drop_options o on o.id = s.md_drop_option_id
                 left join  ag_acl_user uc on uc.id = s.created_by
                 left join  ag_acl_user uc on uc.id = s.created_by
                 left join  ag_acl_user uu on uu.id = s.created_by
                 left join  ag_acl_user uu on uu.id = s.created_by
+                LEFT JOIN ag_acl_customer_object_share os on os.item_id = s.id
             <where>
             <where>
                 <if test="mdDropOptionIds != null">
                 <if test="mdDropOptionIds != null">
                     <foreach collection="mdDropOptionIds" item="mdDropOptionId" index="index" open="(" close=")" separator="or">
                     <foreach collection="mdDropOptionIds" item="mdDropOptionId" index="index" open="(" close=")" separator="or">
@@ -31,12 +32,41 @@
                     and s.id = #{id,jdbcType=BIGINT}
                     and s.id = #{id,jdbcType=BIGINT}
                 </if>
                 </if>
                 <if test="shareCode != null">
                 <if test="shareCode != null">
-                    and s.share_code = #{shareCode,jdbcType=VARCHAR}
+                    and os.item_type = 1
+                    and os.share_code = #{shareCode,jdbcType=VARCHAR}
                 </if>
                 </if>
                 <if test="isActive != null">
                 <if test="isActive != null">
                     and s.is_active = #{isActive,jdbcType=INTEGER}
                     and s.is_active = #{isActive,jdbcType=INTEGER}
                 </if>
                 </if>
             </where>
             </where>
+        group by s.id
         ORDER BY s.id desc
         ORDER BY s.id desc
     </select>
     </select>
+    <resultMap id="BaseResultMap" type="com.yd.api.agms.vo.practitioner.SharePractitionerInfo">
+        <result column="customerId" jdbcType="BIGINT" property="customerId" />
+        <result column="practitionerId" jdbcType="BIGINT" property="practitionerId" />
+        <result column="name" jdbcType="VARCHAR" property="name" />
+        <result column="mobileNo" jdbcType="VARCHAR" property="mobileNo" typeHandler="com.yd.util.deshandler.DESTypeHandler"/>
+        <result column="insurerBranchName" jdbcType="VARCHAR" property="insurerBranchName" />
+        <result column="headImagePath" jdbcType="VARCHAR" property="headImagePath" />
+        <result column="qrCodePath" jdbcType="VARCHAR" property="qrCodePath" />
+    </resultMap>
+    <select id="findSharePractitioner" resultMap="BaseResultMap">
+        SELECT p.customer_id customerId,
+               p.id practitionerId,
+               p.name name,
+               p.mobile_no mobileNo,
+               b.branch_name insurerBranchName,
+               uh.file_path headImagePath,
+               uw.file_path qrCodePath
+        FROM ag_acl_customer_object_share os
+                 LEFT JOIN ag_acl_practitioner p
+                 LEFT JOIN ag_acl_insurer_branch b ON b.id = p.insurer_branch_id
+                 LEFT JOIN ag_acl_file_upload uh
+                           ON uh.target_type = 1 AND uh.target_id = p.id AND uh.is_active = 1 AND uh.file_type = 1
+                 LEFT JOIN ag_acl_file_upload uw
+                           ON uh.target_type = 1 AND uh.target_id = p.id AND uh.is_active = 1 AND uh.file_type = 9
+                           ON p.id = os.practitioner_id
+        WHERE os.share_code = #{shareCode,jdbcType=VARCHAR}
+    </select>
 </mapper>
 </mapper>
\ No newline at end of file

yd-api/src/main/resources/mapper/customer/AclCustomerObjectShareMapper.xml

@@ -212,4 +212,10 @@
       updated_by = #{updatedBy,jdbcType=BIGINT}
       updated_by = #{updatedBy,jdbcType=BIGINT}
     where id = #{id,jdbcType=BIGINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
   </update>
+    <select id="findIdByShareCode" resultType="java.lang.Long">
+      select
+        id
+      from ag_acl_customer_object_share
+      where share_code = #{shareCode,jdbcType=VARCHAR}
+    </select>
 </mapper>
 </mapper>
\ No newline at end of file