From 63211c7592b9c7b814de2756d338ffd33ac0c58f Mon Sep 17 00:00:00 2001
From: zhai <1528081232@qq.com>
Date: 星期一, 19 一月 2026 16:37:38 +0800
Subject: [PATCH] 1、提交验收按钮新增判断是否关联附件 2、借阅暂存添加不可外借新增提醒 3、成果表单借阅管理修改为借阅记录 4、合格资料模块，导出文件按钮需要添加日志 5、装盒按钮调整：需要一个确认按钮并且可以更改盒号，调整盒号时能同步展示盒号容量 6、对接斑马打印机 7、利用用户修改
---
src/main/java/com/zbooksoft/gdmis/service/impl/PhysicalDetailServiceImpl.java | 63 +++++++++++++++++++++++++++----
1 files changed, 55 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zbooksoft/gdmis/service/impl/PhysicalDetailServiceImpl.java b/src/main/java/com/zbooksoft/gdmis/service/impl/PhysicalDetailServiceImpl.java
index 0d9c509..35d19d5 100644
--- a/src/main/java/com/zbooksoft/gdmis/service/impl/PhysicalDetailServiceImpl.java
+++ b/src/main/java/com/zbooksoft/gdmis/service/impl/PhysicalDetailServiceImpl.java
@@ -4,10 +4,9 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruili.wcp.data.entity.management.User;
import com.zbooksoft.gdmis.dao.PhysicalDetailMapper;
-import com.zbooksoft.gdmis.data.entity.CatSwajxx;
-import com.zbooksoft.gdmis.data.entity.CatSwyxxx;
-import com.zbooksoft.gdmis.data.entity.PhysicalDetail;
+import com.zbooksoft.gdmis.data.entity.*;
import com.zbooksoft.gdmis.data.vo.ParentPhysicalInfo;
+import com.zbooksoft.gdmis.service.CatSwypService;
import com.zbooksoft.gdmis.service.CatSwyxxxService;
import com.zbooksoft.gdmis.service.PhysicalDetailService;
import com.zbooksoft.gdmis.service.ProcessingDetailService;
@@ -41,6 +40,9 @@
@Autowired
PhysicalDetailService physicalDetailService;
+ @Autowired
+ CatSwypService catSwypService;
+
@Override
public List<ParentPhysicalInfo> selectDistinctParentPhysicalInfo(Long createUserId) {
return this.baseMapper.selectDistinctParentPhysicalInfo(createUserId);
@@ -70,12 +72,16 @@
List<CatSwyxxx> catSwyxxxList = catSwyxxxService.list(queryWrapper);
for (CatSwyxxx catSwyxxx : catSwyxxxList) {
PhysicalDetail physicalDetail = new PhysicalDetail();
-// physicalDetail.setFileId(catSwajxx.getAjId());
+ physicalDetail.setFileId(catSwajxx.getAjId());
physicalDetail.setItemId(catSwyxxx.getId());
- physicalDetail.setFileTitle(catSwajxx.getXmmc());
- physicalDetail.setItemTitle(catSwyxxx.getZkmc());
- physicalDetail.setItemNumber(catSwyxxx.getZkbh());
- physicalDetail.setArchivalCode(catSwajxx.getSwzldh());
+
+ physicalDetail.setProjectName(catSwajxx.getXmmc());
+ physicalDetail.setProjectNum(catSwyxxx.getZkmc());
+ physicalDetail.setPosition(catSwyxxx.getZkbh());
+ physicalDetail.setSampleNum(catSwajxx.getSwzldh());
+ physicalDetail.setSampleType(catSwajxx.getSwzldh());
+ physicalDetail.setVesselVoyage(catSwajxx.getSwzldh());
+ physicalDetail.setSurveyedArea(catSwajxx.getSwzldh());
physicalDetail.setCreateTime(new Date());
physicalDetail.setCreateUserId(user.getUserId());
physicalDetail.setCreateUserName(user.getTrueName());
@@ -88,4 +94,45 @@
return count;
}
+ /**
+ * 娣诲姞瀹炵墿淇℃伅
+ *
+ * @param idList
+ */
+ @Override
+ public Integer setCgwjxxByIds(List<Long> idList) {
+
+ int count = 0;
+ Subject currentUser = SecurityUtils.getSubject();
+ Session session = currentUser.getSession();
+ User user = (User) session.getAttribute("user");
+ for (Long id : idList) {
+ CatSwyp catSwyp = catSwypService.getById(id);
+ PhysicalDetail physicalDetail = new PhysicalDetail();
+ Long ajId = catSwyp.getAjId();
+ if (ajId == null) {
+ ajId = 0L;
+ }
+ physicalDetail.setFileId(ajId);
+ physicalDetail.setItemId(catSwyp.getId());
+
+ physicalDetail.setProjectName(catSwyp.getXmmc());
+ physicalDetail.setProjectNum(catSwyp.getXmbh());
+ physicalDetail.setPosition(catSwyp.getZwmc());
+ physicalDetail.setSampleNum(catSwyp.getYpbh());
+ physicalDetail.setSampleType(catSwyp.getYplx());
+ physicalDetail.setVesselVoyage(catSwyp.getDcchc());
+ physicalDetail.setSurveyedArea(catSwyp.getDchy());
+ physicalDetail.setCreateTime(new Date());
+ physicalDetail.setCreateUserId(user.getUserId());
+ physicalDetail.setCreateUserName(user.getTrueName());
+ physicalDetail.setFormId(0L);
+ physicalDetail.setSurvey(0);
+ physicalDetail.setSampling(0);
+ physicalDetailService.saveOrUpdate(physicalDetail);
+ count++;
+ }
+ return count;
+
+ }
}
--
Gitblit v1.9.1