Merge remote-tracking branch 'origin/master'

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchiveFileController.java

@@ -357,7 +357,7 @@ public class ArchiveFileController extends BladeController {
             List<ContractInfo> contractInfos = contractClient.queryContractListByIds(longs);
             for(ContractInfo info : contractInfos){
                 if(info.getContractType() == 3){
-                    contractById = info;
+                    contractById = contractClient.getContractById(info.getId());
                     break;
                 }
             }

blade-service/blade-archive/src/main/java/org/springblade/archive/mapper/ArchivesAutoMapper.xml

@@ -305,7 +305,7 @@
     </select>
     <select id="pageByArchivesAuto" resultMap="archivesAutoResultMap">
         select uaa.* from m_archive_tree_contract matc left join u_archives_auto uaa on matc.id = uaa.node_id left join u_archive_file uaf on uaa.id = uaf.archive_id
-        where uaa.is_deleted = 0
+        where uaa.is_deleted = 0 and uaa.is_archive = 1
         <if test="vo.projectId != null and vo.projectId != ''">
             and matc.project_id = #{vo.projectId}
         </if>
@@ -359,7 +359,7 @@
             or ancestors like concat('%',#{nodeId},'%') or id = #{nodeId}
         </foreach>
         ) matc left join u_archives_auto uaa on matc.id = uaa.node_id left join u_archive_file uaf on uaa.id = uaf.archive_id
-        where uaa.is_deleted = 0
+        where uaa.is_deleted = 0 and uaa.is_archive = 1
         <if test="vo.contractId != null and vo.contractId != ''">
             and uaa.contract_id = #{vo.contractId}
         </if>
@@ -418,7 +418,7 @@
         select uaa.id,uaa.file_number,uaa.name,uaa.file_size,CASE uaa.storage_time WHEN '1' THEN '10年' WHEN '2' THEN '30年' ELSE '永久' END as storageTimeValue
         from(
                 select id from m_archive_tree_contract
-                where project_id = #{vo.projectId} and ancestors like concat('%', #{vo.nodeId}, '%') or id = #{vo.nodeId}
+                where project_id = #{vo.projectId} and ancestors like concat('%', #{vo.nodeId}, '%') and is_deleted = 0 or id = #{vo.nodeId}
             ) matc
         left join u_archives_auto uaa on matc.id = uaa.node_id
         where
@@ -434,11 +434,12 @@
         <if test="vo.filingUnit != null and vo.filingUnit != ''">
             and uaa.filing_unit = #{vo.filingUnit}
         </if>
+        and uaa.is_archive = 1
     </select>
     <select id="getFilingUnitList" resultType="java.lang.String">
-        SELECT filing_unit
-        FROM  u_archives_auto WHERE project_id =#{projectId} AND filing_unit is not NULL
-        GROUP BY filing_unit
+        SELECT unit
+        FROM  u_archives_auto WHERE project_id =#{projectId} and is_deleted = 0 AND unit is not NULL
+        GROUP BY unit
     </select>
     <select id="getCarrierTypeByDict" resultType="org.springblade.system.entity.DictBiz">
         SELECT * FROM blade_dict_biz WHERE code = 'storage_type' AND  parent_id > 0 AND tenant_id = 000000

blade-service/blade-business/src/main/java/org/springblade/business/controller/EVisaTaskCheckController.java

@@ -148,17 +148,17 @@ public class EVisaTaskCheckController {
                 List<Long> ids = new ArrayList<>();
                 //获取每个填报表对应的wbs_tree_private的id
                 for (WbsTreeContract treeContract : node) {
-//                    WbsTreePrivate wbsTreePrivate = wbsTreePrivateClient.queryPeersNodeByProjectIdAndId(treeContract.getProjectId(), treeContract.getId());
-//                    ids.add(wbsTreePrivate.getPKeyId());
-                    if (StringUtils.isNotBlank(treeContract.getIsTypePrivatePid()+"")){
-                        ids.add(treeContract.getIsTypePrivatePid());
-                    }
+                    WbsTreePrivate wbsTreePrivate = wbsTreePrivateClient.queryPeersNodeByProjectIdAndId(treeContract.getProjectId(), treeContract.getId());
+                    ids.add(wbsTreePrivate.getPKeyId());
+//                    if (StringUtils.isNotBlank(treeContract.getIsTypePrivatePid()+"")){
+//                        ids.add(treeContract.getIsTypePrivatePid());
+//                    }
                 }
                 JSONObject object = new JSONObject();
                 object.put("privatePKeyId",ids);
                 List<JSONObject> jsonList = this.queryTableEVisaConfig(object);
                 if (jsonList == null || jsonList.size() <= 0) {
-                    return R.data(300, false, "未找到符合电签配置的相关流程，请联系服务人员处理");
+                    return R.data(300, false, contract.getNodeName() +":未找到符合电签配置的相关流程，请联系服务人员处理");
                 }
 
                 //汇总电签配置的审批角色

blade-service/blade-business/src/main/java/org/springblade/business/controller/InformationWriteQueryController.java

@@ -2529,6 +2529,12 @@ public class InformationWriteQueryController extends BladeController {
         StringBuilder parentNodeName = new StringBuilder();
         this.currentNodeAllParent(parentNodeName, removeNode);
 
+        //判断是否子节点有上报或审批过的资料
+        List<InformationQuery> list = informationQueryService.selectChildrenNodeInfo(removeNode);
+        if (list != null && list.size() >= 1){
+            return R.data(300, false, "存在已经上报或审批的节点，不允许删除");
+        }
+
         //查询所有子节点
         List<WbsTreeContract> removeNodeList = jdbcTemplate.query("select p_key_id,type from m_wbs_tree_contract where is_deleted = 0 and contract_id = " + removeNode.getContractId() + " and ancestors like '%" + removeNode.getId() + "%'", new BeanPropertyRowMapper<>(WbsTreeContract.class));
         //获取pKeyId

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

@@ -123,4 +123,5 @@ public interface InformationQueryMapper extends BaseMapper<InformationQuery> {
     // 获取当前节点下,所有表单的字段数据,根据表名
     List<QueryProcessDataVO> getNodeChildTabColsAllByTabName(String tabName);
 
+    List<InformationQuery> selectChildrenNodeInfo(@Param("node") WbsTreeContract node);
 }

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

@@ -832,5 +832,11 @@
                   in ( #{tabName} )
         GROUP BY table_name
     </select>
+    <select id="selectChildrenNodeInfo" resultType="org.springblade.business.entity.InformationQuery">
+        SELECT * FROM u_information_query
+        WHERE wbs_id in (SELECT p_key_id FROM m_wbs_tree_contract
+                        WHERE ancestors LIKE concat('%', #{node.id}, '%') AND  contract_id = #{node.contractId} AND is_deleted = 0 or p_key_id =#{node.pKeyId})
+        AND status IN (1,2)
+    </select>
 
 </mapper>

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

@@ -14,7 +14,7 @@ public interface MetadataClassificationMapper extends BaseMapper<MetadataClassif
 
     MetadataClassification classificationDetail(@Param("type") Integer type);
     void alterTabFiled(@Param("tabName") String containerInitTabName, @Param("fieldName") String initTabFieldName, @Param("fieldType") String fieldType, @Param("fieldLength") Integer fieldLength);
-    void updateFiledType(@Param("tabName") String containerInitTabName, @Param("fieldName") String initTabFieldName, @Param("fieldType") String fieldType, @Param("fieldLength") Integer fieldLength);
+    void updateFiledType(@Param("tabName") String containerInitTabName, @Param("fieldName") String initTabFieldName,@Param("fieldNameNow") String initTabFieldNameNow, @Param("fieldType") String fieldType, @Param("fieldLength") Integer fieldLength);
     MetadataClassification selectMetadaOne(@Param("containerName") String containerName,@Param("code") String code,@Param("fieldKey") String fieldKey,@Param("id") Long id);
 
     void updateMetadataBytype(@Param("ids") List<Long> ids, @Param("type") String type);

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

@@ -29,16 +29,16 @@
     </insert>
 
     <update id="updateFiledType">
-        alter table ${tabName} MODIFY ${fieldName} ${fieldType}(${fieldLength})
+        ALTER TABLE ${tabName} CHANGE `${fieldName}` `${fieldNameNow}` ${fieldType}(${fieldLength})
     </update>
 
     <update id="alterTabFiled">
-        alter table ${tabName} add column ${fieldName} ${fieldType}(${fieldLength})
+        alter table ${tabName} add column `${fieldName}` ${fieldType}(${fieldLength})
     </update>
 
 
     <update id="deleteTableField">
-        alter table ${containerInitTabName} drop column ${fieldKey}
+        alter table ${containerInitTabName} drop column `${fieldKey}`
     </update>
 
     <update id="updateData">

blade-service/blade-business/src/main/java/org/springblade/business/service/IInformationQueryService.java

@@ -144,4 +144,5 @@ public interface IInformationQueryService extends BaseService<InformationQuery>
     //根据节点获取首件数据
     InformationQuery getFirstInfoByWbsId(String wbsId);
 
+    List<InformationQuery> selectChildrenNodeInfo(WbsTreeContract node);
 }

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

@@ -872,4 +872,9 @@ public class InformationQueryServiceImpl extends BaseServiceImpl<InformationQuer
         return this.getOne(new LambdaQueryWrapper<InformationQuery>().eq(InformationQuery::getWbsId, wbsId).eq(InformationQuery::getStatus, 0).eq(InformationQuery::getType, 3).last("limit 1"));
     }
 
+    @Override
+    public List<InformationQuery> selectChildrenNodeInfo(WbsTreeContract node) {
+        return this.baseMapper.selectChildrenNodeInfo(node);
+    }
+
 }

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

@@ -92,10 +92,12 @@ public class MetadataClassificationServiceImpl
                     filetype = "datetime";
                     fileLength = 6;
                 }
+                String oldFieldKey = obj.getFieldKey();
+                obj.setFieldKey("file_key_"+obj.getCode().toLowerCase());
                 obj.setUpdateTime(new Date());
                 obj.setUpdateUser(user.getUserId());
                 baseMapper.updateById(obj);
-                baseMapper.updateFiledType(obj.getContainerInitTabName(),obj.getFieldKey(),filetype,fileLength);
+                baseMapper.updateFiledType(obj.getContainerInitTabName(),oldFieldKey,obj.getFieldKey(),filetype,fileLength);
             }
             return true;
         } catch (Exception e) {

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ArchiveTreeContractMapper.xml

@@ -396,6 +396,7 @@
         select matc1.*,if((SELECT COUNT(*) from m_archive_tree_contract matc WHERE matc.parent_id = matc1.id)=0,true,false)
             as notExsitChild
         from m_archive_tree_contract matc1 WHERE matc1.parent_id = #{nodeId} and matc1.is_deleted =0
+        ORDER BY sort
     </select>
     <select id="getAuthCodeList" resultMap="archiveTreeContractResultMap">
         SELECT
@@ -417,7 +418,7 @@
         FROM
         m_archive_tree_contract d
         WHERE
-        d.is_deleted = 0
+        d.is_deleted = 0 and d.id in
         <foreach item="id" collection="idsList" open="(" close=")" separator=",">
             #{id}
         </foreach>