zhangyu
/
wit-park-backend
forked from xxhjsb/wit-park-backend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

返回时间修改

main
zhangyu 2023-02-23 13:37:13 +08:00
parent 7a24cc710b
commit 1709777cb2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/HiddenDanger.java
View File

@ -40,7 +40,7 @@ public class HiddenDanger extends BaseEntity
/** 上报日期 */ /** 上报日期 */
@ApiModelProperty(value = "上报日期") @ApiModelProperty(value = "上报日期")
private Date submitDate; private String submitDate;
/** 上报人id */ /** 上报人id */
@ApiModelProperty(value = "上报人id") @ApiModelProperty(value = "上报人id")

6
hbt-safety-supervision/hbt-safety-supervision-biz/src/main/resources/mapper/HiddenDangerMapper.xml
View File

@ -22,17 +22,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectHiddenDangerVo"> <sql id="selectHiddenDangerVo">
select id, name, details, risk_id, submit_date, submit_person_id, submit_enterprise_id, reform_measures, reform_status, exceed_time_limit_status, enterprise_id, person_id, remarks, rectification_period from hidden_danger select id, name, details, risk_id riskId, DATE_FORMAT(submit_date,'%Y-%m-%d %H:%i:%S') submitDate, submit_person_id submitPersonId, submit_enterprise_id submitEnterpriseId, reform_measures reformMeasures, reform_status reformStatus, exceed_time_limit_status exceedTimeLimitStatus, enterprise_id enterpriseId, person_id personId, remarks, rectification_period rectificationPeriod from hidden_danger
</sql> </sql>
<select id="selectHiddenDangerList" parameterType="com.hbt.safety.supervision.pojo.HiddenDanger" resultMap="HiddenDangerResult"> <select id="selectHiddenDangerList" parameterType="com.hbt.safety.supervision.pojo.HiddenDanger" resultType="HiddenDanger">
<include refid="selectHiddenDangerVo"/> <include refid="selectHiddenDangerVo"/>
<where> <where>
</where> </where>
</select> </select>
<sql id="selectHiddenDanger"> <sql id="selectHiddenDanger">
select distinct(a.id) id, a.name, a.details, a.risk_id riskId, a.submit_date submitDate, a.reform_measures reformMeasures, a.reform_status reformStatus, a.exceed_time_limit_status exceedTimeLimitStatus, a.enterprise_id enterpriseId, a.person_id personId, a.remarks remarks, a.rectification_period rectificationPeriod, select distinct(a.id) id, a.name, a.details, a.risk_id riskId, DATE_FORMAT(a.submit_date,'%Y-%m-%d %H:%i:%S') submitDate, a.reform_measures reformMeasures, a.reform_status reformStatus, a.exceed_time_limit_status exceedTimeLimitStatus, a.enterprise_id enterpriseId, a.person_id personId, a.remarks remarks, a.rectification_period rectificationPeriod,
b.name as enterprise, b.name as enterprise,
p.name as person, p.name as person,
r.name as riskName, r.name as riskName,