feat: [试验管理] [稽查轨迹] 试验管理的稽查轨迹表

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;

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;
 

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

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<StudyJcgj> 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)));
+    }
+}

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

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<StudyJcgj>
+{
+
+}

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<StudyJcgj>
+{
+    /**
+     * 查询试验-稽查轨迹列表
+     *
+     * @param studyJcgj 试验-稽查轨迹
+     * @return 试验-稽查轨迹集合
+     */
+    public List<StudyJcgj> queryList(StudyJcgj studyJcgj);
+
+}

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<StudyJcgjMapper, StudyJcgj> implements IStudyJcgjService
+{
+    /**
+     * 查询试验-稽查轨迹列表
+     *
+     * @param studyJcgj 试验-稽查轨迹
+     * @return 试验-稽查轨迹
+     */
+    @Override
+    public List<StudyJcgj> queryList(StudyJcgj studyJcgj)
+    {
+        QueryWrapper<StudyJcgj> queryWrapper = Wrappers.query();
+        return this.list(queryWrapper);
+    }
+
+}

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

hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyJcgjMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.hxhq.business.mapper.StudyJcgjMapper">
+</mapper>