From 7e169e1d1b4916e41ce896b4b8deef408ecf5605 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Tue, 3 Feb 2026 10:45:00 +0800 Subject: [PATCH] =?UTF-8?q?fix:[=E8=A1=A8=E5=8D=95=E5=A1=AB=E6=8A=A5]?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hxhq/business/service/impl/GyzjServiceImpl.java | 19 +++++++++++-------- .../hxhq/business/service/impl/MjyServiceImpl.java | 19 +++++++++++-------- .../hxhq/business/service/impl/SjServiceImpl.java | 20 +++++++++++--------- 3 files changed, 33 insertions(+), 25 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 8740645..8288f44 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 @@ -1355,17 +1355,10 @@ public class GyzjServiceImpl extends ServiceImpl implements IG gyzj.setBdId(studyFormId); gyzj.setZjzt(ZjztEnum.wrk.getValue()); gyzj.setJyzt(JyztEnum.wjy.getValue()); - }else{ - //更新 Resource - studyFormFillResource.setMc(gyzj.getMc()); - studyFormFillResource.setNd(gyzj.getNd()); - studyFormFillResource.setNddw(gyzj.getNddw()); - studyFormFillResource.setLy(gyzj.getLy()); - studyFormFillResource.setType(StudyFormFillResourceTypeEnum.gyzj.getValue()); - studyFormFillResource.setSxrq(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",gyzj.getSxrq())); } gyzj.setMc(studyFormFillResource.getMc()); gyzj.setBh(studyFormFillResource.getBh()); + gyzj.setLy(studyFormFillResource.getLy()); gyzj.setNd(String.valueOf(studyFormFillResource.getNd())); gyzj.setNddw(studyFormFillResource.getNddw()); gyzj.setKc(String.valueOf(studyFormFillResource.getKc())); @@ -1382,6 +1375,16 @@ public class GyzjServiceImpl extends ServiceImpl implements IG } else { this.updateById(gyzj); } + if (gyzj != null){ + //更新 Resource + studyFormFillResource.setMc(gyzj.getMc()); + studyFormFillResource.setNd(gyzj.getNd()); + studyFormFillResource.setNddw(gyzj.getNddw()); + studyFormFillResource.setLy(gyzj.getLy()); + if(gyzj.getSxrq()!=null){ + studyFormFillResource.setSxrq(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",gyzj.getSxrq())); + } + } } // 使用 String syl = studyFormFillResource.getSyl(); 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 d8cf730..b7ee8de 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 @@ -1258,19 +1258,12 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS mjy.setBdId(studyFormId); mjy.setZjzt(ZjztEnum.wrk.getValue()); mjy.setJyzt(JyztEnum.wjy.getValue()); - }else{ - //更新 Resource - studyFormFillResource.setMc(mjy.getMc()); - studyFormFillResource.setNd(mjy.getNd()); - studyFormFillResource.setNddw(mjy.getNddw()); - studyFormFillResource.setLy(mjy.getLy()); - studyFormFillResource.setType(StudyFormFillResourceTypeEnum.mjy.getValue()); - studyFormFillResource.setSxrq(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",mjy.getSxrq())); } mjy.setMc(studyFormFillResource.getMc()); mjy.setBh(studyFormFillResource.getBh()); mjy.setNd(String.valueOf(studyFormFillResource.getNd())); mjy.setNddw(studyFormFillResource.getNddw()); + mjy.setLy(studyFormFillResource.getLy()); mjy.setKc(String.valueOf(studyFormFillResource.getKc())); mjy.setKcdw(studyFormFillResource.getKcdw()); mjy.setSxrq(DateUtils.parseDate(studyFormFillResource.getSxrq())); @@ -1285,6 +1278,16 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS } else { this.updateById(mjy); } + if (mjy != null){ + //更新 Resource + studyFormFillResource.setMc(mjy.getMc()); + studyFormFillResource.setNd(mjy.getNd()); + studyFormFillResource.setNddw(mjy.getNddw()); + studyFormFillResource.setLy(mjy.getLy()); + if(mjy.getSxrq()!=null){ + studyFormFillResource.setSxrq(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",mjy.getSxrq())); + } + } } // 使用 String syl = studyFormFillResource.getSyl(); 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 231cc90..3fe8c8b 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 @@ -677,15 +677,6 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi sj.setZjzt(ZjztEnum.rk.getValue()); sj.setJyzt(JyztEnum.wjy.getValue()); sj.setDeptId(template.getDeptId()); - }else{ - //更新 Resource - studyFormFillResource.setMc(sj.getMc()); - studyFormFillResource.setNd(sj.getNd()); - studyFormFillResource.setNddw(sj.getNddw()); - studyFormFillResource.setPh(sj.getPh()); - studyFormFillResource.setLy(sj.getLy()); - studyFormFillResource.setType(StudyFormFillResourceTypeEnum.sj.getValue()); - studyFormFillResource.setSxrq(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",sj.getSxr())); } sj.setMc(studyFormFillResource.getMc()); sj.setBh(studyFormFillResource.getBh()); @@ -714,6 +705,17 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi } else { this.updateById(sj); } + if (sj != null){ + //更新 Resource + studyFormFillResource.setMc(sj.getMc()); + studyFormFillResource.setNd(sj.getNd()); + studyFormFillResource.setNddw(sj.getNddw()); + studyFormFillResource.setPh(sj.getPh()); + studyFormFillResource.setLy(sj.getLy()); + if(sj.getSxr()!=null){ + studyFormFillResource.setSxrq(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",sj.getSxr())); + } + } } // 使用 String syl = studyFormFillResource.getSyl();