From ba0c69b72be1f8a6eb577259dbbb98937447e4e6 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Thu, 5 Feb 2026 13:17:04 +0800 Subject: [PATCH] =?UTF-8?q?fix:[=E5=A1=AB=E6=8A=A5=E8=A1=A8=E5=8D=95]?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hxhq/business/service/impl/GyzjServiceImpl.java | 9 +++++---- .../main/java/com/hxhq/business/service/impl/MjyServiceImpl.java | 7 ++++--- .../main/java/com/hxhq/business/service/impl/SjServiceImpl.java | 1 + .../com/hxhq/business/service/impl/StudyFormFillServiceImpl.java | 2 ++ 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java index ec6feba..13ffbe8 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java @@ -20,6 +20,7 @@ import com.hxhq.business.enums.study.StudyFormFillResourceTypeEnum; import com.hxhq.business.enums.zykgl.*; import com.hxhq.business.form.gyzj.*; import com.hxhq.business.service.*; +import com.hxhq.business.utils.CalUnitTools; import com.hxhq.business.utils.JctUtil; import com.hxhq.business.utils.ObjectCompareUtil; import com.hxhq.business.utils.lang.GyzjJcnrUtil; @@ -1319,6 +1320,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG * @param remark */ @Override + @Transactional(rollbackFor = Exception.class) public void genResource(StudyFormFill studyFormFill, Template template, String remark) { Boolean mark = template.getProduct().equals(StudyFormFillResourceTypeEnum.gyzj.getValue()) ? true : false; SysUser qmr = sysUserService.selectUserById(SecurityUtils.getUserId()); @@ -1391,10 +1393,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG // 使用 String syl = studyFormFillResource.getSyl(); if (StringUtils.isNotEmpty(syl) && NumberUtils.isParsable(syl)) { - BigDecimal kc = new BigDecimal(gyzj.getKc()); - kc = kc.subtract(new BigDecimal(syl)); - gyzj.setKc(kc.toString()); - baseMapper.updateKc(gyzj.getId(), kc.toString()); + String kc = CalUnitTools.subTj(gyzj.getKc(), gyzj.getKcdw(), syl, studyFormFillResource.getSyldw()); + gyzj.setKc(kc); + baseMapper.updateKc(gyzj.getId(), kc); // 使用稽查轨迹 HashMap formData = new LinkedHashMap<>(); formData.put("使用量", syl + studyFormFillResource.getSyldw()); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java index d88667d..e751a35 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java @@ -20,6 +20,7 @@ import com.hxhq.business.enums.study.StudyFormFillResourceTypeEnum; import com.hxhq.business.enums.zykgl.*; import com.hxhq.business.form.mjy.*; import com.hxhq.business.service.*; +import com.hxhq.business.utils.CalUnitTools; import com.hxhq.business.utils.JctUtil; import com.hxhq.business.utils.ObjectCompareUtil; import com.hxhq.business.utils.lang.MjyJcnrUtil; @@ -1222,6 +1223,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS * @param remark */ @Override + @Transactional(rollbackFor = Exception.class) public void genResource(StudyFormFill studyFormFill, Template template, String remark) { Boolean mark = template.getProduct().equals(StudyFormFillResourceTypeEnum.mjy.getValue()) ? true : false; SysUser qmr = sysUserService.selectUserById(SecurityUtils.getUserId()); @@ -1294,9 +1296,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS // 使用 String syl = studyFormFillResource.getSyl(); if (StringUtils.isNotEmpty(syl) && NumberUtils.isParsable(syl)) { - BigDecimal kc = new BigDecimal(mjy.getKc()); - kc = kc.subtract(new BigDecimal(syl)); - mjy.setKc(kc.toString()); + String kc = CalUnitTools.subTj(mjy.getKc(), mjy.getKcdw(), syl, studyFormFillResource.getSyldw()); + mjy.setKc(kc); baseMapper.updateKc(mjy.getId(), kc.toString()); // 使用稽查轨迹 HashMap formData = new LinkedHashMap<>(); 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 241c336..0d33152 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 @@ -639,6 +639,7 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi } @Override + @Transactional(rollbackFor = Exception.class) public void genResource(StudyFormFill studyFormFill, Template template) { Boolean mark = template.getProduct().equals(StudyFormFillResourceTypeEnum.sj.getValue()) ? true : false; SysUser qmr = sysUserService.selectUserById(SecurityUtils.getUserId()); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java index 63c4153..249bf5f 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java @@ -32,6 +32,7 @@ import org.springframework.stereotype.Service; import com.hxhq.business.mapper.StudyFormFillMapper; import com.hxhq.business.domain.StudyFormFill; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.transaction.annotation.Transactional; /** * 试验-填报单Service业务层处理 @@ -386,6 +387,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl