出入管理 APP端 出入申请返回 审批状态

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

@@ -107,4 +107,11 @@ public class CoreIntroduceLetterVo {
 
     @ApiModelProperty(value = "是否已经有出入记录")
     private boolean haveOutInRecord;
+
+    private Integer approveStatus;
+    private String approveRemark;
+    private Date approveTime;
+
+
+
 }

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

@@ -79,6 +79,8 @@ public interface CoreIntroduceLetterMapper extends BaseMapper<CoreIntroduceLette
     void deleteToOrgList(@Param("letterId") Long letterId);
 
     Page<CoreIntroduceLetterVo> selectPageList(@Param("page") Page<CoreIntroduceLetterVo> page, @Param("coreIntroduceLetter") CoreIntroduceLetterRequestDto coreIntroduceLetter);
+    Page<CoreIntroduceLetterVo> selectPageListForApp(@Param("page") Page<CoreIntroduceLetterVo> page, @Param("coreIntroduceLetter") CoreIntroduceLetterRequestDto coreIntroduceLetter);
+
 
     List<CoreIntroduceLetterToOrg> findToOrgListA(@Param("records")  List<CoreIntroduceLetterVo> records);
     List<CoreIntroduceLetterToOrg> findToOrgListB(@Param("records")  List<CoreIntroduceLetterInfoVo> records);

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

@@ -66,8 +66,16 @@ public class CoreIntroduceLetterServiceImpl extends ServiceImpl<CoreIntroduceLet
 //        if (ObjectUtil.isNotNull(request.getRequestFromWeb()) && request.getRequestFromWeb() ) {
 //            request.setType(1);
 //        }
-        //获取数据
-        page = coreIntroduceLetterMapper.selectPageList(page, request);
+        if(ObjectUtil.equal(request.getRequestFromWeb(),true)){
+            //获取数据
+            page = coreIntroduceLetterMapper.selectPageList(page, request);
+        }
+        else
+        {
+            page = coreIntroduceLetterMapper.selectPageListForApp(page, request);
+        }
+
+
         if(CollectionUtils.isNotEmpty(page.getRecords())){
             List<SysOrg> orgList = RemoteCallHandlerExecutor.executeRemoteCall(() -> orgService.findAllOrg(SecurityConstants.INNER), ErrorMsgConstants.QUERY_ORG_DATA_ERROR);
             page = this.buildPageVo(page, orgList);

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

@@ -47,6 +47,7 @@
     <select id="selectPageList"
             resultType="com.xunmei.common.core.domain.letter.vo.CoreIntroduceLetterVo">
         select * from core_introduce_letter a where deleted=0
+
         <if test="coreIntroduceLetter.orgId != null ">
             and a.org_id = #{coreIntroduceLetter.orgId}
         </if>
@@ -70,6 +71,30 @@
         </if>
         order by a.create_time DESC
     </select>
+    <select id="selectPageListForApp"
+            resultType="com.xunmei.common.core.domain.letter.vo.CoreIntroduceLetterVo">
+        select
+        a.*,
+        c.approve_status as approveStatus,
+        c.approve_remark as approveRemark,
+        c.approve_time
+        from core_introduce_letter a
+        left join core_introduce_letter_approve_log c on a.id=c.letter_id
+        where a.deleted=0 ANd a.status!=0 and a.type in (2,3)
+        <if test="coreIntroduceLetter.orgId != null ">
+            and c.org_id = #{coreIntroduceLetter.orgId}
+        </if>
+        <if test="coreIntroduceLetter.letterNo !=null  and coreIntroduceLetter.letterNo !=''">
+            and a.letter_no like concat('%', #{coreIntroduceLetter.letterNo}, '%')
+        </if>
+        <if test="coreIntroduceLetter.reasons !=null  and coreIntroduceLetter.reasons !=''">
+            and a.reasons like concat('%', #{coreIntroduceLetter.reasons}, '%')
+        </if>
+        <if test="coreIntroduceLetter.type !=null  and coreIntroduceLetter.type !=''">
+            and a.type = #{coreIntroduceLetter.type}
+        </if>
+        order by a.create_time DESC
+    </select>
 
 
     <insert id="insertCoreIntroduceLetter" parameterType="com.xunmei.common.core.domain.letter.domain.CoreIntroduceLetter">