质控样表结构重构 相关逻辑重写

ruoyi-system/src/main/java/com/ruoyi/business/domain/ZQualityValue.java

@@ -2,6 +2,7 @@ package com.ruoyi.business.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -26,8 +27,8 @@ public class ZQualityValue extends BaseEntity
     /** 记录id */
     private Long valueId;
 
-    /** $column.columnComment */
-    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    /** 水厂ID */
+    @Excel(name = "水厂ID")
     private Long deviceWorks;
 
     /** 化验项目 */
@@ -56,4 +57,25 @@ public class ZQualityValue extends BaseEntity
     @Excel(name = "有效开始时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date beginTime;
 
+    /** 删除标志（0代表存在 2代表删除） */
+    private Integer delFlag;
+
+    /** 乐观锁 */
+    @Excel(name = "乐观锁")
+    private Long revision;
+
+    //额外返回的字段
+    //关联的水厂/集团信息
+    private TOrganization organization;
+
+    //关联的化验项目
+    private TAssayItem assayItemBean;
+
+    //2025年03月13日10:46:18 返回创建人的全部信息，createBy存放的ID了
+    //创建人
+    private SysUser createUser;
+
+    //更新人
+    private SysUser updateUser;
+
 }

ruoyi-system/src/main/java/com/ruoyi/business/service/impl/ZQualityValueServiceImpl.java

@@ -1,7 +1,15 @@
 package com.ruoyi.business.service.impl;
 
 import java.util.List;
+import java.util.Objects;
+
+import com.ruoyi.business.mapper.TAssayItemMapper;
+import com.ruoyi.business.mapper.TOrganizationMapper;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.mapper.SysUserMapper;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.business.mapper.ZQualityValueMapper;
@@ -20,6 +28,15 @@ public class ZQualityValueServiceImpl implements IZQualityValueService
     @Autowired
     private ZQualityValueMapper zQualityValueMapper;
 
+    @Autowired
+    private TOrganizationMapper organizationMapper;
+
+    @Autowired
+    private TAssayItemMapper assayItemMapper;
+
+    @Autowired
+    private SysUserMapper sysUserMapper;
+
     /**
      * 查询水厂质控值
      * 
@@ -29,7 +46,22 @@ public class ZQualityValueServiceImpl implements IZQualityValueService
     @Override
     public ZQualityValue selectZQualityValueByValueId(Long valueId)
     {
-        return zQualityValueMapper.selectZQualityValueByValueId(valueId);
+        ZQualityValue zQualityValue = zQualityValueMapper.selectZQualityValueByValueId(valueId);
+        if(!Objects.isNull(zQualityValue))
+            this.addExtra(zQualityValue);
+        return zQualityValue;
+    }
+
+    private void addExtra(ZQualityValue zQualityValue) {
+        zQualityValue.setOrganization(this.organizationMapper.selectTOrganizationById(zQualityValue.getDeviceWorks()));
+        zQualityValue.setAssayItemBean(this.assayItemMapper.selectTAssayItemById(Long.valueOf(zQualityValue.getAssayItem())));
+        //2025年03月13日11:16:04 额外返回创建人和编辑人对象
+        String createBy = zQualityValue.getCreateBy();
+        String updateBy = zQualityValue.getUpdateBy();
+        if(StringUtils.isNotBlank(createBy))
+            zQualityValue.setCreateUser(this.sysUserMapper.selectUserById(Long.valueOf(createBy)));
+        if(StringUtils.isNotBlank(updateBy))
+            zQualityValue.setUpdateUser(this.sysUserMapper.selectUserById(Long.valueOf(updateBy)));
     }
 
     /**
@@ -41,7 +73,13 @@ public class ZQualityValueServiceImpl implements IZQualityValueService
     @Override
     public List<ZQualityValue> selectZQualityValueList(ZQualityValue zQualityValue)
     {
-        return zQualityValueMapper.selectZQualityValueList(zQualityValue);
+        List<ZQualityValue> zQualityValues = zQualityValueMapper.selectZQualityValueList(zQualityValue);
+        if(!CollectionUtils.isEmpty(zQualityValues)){
+            for (ZQualityValue qualityValue : zQualityValues) {
+                this.addExtra(qualityValue);
+            }
+        }
+        return zQualityValues;
     }
 
     /**
@@ -54,6 +92,8 @@ public class ZQualityValueServiceImpl implements IZQualityValueService
     public int insertZQualityValue(ZQualityValue zQualityValue)
     {
         zQualityValue.setCreateTime(DateUtils.getNowDate());
+        //存放的是用户ID
+        zQualityValue.setCreateBy(String.valueOf(SecurityUtils.getUserId()));
         return zQualityValueMapper.insertZQualityValue(zQualityValue);
     }
 
@@ -67,6 +107,8 @@ public class ZQualityValueServiceImpl implements IZQualityValueService
     public int updateZQualityValue(ZQualityValue zQualityValue)
     {
         zQualityValue.setUpdateTime(DateUtils.getNowDate());
+        //存放的是用户ID
+        zQualityValue.setUpdateBy(String.valueOf(SecurityUtils.getUserId()));
         return zQualityValueMapper.updateZQualityValue(zQualityValue);
     }
 

ruoyi-system/src/main/resources/mapper/business/ZQualityValueMapper.xml

@@ -15,15 +15,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="lowValue"    column="low_value"    />
         <result property="highValue"    column="high_value"    />
         <result property="beginTime"    column="begin_time"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="revision"    column="revision"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="remark"    column="remark"    />
     </resultMap>
 
     <sql id="selectZQualityValueVo">
-        select value_id, device_works, assay_item, result_value, create_time, update_time, end_time, low_value, high_value, begin_time from z_quality_value
+        select value_id, device_works, assay_item, result_value, create_time, update_time, end_time, low_value, high_value, begin_time, del_flag, revision, create_by, update_by, remark from z_quality_value
     </sql>
-    
+
     <select id="selectZQualityValueByValueId" parameterType="Long" resultMap="ZQualityValueResult">
         <include refid="selectZQualityValueVo"/>
-        where value_id = #{valueId}
+        where value_id = #{valueId} and del_flag = 0
     </select>
         
     <insert id="insertZQualityValue" parameterType="ZQualityValue">
@@ -39,6 +44,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="lowValue != null">low_value,</if>
             <if test="highValue != null">high_value,</if>
             <if test="beginTime != null">begin_time,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="revision != null">revision,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="remark != null">remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="valueId != null">#{valueId},</if>
@@ -51,6 +61,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="lowValue != null">#{lowValue},</if>
             <if test="highValue != null">#{highValue},</if>
             <if test="beginTime != null">#{beginTime},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="revision != null">#{revision},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="remark != null">#{remark},</if>
          </trim>
     </insert>
 
@@ -66,7 +81,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="lowValue != null">low_value = #{lowValue},</if>
             <if test="highValue != null">high_value = #{highValue},</if>
             <if test="beginTime != null">begin_time = #{beginTime},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="revision != null">revision = #{revision},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="remark != null">remark = #{remark},</if>
         </trim>
+        ,revision = revision + 1
         where value_id = #{valueId}
     </update>
 
@@ -96,6 +117,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="highValue != null "> and high_value = #{highValue}</if>
             <if test="beginTime != null "> and begin_time &lt;= #{beginTime}</if>
         </where>
-        order by value_id desc
+        and del_flag = 0 order by value_id desc
     </select>
 </mapper>

sql/business.sql

@@ -279,3 +279,12 @@ ADD COLUMN `remark` varchar(255) NULL COMMENT '备注' AFTER `del_flag`;
 ALTER TABLE `smart-robot`.`biz_device`
     MODIFY COLUMN `del_flag` tinyint NULL DEFAULT 0 COMMENT '删除标志（0代表存在 2代表删除）' AFTER `type`;
 
+
+#2025年03月14日14:51:02 新增的SQL
+ALTER TABLE  `z_quality_value`
+    ADD COLUMN `del_flag` tinyint NULL DEFAULT 0 COMMENT '删除标志（0代表存在 2代表删除）' AFTER `begin_time`,
+ADD COLUMN `revision` int NULL DEFAULT 0 COMMENT '版本号' AFTER `del_flag`,
+ADD COLUMN `create_by` varchar(255) NULL COMMENT '创建者' AFTER `revision`,
+ADD COLUMN `update_by` varchar(255) NULL COMMENT '更新着' AFTER `create_by`,
+ADD COLUMN `remark` varchar(500) NULL COMMENT '备注' AFTER `update_by`;
+