代码提交

bonus-admin/src/main/java/com/bonus/web/domain/TransferApplyDto.java

@@ -35,6 +35,7 @@ public class TransferApplyDto {
      * 接收组织ID
      */
     private String deptId;
+    private List<String> deptIds;
 
     /**
      * 接收组织名称

bonus-admin/src/main/java/com/bonus/web/mapper/TransferApplyMapper.java

@@ -64,4 +64,6 @@ public interface TransferApplyMapper {
     void setTransferTime(TransferFileDto dto);
 
     String getTransferApplyTransferTime(TransferFileDto dto);
+
+    Integer getAllTransferStatus(TransferFileDto dto);
 }

bonus-admin/src/main/java/com/bonus/web/service/impl/TransferApplyServiceImpl.java

@@ -29,9 +29,10 @@ public class TransferApplyServiceImpl implements TransferApplyService {
 
     @Override
     public List<TransferApplyDto> list(TransferApplyDto dto) {
-        if (dto.getDeptId() != null){
+        if (dto.getDeptId() != null) {
             // 查询该部门下所有子部门
-         List<String> deptIds =  transferApplyMapper.getDeptList(dto);
+            List<String> deptIds = transferApplyMapper.getDeptList(dto);
+            dto.setDeptIds(deptIds);
         }
         return transferApplyMapper.list(dto);
     }
@@ -164,9 +165,6 @@ public class TransferApplyServiceImpl implements TransferApplyService {
             Integer i = transferApplyMapper.transferReceive(dto);
             // 查询该申请下，是否所有文件都已接收
             Integer num = transferApplyMapper.isAllReceive(dto);
-            if (num == 1) {
-                transferApplyMapper.updateTransferStatus(dto);
-            }
             if (i > 0) {
                 return AjaxResult.success("接收成功");
             } else {
@@ -181,9 +179,13 @@ public class TransferApplyServiceImpl implements TransferApplyService {
     public AjaxResult updateTransferRecordFilesStatus(TransferFileDto dto) {
         Integer i = transferApplyMapper.updateTransferRecordFilesStatus(dto);
         String transferApplyTransferTime = transferApplyMapper.getTransferApplyTransferTime(dto);
-        if (StringUtils.isBlank(transferApplyTransferTime)){
+        if (StringUtils.isBlank(transferApplyTransferTime)) {
             transferApplyMapper.setTransferTime(dto);
         }
+        Integer num = transferApplyMapper.getAllTransferStatus(dto);
+        if (num == 1) {
+            transferApplyMapper.updateTransferStatus(dto);
+        }
         return i > 0 ? AjaxResult.success("移交成功") : AjaxResult.error("移交失败");
     }
 }

bonus-admin/src/main/resources/mapper/TransferApplyMapper.xml

@@ -340,8 +340,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="transfertTime != null and transfertTime != ''">
 			and DATE(dkta.transfer_time) = #{transfertTime}
 		</if>
-		<if test="deptId != null and deptId != ''">
-			and dkta.dept_id = #{deptId}
+		<if test="deptIds != null">
+			AND dkta.dept_id IN
+			<foreach collection="deptIds" item="deptId" open="(" separator="," close=")">
+				#{deptId}
+			</foreach>
 		</if>
 		<if test="proType != null and proType != ''">
 			and dkp.pro_type = #{proType}
@@ -577,7 +580,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			transfer_apply_id = #{transferApplyId}
 	</select>
 	<select id="getDeptList" resultType="java.lang.String">
-
+		SELECT
+			dept_id
+		FROM
+			da_ky_sys_dept
+		WHERE
+			del_flag = '0'
+		  AND (
+			dept_id = #{deptId}
+		  OR FIND_IN_SET( #{deptId}, ancestors )
+			)
 	</select>
 	<select id="getTransferApplyTransferTime" resultType="java.lang.String">
 		SELECT
@@ -587,5 +599,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		WHERE
 			id = #{transferApplyId}
 	</select>
+	<select id="getAllTransferStatus" resultType="java.lang.Integer">
+		SELECT
+			CASE
+				WHEN
+					COUNT(*) = SUM( CASE WHEN transfer_status = '1' THEN 1 ELSE 0 END ) THEN
+					1 ELSE 0
+				END AS all_received
+		FROM
+			da_ky_transfer_file
+		WHERE
+			transfer_apply_id = #{transferApplyId}
+	</select>
 
 </mapper>