eln_TD
/
eln_svr
9
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

fix:[填报表单]优化

master
15881625488@163.com 2 months ago
parent
95dd3e604f
commit
994eca1b0c
3 changed files with 59 additions and 57 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +24
    -23
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java
  2. +25
    -24
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java
  3. +10
    -10
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java

+ 24
- 23
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java View File

@ -1331,14 +1331,14 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
List<Gyzj> gyzjList = new ArrayList<>(); List<Gyzj> gyzjList = new ArrayList<>();
LinkedList<GyzjJcgj> jcgjList = new LinkedList<>(); LinkedList<GyzjJcgj> jcgjList = new LinkedList<>();
LinkedList<GyzjTz> tzList = new LinkedList<>(); LinkedList<GyzjTz> tzList = new LinkedList<>();
String empty="[]";
String empty = "[]";
if (StringUtils.isNotEmpty(resource) && !StringUtils.equals(empty, resource)) { if (StringUtils.isNotEmpty(resource) && !StringUtils.equals(empty, resource)) {
List<StudyFormFillResource> studyFormFillResourceList = JSONUtil.toList(resource, StudyFormFillResource.class); List<StudyFormFillResource> studyFormFillResourceList = JSONUtil.toList(resource, StudyFormFillResource.class);
String ss="1";
List<StudyFormFillResource> tmp= studyFormFillResourceList.stream().filter(p -> (p.getType() == null && mark) ||(p.getType()!=null&&StudyFormFillResourceTypeEnum.gyzj.getValue()==p.getType())).collect(Collectors.toList());
String ss = "1";
List<StudyFormFillResource> tmp = studyFormFillResourceList.stream().filter(p -> (p.getType() == null && mark) || (p.getType() != null && StudyFormFillResourceTypeEnum.gyzj.getValue() == p.getType())).collect(Collectors.toList());
// 根据编号获取需要处置的列表 // 根据编号获取需要处置的列表
if (tmp.size() > 0) { if (tmp.size() > 0) {
List<String> bhList= tmp.stream().map(StudyFormFillResource::getBh).collect(Collectors.toList());
List<String> bhList = tmp.stream().map(StudyFormFillResource::getBh).collect(Collectors.toList());
LambdaQueryWrapper<Gyzj> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<Gyzj> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(Gyzj::getBh, bhList); queryWrapper.in(Gyzj::getBh, bhList);
gyzjList = this.list(queryWrapper); gyzjList = this.list(queryWrapper);
@ -1377,15 +1377,15 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
} else { } else {
// this.updateById(gyzj); // 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)); 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); gyzjJcgjService.saveBatch(jcgjList);
} }
if(tzList.size()>0){
if (tzList.size() > 0) {
gyzjTzService.saveBatch(tzList); gyzjTzService.saveBatch(tzList);
} }
if(gyzjList.size()>0){
if (gyzjList.size() > 0) {
studyGyzjService.saveBatch(studyId, gyzjList); studyGyzjService.saveBatch(studyId, gyzjList);
} }
} }
/** /**
* 处置、存储 * 处置、存储
*
* @param studyFormFill * @param studyFormFill
* @param gyzjMap * @param gyzjMap
* @param jcgjList * @param jcgjList
* @param tzList * @param tzList
* @param remark * @param remark
*/ */
public void czCc(StudyFormFill studyFormFill,Map<String, Gyzj> gyzjMap,LinkedList<GyzjJcgj> jcgjList,LinkedList<GyzjTz> tzList, String remark,SysUser qmr){
String empty="[]";
public void czCc(StudyFormFill studyFormFill, Map<String, Gyzj> gyzjMap, LinkedList<GyzjJcgj> jcgjList, LinkedList<GyzjTz> tzList, String remark, SysUser qmr) {
String empty = "[]";
if (gyzjMap.size() > 0) { if (gyzjMap.size() > 0) {
// 存储 // 存储
String cclist = studyFormFill.getCclist(); String cclist = studyFormFill.getCclist();
if (StringUtils.isNotEmpty(cclist) && !StringUtils.equals(empty, cclist)) { if (StringUtils.isNotEmpty(cclist) && !StringUtils.equals(empty, cclist)) {
List<StudyFormFillCc> studyFormFillCcList = JSONUtil.toList(cclist, StudyFormFillCc.class); List<StudyFormFillCc> studyFormFillCcList = JSONUtil.toList(cclist, StudyFormFillCc.class);
for (StudyFormFillCc studyFormFillCc : studyFormFillCcList) { for (StudyFormFillCc studyFormFillCc : studyFormFillCcList) {
List<String> list=new ArrayList<>();
List<String> list = new ArrayList<>();
for (String bh : studyFormFillCc.getList()) { for (String bh : studyFormFillCc.getList()) {
Gyzj gyzj = gyzjMap.get(bh); Gyzj gyzj = gyzjMap.get(bh);
if (gyzj != null) { 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())); 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()); 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)) { if (StringUtils.isNotEmpty(czlist) && !StringUtils.equals(empty, czlist)) {
List<StudyFormFillCz> studyFormFillCzList = JSONUtil.toList(czlist, StudyFormFillCz.class); List<StudyFormFillCz> studyFormFillCzList = JSONUtil.toList(czlist, StudyFormFillCz.class);
for (StudyFormFillCz studyFormFillCz : studyFormFillCzList) { for (StudyFormFillCz studyFormFillCz : studyFormFillCzList) {
List<String> list=new ArrayList<>();
List<String> list = new ArrayList<>();
for (String bh : studyFormFillCz.getList()) { for (String bh : studyFormFillCz.getList()) {
Gyzj gyzj = gyzjMap.get(bh); Gyzj gyzj = gyzjMap.get(bh);
if (gyzj != null) { 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())); 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"); baseMapper.updateKcBatch(list, "0");
} }
} }

+ 25
- 24
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java View File

@ -1234,13 +1234,13 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
List<Mjy> mjyList = new ArrayList<>(); List<Mjy> mjyList = new ArrayList<>();
LinkedList<MjyJcgj> jcgjList = new LinkedList<>(); LinkedList<MjyJcgj> jcgjList = new LinkedList<>();
LinkedList<MjyTz> tzList = new LinkedList<>(); LinkedList<MjyTz> tzList = new LinkedList<>();
String empty="[]";
String empty = "[]";
if (StringUtils.isNotEmpty(resource) && !StringUtils.equals(empty, resource)) { if (StringUtils.isNotEmpty(resource) && !StringUtils.equals(empty, resource)) {
List<StudyFormFillResource> studyFormFillResourceList = JSONUtil.toList(resource, StudyFormFillResource.class); List<StudyFormFillResource> studyFormFillResourceList = JSONUtil.toList(resource, StudyFormFillResource.class);
List<StudyFormFillResource> tmp= studyFormFillResourceList.stream().filter(p -> (p.getType() == null && mark) || (p.getType()!=null&&StudyFormFillResourceTypeEnum.mjy.getValue()==p.getType())).collect(Collectors.toList());
List<StudyFormFillResource> tmp = studyFormFillResourceList.stream().filter(p -> (p.getType() == null && mark) || (p.getType() != null && StudyFormFillResourceTypeEnum.mjy.getValue() == p.getType())).collect(Collectors.toList());
// 根据编号获取需要处置的列表 // 根据编号获取需要处置的列表
if (tmp.size() > 0) { if (tmp.size() > 0) {
List<String> bhList =tmp.stream().map(StudyFormFillResource::getBh).collect(Collectors.toList());
List<String> bhList = tmp.stream().map(StudyFormFillResource::getBh).collect(Collectors.toList());
LambdaQueryWrapper<Mjy> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<Mjy> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(Mjy::getBh, bhList); queryWrapper.in(Mjy::getBh, bhList);
mjyList = this.list(queryWrapper); mjyList = this.list(queryWrapper);
@ -1280,15 +1280,15 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
} else { } else {
// this.updateById(mjy); // 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)); 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); mjyJcgjService.saveBatch(jcgjList);
} }
if(tzList.size()>0){
if (tzList.size() > 0) {
mjyTzService.saveBatch(tzList); mjyTzService.saveBatch(tzList);
} }
if(mjyList.size()>0){
if (mjyList.size() > 0) {
studyMjyService.saveBatch(studyId, mjyList); studyMjyService.saveBatch(studyId, mjyList);
} }
} }
/** /**
* 处置、存储 * 处置、存储
*
* @param studyFormFill * @param studyFormFill
* @param mjyMap * @param mjyMap
* @param jcgjList * @param jcgjList
* @param tzList * @param tzList
* @param remark * @param remark
*/ */
public void czCc(StudyFormFill studyFormFill,Map<String, Mjy> mjyMap,LinkedList<MjyJcgj> jcgjList,LinkedList<MjyTz> tzList, String remark,SysUser qmr){
String empty="[]";
public void czCc(StudyFormFill studyFormFill, Map<String, Mjy> mjyMap, LinkedList<MjyJcgj> jcgjList, LinkedList<MjyTz> tzList, String remark, SysUser qmr) {
String empty = "[]";
if (mjyMap.size() > 0) { if (mjyMap.size() > 0) {
// 存储 // 存储
String cclist = studyFormFill.getCclist(); String cclist = studyFormFill.getCclist();
if (StringUtils.isNotEmpty(cclist) && !StringUtils.equals(empty, cclist)) { if (StringUtils.isNotEmpty(cclist) && !StringUtils.equals(empty, cclist)) {
List<StudyFormFillCc> studyFormFillCcList = JSONUtil.toList(cclist, StudyFormFillCc.class); List<StudyFormFillCc> studyFormFillCcList = JSONUtil.toList(cclist, StudyFormFillCc.class);
for (StudyFormFillCc studyFormFillCc : studyFormFillCcList) { for (StudyFormFillCc studyFormFillCc : studyFormFillCcList) {
List<String> list=new ArrayList<>();
List<String> list = new ArrayList<>();
for (String bh : studyFormFillCc.getList()) { for (String bh : studyFormFillCc.getList()) {
Mjy mjy = mjyMap.get(bh); Mjy mjy = mjyMap.get(bh);
if(mjy!=null){
if (mjy != null) {
list.add(bh); list.add(bh);
// 稽查轨迹 // 稽查轨迹
HashMap<String, String> formData = new HashMap<>(2); HashMap<String, String> 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())); 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()); 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)) { if (StringUtils.isNotEmpty(czlist) && !StringUtils.equals(empty, czlist)) {
List<StudyFormFillCz> studyFormFillCzList = JSONUtil.toList(czlist, StudyFormFillCz.class); List<StudyFormFillCz> studyFormFillCzList = JSONUtil.toList(czlist, StudyFormFillCz.class);
for (StudyFormFillCz studyFormFillCz : studyFormFillCzList) { for (StudyFormFillCz studyFormFillCz : studyFormFillCzList) {
List<String> list=new ArrayList<>();
List<String> list = new ArrayList<>();
for (String bh : studyFormFillCz.getList()) { for (String bh : studyFormFillCz.getList()) {
Mjy mjy = mjyMap.get(bh); Mjy mjy = mjyMap.get(bh);
if(mjy!=null){
if (mjy != null) {
list.add(bh); list.add(bh);
// 稽查轨迹 // 稽查轨迹
HashMap<String, String> formData = new HashMap<>(2); HashMap<String, String> 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())); 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"); baseMapper.updateKcBatch(list, "0");
} }
} }

+ 10
- 10
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/SjServiceImpl.java View File

@ -707,16 +707,16 @@ public class SjServiceImpl extends ServiceImpl implements ISjServi
} else { } else {
// this.updateById(sj); // 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()));
} }
} }
// 使用 // 使用

Write Preview
Loading…
Cancel
Save