From c7052421fd150ca223e68291994acf889dd1691b Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Mon, 12 Aug 2024 20:30:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kc/wjxDjxx/mapper/WjxDjxxMapper.java | 4 + .../kc/wjxDjxx/mapper/xml/WjxDjxxMapper.xml | 23 +++- .../service/impl/WjxDjxxServiceImpl.java | 12 ++ .../wjxWjxx/controller/WjxWjxxController.java | 123 ++++++++++++++++++ .../modules/kc/wjxWjxx/entity/WjxWjxx.java | 23 +++- .../kc/wjxWjxx/mapper/WjxWjxxMapper.java | 2 + .../kc/wjxWjxx/mapper/xml/WjxWjxxMapper.xml | 32 ++--- .../kc/wjxWjxx/service/IWjxWjxxService.java | 2 + .../service/impl/WjxWjxxServiceImpl.java | 9 +- .../controller/WjxWjxxTmlbController.java | 10 +- .../kc/wjxWjxxTmlb/entity/WjxWjxxTmlb.java | 4 + .../kc/wjxWjxxTmlb/entity/WjxWjxxTmxx.java | 9 +- .../service/IWjxWjxxTmlbService.java | 2 + .../service/impl/WjxWjxxTmlbServiceImpl.java | 46 +++++++ 14 files changed, 269 insertions(+), 32 deletions(-) diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/WjxDjxxMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/WjxDjxxMapper.java index f988a671..c9f47ff1 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/WjxDjxxMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/WjxDjxxMapper.java @@ -45,4 +45,8 @@ public interface WjxDjxxMapper extends BaseMapper { List exportWjglSysXls(@Param(Constants.WRAPPER)QueryWrapper queryWrapper, StudentWjglSys studentWjglSys); IPage sysWjglList(Page page,@Param(Constants.WRAPPER) QueryWrapper queryWrapper, StudentWjglSys studentWjglSys); + + String getDjnum(@Param("vid")String vid, @Param("wjIndex")Integer wjIndex, @Param("itemIndex")Integer itemIndex); + + String getDjnumType(@Param("vid")String vid, @Param("wjIndex")Integer wjIndex, @Param("itemIndex")Integer itemIndex, @Param("type")String type); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/xml/WjxDjxxMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/xml/WjxDjxxMapper.xml index 22f92909..6cf60e58 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/xml/WjxDjxxMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/xml/WjxDjxxMapper.xml @@ -167,7 +167,7 @@ and y.xm like concat('%',#{params.userName},'%') - order by b.total_score desc + order by b.commit_time desc @@ -332,4 +332,25 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/service/impl/WjxDjxxServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/service/impl/WjxDjxxServiceImpl.java index b5bc6fa8..f9a1bc4e 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/service/impl/WjxDjxxServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/service/impl/WjxDjxxServiceImpl.java @@ -3,6 +3,7 @@ package org.jeecg.modules.kc.wjxDjxx.service.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.incrementer.DefaultIdentifierGenerator; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -253,6 +254,17 @@ public class WjxDjxxServiceImpl extends ServiceImpl impl + UpdateWrapper zyDbtxQx = new UpdateWrapper<>(); + zyDbtxQx.set("flag","1"); + zyDbtxQx.eq("main_id",wjxWjxx.getId()); + zyDbtxQx.eq("create_by",user.getUsername()); + zyDbtxQx.eq("type","2"); + zyDbtxService.update(zyDbtxQx); + + + + + return "提交成功！"; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/controller/WjxWjxxController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/controller/WjxWjxxController.java index 9768fac5..f7432b7e 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/controller/WjxWjxxController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/controller/WjxWjxxController.java @@ -4,6 +4,7 @@ import java.util.Arrays; import java.util.Date; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -31,14 +32,19 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; +import org.jeecg.modules.kc.wjxWjxxTmlb.entity.WjxWjxxTmlb; +import org.jeecg.modules.kc.wjxWjxxTmlb.service.IWjxWjxxTmlbService; +import org.jeecg.modules.kc.wjxWjxxTmlb.vo.WjxWjxxTmlbPage; import org.jeecg.modules.kc.zyDbtx.entity.ZyDbtx; import org.jeecg.modules.kc.zyDbtx.service.IZyDbtxService; +import org.jeecg.modules.kc.zyInfo.entity.ZyInfo; import org.jeecg.modules.system.service.impl.SysBaseApiImpl; import org.jeecg.modules.tools.WjxAuthService; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; @@ -70,6 +76,8 @@ public class WjxWjxxController extends JeecgController @Autowired private IZyDbtxService zyDbtxService; + @Autowired + private IWjxWjxxTmlbService wjxWjxxTmlbService; @@ -154,6 +162,75 @@ public class WjxWjxxController extends JeecgController wjxWjxxService.save(wjxWjxx); return Result.OK("添加成功！"); } + + @AutoLog(value = "问卷发布-添加") + @ApiOperation(value="问卷发布-添加", notes="问卷发布-添加") + @PostMapping(value = "/batchAdd") + public Result batchAdd(@RequestBody List list) { + WjxWjxx zyInfo = list.get(0); + + //删除老师留过的问卷，重新生成新的 + QueryWrapper query = new QueryWrapper<>(); + query.eq("rwbh", zyInfo.getRwbh()); + query.eq("create_by",zyInfo.getCreateBy()); + query.eq("atype",zyInfo.getAtype()); + List oldList = wjxWjxxService.list(query); + wjxWjxxService.remove(query); + + KcSysConfig kcSysConfig = kcSysConfigService.getById("1"); + QueryWrapper kcKechengbiaoQueryWrapper = new QueryWrapper<>(); + kcKechengbiaoQueryWrapper.eq("xqxn",kcSysConfig.getFlag1()); + kcKechengbiaoQueryWrapper.eq("rwbh",zyInfo.getRwbh()); + kcKechengbiaoQueryWrapper.last("limit 1"); + KcKechengbiao kcKechengbiao = kcKechengbiaoService.getOne(kcKechengbiaoQueryWrapper); + for(int i = 0; i < list.size(); i++) { + WjxWjxx par = list.get(i); + List zyInfo1 = oldList.stream().filter(zyInfo2 -> zyInfo2.getId().equals(par.getId())).collect(Collectors.toList()); + if(zyInfo1!=null && zyInfo1.size()>0){ + WjxWjxx zypar = zyInfo1.get(0); + zypar.setSort(par.getSort()); + zypar.setScore(par.getScore()); + wjxWjxxService.save(zypar); + }else{ + par.setXqxn(kcSysConfig.getFlag1()); + par.setQpublish("0"); + par.setXkrs(kcKechengbiao.getXkrs()); + par.setKcmc(kcKechengbiao.getKcmc()); + wjxWjxxService.save(par); + } + } + return Result.OK("添加成功！"); + } + + @AutoLog(value = "问卷发布-添加") + @ApiOperation(value="问卷发布-添加", notes="问卷发布-添加") + @PostMapping(value = "/addOne") + public Result addOne(@RequestBody WjxWjxx zyInfo) { + KcSysConfig kcSysConfig = kcSysConfigService.getById("1"); + QueryWrapper kcKechengbiaoQueryWrapper = new QueryWrapper<>(); + kcKechengbiaoQueryWrapper.eq("xqxn",kcSysConfig.getFlag1()); + kcKechengbiaoQueryWrapper.eq("rwbh",zyInfo.getRwbh()); + kcKechengbiaoQueryWrapper.last("limit 1"); + KcKechengbiao kcKechengbiao = kcKechengbiaoService.getOne(kcKechengbiaoQueryWrapper); + + + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + QueryWrapper zyInfoQueryWrapper = new QueryWrapper<>(); + zyInfoQueryWrapper.eq("xqxn",zyInfo.getXqxn()); + zyInfoQueryWrapper.eq("create_by",sysUser.getUsername()); + zyInfoQueryWrapper.eq("rwbh",zyInfo.getRwbh()); + zyInfoQueryWrapper.eq("atype",zyInfo.getAtype()); + List list = wjxWjxxService.list(zyInfoQueryWrapper); + + zyInfo.setSort(list.size()+1+""); + zyInfo.setXqxn(kcSysConfig.getFlag1()); + zyInfo.setQpublish("0"); + zyInfo.setXkrs(kcKechengbiao.getXkrs()); + zyInfo.setScore("0"); + zyInfo.setAtype(zyInfo.getAtype()); + wjxWjxxService.save(zyInfo); + return Result.OK("添加成功！"); + } /** * 编辑 @@ -166,6 +243,27 @@ public class WjxWjxxController extends JeecgController @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result edit(@RequestBody WjxWjxx wjxWjxx) { wjxWjxxService.updateById(wjxWjxx); + + + List list =wjxWjxx.getList(); + if(list.size()>0){ + String mainId = list.get(0).getMainId(); + + QueryWrapper wjxWjxxTmlbQueryWrapper = new QueryWrapper(); + wjxWjxxTmlbQueryWrapper.eq("main_id",mainId); + List list2 = wjxWjxxTmlbService.list(wjxWjxxTmlbQueryWrapper); + for(WjxWjxxTmlb WjxWjxxTmlb:list2){ + wjxWjxxTmlbService.removeByMainId(WjxWjxxTmlb.getId()); + } + + for(WjxWjxxTmlbPage wjxWjxxTmlbPage:list){ + WjxWjxxTmlb wjxWjxxTmlb = new WjxWjxxTmlb(); + BeanUtils.copyProperties(wjxWjxxTmlbPage, wjxWjxxTmlb); + wjxWjxxTmlbService.saveMain(wjxWjxxTmlb, wjxWjxxTmlbPage.getWjxWjxxTmxxList()); + } + } + + return Result.OK("编辑成功!"); } @@ -179,7 +277,20 @@ public class WjxWjxxController extends JeecgController @ApiOperation(value="问卷信息-通过id删除", notes="问卷信息-通过id删除") @DeleteMapping(value = "/delete") public Result delete(@RequestParam(name="id",required=true) String id) { + WjxWjxx zyInfo = wjxWjxxService.getById(id); wjxWjxxService.removeById(id); + QueryWrapper zyInfoQueryWrapper = new QueryWrapper<>(); + zyInfoQueryWrapper.eq("rwbh",zyInfo.getRwbh()); + zyInfoQueryWrapper.eq("create_by",zyInfo.getCreateBy()); + zyInfoQueryWrapper.eq("xqxn",zyInfo.getXqxn()); + zyInfoQueryWrapper.eq("atype",zyInfo.getAtype()); + zyInfoQueryWrapper.orderByAsc("sort-0"); + List list = wjxWjxxService.list(zyInfoQueryWrapper); + for(int i=0;i } + + + @ApiOperation(value="判断学生是否答过题", notes="判断学生是否答过题") + @GetMapping(value = "/querySfdtById") + public Result querySfdtById(@RequestParam(name="id",required=true) String id) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String num = wjxWjxxService.querySfdtById(id,sysUser.getUsername()); + WjxWjxx WjxWjxx = new WjxWjxx(); + WjxWjxx.setNum(num); + return Result.OK(WjxWjxx); + } + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/entity/WjxWjxx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/entity/WjxWjxx.java index 8b75ec87..86e8ecda 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/entity/WjxWjxx.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/entity/WjxWjxx.java @@ -2,10 +2,13 @@ package org.jeecg.modules.kc.wjxWjxx.entity; import java.io.Serializable; import java.util.Date; +import java.util.List; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; +import org.jeecg.modules.kc.wjxWjxxTmlb.entity.WjxWjxxTmlb; +import org.jeecg.modules.kc.wjxWjxxTmlb.vo.WjxWjxxTmlbPage; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecg.common.aspect.annotation.Dict; @@ -95,13 +98,19 @@ public class WjxWjxx implements Serializable { @TableField(exist = false) private Integer wwcrs; @ApiModelProperty(value = "开始时间") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") private Date startTime; @ApiModelProperty(value = "结束时间") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm") private Date endTime; + + private String sort;//排序 + private String score;//占比 + private String kcnr;//占比 + + @ApiModelProperty(value = "答卷状态标识") @TableField(exist = false) private String flag;// -1 未答卷 0已答卷 1已答卷查询 @@ -125,4 +134,10 @@ public class WjxWjxx implements Serializable { @TableField(exist = false) private String skjs; + + @TableField(exist = false) + private String num; + + @TableField(exist = false) + List list; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/mapper/WjxWjxxMapper.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/mapper/WjxWjxxMapper.java index 0d189c90..2cf4e3c0 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/mapper/WjxWjxxMapper.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/mapper/WjxWjxxMapper.java @@ -28,4 +28,6 @@ public interface WjxWjxxMapper extends BaseMapper { List exportSysXls(@Param(Constants.WRAPPER) QueryWrapper queryWrapper, KccyglSys kccyglSys); WjxWjxx getByKechengId(@Param("id") String id); + + String querySfdtById(@Param("id") String id, @Param("username") String username); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/mapper/xml/WjxWjxxMapper.xml b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/mapper/xml/WjxWjxxMapper.xml index b832f5f5..d54b0a39 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/mapper/xml/WjxWjxxMapper.xml +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/mapper/xml/WjxWjxxMapper.xml @@ -4,27 +4,9 @@ + + + + + \ No newline at end of file diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/service/IWjxWjxxService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/service/IWjxWjxxService.java index 7037b1a9..ade8fa28 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/service/IWjxWjxxService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/service/IWjxWjxxService.java @@ -32,4 +32,6 @@ public interface IWjxWjxxService extends IService { List exportSysXls(QueryWrapper queryWrapper,KccyglSys kccyglSys); WjxWjxx getByKechengId(String id); + + String querySfdtById(String id, String username); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/service/impl/WjxWjxxServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/service/impl/WjxWjxxServiceImpl.java index 00dfe6e9..4a7be236 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/service/impl/WjxWjxxServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/service/impl/WjxWjxxServiceImpl.java @@ -286,7 +286,9 @@ public class WjxWjxxServiceImpl extends ServiceImpl impl map.put("creater","jwctest"); map.put("atype",wjxWjxx.getAtype()); map.put("title",wjxWjxx.getTitle()); - map.put("desc",wjxWjxx.getContent()); + if(StringUtils.isNotEmpty(wjxWjxx.getContent())){ + map.put("desc",wjxWjxx.getContent()); + } map.put("publish",true); map.put("questions",questionsList.toString()); String result = wjxUtil.openapi(map,"1000101"); @@ -374,5 +376,10 @@ public class WjxWjxxServiceImpl extends ServiceImpl impl return baseMapper.getByKechengId(id); } + @Override + public String querySfdtById(String id, String username) { + return baseMapper.querySfdtById(id,username); + } + } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/controller/WjxWjxxTmlbController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/controller/WjxWjxxTmlbController.java index 82a0aabb..87742c7f 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/controller/WjxWjxxTmlbController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/controller/WjxWjxxTmlbController.java @@ -105,7 +105,7 @@ public class WjxWjxxTmlbController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(wjxWjxxTmlb, req.getParameterMap()); Page page = new Page(pageNo, pageSize); - queryWrapper.groupBy("wj_title,wj_score,wj_sytype,wj_type"); + queryWrapper.groupBy("wj_title,wj_score,wj_sytype,wj_type,wj_answer"); IPage pageList = wjxWjxxTmlbService.distinctList(page, queryWrapper); if(pageList.getRecords()!=null){ for(WjxWjxxTmlb par:pageList.getRecords()){ @@ -343,6 +343,14 @@ public class WjxWjxxTmlbController extends JeecgController> getTmxxPeop(@RequestParam(name="id",required=true) String id) { + List WjxWjxxTmlbList = wjxWjxxTmlbService.getTmxxPeop(id); + return Result.OK(WjxWjxxTmlbList); + } + @ApiOperation(value="选项信息主表ID查询", notes="选项信息-通主表ID查询") @GetMapping(value = "/queryDjByMainId") public Result> queryDjByMainId(@RequestParam(name="id",required=true) String id) { diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/entity/WjxWjxxTmlb.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/entity/WjxWjxxTmlb.java index c96ddd5b..c1671280 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/entity/WjxWjxxTmlb.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/entity/WjxWjxxTmlb.java @@ -112,4 +112,8 @@ public class WjxWjxxTmlb implements Serializable { @ApiModelProperty(value = "打开时间") @TableField(exist = false) private Date openTime; + @TableField(exist = false) + private String num; + @TableField(exist = false) + private String num2; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/entity/WjxWjxxTmxx.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/entity/WjxWjxxTmxx.java index 0b17a05c..b68c3015 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/entity/WjxWjxxTmxx.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/entity/WjxWjxxTmxx.java @@ -1,10 +1,8 @@ package org.jeecg.modules.kc.wjxWjxxTmlb.entity; import java.io.Serializable; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; + +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.jeecg.common.aspect.annotation.Dict; @@ -73,4 +71,7 @@ public class WjxWjxxTmxx implements Serializable { private java.lang.Double itemScore; private String mainId; + + @TableField(exist = false) + private String num; } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/service/IWjxWjxxTmlbService.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/service/IWjxWjxxTmlbService.java index 640d6bd1..2b071276 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/service/IWjxWjxxTmlbService.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/service/IWjxWjxxTmlbService.java @@ -55,4 +55,6 @@ public interface IWjxWjxxTmlbService extends IService { List queryDjByMainId(String id); IPage distinctList(Page page, QueryWrapper queryWrapper); + + List getTmxxPeop(String id); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/service/impl/WjxWjxxTmlbServiceImpl.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/service/impl/WjxWjxxTmlbServiceImpl.java index 99358be6..3b9c7748 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/service/impl/WjxWjxxTmlbServiceImpl.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/service/impl/WjxWjxxTmlbServiceImpl.java @@ -4,6 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.commons.lang3.StringUtils; +import org.jeecg.modules.kc.wjxDjxx.entity.WjxDjxxTmxx; +import org.jeecg.modules.kc.wjxDjxx.mapper.WjxDjxxMapper; +import org.jeecg.modules.kc.wjxWjxx.entity.WjxWjxx; +import org.jeecg.modules.kc.wjxWjxx.mapper.WjxWjxxMapper; import org.jeecg.modules.kc.wjxWjxxTmlb.entity.WjxWjxxTmlb; import org.jeecg.modules.kc.wjxWjxxTmlb.entity.WjxWjxxTmxx; import org.jeecg.modules.kc.wjxWjxxTmlb.mapper.WjxWjxxTmxxMapper; @@ -16,6 +20,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.management.Query; import java.io.Serializable; +import java.util.Collections; import java.util.Date; import java.util.List; import java.util.Collection; @@ -33,6 +38,10 @@ public class WjxWjxxTmlbServiceImpl extends ServiceImpl getTmxxPeop(String id) { + + QueryWrapper wjxWjxxTmlbQueryWrapper = new QueryWrapper(); + wjxWjxxTmlbQueryWrapper.eq("main_id",id); + wjxWjxxTmlbQueryWrapper.orderByAsc("wj_index"); + List list = wjxWjxxTmlbMapper.selectList(wjxWjxxTmlbQueryWrapper); + + WjxWjxx wjxWjxx = wjxWjxxMapper.selectById(id); + + + for(WjxWjxxTmlb WjxWjxxTmlb:list){ + if(StringUtils.equals("5",WjxWjxxTmlb.getWjType()+"")){ + String num= wjxDjxxMapper.getDjnumType(wjxWjxx.getVid(),WjxWjxxTmlb.getWjIndex(),null,"1"); + String num2= wjxDjxxMapper.getDjnumType(wjxWjxx.getVid(),WjxWjxxTmlb.getWjIndex(),null,"2"); + WjxWjxxTmlb.setNum(num); + WjxWjxxTmlb.setNum2(num2); + + } + List list2= wjxWjxxTmxxMapper.selectByMainId(WjxWjxxTmlb.getId()); + String itemSelected = ""; + for(WjxWjxxTmxx WjxWjxxTmxx:list2){ + String num= wjxDjxxMapper.getDjnum(wjxWjxx.getVid(),WjxWjxxTmxx.getWjIndex(),WjxWjxxTmxx.getItemIndex()); + if(StringUtils.equals(WjxWjxxTmxx.getItemSelected(),"true")){ + itemSelected = itemSelected+WjxWjxxTmxx.getItemIndex()+","; + } + WjxWjxxTmxx.setNum(num); + } + if(StringUtils.isNotBlank(itemSelected)){ + itemSelected = itemSelected.substring(0, itemSelected.length()-1); + } + WjxWjxxTmlb.setItemSelected(itemSelected); + WjxWjxxTmlb.setWjxWjxxTmxxList(list2); + } + return list; + } + }