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

添加功能

This commit is contained in:
yangjun 2023-04-09 16:09:53 +08:00
parent 2fbf2df4c2
commit 72727b6fd1
4 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcYuyue/controller/KcYuyueController.java
View File

@ -9,6 +9,8 @@ import java.io.UnsupportedEncodingException;
import java.net.URLDecoder; import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.util.oConvertUtils;
@ -112,7 +114,7 @@ public class KcYuyueController extends JeecgController<KcYuyue, IKcYuyueService>
@DeleteMapping(value = "/delete") @DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) { public Result<String> delete(@RequestParam(name="id",required=true) String id) {
kcYuyueService.removeById(id); kcYuyueService.removeById(id);
return Result.OK("取消预约成功!"); return Result.OK("删除预约成功!");
} }
/** /**
@ -178,6 +180,13 @@ public class KcYuyueController extends JeecgController<KcYuyue, IKcYuyueService>
if(kcYuyue.getIsOrderByNow() != null && kcYuyue.getIsOrderByNow()){ if(kcYuyue.getIsOrderByNow() != null && kcYuyue.getIsOrderByNow()){
queryWrapper.orderByAsc("ABS(NOW() - str_to_date( CONCAT( kt.skrq, kt.hhks ), '%Y-%m-%d %H%i' ))"); queryWrapper.orderByAsc("ABS(NOW() - str_to_date( CONCAT( kt.skrq, kt.hhks ), '%Y-%m-%d %H%i' ))");
} }
queryWrapper.ge(StringUtils.isNotBlank(kcYuyue.getStartTime()),"kt.skrq",kcYuyue.getStartTime());
queryWrapper.le(StringUtils.isNotBlank(kcYuyue.getEndTime()),"kt.skrq",kcYuyue.getEndTime());
queryWrapper.eq(StringUtils.isNotBlank(kcYuyue.getKkdw()),"kt.kkdw",kcYuyue.getKkdw());
queryWrapper.eq(StringUtils.isNotBlank(kcYuyue.getJieci()),"kt.hh",kcYuyue.getJieci());
if(StringUtils.isNotBlank(kcYuyue.getYwmc())){
queryWrapper.apply("kt.kcmc like '%"+kcYuyue.getYwmc()+"%' or kt.skjs like '%"+kcYuyue.getYwmc()+"%'");
}
Page<KcYuyue> page = new Page<KcYuyue>(pageNo, pageSize); Page<KcYuyue> page = new Page<KcYuyue>(pageNo, pageSize);
IPage<Map<String,Object>> pageList = kcYuyueService.findTingkeZuJiByPage(page, queryWrapper); IPage<Map<String,Object>> pageList = kcYuyueService.findTingkeZuJiByPage(page, queryWrapper);
return Result.OK(pageList); return Result.OK(pageList);

10
jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcYuyue/entity/KcYuyue.java
View File

@ -76,4 +76,14 @@ public class KcYuyue implements Serializable {
@TableField(exist = false) @TableField(exist = false)
private Boolean isOrderByNow; private Boolean isOrderByNow;
@TableField(exist = false)
private String startTime;
@TableField(exist = false)
private String endTime;
@TableField(exist = false)
private String kkdw;
@TableField(exist = false)
private String jieci;
@TableField(exist = false)
private String ywmc;
} }

2
jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcYuyue/mapper/xml/KcYuyueMapper.xml
View File

@ -5,7 +5,7 @@
<select id="findTingkeZuJiByPage" resultType="java.util.Map"> <select id="findTingkeZuJiByPage" resultType="java.util.Map">
SELECT SELECT
kt.*, kt.*,
a.id AS yyid a.id AS yyid,a.isdeleted
FROM FROM
kc_yuyue a kc_yuyue a
LEFT JOIN kc_ketangbiao kt ON a.ketangbiaoid = kt.id LEFT JOIN kc_ketangbiao kt ON a.ketangbiaoid = kt.id

6
jeecg-module-main/src/main/java/org/jeecg/modules/kc/ktgl/controller/KcKetangbiaoController.java
View File

@ -247,9 +247,9 @@ public class KcKetangbiaoController extends JeecgController<KcKetangbiao, IKcKet
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
String username = JwtUtil.getUserNameByToken(req); // String username = JwtUtil.getUserNameByToken(req);
LoginUser loginUser = commonApi.getUserByName(username); // LoginUser loginUser = commonApi.getUserByName(username);
kcKetangbiao.setUserid(loginUser.getUsername()); // kcKetangbiao.setUserid(loginUser.getUsername());
// QueryWrapper<KcKetangbiao> queryWrapper = QueryGenerator.initQueryWrapper(kcKetangbiao, req.getParameterMap()); // QueryWrapper<KcKetangbiao> queryWrapper = QueryGenerator.initQueryWrapper(kcKetangbiao, req.getParameterMap());
// queryWrapper.apply(StringUtils.isNotBlank(kcKetangbiao.getYwmc())," (skjs like '%"+kcKetangbiao.getYwmc()+"%' or kcmc like '%"+kcKetangbiao.getYwmc()+"%')"); // queryWrapper.apply(StringUtils.isNotBlank(kcKetangbiao.getYwmc())," (skjs like '%"+kcKetangbiao.getYwmc()+"%' or kcmc like '%"+kcKetangbiao.getYwmc()+"%')");
// queryWrapper.ne(StringUtils.isNotBlank(kcKetangbiao.getYwskxs()),"skxs",kcKetangbiao.getYwskxs()); // queryWrapper.ne(StringUtils.isNotBlank(kcKetangbiao.getYwskxs()),"skxs",kcKetangbiao.getYwskxs());