diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyMethodMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyMethodMapper.java index 7974e20..966b802 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyMethodMapper.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyMethodMapper.java @@ -18,6 +18,12 @@ import java.util.List; public interface StudyMethodMapper extends BaseMapper { + /** + * 试验方法列表 + * @param queryWrapper + * @param qmrId 签名人 + * @return 试验方法列表 + */ List queryList(@Param("ew") Wrapper queryWrapper, @Param("qmrId") Long qmrId); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/YqMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/YqMapper.java index b0c9cbd..9d8a854 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/YqMapper.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/YqMapper.java @@ -24,5 +24,10 @@ public interface YqMapper extends BaseMapper */ List queryList(@Param("ew") Wrapper queryWrapper); + /** + * 查询仪器详情 + * @param id 仪器id + * @return 仪器详情 + */ Yq queryInfo(Long id); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspService.java index 7c62f13..f431cae 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspService.java @@ -143,6 +143,7 @@ public interface IGspService extends IService /** * 试验关联的供试品列表 * @param form + * @return 供试品列表 */ List queryStudyList(GspSearchListForm form); @@ -166,21 +167,25 @@ public interface IGspService extends IService /** * 拒绝解档 + * @param form */ void refuseJd(GspGdForm form); /** * 同意借阅 + * @param form */ void agreeJy(GspJyForm form); /** * 拒绝借阅 + * @param form */ void refuseJy(GspJyForm form); /** * 档案确认归还 + * @param form */ void archiveGh(GspGdForm form); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspTzService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspTzService.java index b63b550..ef0a88e 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspTzService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGspTzService.java @@ -21,6 +21,16 @@ public interface IGspTzService extends IService */ public List queryList(GspTz gspTz); + /** + * 保存台账 + * @param gspId 供试品id + * @param qmr 签名人 + * @param qmyy 签名意义 + * @param qmyyEn 签名意义-英文 + * @param czl 操作量 + * @param czldw 操作量单位 + * @param remark 备注 + */ public void saveTz(Long gspId, SysUser qmr, String qmyy,String qmyyEn, String czl, String czldw, String remark); @@ -33,6 +43,7 @@ public interface IGspTzService extends IService * @param ffr2 发放人2 * @param qmr 签名人 * @param qmyy 签名意义 + * @param qmyyEn 签名意义-英文 * @param czl 操作量 * @param czldw 操作量单位 * @param remark 备注 @@ -42,6 +53,17 @@ public interface IGspTzService extends IService /** * 新增归还台账 + * @param gspId 供试品id + * @param ghr1 归还人1 + * @param ghr2 归还人2 + * @param jsr1 接收人1 + * @param jsr2 接收人2 + * @param qmr 签名人 + * @param qmyy 签名意义 + * @param qmyyEn 签名意义-英文 + * @param czl 操作量 + * @param czldw 操作量单位 + * @param remark 备注 */ public void saveGhTz(Long gspId, SysUser ghr1, SysUser ghr2, SysUser jsr1, SysUser jsr2, SysUser qmr, String qmyy,String qmyyEn, String czl, String czldw, String remark); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISjJcgjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISjJcgjService.java index f458fbd..b32319f 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISjJcgjService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISjJcgjService.java @@ -26,8 +26,10 @@ public interface ISjJcgjService extends IService * @param sjId 试剂id * @param jcgjlx 稽查轨迹类型:1:流程;3:编辑 * @param jcmc 稽查名称 + * @param jcmcEn 稽查名称-英文 * @param jcmcys 稽查名称颜色:1:蓝色;3:红色;5:绿色;7:橙色 * @param jcnr 稽查内容 + * @param jcnrEn 稽查内容-英文 */ public void saveJcgj(Long sjId, Integer jcgjlx, String jcmc, String jcmcEn, Integer jcmcys, String jcnr, String jcnrEn); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISjService.java index 426c68d..22c0605 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISjService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISjService.java @@ -40,13 +40,14 @@ public interface ISjService extends IService /** * 通过编号获取试剂 * @param bh 编号 + * @return 试剂 */ Sj getSjByBh(String bh); /** * 获取试剂详情 * @param id 试剂id - * @return + * @return 试剂详情 */ SjListDto getInfo(Long id); @@ -119,6 +120,7 @@ public interface ISjService extends IService /** * 试验物资列表 * @param form + * @return 试验物资列表 */ List queryStudyList(GspSearchListForm form); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISjTzService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISjTzService.java index 973700a..fbd4caf 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISjTzService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/ISjTzService.java @@ -28,7 +28,9 @@ public interface ISjTzService extends IService * @param sjId 试剂id * @param qmrId 签名人id * @param qmrMc 签名人名称 + * @param qmrMcEn 签名人名称-英文 * @param qmyy 签名意义 + * @param qmyyEn 签名意义-英文 * @param czl 操作量 * @param czldw 操作量单位 * @param remark 备注 @@ -44,6 +46,7 @@ public interface ISjTzService extends IService * @param czldw 操作量单位 * @param remark 备注 * @param qmr 签名人 + * @return 台账信息 */ SjTz genTz(Long sjId, String qmyy, String qmyyEn, String czl, String czldw, String remark, SysUser qmr); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyMethodReadService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyMethodReadService.java index a209b46..3a3e4a2 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyMethodReadService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyMethodReadService.java @@ -15,5 +15,10 @@ import java.util.List; */ public interface IStudyMethodReadService extends IService { + /** + * 试验方法已读列表 + * @param studyMethodId 试验方法id + * @return 已读列表 + */ List queryList(Long studyMethodId); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyMethodService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyMethodService.java index 16dfe70..74629cf 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyMethodService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyMethodService.java @@ -30,7 +30,10 @@ public interface IStudyMethodService extends IService */ void save(StudyMethodForm form); - /** 阅读 */ + /** + * 标记阅读 + * @param form + */ void read(StudyMethodReadForm form); /** diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyRoomHistoryService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyRoomHistoryService.java index eff5a60..4cb3897 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyRoomHistoryService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyRoomHistoryService.java @@ -28,6 +28,8 @@ public interface IStudyRoomHistoryService extends IService /** * 添加饲养间更换记录 * @param studyRoom + * @param oldLj 旧的笼具 + * @param ghr 更换人 */ void addStudyRoomHistory(StudyRoom studyRoom, String oldLj, SysUser ghr); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyRoomJcgjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyRoomJcgjService.java index 1f911f4..1426322 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyRoomJcgjService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyRoomJcgjService.java @@ -21,6 +21,17 @@ public interface IStudyRoomJcgjService extends IService */ public List queryList(StudyRoomJcgj studyRoomJcgj); + /** + * 保存稽查轨迹 + * @param studyRoomId 饲养间id + * @param jcgjlx 稽查类型 + * @param jcmc 稽查名称 + * @param jcmcEn 稽查名称-英文 + * @param jcmcys 稽查名称颜色:1:蓝色;3:红色;5:绿色;7:橙色 + * @param jcnr 稽查内容 + * @param jcnrEn 稽查内容-英文 + * @param qmr 签名人 + */ void saveJcgj(Long studyRoomId, Integer jcgjlx, String jcmc, String jcmcEn, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudySjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudySjService.java index 29cb472..fcbd1ff 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudySjService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudySjService.java @@ -22,5 +22,10 @@ public interface IStudySjService extends IService */ public List queryList(StudySj studySj); + /** + * 批量保存试验-试剂关联 + * @param studyId 试验id + * @param sjList 试剂列表 + */ void saveBatch(Long studyId, List sjList); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IYqJcgjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IYqJcgjService.java index 9976d7c..1397908 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IYqJcgjService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IYqJcgjService.java @@ -25,8 +25,10 @@ public interface IYqJcgjService extends IService * @param yqId 仪器id * @param jcgjlx 稽查轨迹类型:1:流程;3:编辑 * @param jcmc 稽查名称 + * @param jcmcEn 稽查名称-英文 * @param jcmcys 稽查名称颜色:1:蓝色;3:红色;5:绿色;7:橙色 * @param jcnr 稽查内容 + * @param jcnrEn 稽查内容-英文 */ public void saveJcgj(Long yqId, Integer jcgjlx, String jcmc, String jcmcEn, Integer jcmcys, String jcnr, String jcnrEn); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IYqService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IYqService.java index 2f3f9f7..b031a50 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IYqService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IYqService.java @@ -16,14 +16,27 @@ public interface IYqService extends IService { /** * 查询仪器管理列表 + * @param form * @return 仪器管理集合 */ public List queryList(YqSearchForm form); + /** + * 查询仪器详情 + * @param id 仪器id + * @return 仪器详情 + */ Yq queryInfo(Long id); - /** 新增仪器信息 */ + /** + * 新增仪器信息 + * @param yqForm + */ void addYq(YqForm yqForm); - + + /** + * 更新仪器 + * @param yqForm + */ void updateYq(YqForm yqForm); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java index 87d85df..241c336 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java @@ -647,7 +647,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi Long deptId = template.getDeptId(); // 生成/使用 String resource = studyFormFill.getResource(); - Map sjMap = new HashMap<>(); + Map sjMap = new HashMap<>(16); List sjList = new ArrayList<>(); LinkedList jcgjList = new LinkedList<>(); LinkedList tzList = new LinkedList<>(); @@ -806,7 +806,14 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi } } - // 处置 + /** + * 处置 + * @param studyFormFill + * @param sjMap + * @param jcgjList + * @param tzList + * @param qmr + */ private void cz(StudyFormFill studyFormFill, Map sjMap, List jcgjList, List tzList, SysUser qmr) { String empty = "[]"; // 处置,库存全变为0 diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyMethodServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyMethodServiceImpl.java index 4a9f99f..91bc53b 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyMethodServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyMethodServiceImpl.java @@ -166,7 +166,7 @@ public class StudyMethodServiceImpl extends ServiceImpl checkAllMethodReadStatus(Long userId, Long studyId, Long studySubjectId) { - HashMap result=new HashMap<>(); + HashMap result=new HashMap<>(16); Study study = studyService.getById(studyId); if(study==null){ throw new ServiceException("信息不存在"); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/CalUnitTools.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/CalUnitTools.java index 923fc31..ee37704 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/CalUnitTools.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/CalUnitTools.java @@ -11,21 +11,28 @@ import java.util.Map; /** * 单位换算工具 + * @author HanLong */ public class CalUnitTools { private static String[] unitList = {"pL", "nL", "uL", "mL", "L"}; - // 定义单位换算基准(以升L为基准单位) + /** + * 定义单位换算基准(以升L为基准单位) + */ private static final Map UNIT_TO_LITER = new HashMap<>(); static { // 初始化单位换算关系 UNIT_TO_LITER.put("L", new BigDecimal("1.0")); - UNIT_TO_LITER.put("mL", new BigDecimal("0.001")); // 毫升 - UNIT_TO_LITER.put("uL", new BigDecimal("0.000001")); // 微升 (μL,这里用uL代替) - UNIT_TO_LITER.put("nL", new BigDecimal("0.000000001")); // 纳升 - UNIT_TO_LITER.put("pL", new BigDecimal("0.000000000001")); // 皮升 + // 毫升 + UNIT_TO_LITER.put("mL", new BigDecimal("0.001")); + // 微升 (μL,这里用uL代替) + UNIT_TO_LITER.put("uL", new BigDecimal("0.000001")); + // 纳升 + UNIT_TO_LITER.put("nL", new BigDecimal("0.000000001")); + // 皮升 + UNIT_TO_LITER.put("pL", new BigDecimal("0.000000000001")); } /**