Skip to content

R
RuoYi-Vue-master
Commit 2f4d1124 authored by 周昊's avatar 周昊
Browse files
Options

1、修改pc端导出word 

2、修改pc端获取项目添加业态字段
parent 2ed88edd
Show whitespace changes
Inline Side-by-side
Showing with 67 additions and 17 deletions
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/LedgerProjectController.java
View file @ 2f4d1124
...@@ -114,7 +114,7 @@ public class LedgerProjectController extends BaseController ...@@ -114,7 +114,7 @@ public class LedgerProjectController extends BaseController
public R<List<LedgerProject>> listByQuery(@PathVariable String projectName) public R<List<LedgerProject>> listByQuery(@PathVariable String projectName)
{ {
QueryWrapper<LedgerProject> queryWrapper = new QueryWrapper<>(); QueryWrapper<LedgerProject> queryWrapper = new QueryWrapper<>();
queryWrapper.select("name","id").lambda().like(LedgerProject::getName,projectName); queryWrapper.select("name","id","business").lambda().like(LedgerProject::getName,projectName);
List<LedgerProject> list = ledgerProjectService.list(queryWrapper); List<LedgerProject> list = ledgerProjectService.list(queryWrapper);
return R.ok(list); return R.ok(list);
} }
......
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/LedgerProject.java
View file @ 2f4d1124
...@@ -27,6 +27,10 @@ public class LedgerProject extends BaseEntityClean ...@@ -27,6 +27,10 @@ public class LedgerProject extends BaseEntityClean
@Excel(name = "项目类型") @Excel(name = "项目类型")
private String type; private String type;
/** 项目业态 */
@Excel(name = "项目业态")
private String business;
/** 组织机构id */ /** 组织机构id */
@Excel(name = "组织机构id") @Excel(name = "组织机构id")
private Long deptId; private Long deptId;
......
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/domain/dto/RiskNotificationExportWordDto.java
View file @ 2f4d1124
...@@ -64,6 +64,11 @@ public class RiskNotificationExportWordDto { ...@@ -64,6 +64,11 @@ public class RiskNotificationExportWordDto {
*/ */
private String userName; private String userName;
/**
* 管控责任人联系电话
*/
private String userPhone;
/** /**
* 应急措施 * 应急措施
*/ */
......
censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/LedgerRoomServiceImpl.java
View file @ 2f4d1124
...@@ -57,7 +57,7 @@ public class LedgerRoomServiceImpl extends MPJBaseServiceImpl<LedgerRoomMapper, ...@@ -57,7 +57,7 @@ public class LedgerRoomServiceImpl extends MPJBaseServiceImpl<LedgerRoomMapper,
return "#FF9800"; return "#FF9800";
case "一般风险": case "一般风险":
return "#FFFF00"; return "#FFFF00";
case "较小风险": case "低风险":
return "#0091EA"; return "#0091EA";
default: default:
return "#F0F1F5"; return "#F0F1F5";
......
censoft-rongtong/src/main/resources/mapper/system/LedgerProjectMapper.xml
View file @ 2f4d1124
...@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="id" column="id" /> <result property="id" column="id" />
<result property="name" column="name" /> <result property="name" column="name" />
<result property="type" column="type" /> <result property="type" column="type" />
<result property="business" column="business" />
<result property="deptId" column="dept_id" /> <result property="deptId" column="dept_id" />
<result property="city" column="city" /> <result property="city" column="city" />
<result property="address" column="address" /> <result property="address" column="address" />
...@@ -21,11 +22,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -21,11 +22,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectLedgerProjectVo"> <sql id="selectLedgerProjectVo">
select id, name, type, dept_id, city, address, source, status, del_flag, create_by, create_time, update_by, update_time from ledger_project select id, name, type,business, dept_id, city, address, source, status, del_flag, create_by, create_time, update_by, update_time from ledger_project
</sql> </sql>
<select id="selectLedgerProjectList" parameterType="com.censoft.censoftrongtong.domain.LedgerProject" resultMap="LedgerProjectResult"> <select id="selectLedgerProjectList" parameterType="com.censoft.censoftrongtong.domain.LedgerProject" resultMap="LedgerProjectResult">
SELECT p.id, p.NAME, p.type, p.dept_id, d.dept_name, p.city, p.address, p.source, p.STATUS, p.del_flag, p.create_by, p.create_time, p.update_by, p.update_time FROM ledger_project p LEFT JOIN sys_dept d ON p.dept_id = d.dept_id SELECT p.id, p.NAME, p.type,p.business, p.dept_id, d.dept_name, p.city, p.address, p.source, p.STATUS, p.del_flag, p.create_by, p.create_time, p.update_by, p.update_time FROM ledger_project p LEFT JOIN sys_dept d ON p.dept_id = d.dept_id
<where> <where>
<if test="name != null and name != ''"> and p.name like concat('%', #{name}, '%')</if> <if test="name != null and name != ''"> and p.name like concat('%', #{name}, '%')</if>
<if test="type != null and type != ''"> and p.type = #{type}</if> <if test="type != null and type != ''"> and p.type = #{type}</if>
...@@ -46,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -46,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
lp.id, lp.id,
lp.NAME, lp.NAME,
lp.type, lp.type,
lp.business,
lp.dept_id, lp.dept_id,
lp.city, lp.city,
lp.address, lp.address,
...@@ -69,6 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -69,6 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="name != null">name,</if> <if test="name != null">name,</if>
<if test="type != null">type,</if> <if test="type != null">type,</if>
<if test="business != null">business,</if>
<if test="deptId != null">dept_id,</if> <if test="deptId != null">dept_id,</if>
<if test="city != null">city,</if> <if test="city != null">city,</if>
<if test="address != null">address,</if> <if test="address != null">address,</if>
...@@ -83,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -83,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="name != null">#{name},</if> <if test="name != null">#{name},</if>
<if test="type != null">#{type},</if> <if test="type != null">#{type},</if>
<if test="business != null">#{business},</if>
<if test="deptId != null">#{deptId},</if> <if test="deptId != null">#{deptId},</if>
<if test="city != null">#{city},</if> <if test="city != null">#{city},</if>
<if test="address != null">#{address},</if> <if test="address != null">#{address},</if>
...@@ -101,6 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -101,6 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="name != null">name = #{name},</if> <if test="name != null">name = #{name},</if>
<if test="type != null">type = #{type},</if> <if test="type != null">type = #{type},</if>
<if test="business != null">business = #{business},</if>
<if test="deptId != null">dept_id = #{deptId},</if> <if test="deptId != null">dept_id = #{deptId},</if>
<if test="city != null">city = #{city},</if> <if test="city != null">city = #{city},</if>
<if test="address != null">address = #{address},</if> <if test="address != null">address = #{address},</if>
......
censoft-rongtong/src/main/resources/mapper/system/RiskPlanInherentListMapper.xml
View file @ 2f4d1124
...@@ -391,18 +391,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -391,18 +391,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="getRiskNotificationExportWordDto" <select id="getRiskNotificationExportWordDto"
resultType="com.censoft.censoftrongtong.domain.dto.RiskNotificationExportWordDto"> resultType="com.censoft.censoftrongtong.domain.dto.RiskNotificationExportWordDto">
SELECT SELECT
IFNULL( rpil.`name`, ' ' ) AS `name`, lr.`name` AS `name`,
rpil.`level`, rpil.`level`,
rpil.hazard_source_name AS dangerName, rpil.`name` AS dangerName,
rpil.point_type AS pointType, rpil.point_type AS pointType,
rpil.type, rpil.type,
rpil.safety_warning_signs AS safetyWarningSigns, rpil.safety_warning_signs AS safetyWarningSigns,
rpil.measures_administration AS measuresAdministration, rpil.measures_administration AS measuresAdministration,
rpil.measures_dept_name AS deptName, rpil.measures_dept_name AS deptName,
rpil.measures_user_name AS userName, rpil.measures_user_name AS userName,
rpil.measures_user_phone AS userPhone,
rpil.measures_emergency AS measuresEmergency rpil.measures_emergency AS measuresEmergency
FROM FROM
risk_plan_inherent_list rpil risk_plan_inherent_list rpil
left join ledger_room lr on lr.id = rpil.room_id
WHERE WHERE
rpil.id = #{inherentId} rpil.id = #{inherentId}
</select> </select>
......
ruoyi-admin/src/main/resources/templates/ftl/word.ftl
View file @ 2f4d1124
...@@ -663,7 +663,9 @@ ...@@ -663,7 +663,9 @@
<w:rPr> <w:rPr>
<wx:font wx:val="宋体"/> <wx:font wx:val="宋体"/>
</w:rPr> </w:rPr>
<#if name??>
<w:t>${name}</w:t> <w:t>${name}</w:t>
</#if>
</w:r> </w:r>
<w:r wsp:rsidRPr="009370A0"> <w:r wsp:rsidRPr="009370A0">
<w:t> (</w:t> <w:t> (</w:t>
...@@ -672,7 +674,9 @@ ...@@ -672,7 +674,9 @@
<w:rPr> <w:rPr>
<wx:font wx:val="宋体"/> <wx:font wx:val="宋体"/>
</w:rPr> </w:rPr>
<#if level??>
<w:t>${level}</w:t> <w:t>${level}</w:t>
</#if>
</w:r> </w:r>
<w:r wsp:rsidRPr="009370A0"> <w:r wsp:rsidRPr="009370A0">
<w:t>)</w:t> <w:t>)</w:t>
...@@ -694,7 +698,9 @@ ...@@ -694,7 +698,9 @@
<wx:font wx:val="宋体"/> <wx:font wx:val="宋体"/>
</w:rPr> </w:rPr>
<#if dangerName??> <#if dangerName??>
<w:t>${dangerName}</w:t> <w:t>
${dangerName}
</w:t>
</#if> </#if>
</w:r> </w:r>
</w:p> </w:p>
...@@ -763,7 +769,11 @@ ...@@ -763,7 +769,11 @@
<w:rPr> <w:rPr>
<wx:font wx:val="宋体"/> <wx:font wx:val="宋体"/>
</w:rPr> </w:rPr>
<w:t>
<#if pointType??>
<w:t>${pointType}</w:t> <w:t>${pointType}</w:t>
</#if>
</w:t>
</w:r> </w:r>
</w:p> </w:p>
</w:tc> </w:tc>
...@@ -781,7 +791,11 @@ ...@@ -781,7 +791,11 @@
<w:rPr> <w:rPr>
<wx:font wx:val="宋体"/> <wx:font wx:val="宋体"/>
</w:rPr> </w:rPr>
<w:t>
<#if type??>
<w:t>${type}</w:t> <w:t>${type}</w:t>
</#if>
</w:t>
</w:r> </w:r>
</w:p> </w:p>
</w:tc> </w:tc>
...@@ -953,7 +967,11 @@ ...@@ -953,7 +967,11 @@
<w:rPr> <w:rPr>
<wx:font wx:val="宋体"/> <wx:font wx:val="宋体"/>
</w:rPr> </w:rPr>
<w:t>
<#if measuresAdministration??>
<w:t>${measuresAdministration}</w:t> <w:t>${measuresAdministration}</w:t>
</#if>
</w:t>
</w:r> </w:r>
</w:p> </w:p>
</w:tc> </w:tc>
...@@ -1033,7 +1051,11 @@ ...@@ -1033,7 +1051,11 @@
<w:jc w:val="center"/> <w:jc w:val="center"/>
</w:pPr> </w:pPr>
<w:r wsp:rsidRPr="009370A0"> <w:r wsp:rsidRPr="009370A0">
<w:t>
<#if deptName??>
<w:t>${deptName}</w:t> <w:t>${deptName}</w:t>
</#if>
</w:t>
</w:r> </w:r>
</w:p> </w:p>
</w:tc> </w:tc>
...@@ -1048,7 +1070,11 @@ ...@@ -1048,7 +1070,11 @@
<w:jc w:val="center"/> <w:jc w:val="center"/>
</w:pPr> </w:pPr>
<w:r wsp:rsidRPr="009370A0"> <w:r wsp:rsidRPr="009370A0">
<w:t>
<#if userName??>
<w:t>${userName}</w:t> <w:t>${userName}</w:t>
</#if>
</w:t>
</w:r> </w:r>
</w:p> </w:p>
</w:tc> </w:tc>
...@@ -1066,7 +1092,11 @@ ...@@ -1066,7 +1092,11 @@
<w:rPr> <w:rPr>
<wx:font wx:val="宋体"/> <wx:font wx:val="宋体"/>
</w:rPr> </w:rPr>
<w:t>
<#if measuresEmergency??>
<w:t>${measuresEmergency}</w:t> <w:t>${measuresEmergency}</w:t>
</#if>
</w:t>
</w:r> </w:r>
</w:p> </w:p>
</w:tc> </w:tc>
...@@ -1091,7 +1121,7 @@ ...@@ -1091,7 +1121,7 @@
<w:rFonts w:hint="fareast"/> <w:rFonts w:hint="fareast"/>
<wx:font wx:val="宋体"/> <wx:font wx:val="宋体"/>
</w:rPr> </w:rPr>
<w:t>急救电话：火警电话：公司</w:t> <w:t>急救电话：120 火警电话：119 公司</w:t>
</w:r> </w:r>
<w:r wsp:rsidRPr="009370A0"> <w:r wsp:rsidRPr="009370A0">
<w:rPr> <w:rPr>
...@@ -1107,7 +1137,11 @@ ...@@ -1107,7 +1137,11 @@
<w:rFonts w:hint="fareast"/> <w:rFonts w:hint="fareast"/>
<wx:font wx:val="宋体"/> <wx:font wx:val="宋体"/>
</w:rPr> </w:rPr>
<w:t>小时应急值守电话：</w:t> <w:t>小时应急值守电话：
<#if userPhone??>
<w:t>${userPhone}</w:t>
</#if>
</w:t>
</w:r> </w:r>
</w:p> </w:p>
</w:tc> </w:tc>
......
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