Merge remote-tracking branch 'origin/dev_v1.0.0' into dev_v1.0.0

sop-api/src/main/java/com/qmth/sop/server/api/TBViolationDetailController.java

@@ -2,6 +2,7 @@ package com.qmth.sop.server.api;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qmth.boot.api.constant.ApiConstant;
+import com.qmth.sop.business.entity.SysUser;
 import com.qmth.sop.business.entity.TBViolationDetail;
 import com.qmth.sop.business.service.TBViolationDetailService;
 import com.qmth.sop.common.contant.SystemConstant;
@@ -39,7 +40,8 @@ public class TBViolationDetailController {
     @ApiResponses({@ApiResponse(code = 200, message = "违规明细表查询结果", response = TBViolationDetail.class)})
     public Result query(@ApiParam(value = "sop违规登记表id", required = true) @RequestParam long id) {
 
-        List<TBViolationDetail> resultIPage = tBViolationDetailService.list(new QueryWrapper<TBViolationDetail>().lambda().eq(TBViolationDetail::getViolationId, id).orderByDesc(TBViolationDetail::getCreateTime));
+//        List<TBViolationDetail> resultIPage = tBViolationDetailService.list(new QueryWrapper<TBViolationDetail>().lambda().eq(TBViolationDetail::getViolationId, id).orderByDesc(TBViolationDetail::getCreateTime));
+        List<TBViolationDetail> resultIPage = tBViolationDetailService.listByViolationId(id);
         return ResultUtil.ok(resultIPage);
     }
 

sop-business/src/main/java/com/qmth/sop/business/entity/TBViolationDetail.java

@@ -1,5 +1,6 @@
 package com.qmth.sop.business.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
@@ -42,6 +43,10 @@ public class TBViolationDetail implements Serializable {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long createId;
 
+    @ApiModelProperty(value = "创建人")
+    @TableField(exist = false)
+    private String createName;
+
     @ApiModelProperty(value = "创建时间")
     private Long createTime;
 
@@ -92,4 +97,12 @@ public class TBViolationDetail implements Serializable {
     public void setCreateTime(Long createTime) {
         this.createTime = createTime;
     }
+
+    public String getCreateName() {
+        return createName;
+    }
+
+    public void setCreateName(String createName) {
+        this.createName = createName;
+    }
 }

sop-business/src/main/java/com/qmth/sop/business/mapper/TBViolationDetailMapper.java

@@ -2,6 +2,9 @@ package com.qmth.sop.business.mapper;
 
 import com.qmth.sop.business.entity.TBViolationDetail;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface TBViolationDetailMapper extends BaseMapper<TBViolationDetail> {
 
+    List<TBViolationDetail> listByViolationId(@Param("id") long id);
 }

sop-business/src/main/java/com/qmth/sop/business/service/TBViolationDetailService.java

@@ -3,6 +3,8 @@ package com.qmth.sop.business.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.sop.business.entity.TBViolationDetail;
+
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -33,4 +35,5 @@ public interface TBViolationDetailService extends IService<TBViolationDetail>{
     Boolean delete(Long id);
 
 
+    List<TBViolationDetail> listByViolationId(long id);
 }

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBViolationDetailServiceImpl.java

@@ -1,13 +1,11 @@
 package com.qmth.sop.business.service.impl;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.boot.api.exception.ApiException;
-import com.qmth.sop.business.entity.TBViolationDetail;
 import com.qmth.sop.business.entity.SysUser;
+import com.qmth.sop.business.entity.TBViolationDetail;
 import com.qmth.sop.business.mapper.TBViolationDetailMapper;
 import com.qmth.sop.business.service.TBViolationDetailService;
-import com.qmth.sop.common.contant.SystemConstant;
 import com.qmth.sop.common.enums.ExceptionResultEnum;
 import com.qmth.sop.common.enums.FieldUniqueEnum;
 import com.qmth.sop.common.util.ResultUtil;
@@ -15,9 +13,8 @@ import com.qmth.sop.common.util.ServletUtil;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.Map;
+
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -30,50 +27,55 @@ import java.util.Objects;
  * @Company: www.qmth.com.cn
  */
 @Service
-public class TBViolationDetailServiceImpl extends ServiceImpl<TBViolationDetailMapper, TBViolationDetail> implements TBViolationDetailService{
+public class TBViolationDetailServiceImpl extends ServiceImpl<TBViolationDetailMapper, TBViolationDetail> implements TBViolationDetailService {
 
 
-		/**
-		* 新增修改违规明细表
-		*
-		* @param tBViolationDetail
-		*/
-		@Override
-		@Transactional
-		public Boolean saveTBViolationDetail(TBViolationDetail tBViolationDetail) {
-			try {
-				SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-				if (Objects.isNull(tBViolationDetail.getId())) {// 新增
-					tBViolationDetail.setCreateId(sysUser.getId());
-					tBViolationDetail.setCreateTime(System.currentTimeMillis());
-				} else { // 修改
+    /**
+     * 新增修改违规明细表
+     *
+     * @param tBViolationDetail
+     */
+    @Override
+    @Transactional
+    public Boolean saveTBViolationDetail(TBViolationDetail tBViolationDetail) {
+        try {
+            SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+            if (Objects.isNull(tBViolationDetail.getId())) {// 新增
+                tBViolationDetail.setCreateId(sysUser.getId());
+                tBViolationDetail.setCreateTime(System.currentTimeMillis());
+            } else { // 修改
 //					tBViolationDetail.updateInfo(sysUser.getId());
-				}
-				return saveOrUpdate(tBViolationDetail);
-			} catch (Exception e) {
-				if (e instanceof DuplicateKeyException) {
-				String errorColumn = e.getCause().toString();
-				String columnStr = errorColumn.substring(errorColumn.lastIndexOf("key") + 3, errorColumn.length()).replaceAll("'", "");
-				throw ExceptionResultEnum.SQL_ERROR.exception("[" + FieldUniqueEnum.convertToTitle(columnStr) + "]数据不允许重复插入");
-				} else if (e instanceof ApiException) {
-				ResultUtil.error((ApiException) e, e.getMessage());
-				} else {
-				ResultUtil.error(e.getMessage());
-				}
-			}
-			return null;
+            }
+            return saveOrUpdate(tBViolationDetail);
+        } catch (Exception e) {
+            if (e instanceof DuplicateKeyException) {
+                String errorColumn = e.getCause().toString();
+                String columnStr = errorColumn.substring(errorColumn.lastIndexOf("key") + 3, errorColumn.length()).replaceAll("'", "");
+                throw ExceptionResultEnum.SQL_ERROR.exception("[" + FieldUniqueEnum.convertToTitle(columnStr) + "]数据不允许重复插入");
+            } else if (e instanceof ApiException) {
+                ResultUtil.error((ApiException) e, e.getMessage());
+            } else {
+                ResultUtil.error(e.getMessage());
+            }
+        }
+        return null;
+
+    }
 
-		}
+    /**
+     * 删除违规明细表
+     *
+     * @param id
+     */
+    @Override
+    @Transactional
+    public Boolean delete(Long id) {
+        return this.removeById(id);
+    }
 
-		/**
-		* 删除违规明细表
-		*
-		* @param id
-		*/
-		@Override
-		@Transactional
-		public Boolean delete(Long id) {
-			return this.removeById(id);
-		}
+    @Override
+    public List<TBViolationDetail> listByViolationId(long id) {
+        return this.baseMapper.listByViolationId(id);
+    }
 
 }

sop-business/src/main/resources/mapper/TBViolationDetailMapper.xml

@@ -1,5 +1,19 @@
 <?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.qmth.sop.business.mapper.TBViolationDetailMapper">
+    <select id="listByViolationId" resultType="com.qmth.sop.business.entity.TBViolationDetail">
+        SELECT
+        a.*,
+        cu.real_name create_name
+        FROM
+        t_b_violation_detail a
+        LEFT JOIN sys_user cu ON cu.id = a.create_id
+        <where>
+            <if test="id != null and id != ''">
+                and a.violation_id = #{id}
+            </if>
+        </where>
 
+        ORDER BY a.create_time DESC
+    </select>
 </mapper>