Merge remote-tracking branch 'origin/V0.0.4' into V0.0.4

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

@@ -111,4 +111,7 @@ public interface CoreIntroduceLetterMapper extends BaseMapper<CoreIntroduceLette
     List<PanelListVo> selectToDoApproveListForAPP(@Param("request") CoreIntroduceLetterApproveRequestDto request);
 
 
+    void batchUpdateApproveLogStatus(@Param("requestList") List<CoreIntroduceLetterApproveLog> requestList);
+    void updateApproveLogStatus(@Param("request") CoreIntroduceLetterApproveLog request);
+
 }

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

@@ -1,7 +1,5 @@
 package com.xunmei.core.letter.service.impl;
 
-import cn.hutool.core.date.DateField;
-import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson2.JSON;
@@ -22,7 +20,6 @@ import com.xunmei.common.core.domain.panel.enums.PanelTypeEnums;
 import com.xunmei.common.core.domain.panel.vo.PanelListVo;
 import com.xunmei.common.core.domain.panel.vo.WebPanelResult;
 import com.xunmei.common.core.util.BeanHelper;
-import com.xunmei.common.core.vo.IdNameVo;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.common.security.utils.DictUtils;
 import com.xunmei.common.security.utils.SecurityUtils;
@@ -30,8 +27,6 @@ import com.xunmei.core.letter.mapper.CoreIntroduceLetterApproveLogMapper;
 import com.xunmei.core.letter.mapper.CoreIntroduceLetterMapper;
 import com.xunmei.core.letter.mapper.CoreOutInRecordMapper;
 import com.xunmei.core.letter.service.ICoreIntroduceLetterService;
-import com.xunmei.core.safetyCheck.domain.CoreSafetyTask;
-import com.xunmei.system.api.Eto.RoleConditionEto;
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.RemoteRoleService;
 import com.xunmei.system.api.domain.SysOrg;
@@ -42,8 +37,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.time.LocalDate;
-import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -415,6 +408,7 @@ public class CoreIntroduceLetterServiceImpl extends ServiceImpl<CoreIntroduceLet
         oqw.ne(CoreIntroduceLetter::getStatus, 2).eq(CoreIntroduceLetter::getDeleted, 0);
         List<CoreIntroduceLetter> coreIntroduceLetters = coreIntroduceLetterMapper.selectList(oqw);
         List<CoreIntroduceLetter> overdueLettersList = new ArrayList<>();
+        List<CoreIntroduceLetterApproveLog> approveLogs=  new ArrayList<>();
         if (ObjectUtil.isNotEmpty(coreIntroduceLetters)) {
             Date currentDate = DateUtil.beginOfDay(new Date());
 
@@ -423,10 +417,19 @@ public class CoreIntroduceLetterServiceImpl extends ServiceImpl<CoreIntroduceLet
                 if (result > 0) {
                     x.setStatus(2);
                     overdueLettersList.add(x);
+                    CoreIntroduceLetterApproveLog approveLog=   new CoreIntroduceLetterApproveLog();
+                    approveLog.setLetterId(x.getId());
+                    approveLog.setApproveStatus(3);
+                    approveLogs.add(approveLog);
                 }
             });
         }
         if (ObjectUtil.isNotEmpty(overdueLettersList)) {
+            approveLogs.forEach(x->{
+                coreIntroduceLetterMapper.updateApproveLogStatus(x);
+            });
+            // 批量修改需要修改连接字符串添加 &allowMultiQueries=true
+            //coreIntroduceLetterMapper.batchUpdateApproveLogStatus(approveLogs);
             saveOrUpdateBatch(overdueLettersList);
         }
     }

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

@@ -180,6 +180,16 @@
         update core_introduce_letter_approve_log set check_status=#{checkLog.checkStatus},check_remark=#{checkLog.checkRemark},check_user=#{checkLog.checkUser},check_time=#{checkLog.checkTime},status=#{checkLog.status}
         where id=#{checkLog.id}
     </insert>
+    <update id="batchUpdateApproveLogStatus" parameterType="java.util.List">
+        <foreach collection="requestList" item="item" index="index" separator=";">
+            update core_introduce_letter_approve_log set approve_status=#{item.approveStatus} where letter_id=#{item.letterId}
+        </foreach>
+    </update>
+    <update id="updateApproveLogStatus" >
+
+            update core_introduce_letter_approve_log set approve_status=#{request.approveStatus} where letter_id=#{request.letterId}
+
+    </update>
     <insert id="saveCheckLogs">
         insert into
             core_introduce_letter_approve_log (id,letter_id,org_id,approve_status)values
@@ -379,7 +389,7 @@
         c.approve_status as status
         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 c.approve_status=1
+        where a.deleted=0 ANd a.status=1 AND c.approve_status=0
         <if test="request.orgId !=null  and request.orgId !=''">
             and c.org_id = #{request.orgId}
         </if>