Merge branch 'V0.0.3' of http://10.87.10.227:4000/jzyd_yyds/soc into V0.0.3

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/letter/vo/CoreIntroduceLetterApproveVo.java

@@ -95,7 +95,7 @@ public class CoreIntroduceLetterApproveVo {
     @ApiModelProperty(value = "审批备注")
     private String approveRemark;
 
-    @ApiModelProperty(value = "审批状态：0 草稿 ，1 使用中， 2 已逾期")
+    @ApiModelProperty(value = "审批状态：0待审批1通过2不通过3逾期")
     private Integer approveStatus;
 
     /**

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/letter/vo/CoreIntroduceLetterInfoVo.java

@@ -117,6 +117,8 @@ public class CoreIntroduceLetterInfoVo {
 
     private List<CoreIntroduceLetterUserAddDto> userInfos;
 
+    private List<CoreIntroduceLetterApproveVo> approveInfos;
+
     @ApiModelProperty(value = "接待机构")
     private List<Long> receptionOrgIds;
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/letter/mapper/CoreIntroduceLetterMapper.java

@@ -97,8 +97,9 @@ public interface CoreIntroduceLetterMapper extends BaseMapper<CoreIntroduceLette
 
     void saveCheckLogs(@Param("checkLogs") List<CoreIntroduceLetterApproveLog> checkLogs);
 
-    CoreIntroduceLetterApproveLog findCheckLog(@Param("letterId") Long letterId, @Param("orgId") Long orgId);
+    List<CoreIntroduceLetterApproveVo> findLetterApproveInfos(@Param("letterId") Long letterId);
 
+    CoreIntroduceLetterApproveLog findCheckLog(@Param("letterId") Long letterId, @Param("orgId") Long orgId);
     void deleteCheckLogs(@Param("letterId") Long letterId);
 
     List<CoreIntroduceLetterCheckLogVo> auditAllList(@Param("letterId") Long letterId);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/letter/service/impl/CoreIntroduceLetterServiceImpl.java

@@ -172,6 +172,11 @@ public class CoreIntroduceLetterServiceImpl extends ServiceImpl<CoreIntroduceLet
         CoreIntroduceLetterApproveLog
                 checkLog = coreIntroduceLetterMapper.findCheckLog(id,SecurityUtils.getLoginUser().getOrgId());
         coreIntroduceLetterVo.setApproveLog(checkLog);
+
+        List<CoreIntroduceLetterApproveVo> approveVoList = coreIntroduceLetterMapper.findLetterApproveInfos(id);
+        if(CollectionUtils.isNotEmpty(approveVoList)){
+            coreIntroduceLetterVo.setApproveInfos(approveVoList);
+        }
         return coreIntroduceLetterVo;
     }
 

soc-modules/soc-modules-core/src/main/resources/mapper/letter/CoreIntroduceLetterMapper.xml

@@ -291,6 +291,18 @@
             and c.approve_status = #{coreIntroduceLetter.approveStatus}
         </if>
     </select>
+    <select id="findLetterApproveInfos"
+            resultType="com.xunmei.common.core.domain.letter.vo.CoreIntroduceLetterApproveVo">
+        select
+            c.approve_status as approveStatus,
+            c.approve_remark as approveRemark,
+            c.approve_time,
+            o.short_name as orgName
+        from core_introduce_letter a
+         left join core_introduce_letter_approve_log c on a.id=c.letter_id
+         LEFT JOIN sys_org o ON c.org_id=o.id
+        where  a.id=#{letterId}
+    </select>
     <select id="findCheckLog"
             resultType="com.xunmei.common.core.domain.letter.domain.CoreIntroduceLetterApproveLog">
         select * from core_introduce_letter_approve_log where  letter_id=#{letterId} and org_id=#{orgId}