Browse Source

11111111111111

zhouli 8 months ago
parent
commit
9bb155c156

+ 0 - 2
kd-service/kd-scientific/src/main/java/org/sky/scientific/controller/ArchiveCenterController.java

@@ -13,7 +13,6 @@ import lombok.AllArgsConstructor;
 import lombok.SneakyThrows;
 import org.sky.core.boot.ctrl.KdController;
 import org.sky.core.tool.api.R;
-import org.sky.core.tool.utils.DateUtil;
 import org.sky.core.tool.utils.FileUtil;
 import org.sky.scientific.mapper.DownloadTaskMapper;
 import org.sky.scientific.pojo.entity.ArchiveAttachEntity;
@@ -125,7 +124,6 @@ public class ArchiveCenterController extends KdController {
 		} else {
 			DownloadTask task = new DownloadTask();
 			task.setYearAndMonth(year);
-			task.setExpireTime(DateUtil.plusDays(new Date(), 1));
 			int result = downloadTaskMapper.insert(task);
 			if (result == 1) {
 				response.setContentType("application/json;charset=UTF-8");

+ 1 - 0
kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/ArchiveServiceImpl.java

@@ -384,6 +384,7 @@ public class ArchiveServiceImpl implements IArchiveService {
 		//设置任务状态为 已完成
 		task.setStatus(2);
 		task.setZipUrl(zipPath);
+		task.setExpireTime(DateUtil.plusDays(new Date(), 1));
 		downloadTaskMapper.updateById(task);
 		System.out.println("一键导出耗时:" + l / 1000 + "秒");
 	}

+ 1 - 1
kd-service/kd-scientific/src/main/java/org/sky/scientific/service/impl/EnterpriseInfoServiceImpl.java

@@ -565,7 +565,7 @@ public class EnterpriseInfoServiceImpl extends BaseServiceImpl<EnterpriseInfoMap
 			throw new ServiceException("参数year为年份,如2025");
 		}
 		A107012VO vo = new A107012VO();
-		A107012 one = a107012Mapper.selectOne(Wrappers.<A107012>lambdaQuery().eq(A107012::getYearAndMonth, year));
+		A107012 one = a107012Mapper.selectOne(Wrappers.<A107012>lambdaQuery().eq(A107012::getYearAndMonth, year).eq(A107012::getTenantId, SecureUtil.getTenantId()));
 
 		BigDecimal d43 = new BigDecimal("0.00"), d44 = new BigDecimal("0.00"), d46 = new BigDecimal("0.00"), d48 = new BigDecimal("0.00"), d49 = new BigDecimal("0.00");
 		if (Func.notNull(one)) {