fix:[填报表单]优化

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<String, String> formData = new LinkedHashMap<>();
                         formData.put("使用量", syl + studyFormFillResource.getSyldw());

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<String, String> formData = new LinkedHashMap<>();

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());

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
      * @param studyFormFill
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void tj(StudyFormFill studyFormFill) {
         SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
         //验证签名人密码