From a3f3cc0a10da2acc4364637f4f75e4059c488a36 Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Tue, 30 Dec 2025 18:41:01 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20[=E8=AF=95=E9=AA=8C=E7=AE=A1=E7=90=86]?= =?UTF-8?q?=20[=E7=A8=BD=E6=9F=A5=E8=BD=A8=E8=BF=B9]=20=E8=AF=95=E9=AA=8C?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=9A=84=E7=A8=BD=E6=9F=A5=E8=BD=A8=E8=BF=B9?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/plus/java/controller.java.vm | 2 +- .../src/main/resources/plus/java/domain.java.vm | 3 +- .../main/resources/plus/java/serviceImpl.java.vm | 2 +- .../business/controller/StudyJcgjController.java | 64 ++++++++++++ .../java/com/hxhq/business/domain/StudyJcgj.java | 110 +++++++++++++++++++++ .../com/hxhq/business/mapper/StudyJcgjMapper.java | 14 +++ .../hxhq/business/service/IStudyJcgjService.java | 23 +++++ .../service/impl/StudyJcgjServiceImpl.java | 35 +++++++ .../business/service/impl/StudyServiceImpl.java | 1 + .../resources/mapper/business/StudyJcgjMapper.xml | 6 ++ 10 files changed, 257 insertions(+), 3 deletions(-) create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyJcgjController.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyJcgj.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyJcgjMapper.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyJcgjService.java create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyJcgjServiceImpl.java create mode 100644 hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyJcgjMapper.xml diff --git a/hxhq-modules/hxhq-gen/src/main/resources/plus/java/controller.java.vm b/hxhq-modules/hxhq-gen/src/main/resources/plus/java/controller.java.vm index 9ae0b80..eec08b7 100644 --- a/hxhq-modules/hxhq-gen/src/main/resources/plus/java/controller.java.vm +++ b/hxhq-modules/hxhq-gen/src/main/resources/plus/java/controller.java.vm @@ -2,7 +2,7 @@ package ${packageName}.controller; import java.util.Arrays; import java.util.List; -import org.springframework.stereotype.Controller; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import ${packageName}.domain.${ClassName}; import ${packageName}.service.I${ClassName}Service; diff --git a/hxhq-modules/hxhq-gen/src/main/resources/plus/java/domain.java.vm b/hxhq-modules/hxhq-gen/src/main/resources/plus/java/domain.java.vm index 6a1e649..6194a7b 100644 --- a/hxhq-modules/hxhq-gen/src/main/resources/plus/java/domain.java.vm +++ b/hxhq-modules/hxhq-gen/src/main/resources/plus/java/domain.java.vm @@ -4,6 +4,7 @@ package ${packageName}.domain; import ${import}; #end import com.baomidou.mybatisplus.annotation.TableName; +import com.hxhq.common.core.domain.MpBaseEntity; /** @@ -13,7 +14,7 @@ import com.baomidou.mybatisplus.annotation.TableName; * @date ${datetime} */ @TableName("${tableName}") -public class ${ClassName} extends MPBaseEntity +public class ${ClassName} extends MpBaseEntity { private static final long serialVersionUID = 1L; diff --git a/hxhq-modules/hxhq-gen/src/main/resources/plus/java/serviceImpl.java.vm b/hxhq-modules/hxhq-gen/src/main/resources/plus/java/serviceImpl.java.vm index 9e84c93..ffa8577 100644 --- a/hxhq-modules/hxhq-gen/src/main/resources/plus/java/serviceImpl.java.vm +++ b/hxhq-modules/hxhq-gen/src/main/resources/plus/java/serviceImpl.java.vm @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; #end #foreach ($column in $columns) #if($column.javaField == 'createTime' || $column.javaField == 'updateTime') - import com.ruoyi.common.utils.DateUtils; + import com.hxhq.common.core.utils.DateUtils; #break #end #end diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyJcgjController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyJcgjController.java new file mode 100644 index 0000000..73a7fe5 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyJcgjController.java @@ -0,0 +1,64 @@ +package com.hxhq.business.controller; + +import java.util.Arrays; +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.hxhq.business.domain.StudyJcgj; +import com.hxhq.business.service.IStudyJcgjService; +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 2025-12-30 + */ +@RestController +@RequestMapping("/business/studyJcgj") +public class StudyJcgjController extends BaseController +{ + @Autowired + private IStudyJcgjService studyJcgjService; + + /** + * 查询试验-稽查轨迹列表 + */ + @GetMapping("/list") + public TableDataInfo list(StudyJcgj studyJcgj) + { + startPage(); + List list = studyJcgjService.queryList(studyJcgj); + return getDataTable(list); + } + + /** + * 获取试验-稽查轨迹详细信息 + */ + @GetMapping(value = "/info") + public AjaxResult getInfo(Long id) + { + return AjaxResult.success(studyJcgjService.getById(id)); + } + + /** + * 新增试验-稽查轨迹信息 + */ + @PostMapping("/save") + public AjaxResult save(@RequestBody StudyJcgj studyJcgj) + { + return toAjax(studyJcgjService.saveOrUpdate(studyJcgj)); + } + + /** + * 删除试验-稽查轨迹信息 + */ + @PostMapping("/delete") + public AjaxResult delete(@RequestBody Long[] ids) + { + return toAjax(studyJcgjService.removeByIds(Arrays.asList(ids))); + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyJcgj.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyJcgj.java new file mode 100644 index 0000000..ed0cc6e --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyJcgj.java @@ -0,0 +1,110 @@ +package com.hxhq.business.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.hxhq.common.core.domain.MpBaseEntity; + + +/** + * 试验-稽查轨迹对象 t_study_jcgj + * + * @author hxhq + * @date 2025-12-30 + */ +@TableName("t_study_jcgj") +public class StudyJcgj extends MpBaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 所属试验 */ + private Long studyId; + + /** 稽查轨迹类型:1:流程；3：编辑；5：人员 */ + private Long jcgjlx; + + /** 稽查名称 */ + private String jcmc; + + /** 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 */ + private Long jcmcys; + + /** 稽查内容 */ + private String jcnr; + + /** 签名人id */ + private Long qmrId; + + /** 签名人名称 */ + private String qmrMc; + + + public void setStudyId(Long studyId) + { + this.studyId = studyId; + } + + public Long getStudyId() + { + return studyId; + } + + public void setJcgjlx(Long jcgjlx) + { + this.jcgjlx = jcgjlx; + } + + public Long getJcgjlx() + { + return jcgjlx; + } + + public void setJcmc(String jcmc) + { + this.jcmc = jcmc; + } + + public String getJcmc() + { + return jcmc; + } + + public void setJcmcys(Long jcmcys) + { + this.jcmcys = jcmcys; + } + + public Long getJcmcys() + { + return jcmcys; + } + + public void setJcnr(String jcnr) + { + this.jcnr = jcnr; + } + + public String getJcnr() + { + return jcnr; + } + + public void setQmrId(Long qmrId) + { + this.qmrId = qmrId; + } + + public Long getQmrId() + { + return qmrId; + } + + public void setQmrMc(String qmrMc) + { + this.qmrMc = qmrMc; + } + + public String getQmrMc() + { + return qmrMc; + } + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyJcgjMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyJcgjMapper.java new file mode 100644 index 0000000..efd0dc9 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyJcgjMapper.java @@ -0,0 +1,14 @@ +package com.hxhq.business.mapper; + +import com.hxhq.business.domain.StudyJcgj; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +/** + * 试验-稽查轨迹Mapper接口 + * + * @author hxhq + * @date 2025-12-30 + */ +public interface StudyJcgjMapper extends BaseMapper +{ + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyJcgjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyJcgjService.java new file mode 100644 index 0000000..17e8cbf --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyJcgjService.java @@ -0,0 +1,23 @@ +package com.hxhq.business.service; + +import java.util.List; +import com.hxhq.business.domain.StudyJcgj; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * 试验-稽查轨迹Service接口 + * + * @author hxhq + * @date 2025-12-30 + */ +public interface IStudyJcgjService extends IService +{ + /** + * 查询试验-稽查轨迹列表 + * + * @param studyJcgj 试验-稽查轨迹 + * @return 试验-稽查轨迹集合 + */ + public List queryList(StudyJcgj studyJcgj); + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyJcgjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyJcgjServiceImpl.java new file mode 100644 index 0000000..c062998 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyJcgjServiceImpl.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.StudyJcgjMapper; +import com.hxhq.business.domain.StudyJcgj; +import com.hxhq.business.service.IStudyJcgjService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * 试验-稽查轨迹Service业务层处理 + * + * @author hxhq + * @date 2025-12-30 + */ +@Service +public class StudyJcgjServiceImpl extends ServiceImpl implements IStudyJcgjService +{ + /** + * 查询试验-稽查轨迹列表 + * + * @param studyJcgj 试验-稽查轨迹 + * @return 试验-稽查轨迹 + */ + @Override + public List queryList(StudyJcgj studyJcgj) + { + QueryWrapper queryWrapper = Wrappers.query(); + return this.list(queryWrapper); + } + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyServiceImpl.java index f2fbea4..39fb843 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyServiceImpl.java @@ -51,6 +51,7 @@ public class StudyServiceImpl extends ServiceImpl implements if(form.getStatus()!=null && form.getStatus().intValue()>0){ queryWrapper.eq("s.status",form.getStatus()); } + queryWrapper.orderByDesc("s.create_time"); return baseMapper.queryList(queryWrapper); } diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyJcgjMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyJcgjMapper.xml new file mode 100644 index 0000000..e177cdb --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyJcgjMapper.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file