From c5a46077a750a187b095c8ddb6ec288a4e94b9d6 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Mon, 26 Jan 2026 20:25:42 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A[=E8=AF=95=E9=AA=8C=E7=AE=A1?= =?UTF-8?q?=E7=90=86]=E8=A1=A8=E5=8D=95=E6=9B=B4=E6=96=B0=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hxhq/business/mapper/StudyFormApplyMapper.java | 21 ++++++++++++ .../hxhq/business/mapper/StudyFormPlanMapper.java | 21 ++++++++++++ .../hxhq/business/mapper/StudyFormPreMapper.java | 21 ++++++++++++ .../business/service/impl/GyzjServiceImpl.java | 7 ++++ .../service/impl/StudyFormApplyServiceImpl.java | 40 +++------------------- .../service/impl/StudyFormFillServiceImpl.java | 27 ++++----------- .../service/impl/StudyFormPlanServiceImpl.java | 22 ++++-------- .../service/impl/StudyFormPreServiceImpl.java | 22 ++++-------- .../com/hxhq/business/utils/lang/GyzjJcnrUtil.java | 3 +- .../com/hxhq/business/utils/lang/MjyJcnrUtil.java | 2 +- .../hxhq/business/utils/pdf/resource/Dosage.java | 2 +- .../mapper/business/StudyFormApplyMapper.xml | 13 +++++++ .../mapper/business/StudyFormPlanMapper.xml | 13 +++++++ .../mapper/business/StudyFormPreMapper.xml | 13 +++++++ 14 files changed, 135 insertions(+), 92 deletions(-) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormApplyMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormApplyMapper.java index 648f9ad..5d75d18 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormApplyMapper.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormApplyMapper.java @@ -32,4 +32,25 @@ public interface StudyFormApplyMapper extends BaseMapper * @return */ StudyFormApply queryInfo(@Param("id") Long id); + + /** + * 更新表单内容 + * @param id + * @param bdnr + */ + void updateBdnr(@Param("id") Long id,@Param("bdnr") String bdnr,@Param("zdxgjl") String zdxgjl,@Param("syId") Long syId,@Param("bmId") Long bmId,@Param("sdId") Long sdId); + + /** + * 更新复核意见 + * @param id + * @param fhyjjl + */ + void updateFhyjjl(@Param("id") Long id,@Param("fhyjjl") String fhyjjl); + + /** + * 更新字段勾选记录 + * @param id + * @param zdgxjl + */ + void updateZdgxjl(@Param("id") Long id,@Param("zdgxjl") String zdgxjl); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormPlanMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormPlanMapper.java index 539935c..3b2b1ad 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormPlanMapper.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormPlanMapper.java @@ -30,4 +30,25 @@ public interface StudyFormPlanMapper extends BaseMapper * @return */ StudyFormPlan queryInfo(@Param("id") Long id); + + /** + * 更新表单内容 + * @param id + * @param bdnr + */ + void updateBdnr(@Param("id") Long id,@Param("bdnr") String bdnr,@Param("zdxgjl") String zdxgjl); + + /** + * 更新复核意见 + * @param id + * @param fhyjjl + */ + void updateFhyjjl(@Param("id") Long id,@Param("fhyjjl") String fhyjjl); + + /** + * 更新字段勾选记录 + * @param id + * @param zdgxjl + */ + void updateZdgxjl(@Param("id") Long id,@Param("zdgxjl") String zdgxjl); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormPreMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormPreMapper.java index cdc3a5a..cc802d0 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormPreMapper.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormPreMapper.java @@ -32,4 +32,25 @@ public interface StudyFormPreMapper extends BaseMapper * @return */ StudyFormPre queryInfo(@Param("id") Long id); + + /** + * 更新表单内容 + * @param id + * @param bdnr + */ + void updateBdnr(@Param("id") Long id,@Param("bdnr") String bdnr,@Param("zdxgjl") String zdxgjl); + + /** + * 更新复核意见 + * @param id + * @param fhyjjl + */ + void updateFhyjjl(@Param("id") Long id,@Param("fhyjjl") String fhyjjl); + + /** + * 更新字段勾选记录 + * @param id + * @param zdgxjl + */ + void updateZdgxjl(@Param("id") Long id,@Param("zdgxjl") String zdgxjl); } 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 e064f0a..686b14d 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 @@ -4,15 +4,21 @@ import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; +import cn.hutool.json.JSONUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hxhq.business.domain.*; import com.hxhq.business.dto.gyzj.DetailDto; import com.hxhq.business.dto.gyzj.ListDto; +import com.hxhq.business.dto.study.StudyFormFillCc; +import com.hxhq.business.dto.study.StudyFormFillCz; +import com.hxhq.business.dto.study.StudyFormFillResource; import com.hxhq.business.enums.archive.ArchiveLogTypeEnum; import com.hxhq.business.enums.zykgl.*; import com.hxhq.business.form.gyzj.*; import com.hxhq.business.service.*; +import com.hxhq.business.utils.JctUtil; import com.hxhq.business.utils.ObjectCompareUtil; import com.hxhq.common.core.exception.ServiceException; import com.hxhq.common.core.utils.DateUtils; @@ -20,6 +26,7 @@ import com.hxhq.common.core.utils.StringUtils; import com.hxhq.common.security.utils.SecurityUtils; import com.hxhq.system.api.domain.SysUser; import com.hxhq.system.service.ISysUserService; +import org.apache.commons.lang3.math.NumberUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java index 80093d6..2976710 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java @@ -574,32 +574,8 @@ public class StudyFormApplyServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); @@ -638,10 +614,8 @@ public class StudyFormApplyServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); @@ -683,13 +676,8 @@ public class StudyFormFillServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); Map formDataEn = new LinkedHashMap<>(); List studyFormFillJcgjs = new ArrayList<>(); @@ -720,11 +708,8 @@ public class StudyFormFillServiceImpl extends ServiceImpl + + + update t_study_form_apply set bdnr=#{bdnr},zdxgjl=#{zdxgjl},sy_id=#{syId},bm_id=#{bmId},sd_id=#{sdId} where id=#{id}; + + + + update t_study_form_apply set fhyjjl=#{fhyjjl} where id=#{id}; + + + + update t_study_form_apply set zdgxjl=#{zdgxjl} where id=#{id}; + + \ No newline at end of file diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPlanMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPlanMapper.xml index fdfec0e..5850153 100644 --- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPlanMapper.xml +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPlanMapper.xml @@ -22,4 +22,17 @@ join t_study ts on ts.id=t.study_id where t.id=#{id} + + + update t_study_form_plan set bdnr=#{bdnr},zdxgjl=#{zdxgjl} where id=#{id}; + + + + update t_study_form_plan set fhyjjl=#{fhyjjl} where id=#{id}; + + + + update t_study_form_plan set zdgxjl=#{zdgxjl} where id=#{id}; + + \ No newline at end of file diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPreMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPreMapper.xml index c4c78e2..f6446e1 100644 --- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPreMapper.xml +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPreMapper.xml @@ -23,4 +23,17 @@ join t_study ts on ts.id=t.study_id where t.id=#{id} + + + update t_study_form_pre set bdnr=#{bdnr},zdxgjl=#{zdxgjl} where id=#{id}; + + + + update t_study_form_pre set fhyjjl=#{fhyjjl} where id=#{id}; + + + + update t_study_form_pre set zdgxjl=#{zdgxjl} where id=#{id}; + + \ No newline at end of file