diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyGyzjController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyGyzjController.java new file mode 100644 index 0000000..19bda6e --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyGyzjController.java @@ -0,0 +1,85 @@ +package com.hxhq.business.controller; + +import java.util.Arrays; +import java.util.List; + +import com.hxhq.business.dto.gyzj.ListDto; +import com.hxhq.business.form.gyzj.BjForm; +import com.hxhq.business.form.gyzj.CzyjForm; +import com.hxhq.business.form.gyzj.GhForm; +import com.hxhq.business.form.gyzj.SearchForm; +import com.hxhq.business.service.IGyzjService; +import com.hxhq.common.security.annotation.RequiresPermissions; +import com.hxhq.common.security.utils.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.hxhq.business.domain.StudyGyzj; +import com.hxhq.business.service.IStudyGyzjService; +import com.hxhq.common.core.web.controller.BaseController; +import com.hxhq.common.core.web.domain.AjaxResult; +import com.hxhq.common.core.web.page.TableDataInfo; + + +/** + * 试验-物资信息-给药制剂Controller + * + * @author hxhq + * @date 2026-01-09 + */ +@RestController +@RequestMapping("/business/studyGyzj") +public class StudyGyzjController extends BaseController +{ + @Autowired + private IGyzjService gyzjService; + + /** + * 列表 + */ + @RequiresPermissions({"business:studyGyzj:list","business:nonTrialGyzj:list","business:drugGyzj:list"}) + @GetMapping("/list") + public TableDataInfo list(SearchForm form) + { + startPage(); + List list = gyzjService.queryStudyList(form); + return getDataTable(list); + } + + /** + * 处置药剂 + */ + @PostMapping("/czyj") + @RequiresPermissions({"business:studyGyzj:xq","business:nonTrialGyzj:xq","business:drugGyzj:xq"}) + public AjaxResult czyj(@RequestBody CzyjForm form) + { + form.setClrId(SecurityUtils.getUserId()); + gyzjService.czyj(form); + return AjaxResult.success("操作成功"); + } + + /** + * 编辑 + */ + @PostMapping("bj") + @RequiresPermissions({"business:studyGyzj:bj","business:nonTrialGyzj:bj","business:drugGyzj:bj"}) + public AjaxResult bj(@RequestBody BjForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + gyzjService.bj(form); + return AjaxResult.success("操作成功"); + } + + /** + * 归还 + */ + @PostMapping("gh") + @RequiresPermissions({"business:studyGyzj:gh","business:nonTrialGyzj:gh","business:drugGyzj:gh"}) + public AjaxResult gh(@RequestBody GhForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + form.setJsr1Id(SecurityUtils.getUserId()); + gyzjService.gh(form); + return AjaxResult.success("操作成功"); + } + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyMjyController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyMjyController.java new file mode 100644 index 0000000..3dc3278 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyMjyController.java @@ -0,0 +1,95 @@ +package com.hxhq.business.controller; + +import java.util.Arrays; +import java.util.List; + +import com.hxhq.business.dto.mjy.ListDto; +import com.hxhq.business.form.mjy.*; +import com.hxhq.business.service.IMjyService; +import com.hxhq.common.security.annotation.RequiresPermissions; +import com.hxhq.common.security.utils.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.hxhq.business.domain.StudyMjy; +import com.hxhq.business.service.IStudyMjyService; +import com.hxhq.common.core.web.controller.BaseController; +import com.hxhq.common.core.web.domain.AjaxResult; +import com.hxhq.common.core.web.page.TableDataInfo; + + +/** + * 试验-物资信息-麻精药Controller + * + * @author hxhq + * @date 2026-01-09 + */ +@RestController +@RequestMapping("/business/studyMjy") +public class StudyMjyController extends BaseController +{ + @Autowired + private IMjyService mjyService; + + /** + * 列表 + */ + @RequiresPermissions({"business:studyMjy:list","business:nonTrialMjy:list","business:drugMjy:list"}) + @GetMapping("/list") + public TableDataInfo list(SearchForm form) + { + startPage(); + List list = mjyService.queryStudyList(form); + return getDataTable(list); + } + + + /** + * 处置药剂 + */ + @PostMapping("/czyj") + @RequiresPermissions({"business:studyMjy:czyj","business:nonTrialMjy:czyj","business:drugMjy:czyj"}) + public AjaxResult czyj(@RequestBody CzyjForm form) + { + form.setClrId(SecurityUtils.getUserId()); + mjyService.czyj(form); + return AjaxResult.success("操作成功"); + } + + + /** + * 编辑 + */ + @PostMapping("bj") + @RequiresPermissions({"business:studyMjy:bj","business:nonTrialMjy:bj","business:drugMjy:bj"}) + public AjaxResult bj(@RequestBody BjForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + mjyService.bj(form); + return AjaxResult.success("操作成功"); + } + + /** + * 修改库存 + */ + @PostMapping("xgkc") + @RequiresPermissions({"business:studyMjy:xgkc","business:nonTrialMjy:xgkc","business:drugMjy:xgkc"}) + public AjaxResult xgkc(@RequestBody XgkcForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + mjyService.xgkc(form); + return AjaxResult.success("操作成功"); + } + + /** + * 归还 + */ + @PostMapping("gh") + @RequiresPermissions({"business:studyMjy:gh","business:nonTrialMjy:gh","business:drugMjy:gh"}) + public AjaxResult gh(@RequestBody GhForm form) + { + form.setQmrId(SecurityUtils.getUserId()); + mjyService.gh(form); + return AjaxResult.success("操作成功"); + } + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyGyzj.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyGyzj.java new file mode 100644 index 0000000..f66ae70 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyGyzj.java @@ -0,0 +1,45 @@ +package com.hxhq.business.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.hxhq.common.core.domain.MpBaseEntity; + + +/** + * 试验-物资信息-给药制剂对象 t_study_gyzj + * + * @author hxhq + * @date 2026-01-09 + */ +@TableName("t_study_gyzj") +public class StudyGyzj extends MpBaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 所属试验id */ + private Long studyId; + + /** 资源id */ + private Long resourceId; + + + public void setStudyId(Long studyId) + { + this.studyId = studyId; + } + + public Long getStudyId() + { + return studyId; + } + + public void setResourceId(Long resourceId) + { + this.resourceId = resourceId; + } + + public Long getResourceId() + { + return resourceId; + } + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyMjy.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyMjy.java new file mode 100644 index 0000000..8c6b82c --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyMjy.java @@ -0,0 +1,45 @@ +package com.hxhq.business.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.hxhq.common.core.domain.MpBaseEntity; + + +/** + * 试验-物资信息-麻精药对象 t_study_mjy + * + * @author hxhq + * @date 2026-01-09 + */ +@TableName("t_study_mjy") +public class StudyMjy extends MpBaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 所属试验id */ + private Long studyId; + + /** 资源id */ + private Long resourceId; + + + public void setStudyId(Long studyId) + { + this.studyId = studyId; + } + + public Long getStudyId() + { + return studyId; + } + + public void setResourceId(Long resourceId) + { + this.resourceId = resourceId; + } + + public Long getResourceId() + { + return resourceId; + } + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/SearchForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/SearchForm.java index f799f8b..9f86133 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/SearchForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/SearchForm.java @@ -27,6 +27,17 @@ public class SearchForm { /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */ private Integer jyzt; + /** 试验id */ + private Long studyId; + + public Long getStudyId() { + return studyId; + } + + public void setStudyId(Long studyId) { + this.studyId = studyId; + } + public String getMc() { return mc; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/SearchForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/SearchForm.java index cf10a83..cd75066 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/SearchForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/SearchForm.java @@ -27,6 +27,17 @@ public class SearchForm { /** 借阅状态 1:未借阅 3:待借阅 5:借阅中 */ private Integer jyzt; + /** 试验id */ + private Long studyId; + + public Long getStudyId() { + return studyId; + } + + public void setStudyId(Long studyId) { + this.studyId = studyId; + } + public String getMc() { return mc; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GyzjMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GyzjMapper.java index a36942e..4704a0e 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GyzjMapper.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/GyzjMapper.java @@ -22,6 +22,13 @@ public interface GyzjMapper extends BaseMapper * @param queryWrapper * @return */ + List queryStudyList(@Param("ew") Wrapper queryWrapper); + + /** + * 查询列表 + * @param queryWrapper + * @return + */ List queryList(@Param("ew") Wrapper queryWrapper); /** diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/MjyMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/MjyMapper.java index f4ef11c..0726a4a 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/MjyMapper.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/MjyMapper.java @@ -22,6 +22,13 @@ public interface MjyMapper extends BaseMapper * @param queryWrapper * @return */ + List queryStudyList(@Param("ew") Wrapper queryWrapper); + + /** + * 查询列表 + * @param queryWrapper + * @return + */ List queryList(@Param("ew") Wrapper queryWrapper); /** diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyGyzjMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyGyzjMapper.java new file mode 100644 index 0000000..7d998ba --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyGyzjMapper.java @@ -0,0 +1,14 @@ +package com.hxhq.business.mapper; + +import com.hxhq.business.domain.StudyGyzj; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +/** + * 试验-物资信息-给药制剂Mapper接口 + * + * @author hxhq + * @date 2026-01-09 + */ +public interface StudyGyzjMapper extends BaseMapper +{ + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyMjyMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyMjyMapper.java new file mode 100644 index 0000000..c37db58 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyMjyMapper.java @@ -0,0 +1,14 @@ +package com.hxhq.business.mapper; + +import com.hxhq.business.domain.StudyMjy; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +/** + * 试验-物资信息-麻精药Mapper接口 + * + * @author hxhq + * @date 2026-01-09 + */ +public interface StudyMjyMapper extends BaseMapper +{ + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjService.java index 9a272b1..cfa40fb 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjService.java @@ -24,6 +24,14 @@ public interface IGyzjService extends IService * @param form 给药制剂 * @return 给药制剂集合 */ + public List queryStudyList(SearchForm form); + + /** + * 查询给药制剂列表 + * + * @param form 给药制剂 + * @return 给药制剂集合 + */ public List queryList(SearchForm form); /** diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyService.java index bff7884..5aef2e5 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyService.java @@ -23,6 +23,14 @@ public interface IMjyService extends IService { * @param form 麻精药 * @return 麻精药集合 */ + public List queryStudyList(SearchForm form); + + /** + * 查询麻精药列表 + * + * @param form 麻精药 + * @return 麻精药集合 + */ public List queryList(SearchForm form); /** diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyGyzjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyGyzjService.java new file mode 100644 index 0000000..013a053 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyGyzjService.java @@ -0,0 +1,23 @@ +package com.hxhq.business.service; + +import java.util.List; +import com.hxhq.business.domain.StudyGyzj; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * 试验-物资信息-给药制剂Service接口 + * + * @author hxhq + * @date 2026-01-09 + */ +public interface IStudyGyzjService extends IService +{ + /** + * 查询试验-物资信息-给药制剂列表 + * + * @param studyGyzj 试验-物资信息-给药制剂 + * @return 试验-物资信息-给药制剂集合 + */ + public List queryList(StudyGyzj studyGyzj); + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyMjyService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyMjyService.java new file mode 100644 index 0000000..413efff --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyMjyService.java @@ -0,0 +1,23 @@ +package com.hxhq.business.service; + +import java.util.List; +import com.hxhq.business.domain.StudyMjy; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * 试验-物资信息-麻精药Service接口 + * + * @author hxhq + * @date 2026-01-09 + */ +public interface IStudyMjyService extends IService +{ + /** + * 查询试验-物资信息-麻精药列表 + * + * @param studyMjy 试验-物资信息-麻精药 + * @return 试验-物资信息-麻精药集合 + */ + public List queryList(StudyMjy studyMjy); + +} 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 0d339cd..31c2100 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 @@ -58,6 +58,40 @@ public class GyzjServiceImpl extends ServiceImpl implements IG * @return 暂存柜 */ @Override + public List queryStudyList(SearchForm form) { + QueryWrapper queryWrapper = Wrappers.query(); + queryWrapper.eq("ts.del_flag", "0"); + queryWrapper.eq("ts.study_id", form.getStudyId()); + if (form.getJyzt() != null && form.getJyzt().intValue() > 0) { + queryWrapper.eq("t.jyzt", form.getJyzt()); + } + if (form.getZjzt() != null && form.getZjzt().intValue() > 0) { + queryWrapper.eq("t.zjzt", form.getZjzt()); + } + if (StringUtils.isNoneBlank(form.getMc())) { + queryWrapper.and(p -> p.like("t.`mc`", form.getMc())); + } + if (StringUtils.isNoneBlank(form.getBh())) { + queryWrapper.and(p -> p.like("t.`bh`", form.getBh())); + } + if (StringUtils.isNoneBlank(form.getStartDate())) { + queryWrapper.apply("t.sxrq>={0}", form.getStartDate()); + } + if (StringUtils.isNoneBlank(form.getEndDate())) { + queryWrapper.apply("t.sxrq<{0}", form.getEndDate()); + } + queryWrapper.orderByDesc("ts.id"); + return baseMapper.queryStudyList(queryWrapper); + } + + + /** + * 列表 + * + * @param form 暂存柜 + * @return 暂存柜 + */ + @Override public List queryList(SearchForm form) { QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.eq("t.del_flag", "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 e45d331..024ca4d 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 @@ -58,6 +58,39 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS * @return 暂存柜 */ @Override + public List queryStudyList(SearchForm form) { + QueryWrapper queryWrapper = Wrappers.query(); + queryWrapper.eq("ts.del_flag", "0"); + queryWrapper.eq("ts.study_id", form.getStudyId()); + if (form.getJyzt() != null && form.getJyzt().intValue() > 0) { + queryWrapper.eq("t.jyzt", form.getJyzt()); + } + if (form.getZjzt() != null && form.getZjzt().intValue() > 0) { + queryWrapper.eq("t.zjzt", form.getZjzt()); + } + if (StringUtils.isNoneBlank(form.getMc())) { + queryWrapper.and(p -> p.like("t.`mc`", form.getMc())); + } + if (StringUtils.isNoneBlank(form.getBh())) { + queryWrapper.and(p -> p.like("t.`bh`", form.getBh())); + } + if (StringUtils.isNoneBlank(form.getStartDate())) { + queryWrapper.apply("t.sxrq>={0}", form.getStartDate()); + } + if (StringUtils.isNoneBlank(form.getEndDate())) { + queryWrapper.apply("t.sxrq<{0}", form.getEndDate()); + } + queryWrapper.orderByDesc("ts.id"); + return baseMapper.queryStudyList(queryWrapper); + } + + /** + * 列表 + * + * @param form 暂存柜 + * @return 暂存柜 + */ + @Override public List queryList(SearchForm form) { QueryWrapper queryWrapper = Wrappers.query(); queryWrapper.eq("t.del_flag", "0"); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyGyzjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyGyzjServiceImpl.java new file mode 100644 index 0000000..d54a584 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyGyzjServiceImpl.java @@ -0,0 +1,35 @@ +package com.hxhq.business.service.impl; + +import java.util.List; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; + import com.hxhq.common.core.utils.DateUtils; +import org.springframework.stereotype.Service; +import com.hxhq.business.mapper.StudyGyzjMapper; +import com.hxhq.business.domain.StudyGyzj; +import com.hxhq.business.service.IStudyGyzjService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * 试验-物资信息-给药制剂Service业务层处理 + * + * @author hxhq + * @date 2026-01-09 + */ +@Service +public class StudyGyzjServiceImpl extends ServiceImpl implements IStudyGyzjService +{ + /** + * 查询试验-物资信息-给药制剂列表 + * + * @param studyGyzj 试验-物资信息-给药制剂 + * @return 试验-物资信息-给药制剂 + */ + @Override + public List queryList(StudyGyzj studyGyzj) + { + QueryWrapper queryWrapper = Wrappers.query(); + return this.list(queryWrapper); + } + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyMjyServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyMjyServiceImpl.java new file mode 100644 index 0000000..3a1c8bb --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyMjyServiceImpl.java @@ -0,0 +1,35 @@ +package com.hxhq.business.service.impl; + +import java.util.List; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; + import com.hxhq.common.core.utils.DateUtils; +import org.springframework.stereotype.Service; +import com.hxhq.business.mapper.StudyMjyMapper; +import com.hxhq.business.domain.StudyMjy; +import com.hxhq.business.service.IStudyMjyService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * 试验-物资信息-麻精药Service业务层处理 + * + * @author hxhq + * @date 2026-01-09 + */ +@Service +public class StudyMjyServiceImpl extends ServiceImpl implements IStudyMjyService +{ + /** + * 查询试验-物资信息-麻精药列表 + * + * @param studyMjy 试验-物资信息-麻精药 + * @return 试验-物资信息-麻精药 + */ + @Override + public List queryList(StudyMjy studyMjy) + { + QueryWrapper queryWrapper = Wrappers.query(); + return this.list(queryWrapper); + } + +} diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjFfjlMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjFfjlMapper.xml index 2fcec93..a7cdf8a 100644 --- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjFfjlMapper.xml +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjFfjlMapper.xml @@ -5,10 +5,11 @@ select t.id,t.mc,t.bh,t.nd,t.nddw,t.kc,t.kcdw,t.sxrq,t.zjzt,t.jyzt,t.cctj,t.ccwz,t.create_time,t.bjzt,t.kcbjzt,t.rqzt,t.ghzt - ,t.ckl,t.ckldw,t.ffzytj,t.ckmz,t.ckmzdw,t.lqr1_mc,t.lqr2_mc,t.ffr1_mc,t.ffr2_mc,t.ffbz, 'todo' as mdMc + ,t.ckl,t.ckldw,t.ffzytj,t.ckmz,t.ckmzdw,t.lqr1_mc,t.lqr2_mc,t.ffr1_mc,t.ffr2_mc,t.ffbz,s.name as mdMc ,z.mc as zcgMc FROM `t_gyzj` t - left join `t_zcg` z on z.id=t.zcg_id + join `t_study` s on s.id=t.md_id + join `t_zcg` z on z.id=t.zcg_id + + + ${ew.sqlSegment} + + + + + select t.id,t.mc,t.bh,t.ffzytj,t.ffrq,t.ghrq,t.ckl,t.ckldw,t.rkl,t.rkldw,t.ckmz,t.ckmzdw,t.lqr1_mc,t.lqr2_mc,t.ffr1_mc,t.ffr2_mc,t.jsr1_mc,t.jsr2_mc,t.rkmz,t.rkmzdw - ,t.syl,t.syldw,t.jlzt,t.jyzt, 'todo' as mdMc + ,t.syl,t.syldw,t.jlzt,t.jyzt,s.name as mdMc ,z.mc as zcgMc FROM `t_mjy_ffjl` t - left join `t_zcg` z on z.id=t.zcg_id + join `t_zcg` z on z.id=t.zcg_id + join `t_study` s on s.id=t.md_id ${ew.sqlSegment} diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/MjyMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/MjyMapper.xml index 3025e81..0dd5984 100644 --- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/MjyMapper.xml +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/MjyMapper.xml @@ -12,10 +12,24 @@ + + + \ No newline at end of file diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPlanMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPlanMapper.xml index 0e41540..3380c8e 100644 --- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPlanMapper.xml +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPlanMapper.xml @@ -6,7 +6,7 @@ \ No newline at end of file diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPreMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPreMapper.xml index 4ab1c6e..447d992 100644 --- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPreMapper.xml +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPreMapper.xml @@ -6,7 +6,7 @@ \ No newline at end of file diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyGyzjMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyGyzjMapper.xml new file mode 100644 index 0000000..948fd2f --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyGyzjMapper.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyMjyMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyMjyMapper.xml new file mode 100644 index 0000000..058fae2 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyMjyMapper.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file