From abfcb7db68100d3a56741f807a08473813b018c2 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Tue, 14 Apr 2026 15:56:50 +0800 Subject: [PATCH] =?UTF-8?q?fix:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86]?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hxhq/business/dto/study/StudyFormFillCc.java | 9 +++++++++ .../main/java/com/hxhq/business/dto/study/StudyFormFillCz.java | 9 +++++++++ .../main/java/com/hxhq/business/service/impl/GspServiceImpl.java | 7 +++++-- .../java/com/hxhq/business/service/impl/GyzjServiceImpl.java | 6 ++++-- .../main/java/com/hxhq/business/service/impl/MjyServiceImpl.java | 6 ++++-- .../main/java/com/hxhq/business/service/impl/SjServiceImpl.java | 6 ++++-- 6 files changed, 35 insertions(+), 8 deletions(-) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/study/StudyFormFillCc.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/study/StudyFormFillCc.java index 91cac63..a453ccf 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/study/StudyFormFillCc.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/study/StudyFormFillCc.java @@ -15,9 +15,18 @@ public class StudyFormFillCc { */ private String cctj; + private String cctjqt; private String ccwz; private List list; + public String getCctjqt() { + return cctjqt; + } + + public void setCctjqt(String cctjqt) { + this.cctjqt = cctjqt; + } + public String getCctj() { return cctj; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/study/StudyFormFillCz.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/study/StudyFormFillCz.java index 4cb316b..7ad5709 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/study/StudyFormFillCz.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/study/StudyFormFillCz.java @@ -14,8 +14,17 @@ public class StudyFormFillCz { */ private String czfs; + private String czfsqt; private List list; + public String getCzfsqt() { + return czfsqt; + } + + public void setCzfsqt(String czfsqt) { + this.czfsqt = czfsqt; + } + public String getCzfs() { return czfs; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspServiceImpl.java index c0af261..e88f3ce 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GspServiceImpl.java @@ -209,9 +209,10 @@ public class GspServiceImpl extends ServiceImpl implements IGspS if (gsp != null) { list.add(gsp.getId()); // 稽查轨迹 + String other="其他"; HashMap formData = new HashMap<>(2); formData.put("存储位置", studyFormFillCc.getCcwz()); - formData.put("存储条件", studyFormFillCc.getCctj()); + formData.put("存储条件", studyFormFillCc.getCctj().equals(other)?studyFormFillCc.getCctj():studyFormFillCc.getCctjqt()); jcgjList.add(gspJcgjService.getJcgj(gsp, JcgjlxEnum.lc.getValue(), "存储", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(GyzjJcnrUtil.getMapEn(formData)), qmr, remark)); // 台账 tzList.add(gspTzService.getTzGen(gsp.getId(), null, null, null, null, null, null, null, null, qmr, "存储", gsp.getKc(), gsp.getKcdw(), remark, studyFormFill.getId())); @@ -250,8 +251,10 @@ public class GspServiceImpl extends ServiceImpl implements IGspS if (gsp != null) { list.add(gsp.getId()); // 稽查轨迹 + + String other="其他"; HashMap formData = new HashMap<>(2); - formData.put("处置方式", studyFormFillCz.getCzfs()); + formData.put("处置方式", studyFormFillCz.getCzfs().equals(other)?studyFormFillCz.getCzfs():studyFormFillCz.getCzfsqt()); formData.put("处置量", gsp.getKc() + gsp.getKcdw()); jcgjList.add(gspJcgjService.getJcgj(gsp, JcgjlxEnum.lc.getValue(), "处置", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(GyzjJcnrUtil.getMapEn(formData)), qmr, remark)); 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 8c77b27..b83705c 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 @@ -1615,9 +1615,10 @@ public class GyzjServiceImpl extends ServiceImpl implements IG if (gyzj != null) { list.add(gyzj.getId()); // 稽查轨迹 + String other="其他"; HashMap formData = new HashMap<>(2); formData.put("存储位置", studyFormFillCc.getCcwz()); - formData.put("存储条件", studyFormFillCc.getCctj()); + formData.put("存储条件", studyFormFillCc.getCctj().equals(other)?studyFormFillCc.getCctj():studyFormFillCc.getCctjqt()); jcgjList.add(gyzjJcgjService.getJcgj(gyzj, JcgjlxEnum.lc.getValue(), "存储", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(GyzjJcnrUtil.getMapEn(formData)), qmr, remark)); // 台账 tzList.add(gyzjTzService.getTzGen(gyzj.getId(), null, null, null, null, null, null, null, null, qmr, "存储", gyzj.getKc(), gyzj.getKcdw(), remark, studyFormFill.getId())); @@ -1656,8 +1657,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG if (gyzj != null) { list.add(gyzj.getId()); // 稽查轨迹 + String other="其他"; HashMap formData = new HashMap<>(2); - formData.put("处置方式", studyFormFillCz.getCzfs()); + formData.put("处置方式", studyFormFillCz.getCzfs().equals(other)?studyFormFillCz.getCzfs():studyFormFillCz.getCzfsqt()); formData.put("处置量", gyzj.getKc() + gyzj.getKcdw()); jcgjList.add(gyzjJcgjService.getJcgj(gyzj, JcgjlxEnum.lc.getValue(), "处置", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(GyzjJcnrUtil.getMapEn(formData)), qmr, remark)); 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 742cb9c..79eae06 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 @@ -1390,8 +1390,9 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS if (mjy != null) { list.add(mjy.getId()); // 稽查轨迹 + String other="其他"; HashMap formData = new HashMap<>(2); - formData.put("处置方式", studyFormFillCz.getCzfs()); + formData.put("处置方式", studyFormFillCz.getCzfs().equals(other)?studyFormFillCz.getCzfs():studyFormFillCz.getCzfsqt()); formData.put("处置量", mjy.getKc() + mjy.getKcdw()); jcgjList.add(mjyJcgjService.getJcgj(mjy, JcgjlxEnum.lc.getValue(), "处置", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(MjyJcnrUtil.getMapEn(formData)), qmr, remark)); @@ -1430,9 +1431,10 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS if (mjy != null) { list.add(mjy.getId()); // 稽查轨迹 + String other="其他"; HashMap formData = new HashMap<>(2); formData.put("存储位置", studyFormFillCc.getCcwz()); - formData.put("存储条件", studyFormFillCc.getCctj()); + formData.put("存储条件", studyFormFillCc.getCctj().equals(other)?studyFormFillCc.getCctj():studyFormFillCc.getCctjqt()); jcgjList.add(mjyJcgjService.getJcgj(mjy, JcgjlxEnum.lc.getValue(), "存储", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), JctUtil.formatStr(MjyJcnrUtil.getMapEn(formData)), qmr, remark)); // 台账 tzList.add(mjyTzService.getTzGen(mjy.getId(), null, null, null, null, null, null, null, null, qmr, "存储", mjy.getKc(), mjy.getKcdw(), remark, studyFormFill.getId())); 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 d8fa974..4db67b9 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 @@ -900,9 +900,10 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi if (sj != null) { list.add(sj.getId()); // 稽查轨迹 + String other="其他"; LinkedHashMap jcnrMap = new LinkedHashMap<>(); jcnrMap.put("存储位置", studyFormFillCc.getCcwz()); - jcnrMap.put("存储条件", studyFormFillCc.getCctj()); + jcnrMap.put("存储条件", studyFormFillCc.getCctj().equals(other)?studyFormFillCc.getCctj():studyFormFillCc.getCctjqt()); LinkedHashMap jcnrEnMap = new LinkedHashMap<>(); jcnrEnMap.put("Storage Location", studyFormFillCc.getCcwz()); @@ -946,8 +947,9 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi if (sj != null) { list.add(sj.getId()); // 稽查轨迹 + String other="其他"; LinkedHashMap jcnrMap = new LinkedHashMap<>(); - jcnrMap.put("处置方式", studyFormFillCz.getCzfs()); + jcnrMap.put("处置方式", studyFormFillCz.getCzfs().equals(other)?studyFormFillCz.getCzfs():studyFormFillCz.getCzfsqt()); jcnrMap.put("处置量", sj.getKc() + sj.getKcdw()); LinkedHashMap jcnrEnMap = new LinkedHashMap<>();