From 994eca1b0c785c3a8b4bae7f53e8e18ac276690f Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Tue, 3 Feb 2026 11:12:14 +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 --- .../business/service/impl/GyzjServiceImpl.java | 47 +++++++++++---------- .../hxhq/business/service/impl/MjyServiceImpl.java | 49 +++++++++++----------- .../hxhq/business/service/impl/SjServiceImpl.java | 20 ++++----- 3 files changed, 59 insertions(+), 57 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 f673fa3..ec6feba 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 @@ -1331,14 +1331,14 @@ public class GyzjServiceImpl extends ServiceImpl implements IG List gyzjList = new ArrayList<>(); LinkedList jcgjList = new LinkedList<>(); LinkedList tzList = new LinkedList<>(); - String empty="[]"; + String empty = "[]"; if (StringUtils.isNotEmpty(resource) && !StringUtils.equals(empty, resource)) { List studyFormFillResourceList = JSONUtil.toList(resource, StudyFormFillResource.class); - String ss="1"; - List tmp= studyFormFillResourceList.stream().filter(p -> (p.getType() == null && mark) ||(p.getType()!=null&&StudyFormFillResourceTypeEnum.gyzj.getValue()==p.getType())).collect(Collectors.toList()); + String ss = "1"; + List tmp = studyFormFillResourceList.stream().filter(p -> (p.getType() == null && mark) || (p.getType() != null && StudyFormFillResourceTypeEnum.gyzj.getValue() == p.getType())).collect(Collectors.toList()); // 根据编号获取需要处置的列表 if (tmp.size() > 0) { - List bhList= tmp.stream().map(StudyFormFillResource::getBh).collect(Collectors.toList()); + List bhList = tmp.stream().map(StudyFormFillResource::getBh).collect(Collectors.toList()); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.in(Gyzj::getBh, bhList); gyzjList = this.list(queryWrapper); @@ -1377,15 +1377,15 @@ 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())); - } + studyFormFillResource.setType(StudyFormFillResourceTypeEnum.gyzj.getValue()); + } else { + //使用的才更新 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())); } } // 使用 @@ -1409,36 +1409,37 @@ public class GyzjServiceImpl extends ServiceImpl implements IG studyFormFill.setResource(JSONObject.toJSONString(studyFormFillResourceList)); } // 处置、存储 - czCc(studyFormFill,gyzjMap,jcgjList,tzList,remark,qmr); + czCc(studyFormFill, gyzjMap, jcgjList, tzList, remark, qmr); } - if(jcgjList.size()>0){ + if (jcgjList.size() > 0) { gyzjJcgjService.saveBatch(jcgjList); } - if(tzList.size()>0){ + if (tzList.size() > 0) { gyzjTzService.saveBatch(tzList); } - if(gyzjList.size()>0){ + if (gyzjList.size() > 0) { studyGyzjService.saveBatch(studyId, gyzjList); } } /** * 处置、存储 + * * @param studyFormFill * @param gyzjMap * @param jcgjList * @param tzList * @param remark */ - public void czCc(StudyFormFill studyFormFill,Map gyzjMap,LinkedList jcgjList,LinkedList tzList, String remark,SysUser qmr){ - String empty="[]"; + public void czCc(StudyFormFill studyFormFill, Map gyzjMap, LinkedList jcgjList, LinkedList tzList, String remark, SysUser qmr) { + String empty = "[]"; if (gyzjMap.size() > 0) { // 存储 String cclist = studyFormFill.getCclist(); if (StringUtils.isNotEmpty(cclist) && !StringUtils.equals(empty, cclist)) { List studyFormFillCcList = JSONUtil.toList(cclist, StudyFormFillCc.class); for (StudyFormFillCc studyFormFillCc : studyFormFillCcList) { - List list=new ArrayList<>(); + List list = new ArrayList<>(); for (String bh : studyFormFillCc.getList()) { Gyzj gyzj = gyzjMap.get(bh); if (gyzj != null) { @@ -1452,7 +1453,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG tzList.add(gyzjTzService.getTzGen(gyzj.getId(), null, null, null, null, null, null, null, null, qmr, "存储", gyzj.getKc(), gyzj.getKcdw(), remark, studyFormFill.getId())); } } - if(list.size()>0){ + if (list.size() > 0) { baseMapper.updateCc(list, studyFormFillCc.getCctj(), studyFormFillCc.getCcwz()); } } @@ -1463,7 +1464,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG if (StringUtils.isNotEmpty(czlist) && !StringUtils.equals(empty, czlist)) { List studyFormFillCzList = JSONUtil.toList(czlist, StudyFormFillCz.class); for (StudyFormFillCz studyFormFillCz : studyFormFillCzList) { - List list=new ArrayList<>(); + List list = new ArrayList<>(); for (String bh : studyFormFillCz.getList()) { Gyzj gyzj = gyzjMap.get(bh); if (gyzj != null) { @@ -1478,7 +1479,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG tzList.add(gyzjTzService.getTzGen(gyzj.getId(), null, null, null, null, null, null, null, null, qmr, "处置", gyzj.getKc(), gyzj.getKcdw(), remark, studyFormFill.getId())); } } - if(list.size()>0) { + if (list.size() > 0) { baseMapper.updateKcBatch(list, "0"); } } 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 74da2b8..d88667d 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 @@ -1234,13 +1234,13 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS List mjyList = new ArrayList<>(); LinkedList jcgjList = new LinkedList<>(); LinkedList tzList = new LinkedList<>(); - String empty="[]"; + String empty = "[]"; if (StringUtils.isNotEmpty(resource) && !StringUtils.equals(empty, resource)) { List studyFormFillResourceList = JSONUtil.toList(resource, StudyFormFillResource.class); - List tmp= studyFormFillResourceList.stream().filter(p -> (p.getType() == null && mark) || (p.getType()!=null&&StudyFormFillResourceTypeEnum.mjy.getValue()==p.getType())).collect(Collectors.toList()); + List tmp = studyFormFillResourceList.stream().filter(p -> (p.getType() == null && mark) || (p.getType() != null && StudyFormFillResourceTypeEnum.mjy.getValue() == p.getType())).collect(Collectors.toList()); // 根据编号获取需要处置的列表 if (tmp.size() > 0) { - List bhList =tmp.stream().map(StudyFormFillResource::getBh).collect(Collectors.toList()); + List bhList = tmp.stream().map(StudyFormFillResource::getBh).collect(Collectors.toList()); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.in(Mjy::getBh, bhList); mjyList = this.list(queryWrapper); @@ -1280,15 +1280,15 @@ 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())); - } + studyFormFillResource.setType(StudyFormFillResourceTypeEnum.mjy.getValue()); + } else { + //使用的才更新 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())); } } // 使用 @@ -1312,39 +1312,40 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS studyFormFill.setResource(JSONObject.toJSONString(studyFormFillResourceList)); } // 处置、存储 - czCc(studyFormFill,mjyMap,jcgjList,tzList,remark,qmr); + czCc(studyFormFill, mjyMap, jcgjList, tzList, remark, qmr); } - if(jcgjList.size()>0){ + if (jcgjList.size() > 0) { mjyJcgjService.saveBatch(jcgjList); } - if(tzList.size()>0){ + if (tzList.size() > 0) { mjyTzService.saveBatch(tzList); } - if(mjyList.size()>0){ + if (mjyList.size() > 0) { studyMjyService.saveBatch(studyId, mjyList); } } /** * 处置、存储 + * * @param studyFormFill * @param mjyMap * @param jcgjList * @param tzList * @param remark */ - public void czCc(StudyFormFill studyFormFill,Map mjyMap,LinkedList jcgjList,LinkedList tzList, String remark,SysUser qmr){ - String empty="[]"; + public void czCc(StudyFormFill studyFormFill, Map mjyMap, LinkedList jcgjList, LinkedList tzList, String remark, SysUser qmr) { + String empty = "[]"; if (mjyMap.size() > 0) { // 存储 String cclist = studyFormFill.getCclist(); if (StringUtils.isNotEmpty(cclist) && !StringUtils.equals(empty, cclist)) { List studyFormFillCcList = JSONUtil.toList(cclist, StudyFormFillCc.class); for (StudyFormFillCc studyFormFillCc : studyFormFillCcList) { - List list=new ArrayList<>(); + List list = new ArrayList<>(); for (String bh : studyFormFillCc.getList()) { Mjy mjy = mjyMap.get(bh); - if(mjy!=null){ + if (mjy != null) { list.add(bh); // 稽查轨迹 HashMap formData = new HashMap<>(2); @@ -1355,7 +1356,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS tzList.add(mjyTzService.getTzGen(mjy.getId(), null, null, null, null, null, null, null, null, qmr, "存储", mjy.getKc(), mjy.getKcdw(), remark, studyFormFill.getId())); } } - if(list.size()>0){ + if (list.size() > 0) { baseMapper.updateCc(list, studyFormFillCc.getCctj(), studyFormFillCc.getCcwz()); } } @@ -1366,10 +1367,10 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS if (StringUtils.isNotEmpty(czlist) && !StringUtils.equals(empty, czlist)) { List studyFormFillCzList = JSONUtil.toList(czlist, StudyFormFillCz.class); for (StudyFormFillCz studyFormFillCz : studyFormFillCzList) { - List list=new ArrayList<>(); + List list = new ArrayList<>(); for (String bh : studyFormFillCz.getList()) { Mjy mjy = mjyMap.get(bh); - if(mjy!=null){ + if (mjy != null) { list.add(bh); // 稽查轨迹 HashMap formData = new HashMap<>(2); @@ -1381,7 +1382,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS tzList.add(mjyTzService.getTzGen(mjy.getId(), null, null, null, null, null, null, null, null, qmr, "处置", mjy.getKc(), mjy.getKcdw(), remark, studyFormFill.getId())); } } - if(list.size()>0) { + if (list.size() > 0) { baseMapper.updateKcBatch(list, "0"); } } 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 bf99bea..91bc908 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 @@ -707,16 +707,16 @@ 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())); - } + studyFormFillResource.setType(StudyFormFillResourceTypeEnum.sj.getValue()); + }else{ + //使用的才更新 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())); } } // 使用