Merge branch 'test-merge-02' of http://219.151.181.73:3000/zhuwei/bladex into test-merge-02

blade-service-api/blade-business-api/src/main/java/org/springblade/business/vo/ArchiveFileVO.java

@@ -97,4 +97,9 @@ public class ArchiveFileVO extends ArchiveFile {
     private String archiveName;
 
     private Integer extType;
+
+    /**
+     * 是否已组卷
+     */
+    private Integer isArchive;
 }

blade-service/blade-business/src/main/java/org/springblade/business/mapper/ArchiveFileMapper.xml

@@ -93,6 +93,16 @@
         <if test="vo.sourceType != null and vo.sourceType != ''">
             and u.source_type = #{vo.sourceType}
         </if>
+        <if test="vo.isArchive != null and vo.isArchive != ''">
+            <choose>
+                <when test="vo.isArchive == 0">
+                    AND (u.is_archive = #{vo.isArchive} OR u.is_archive IS NULL)
+                </when>
+                <otherwise>
+                    AND u.is_archive = #{vo.isArchive}
+                </otherwise>
+            </choose>
+        </if>
         <if test="vo.rectification == null and vo.archiveId == null">
             and (u.is_auto_file is null or u.is_auto_file != 1)
         </if>
@@ -166,7 +176,16 @@
         <if test="vo.sourceType != null and vo.sourceType != ''">
             and u.source_type = #{vo.sourceType}
         </if>
-
+        <if test="vo.isArchive != null and vo.isArchive != ''">
+            <choose>
+                <when test="vo.isArchive == 0">
+                    AND (u.is_archive = #{vo.isArchive} OR u.is_archive IS NULL)
+                </when>
+                <otherwise>
+                    AND u.is_archive = #{vo.isArchive}
+                </otherwise>
+            </choose>
+        </if>
         <if test="vo.rectification == null and vo.archiveId == null">
             and (u.is_auto_file is null or u.is_auto_file != 1)
         </if>

blade-service/blade-business/src/main/java/org/springblade/business/mapper/StandardInfoMapper.java

@@ -36,7 +36,8 @@ public interface StandardInfoMapper extends BaseMapper<StandardInfo> {
                                                    @Param("joinGroupId") Long joinGroupId
     );
 
-    List<StandardInfoPrivateJoinVO> effectPreview(@Param("rightIds") List<Long> rightIds);
+    List<StandardInfoPrivateJoinVO> effectPreview(@Param("rightIds") List<Long> rightIds,
+                                                  @Param("size") Integer size);
 }
 
 

blade-service/blade-business/src/main/java/org/springblade/business/mapper/StandardInfoMapper.xml

@@ -258,7 +258,7 @@
           </if>
           AND a.is_deleted = 0
         GROUP BY
-            a.private_id
+            a.group_id,a.private_id
     </select>
 
     <select id="findByPrivateGroupJoinLeftId" resultType="org.springblade.business.vo.StandardElementVo">
@@ -286,11 +286,11 @@
 
     <select id="effectPreview" resultMap="BaseResultElementJoin">
         SELECT
-            a.*, concat(a.symbol,a.name) symbolName,c.group_id group_id
+            a.*, concat(a.symbol,a.name) symbolName,null group_id
         FROM
             u_standard_info a
                 INNER JOIN u_standard_info_join b ON a.id = b.standard_info_left_id
-                INNER JOIN u_standard_info_private_join c ON a.id = c.standard_info_id
+                LEFT JOIN u_standard_info_private_join c ON a.id = c.standard_info_id
 
                 AND a.is_deleted = b.is_deleted
         WHERE
@@ -300,6 +300,7 @@
                 #{item}
             </foreach>
         GROUP BY
-            c.group_id,b.standard_info_left_id
+            b.standard_info_left_id
+        HAVING COUNT(DISTINCT b.standard_info_right_id) = #{size};
     </select>
 </mapper>

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TrialNumberRuleServiceImpl.java

@@ -135,7 +135,7 @@ public class TrialNumberRuleServiceImpl extends BaseServiceImpl<TrialNumberRuleM
                     String autoIncrementNumber="";
                     //如果是需要自增的 先要查出当前数据库中自增编号的最大值
 
-                    String sql3 = "SELECT auto_increment_number FROM u_trial_auto_number where type="+type+" and is_deleted=0 ORDER BY auto_increment_number DESC LIMIT 1";
+                    String sql3 = "SELECT auto_increment_number FROM u_trial_auto_number where type="+type+" and contract_id="+contractId+" and is_deleted=0 ORDER BY auto_increment_number DESC LIMIT 1";
                     String maxNumber = jdbcTemplate.query(sql3, rs -> {
                         if (rs.next()) {
                             return rs.getObject(1, String.class);
@@ -143,7 +143,7 @@ public class TrialNumberRuleServiceImpl extends BaseServiceImpl<TrialNumberRuleM
                             return rule.getData();
                         }
                     });
-                    String sql4="select auto_increment_number FROM u_trial_auto_number where type="+type+" and is_deleted=0  ORDER BY auto_increment_number ASC";
+                    String sql4="select auto_increment_number FROM u_trial_auto_number where type="+type+" and contract_id="+contractId+" and is_deleted=0  ORDER BY auto_increment_number ASC";
                     List<String> autoNumbers = jdbcTemplate.query(sql4, new SingleColumnRowMapper<>(String.class));
                     //判断自增的流水号是否是连续的 是连续的就在最大值加1，不是连续的先使用缺失的编号
                     List<String> missingNumbers = findMissingNumberPatterns(autoNumbers);
@@ -321,6 +321,15 @@ public class TrialNumberRuleServiceImpl extends BaseServiceImpl<TrialNumberRuleM
             }
             jdbcTemplate.execute(update);
         }
+        String pattern = "trialAutoNumber:" + contractId + ":" + type + ":*:lock:*";
+        Set<String> keys = bladeRedis.keys(pattern);
+        if (keys != null && !keys.isEmpty()) {
+            for (String key : keys) {
+                bladeRedis.del(key);
+            }
+        }
+        String sql="update u_trial_auto_number set is_deleted=0 where contract_id="+contractId+" and type="+ type;
+        jdbcTemplate.update(sql);
         return true;
     }
 

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/UStandardInfoServiceImpl.java

@@ -356,7 +356,7 @@ public class UStandardInfoServiceImpl extends ServiceImpl<StandardInfoMapper, St
     @Override
     public List<StandardInfoPrivateJoinVO> effectPreview(String ids) {
         List<Long> collect = Arrays.stream(ids.split(",")).map(Long::parseLong).collect(Collectors.toList());
-        return baseMapper.effectPreview(collect);
+        return baseMapper.effectPreview(collect,collect.size());
     }
 }