档案抽检相关修改，专家账号只注册一次

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/entity/MiddleMeterApply.java

@@ -27,6 +27,8 @@ import org.springblade.core.mp.base.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * 中间计量申请表实体类
  *
@@ -59,6 +61,7 @@ public class MiddleMeterApply extends BaseEntity {
      * 合同计量期id
      */
     @ApiModelProperty(value = "合同计量期id")
+    @NotNull(message = "合同计量期id不能为null")
     private Long contractPeriodId;
     /**
      * 合同计量期期号

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

@@ -1022,7 +1022,7 @@
     </select>
     <select id="getNodeAllArchive" resultType="org.springblade.archive.entity.ArchivesAuto">
         select id,expert_id
-        from u_archives_auto where is_deleted = 0 and node_id in
+        from u_archives_auto where is_deleted = 0 and is_apply = 1 and node_id in
         <foreach collection="ids" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
@@ -1036,7 +1036,7 @@
         WHERE project_id = #{projectId} and is_deleted = 0 and is_inspect = 1 and FIND_IN_SET(#{userId},expert_id)
     </select>
     <select id="getUserInspectInfo" resultType="org.springblade.archive.vo.ExpertInspectionVO">
-        select aei.id,aei.archive_name ,aei.opinion , aei.archive_id,expert_name,
+        select aei.id,aei.archive_name ,aei.opinion , aei.archive_id,expert_name,file_id,
                (case when unit_type = 1 then '施工' when unit_type = 2 then '监理' else '业主' end) as unitName,
                (select uaf.pdf_file_url from u_archive_file uaf where uaf.id = aei.file_id) as filePdf
         from u_archive_expert_inspection aei

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchivesAutoServiceImpl.java

@@ -2922,7 +2922,7 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 	public void saveInspect(ExpertInspection inspection) {
 		//判断是否存在文件id
 		if (inspection.getFileId() == null){
-			throw new ServiceException("未获取到当前的文件id");
+			throw new ServiceException("不能直接修改合格档案，请进入档案对卷内文件填写意见");
 		}
 		//专家基本信息
 		Long userId = AuthUtil.getUserId();

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ArchiveTreeContractServiceImpl.java

@@ -43,6 +43,7 @@ import org.springblade.common.utils.ForestNodeMergerEx;
 import org.springblade.manager.vo.*;
 import org.springblade.manager.mapper.ArchiveTreeContractMapper;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.meter.vo.NodeSortVO;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -1352,7 +1353,7 @@ public class ArchiveTreeContractServiceImpl extends BaseServiceImpl<ArchiveTreeC
 	 * @return
 	 */
 	@Override
-	public List<InspectTreeVO> getUnitAllNode(Long projectId,String types) {
+	public List<InspectTreeVO> 	getUnitAllNode(Long projectId,String types) {
 		/**
 		 *  1业主2监理3施工4影像5竣工图,根据勾选的类型，返回单位首节点集合，勾选哪个单位回显哪个
 		 *   如果勾选了施工，又勾选了影像和竣工图，则只返回施工，
@@ -1383,6 +1384,9 @@ public class ArchiveTreeContractServiceImpl extends BaseServiceImpl<ArchiveTreeC
 		//结果集
 		List<InspectTreeVO> unitAllNode = baseMapper.getUnitAllNode(projectId,ownerUnit,supervisorUnit,buildUnit);
 		unitAllNode.add(firstNode);
+		List<InspectTreeVO> list = org.springblade.manager.utils.ForestNodeMerger.merge(unitAllNode);
+		List<Long> ids = new ArrayList<>();
+		gatherSortNode(list,ids);
 		return org.springblade.manager.utils.ForestNodeMerger.merge(unitAllNode);
 	}
 
@@ -1427,6 +1431,18 @@ public class ArchiveTreeContractServiceImpl extends BaseServiceImpl<ArchiveTreeC
 		return vos;
 	}
 
+	//递归方法
+	private void gatherSortNode(List<InspectTreeVO>list, List<Long> ids){
+		for (InspectTreeVO vo : list) {
+			if (vo.getChildren().size() == 0){
+				ids.add(vo.getId());
+				continue;
+			}else {
+				gatherSortNode(vo.getChildren(), ids);
+			}
+		}
+	}
+
 	/**
 	 * 在线验收-开始抽检
 	 */

blade-service/blade-meter/src/main/java/org/springblade/meter/mapper/ChangeTokenFormMapper.xml

@@ -254,8 +254,8 @@
     </select>
     <select id="getNodeFormAndMeterMoney" resultType="org.springblade.meter.vo.InventoryFormMeterVO">
         select change_build_picture_total,
-                (select sum(current_meter_total) from s_inventory_form_apply ifa where ifa.is_deleted = 0
-                        and ifa.contract_form_id = ifm.contract_form_id and ifa.contract_meter_id = ifm.contract_meter_id) as allMeterMoney
+                ifnull((select sum(current_meter_total) from s_inventory_form_apply ifa where ifa.is_deleted = 0
+                         and ifa.contract_form_id = ifm.contract_form_id and ifa.contract_meter_id = ifm.contract_meter_id),0) as allMeterMoney
         from s_inventory_form_meter ifm
         where is_deleted = 0 and contract_form_id = #{id} and contract_meter_id = #{meterId}
     </select>