Skip to content

K
klck
Commit 52507452 authored by dongjg's avatar dongjg
Browse files
Options

Merge branch 'master' of H:\Project\java\klck\klck with conflicts.

parent ca6e511c
Show whitespace changes
Inline Side-by-side
Showing with 141 additions and 169 deletions
ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesRoleDetailController.java
View file @ 52507452
......@@ -24,7 +24,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
* 规则详情Controller
*
* @author dongjg
* @date 2023-07-12
* @date 2023-07-13
*/
@RestController
@RequestMapping("/system/suppliesroledetail")
......
ruoyi-supplies/src/main/java/com/ruoyi/system/domain/ActSuppliesRoleDetail.java
View file @ 52507452
......@@ -9,7 +9,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
* 规则详情对象 act_supplies_role_detail
*
* @author dongjg
* @date 2023-07-12
* @date 2023-07-13
*/
public class ActSuppliesRoleDetail extends BaseEntity
{
......@@ -26,14 +26,30 @@ public class ActSuppliesRoleDetail extends BaseEntity
@Excel(name = "规则名称")
private String detailName;
/** 目标行 */
@Excel(name = "目标行")
private String detailMH;
/** 规则内容 */
@Excel(name = "规则内容")
private String detailContent;
/** 目标列 */
@Excel(name = "目标列")
private String detailML;
/** 状态 */
@Excel(name = "状态")
private Integer status;
/** 原行 */
@Excel(name = "原行")
private String detailYH;
/** 原列 */
@Excel(name = "原列")
private String datailYL;
public void setId(Integer id)
{
this.id = id;
......@@ -61,6 +77,15 @@ public class ActSuppliesRoleDetail extends BaseEntity
{
return detailName;
}
public void setDetailMH(String detailMH)
{
this.detailMH = detailMH;
}
public String getDetailMH()
{
return detailMH;
}
public void setDetailContent(String detailContent)
{
this.detailContent = detailContent;
......@@ -70,6 +95,15 @@ public class ActSuppliesRoleDetail extends BaseEntity
{
return detailContent;
}
public void setDetailML(String detailML)
{
this.detailML = detailML;
}
public String getDetailML()
{
return detailML;
}
public void setStatus(Integer status)
{
this.status = status;
......@@ -79,6 +113,24 @@ public class ActSuppliesRoleDetail extends BaseEntity
{
return status;
}
public void setDetailYH(String detailYH)
{
this.detailYH = detailYH;
}
public String getDetailYH()
{
return detailYH;
}
public void setDatailYL(String datailYL)
{
this.datailYL = datailYL;
}
public String getDatailYL()
{
return datailYL;
}
@Override
public String toString() {
......@@ -86,10 +138,14 @@ public class ActSuppliesRoleDetail extends BaseEntity
.append("id", getId())
.append("roleId", getRoleId())
.append("detailName", getDetailName())
.append("detailMH", getDetailMH())
.append("detailContent", getDetailContent())
.append("detailML", getDetailML())
.append("status", getStatus())
.append("detailYH", getDetailYH())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("datailYL", getDatailYL())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.toString();
......
ruoyi-supplies/src/main/java/com/ruoyi/system/mapper/ActSuppliesRoleDetailMapper.java
View file @ 52507452
......@@ -7,7 +7,7 @@ import com.ruoyi.system.domain.ActSuppliesRoleDetail;
* 规则详情Mapper接口
*
* @author dongjg
* @date 2023-07-12
* @date 2023-07-13
*/
public interface ActSuppliesRoleDetailMapper
{
......
ruoyi-supplies/src/main/java/com/ruoyi/system/service/IActSuppliesRoleDetailService.java
View file @ 52507452
......@@ -7,7 +7,7 @@ import com.ruoyi.system.domain.ActSuppliesRoleDetail;
* 规则详情Service接口
*
* @author dongjg
* @date 2023-07-12
* @date 2023-07-13
*/
public interface IActSuppliesRoleDetailService
{
......
ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesRoleDetailServiceImpl.java
View file @ 52507452
......@@ -12,7 +12,7 @@ import com.ruoyi.system.service.IActSuppliesRoleDetailService;
* 规则详情Service业务层处理
*
* @author dongjg
* @date 2023-07-12
* @date 2023-07-13
*/
@Service
public class ActSuppliesRoleDetailServiceImpl implements IActSuppliesRoleDetailService
......
ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesRoleDetailMapper.xml
View file @ 52507452
......@@ -8,16 +8,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="id" column="id" />
<result property="roleId" column="role_id" />
<result property="detailName" column="detail_name" />
<result property="detailMH" column="detail_m_h" />
<result property="detailContent" column="detail_content" />
<result property="detailML" column="detail_m_l" />
<result property="status" column="status" />
<result property="detailYH" column="detail_y_h" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="datailYL" column="datail_y_l" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
</resultMap>
<sql id="selectActSuppliesRoleDetailVo">
select id, role_id, detail_name, detail_content, status, create_by, create_time, update_by, update_time from act_supplies_role_detail
select id, role_id, detail_name, detail_m_h, detail_content, detail_m_l, status, detail_y_h, create_by, create_time, datail_y_l, update_by, update_time from act_supplies_role_detail
</sql>
<select id="selectActSuppliesRoleDetailList" parameterType="ActSuppliesRoleDetail" resultMap="ActSuppliesRoleDetailResult">
......@@ -25,8 +29,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<if test="roleId != null "> and role_id = #{roleId}</if>
<if test="detailName != null and detailName != ''"> and detail_name like concat('%', #{detailName}, '%')</if>
<if test="detailMH != null and detailMH != ''"> and detail_m_h = #{detailMH}</if>
<if test="detailContent != null and detailContent != ''"> and detail_content = #{detailContent}</if>
<if test="detailML != null and detailML != ''"> and detail_m_l = #{detailML}</if>
<if test="status != null "> and status = #{status}</if>
<if test="detailYH != null and detailYH != ''"> and detail_y_h = #{detailYH}</if>
<if test="datailYL != null and datailYL != ''"> and datail_y_l = #{datailYL}</if>
</where>
</select>
......@@ -40,20 +48,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="roleId != null">role_id,</if>
<if test="detailName != null">detail_name,</if>
<if test="detailMH != null">detail_m_h,</if>
<if test="detailContent != null">detail_content,</if>
<if test="detailML != null">detail_m_l,</if>
<if test="status != null">status,</if>
<if test="detailYH != null">detail_y_h,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="datailYL != null">datail_y_l,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="roleId != null">#{roleId},</if>
<if test="detailName != null">#{detailName},</if>
<if test="detailMH != null">#{detailMH},</if>
<if test="detailContent != null">#{detailContent},</if>
<if test="detailML != null">#{detailML},</if>
<if test="status != null">#{status},</if>
<if test="detailYH != null">#{detailYH},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="datailYL != null">#{datailYL},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
</trim>
......@@ -64,10 +80,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="SET" suffixOverrides=",">
<if test="roleId != null">role_id = #{roleId},</if>
<if test="detailName != null">detail_name = #{detailName},</if>
<if test="detailMH != null">detail_m_h = #{detailMH},</if>
<if test="detailContent != null">detail_content = #{detailContent},</if>
<if test="detailML != null">detail_m_l = #{detailML},</if>
<if test="status != null">status = #{status},</if>
<if test="detailYH != null">detail_y_h = #{detailYH},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="datailYL != null">datail_y_l = #{datailYL},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
......
ruoyi-system/src/main/resources/mapper/system/SysSuppliesMapper.xml
View file @ 52507452
......@@ -4,172 +4,39 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.ISysSuppliesMapper">
<resultMap type="SysSupplies" id="SuppliesTemplateResult">
<result property="id" column="id" />
<result property="detId" column="det_id" />
<result property="templateName" column="template_name" />
<result property="templateContent" column="template_content" />
<result property="status" column="status" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="sysclassify" column="sysclassify"/>
<result property="sname" column="sname" />
<resultMap type="SysSupplies" id="SysSuppliesResult">
<result property="id" column="id"/>
<result property="name" column="name"/>
<result property="jsons" column="jsons"/>
</resultMap>
<resultMap type="com.ruoyi.system.domain.ActSuppliesDetails" id="SuppliesDetailsResult">
<result property="id" column="id" />
<result property="sid" column="sid" />
<result property="detailsName" column="details_name" />
<result property="sysclassify" column="sysclassify" />
<result property="status" column="status" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
</resultMap>
<sql id="selectSuppliesTemplateVo">
select id, det_id, template_name, template_content, status, create_by, create_time, update_by, update_time from act_supplies_template
</sql>
<select id="selectlistnameid" parameterType="com.ruoyi.system.domain.ActSuppliesDetails" resultMap="SuppliesDetailsResult">
select id, sid, details_name, sysclassify from act_supplies_details where status = 0
</select>
<select id="selectSuppliesTemplateList" parameterType="SysSupplies" resultMap="SuppliesTemplateResult">
select a.id, a.det_id, a.template_name, a.template_content, a.status,b.details_name sname,b.sysclassify from act_supplies_template a,act_supplies_details b
<where>
<if test="detId != null "> and a.det_id = #{detId}</if>
<if test="templateName != null and templateName != ''"> and a.template_name like concat('%', #{templateName}, '%')</if>
<if test="templateContent != null and templateContent != ''"> and a.template_content = #{templateContent}</if>
<if test="status != null "> and a.status = #{status}</if>
and a.det_id = b.id
</where>
<select id="list" resultMap="SysSuppliesResult">
select
id,
name,
jsons
from sys_supplies
where 1=1
</select>
<select id="selectSuppliesTemplateById" parameterType="Long" resultMap="SuppliesTemplateResult">
<include refid="selectSuppliesTemplateVo"/>
<select id="selectExcelById" resultMap="SysSuppliesResult">
select
id,
name,
jsons
from sys_supplies
where id = #{id}
</select>
<select id="saveTemplate" parameterType="Long" resultMap="SuppliesTemplateResult">
<include refid="selectSuppliesTemplateVo"/>
where id = #{id}
</select>
<insert id="insertSuppliesTemplate" parameterType="SysSupplies" useGeneratedKeys="true" keyProperty="id">
insert into act_supplies_template
<insert id="save" parameterType="SysSupplies" useGeneratedKeys="true" keyProperty="id">
insert into sys_supplies
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="detId != null">det_id,</if>
<if test="templateName != null">template_name,</if>
<if test="templateContent != null">template_content,</if>
<if test="status != null">status,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="name != null">name,</if>
<if test="jsons != null">jsons,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="detId != null">#{detId},</if>
<if test="templateName != null">#{templateName},</if>
<if test="templateContent != null">#{templateContent},</if>
<if test="status != null">#{status},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
</trim>
</insert>
<if test="name != null">#{name},</if>
<if test="jsons != null">#{jsons},</if>
<update id="updateSuppliesTemplate" parameterType="SysSupplies">
update act_supplies_template
<trim prefix="SET" suffixOverrides=",">
<if test="detId != null">det_id = #{detId},</if>
<if test="templateName != null">template_name = #{templateName},</if>
<if test="templateContent != null">template_content = #{templateContent},</if>
<if test="status != null">status = #{status},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteSuppliesTemplateById" parameterType="Long">
delete from act_supplies_template where id = #{id}
</delete>
<delete id="deleteSuppliesTemplateByIds" parameterType="String">
delete from act_supplies_template where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</insert>
</mapper>
\ No newline at end of file
<!--<?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.ruoyi.system.mapper.ISysSuppliesMapper">-->
<!-- <resultMap type="SysSupplies" id="SysSuppliesResult">-->
<!-- <result property="id" column="id"/>-->
<!-- <result property="name" column="name"/>-->
<!-- <result property="jsons" column="jsons"/>-->
<!-- </resultMap>-->
<!-- <select id="list" resultMap="SysSuppliesResult">-->
<!-- select-->
<!-- id,-->
<!-- name,-->
<!-- jsons-->
<!-- from sys_supplies-->
<!-- where 1=1-->
<!-- </select>-->
<!-- <select id="selectExcelById" resultMap="SysSuppliesResult">-->
<!-- select-->
<!-- id,-->
<!-- name,-->
<!-- jsons-->
<!-- from sys_supplies-->
<!-- where id = #{id}-->
<!-- </select>-->
<!-- <insert id="save" parameterType="SysSupplies" useGeneratedKeys="true" keyProperty="id">-->
<!-- insert into sys_supplies-->
<!-- <trim prefix="(" suffix=")" suffixOverrides=",">-->
<!-- <if test="name != null">name,</if>-->
<!-- <if test="jsons != null">jsons,</if>-->
<!-- </trim>-->
<!-- <trim prefix="values (" suffix=")" suffixOverrides=",">-->
<!-- <if test="name != null">#{name},</if>-->
<!-- <if test="jsons != null">#{jsons},</if>-->
<!-- </trim>-->
<!-- </insert>-->
<!--</mapper>-->
\ No newline at end of file
ruoyi-ui/src/views/system/suppliesroledetail/index.vue
View file @ 52507452
......@@ -78,9 +78,18 @@
<el-table v-loading="loading" :data="suppliesroledetailList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="规则详情ID" align="center" prop="id" />
<el-table-column label="导入规则ID" align="center" prop="roleId" />
<el-table-column label="规则名称" align="center" prop="detailName" />
<el-table-column label="ID" align="center" prop="id" />
<el-table-column label="导入规则" align="center" prop="roleId" />
<el-table-column label="替换规则" align="center" prop="detailML,detailMH,detailYH,datailYL" >
<template slot-scope="scope">
{{scope.row.detailML}}{{scope.row.detailMH}}
<span v-show="scope.row.detailML!=null&&scope.row.detailML!=null&&scope.row.detailML!=null&&scope.row.detailML!=null"> 单元替换 </span>
{{scope.row.datailYL}}{{scope.row.detailYH}}</template>
</el-table-column>
<el-table-column label="目标列" align="center" prop="detailML" />
<el-table-column label="目标行" align="center" prop="detailMH" />
<el-table-column label="模板列" align="center" prop="datailYL" />
<el-table-column label="模板行" align="center" prop="detailYH" />
<el-table-column label="规则内容" align="center" prop="detailContent" />
<el-table-column label="状态" align="center" prop="status" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
......@@ -114,12 +123,24 @@
<!-- 添加或修改规则详情对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="导入规则ID" prop="roleId">
<el-form-item label="ID" prop="roleId">
<el-input v-model="form.roleId" placeholder="请输入导入规则ID" />
</el-form-item>
<el-form-item label="规则名称" prop="detailName">
<el-input v-model="form.detailName" placeholder="请输入规则名称" />
</el-form-item>
<el-form-item label="原行" prop="detailYH">
<el-input v-model="form.detailYH" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="原列" prop="datailYL">
<el-input v-model="form.datailYL" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="目标行" prop="detailMH">
<el-input v-model="form.detailMH" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="目标列" prop="detailML">
<el-input v-model="form.detailML" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="规则内容">
<editor v-model="form.detailContent" :min-height="192"/>
</el-form-item>
......@@ -172,8 +193,12 @@ export default {
pageSize: 10,
roleId: null,
detailName: null,
detailMH: null,
detailContent: null,
detailML: null,
status: null,
detailYH: null,
datailYL: null,
},
// 表单参数
form: {},
......@@ -206,10 +231,14 @@ export default {
id: null,
roleId: null,
detailName: null,
detailMH: null,
detailContent: null,
detailML: null,
status: 0,
detailYH: null,
createBy: null,
createTime: null,
datailYL: null,
updateBy: null,
updateTime: null
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment