yangjun
/
dbsd_kczx_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

This commit is contained in:
yangjun 2024-08-12 20:30:48 +08:00
parent 47d9e42f61
commit c7052421fd
14 changed files with 269 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/WjxDjxxMapper.java
View File

@ -45,4 +45,8 @@ public interface WjxDjxxMapper extends BaseMapper<WjxDjxx> {
List<StudentWjglSys> exportWjglSysXls(@Param(Constants.WRAPPER)QueryWrapper<StudentWjglSys> queryWrapper, StudentWjglSys studentWjglSys);
IPage<StudentWjglSys> sysWjglList(Page<StudentWjglSys> page,@Param(Constants.WRAPPER) QueryWrapper<StudentWjglSys> 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);
}

23
jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/mapper/xml/WjxDjxxMapper.xml
View File

@ -167,7 +167,7 @@
<if test="params.userName!=null and params.userName != ''">
and y.xm like concat('%',#{params.userName},'%')
</if>
order by b.total_score desc
order by b.commit_time desc
</select>
@ -332,4 +332,25 @@
</if>
</where>
</select>
<select id="getDjnum" resultType="java.lang.String">
select count(*) as num from wjx_djxx_tmxx where vid = #{vid} and wj_index = #{wjIndex}
<if test="itemIndex != null and itemIndex != ''">
and item_index = #{itemIndex}
</if>
</select>
<select id="getDjnumType" resultType="java.lang.String">
select count(*) as num from wjx_djxx_tmxx where vid = #{vid} and wj_index = #{wjIndex}
<if test="itemIndex != null and itemIndex != ''">
and item_index = #{itemIndex}
</if>
<if test='type != null and type != "" and type=="1"'>
and item_score != '0'
</if>
<if test='type != null and type != "" and type=="2"'>
and item_score = '0'
</if>
</select>
</mapper>

12
jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxDjxx/service/impl/WjxDjxxServiceImpl.java
View File

@ -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<WjxDjxxMapper, WjxDjxx> impl
UpdateWrapper<ZyDbtx> 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 "提交成功！";
}

123
jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/controller/WjxWjxxController.java
View File

@ -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<WjxWjxx, IWjxWjxxService>
@Autowired
private IZyDbtxService zyDbtxService;
@Autowired
private IWjxWjxxTmlbService wjxWjxxTmlbService;
@ -154,6 +162,75 @@ public class WjxWjxxController extends JeecgController<WjxWjxx, IWjxWjxxService>
wjxWjxxService.save(wjxWjxx);
return Result.OK("添加成功！");
}
@AutoLog(value = "问卷发布-添加")
@ApiOperation(value="问卷发布-添加", notes="问卷发布-添加")
@PostMapping(value = "/batchAdd")
public Result<String> batchAdd(@RequestBody List<WjxWjxx> list) {
WjxWjxx zyInfo = list.get(0);
//删除老师留过的问卷，重新生成新的
QueryWrapper<WjxWjxx> query = new QueryWrapper<>();
query.eq("rwbh", zyInfo.getRwbh());
query.eq("create_by",zyInfo.getCreateBy());
query.eq("atype",zyInfo.getAtype());
List<WjxWjxx> oldList = wjxWjxxService.list(query);
wjxWjxxService.remove(query);
KcSysConfig kcSysConfig = kcSysConfigService.getById("1");
QueryWrapper<KcKechengbiao> 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<WjxWjxx> 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<String> addOne(@RequestBody WjxWjxx zyInfo) {
KcSysConfig kcSysConfig = kcSysConfigService.getById("1");
QueryWrapper<KcKechengbiao> 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<WjxWjxx> 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<WjxWjxx> 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<WjxWjxx, IWjxWjxxService>
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody WjxWjxx wjxWjxx) {
wjxWjxxService.updateById(wjxWjxx);
List<WjxWjxxTmlbPage> list =wjxWjxx.getList();
if(list.size()>0){
String mainId = list.get(0).getMainId();
QueryWrapper<WjxWjxxTmlb> wjxWjxxTmlbQueryWrapper = new QueryWrapper<WjxWjxxTmlb>();
wjxWjxxTmlbQueryWrapper.eq("main_id",mainId);
List<WjxWjxxTmlb> 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<WjxWjxx, IWjxWjxxService>
@ApiOperation(value="问卷信息-通过id删除", notes="问卷信息-通过id删除")
@DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) {
WjxWjxx zyInfo = wjxWjxxService.getById(id);
wjxWjxxService.removeById(id);
QueryWrapper<WjxWjxx> 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<WjxWjxx> list = wjxWjxxService.list(zyInfoQueryWrapper);
for(int i=0;i<list.size();i++){
WjxWjxx zyInfoPar = list.get(i);
zyInfoPar.setSort(i+1+"");
wjxWjxxService.updateById(zyInfoPar);
}
return Result.OK("删除成功!");
}
@ -415,4 +526,16 @@ public class WjxWjxxController extends JeecgController<WjxWjxx, IWjxWjxxService>
}
@ApiOperation(value="判断学生是否答过题", notes="判断学生是否答过题")
@GetMapping(value = "/querySfdtById")
public Result<WjxWjxx> 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);
}
}

23
jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/entity/WjxWjxx.java
View File

@ -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<WjxWjxxTmlbPage> list;
}

2
jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/mapper/WjxWjxxMapper.java
View File

@ -28,4 +28,6 @@ public interface WjxWjxxMapper extends BaseMapper<WjxWjxx> {
List<KccyglSys> exportSysXls(@Param(Constants.WRAPPER) QueryWrapper<KccyglSys> queryWrapper, KccyglSys kccyglSys);
WjxWjxx getByKechengId(@Param("id") String id);
String querySfdtById(@Param("id") String id, @Param("username") String username);
}

32
jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/mapper/xml/WjxWjxxMapper.xml
View File

@ -4,27 +4,9 @@
<select id="findPage" parameterType="org.jeecg.modules.kc.wjxWjxx.entity.WjxWjxx" resultType="org.jeecg.modules.kc.wjxWjxx.entity.WjxWjxx">
select
id,
create_by,
create_time,
update_by,
update_time,
creater,
atype,
title,
content,
qpublish,
compress_img,
questions,
vid,
xqxn,
rwbh,
kcmc,
xkrs,
a.*,
(select count(*) from wjx_djxx b where flag = '1' and vid = a.vid) as ywcrs,
xkrs - (SELECT count(*) FROM wjx_djxx b WHERE flag = '1' AND vid = a.vid ) AS wwcrs,
start_time,
end_time
xkrs - (SELECT count(*) FROM wjx_djxx b WHERE flag = '1' AND vid = a.vid ) AS wwcrs
from wjx_wjxx a
where rwbh = #{param.rwbh}
and xqxn = #{param.xqxn}
@ -41,7 +23,7 @@
<if test="param.id != null and param.id != ''">
and a.id = #{param.id}
</if>
order by end_time desc
order by sort asc
</select>
<select id="findStuPage" parameterType="org.jeecg.modules.kc.wjxWjxx.entity.WjxWjxx" resultType="org.jeecg.modules.kc.wjxWjxx.entity.WjxWjxx">
@ -146,4 +128,12 @@
select a.*,b.skjs from wjx_wjxx a ,kc_kechengbiao b
where a.rwbh = b.rwbh and a.create_by = b.jgh and a.xqxn = b.xqxn and a.id = #{id} limit 1
</select>
<select id="querySfdtById" resultType="java.lang.String">
select count(*) as num from wjx_wjxx a ,wjx_djxx b
where a.vid = b.vid and b.create_by = #{username} and a.id = #{id}
</select>
</mapper>

2
jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/service/IWjxWjxxService.java
View File

@ -32,4 +32,6 @@ public interface IWjxWjxxService extends IService<WjxWjxx> {
List<KccyglSys> exportSysXls(QueryWrapper<KccyglSys> queryWrapper,KccyglSys kccyglSys);
WjxWjxx getByKechengId(String id);
String querySfdtById(String id, String username);
}

9
jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/service/impl/WjxWjxxServiceImpl.java
View File

@ -286,7 +286,9 @@ public class WjxWjxxServiceImpl extends ServiceImpl<WjxWjxxMapper, WjxWjxx> 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<WjxWjxxMapper, WjxWjxx> impl
return baseMapper.getByKechengId(id);
}
@Override
public String querySfdtById(String id, String username) {
return baseMapper.querySfdtById(id,username);
}
}

10
jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/controller/WjxWjxxTmlbController.java
View File

@ -105,7 +105,7 @@ public class WjxWjxxTmlbController extends JeecgController<WjxWjxxTmlb, IWjxWjxx
HttpServletRequest req) {
QueryWrapper<WjxWjxxTmlb> queryWrapper = QueryGenerator.initQueryWrapper(wjxWjxxTmlb, req.getParameterMap());
Page<WjxWjxxTmlb> page = new Page<WjxWjxxTmlb>(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<WjxWjxxTmlb> pageList = wjxWjxxTmlbService.distinctList(page, queryWrapper);
if(pageList.getRecords()!=null){
for(WjxWjxxTmlb par:pageList.getRecords()){
@ -343,6 +343,14 @@ public class WjxWjxxTmlbController extends JeecgController<WjxWjxxTmlb, IWjxWjxx
return Result.OK(WjxWjxxTmlbList);
}
@ApiOperation(value="选项信息主表ID查询", notes="选项信息-通主表ID查询")
@GetMapping(value = "/getTmxxPeop")
public Result<List<WjxWjxxTmlb>> getTmxxPeop(@RequestParam(name="id",required=true) String id) {
List<WjxWjxxTmlb> WjxWjxxTmlbList = wjxWjxxTmlbService.getTmxxPeop(id);
return Result.OK(WjxWjxxTmlbList);
}
@ApiOperation(value="选项信息主表ID查询", notes="选项信息-通主表ID查询")
@GetMapping(value = "/queryDjByMainId")
public Result<List<WjxWjxxTmlb>> queryDjByMainId(@RequestParam(name="id",required=true) String id) {

4
jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/entity/WjxWjxxTmlb.java
View File

@ -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;
}

9
jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/entity/WjxWjxxTmxx.java
View File

@ -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;
}

2
jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/service/IWjxWjxxTmlbService.java
View File

@ -55,4 +55,6 @@ public interface IWjxWjxxTmlbService extends IService<WjxWjxxTmlb> {
List<WjxWjxxTmlb> queryDjByMainId(String id);
IPage<WjxWjxxTmlb> distinctList(Page<WjxWjxxTmlb> page, QueryWrapper<WjxWjxxTmlb> queryWrapper);
List<WjxWjxxTmlb> getTmxxPeop(String id);
}

46
jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxxTmlb/service/impl/WjxWjxxTmlbServiceImpl.java
View File

@ -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<WjxWjxxTmlbMapper, WjxWj
private WjxWjxxTmlbMapper wjxWjxxTmlbMapper;
@Autowired
private WjxWjxxTmxxMapper wjxWjxxTmxxMapper;
@Autowired
private WjxDjxxMapper wjxDjxxMapper;
@Autowired
private WjxWjxxMapper wjxWjxxMapper;
@Override
@Transactional(rollbackFor = Exception.class)
@ -140,4 +149,41 @@ public class WjxWjxxTmlbServiceImpl extends ServiceImpl<WjxWjxxTmlbMapper, WjxWj
return baseMapper.distinctList(page,queryWrapper);
}
@Override
public List<WjxWjxxTmlb> getTmxxPeop(String id) {
QueryWrapper<WjxWjxxTmlb> wjxWjxxTmlbQueryWrapper = new QueryWrapper<WjxWjxxTmlb>();
wjxWjxxTmlbQueryWrapper.eq("main_id",id);
wjxWjxxTmlbQueryWrapper.orderByAsc("wj_index");
List<WjxWjxxTmlb> 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<WjxWjxxTmxx> 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;
}
}