Commit 7446a4a6 authored by 赵啸非's avatar 赵啸非

添加消息任务表

parent 07712419
...@@ -274,6 +274,7 @@ CREATE INDEX idx_datumId ON mortals_sys_matter_datum_file (datumId); ...@@ -274,6 +274,7 @@ CREATE INDEX idx_datumId ON mortals_sys_matter_datum_file (datumId);
-- ---------------------------- -- ----------------------------
ALTER TABLE mortals_sys_site ADD COLUMN `govAffairStyle` varchar(1024) COMMENT '政务风貌,多个逗号分割' AFTER modelIds; ALTER TABLE mortals_sys_site ADD COLUMN `govAffairStyle` varchar(1024) COMMENT '政务风貌,多个逗号分割' AFTER modelIds;
ALTER TABLE mortals_sys_site ADD COLUMN `complaintHotline` varchar(64) COMMENT '投诉电话' AFTER govAffairStyle;
-- ---------------------------- -- ----------------------------
......
...@@ -14,7 +14,7 @@ import lombok.Data; ...@@ -14,7 +14,7 @@ import lombok.Data;
* 站点实体对象 * 站点实体对象
* *
* @author zxfei * @author zxfei
* @date 2024-12-04 * @date 2024-12-11
*/ */
@Data @Data
public class SiteEntity extends SiteVo { public class SiteEntity extends SiteVo {
...@@ -168,6 +168,10 @@ public class SiteEntity extends SiteVo { ...@@ -168,6 +168,10 @@ public class SiteEntity extends SiteVo {
* 政务风貌,多个逗号分割 * 政务风貌,多个逗号分割
*/ */
private String govAffairStyle; private String govAffairStyle;
/**
* 投诉电话
*/
private String complaintHotline;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -222,5 +226,6 @@ public class SiteEntity extends SiteVo { ...@@ -222,5 +226,6 @@ public class SiteEntity extends SiteVo {
this.leadingOfficialTelephone = ""; this.leadingOfficialTelephone = "";
this.modelIds = ""; this.modelIds = "";
this.govAffairStyle = ""; this.govAffairStyle = "";
this.complaintHotline = "";
} }
} }
\ No newline at end of file
...@@ -7,7 +7,7 @@ import com.mortals.xhx.module.site.model.SiteEntity; ...@@ -7,7 +7,7 @@ import com.mortals.xhx.module.site.model.SiteEntity;
* 站点查询对象 * 站点查询对象
* *
* @author zxfei * @author zxfei
* @date 2024-12-04 * @date 2024-12-11
*/ */
public class SiteQuery extends SiteEntity { public class SiteQuery extends SiteEntity {
/** 开始 序号,主键,自增长 */ /** 开始 序号,主键,自增长 */
...@@ -361,6 +361,11 @@ public class SiteQuery extends SiteEntity { ...@@ -361,6 +361,11 @@ public class SiteQuery extends SiteEntity {
/** 结束 修改时间 */ /** 结束 修改时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 投诉电话 */
private List<String> complaintHotlineList;
/** 投诉电话排除列表 */
private List <String> complaintHotlineNotList;
/** OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<SiteQuery> orConditionList; private List<SiteQuery> orConditionList;
...@@ -2367,6 +2372,38 @@ public class SiteQuery extends SiteEntity { ...@@ -2367,6 +2372,38 @@ public class SiteQuery extends SiteEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 投诉电话
* @return complaintHotlineList
*/
public List<String> getComplaintHotlineList(){
return this.complaintHotlineList;
}
/**
* 设置 投诉电话
* @param complaintHotlineList
*/
public void setComplaintHotlineList(List<String> complaintHotlineList){
this.complaintHotlineList = complaintHotlineList;
}
/**
* 获取 投诉电话
* @return complaintHotlineNotList
*/
public List<String> getComplaintHotlineNotList(){
return this.complaintHotlineNotList;
}
/**
* 设置 投诉电话
* @param complaintHotlineNotList
*/
public void setComplaintHotlineNotList(List<String> complaintHotlineNotList){
this.complaintHotlineNotList = complaintHotlineNotList;
}
/** /**
* 设置 序号,主键,自增长 * 设置 序号,主键,自增长
* @param id * @param id
...@@ -3528,6 +3565,25 @@ public class SiteQuery extends SiteEntity { ...@@ -3528,6 +3565,25 @@ public class SiteQuery extends SiteEntity {
} }
/**
* 设置 投诉电话
* @param complaintHotline
*/
public SiteQuery complaintHotline(String complaintHotline){
setComplaintHotline(complaintHotline);
return this;
}
/**
* 设置 投诉电话
* @param complaintHotlineList
*/
public SiteQuery complaintHotlineList(List<String> complaintHotlineList){
this.complaintHotlineList = complaintHotlineList;
return this;
}
/** /**
* 获取 OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合,列表项之间是OR,项内容之间是AND,如:(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
......
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="createUserId" column="createUserId" /> <result property="createUserId" column="createUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="complaintHotline" column="complaintHotline" />
</resultMap> </resultMap>
<!-- 表所有列 --> <!-- 表所有列 -->
...@@ -174,23 +175,26 @@ ...@@ -174,23 +175,26 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime, a.updateTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('complaintHotline') or colPickMode == 1 and data.containsKey('complaintHotline')))">
a.complaintHotline,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="SiteEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="SiteEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_sys_site insert into mortals_sys_site
(siteName,siteCode,areaID,areaCode,areaName,proCode,cityCode,districtCode,siteIp,sitePort,longitude,latitude,siteTel,detailAddress,siteRemark,amWorkStartTime,amWorkEndTime,pmWorkStartTime,pmWorkEndTime,workday1,workday2,workday3,workday4,workday5,workday6,workday7,onlineTake,appointment,gowMap,level,building,logoPath,englishName,leadingOfficial,leadingOfficialTelephone,modelIds,govAffairStyle,createTime,createUserId,updateTime) (siteName,siteCode,areaID,areaCode,areaName,proCode,cityCode,districtCode,siteIp,sitePort,longitude,latitude,siteTel,detailAddress,siteRemark,amWorkStartTime,amWorkEndTime,pmWorkStartTime,pmWorkEndTime,workday1,workday2,workday3,workday4,workday5,workday6,workday7,onlineTake,appointment,gowMap,level,building,logoPath,englishName,leadingOfficial,leadingOfficialTelephone,modelIds,govAffairStyle,createTime,createUserId,updateTime,complaintHotline)
VALUES VALUES
(#{siteName},#{siteCode},#{areaID},#{areaCode},#{areaName},#{proCode},#{cityCode},#{districtCode},#{siteIp},#{sitePort},#{longitude},#{latitude},#{siteTel},#{detailAddress},#{siteRemark},#{amWorkStartTime},#{amWorkEndTime},#{pmWorkStartTime},#{pmWorkEndTime},#{workday1},#{workday2},#{workday3},#{workday4},#{workday5},#{workday6},#{workday7},#{onlineTake},#{appointment},#{gowMap},#{level},#{building},#{logoPath},#{englishName},#{leadingOfficial},#{leadingOfficialTelephone},#{modelIds},#{govAffairStyle},#{createTime},#{createUserId},#{updateTime}) (#{siteName},#{siteCode},#{areaID},#{areaCode},#{areaName},#{proCode},#{cityCode},#{districtCode},#{siteIp},#{sitePort},#{longitude},#{latitude},#{siteTel},#{detailAddress},#{siteRemark},#{amWorkStartTime},#{amWorkEndTime},#{pmWorkStartTime},#{pmWorkEndTime},#{workday1},#{workday2},#{workday3},#{workday4},#{workday5},#{workday6},#{workday7},#{onlineTake},#{appointment},#{gowMap},#{level},#{building},#{logoPath},#{englishName},#{leadingOfficial},#{leadingOfficialTelephone},#{modelIds},#{govAffairStyle},#{createTime},#{createUserId},#{updateTime},#{complaintHotline})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_sys_site insert into mortals_sys_site
(siteName,siteCode,areaID,areaCode,areaName,proCode,cityCode,districtCode,siteIp,sitePort,longitude,latitude,siteTel,detailAddress,siteRemark,amWorkStartTime,amWorkEndTime,pmWorkStartTime,pmWorkEndTime,workday1,workday2,workday3,workday4,workday5,workday6,workday7,onlineTake,appointment,gowMap,level,building,logoPath,englishName,leadingOfficial,leadingOfficialTelephone,modelIds,govAffairStyle,createTime,createUserId,updateTime) (siteName,siteCode,areaID,areaCode,areaName,proCode,cityCode,districtCode,siteIp,sitePort,longitude,latitude,siteTel,detailAddress,siteRemark,amWorkStartTime,amWorkEndTime,pmWorkStartTime,pmWorkEndTime,workday1,workday2,workday3,workday4,workday5,workday6,workday7,onlineTake,appointment,gowMap,level,building,logoPath,englishName,leadingOfficial,leadingOfficialTelephone,modelIds,govAffairStyle,createTime,createUserId,updateTime,complaintHotline)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.siteName},#{item.siteCode},#{item.areaID},#{item.areaCode},#{item.areaName},#{item.proCode},#{item.cityCode},#{item.districtCode},#{item.siteIp},#{item.sitePort},#{item.longitude},#{item.latitude},#{item.siteTel},#{item.detailAddress},#{item.siteRemark},#{item.amWorkStartTime},#{item.amWorkEndTime},#{item.pmWorkStartTime},#{item.pmWorkEndTime},#{item.workday1},#{item.workday2},#{item.workday3},#{item.workday4},#{item.workday5},#{item.workday6},#{item.workday7},#{item.onlineTake},#{item.appointment},#{item.gowMap},#{item.level},#{item.building},#{item.logoPath},#{item.englishName},#{item.leadingOfficial},#{item.leadingOfficialTelephone},#{item.modelIds},#{item.govAffairStyle},#{item.createTime},#{item.createUserId},#{item.updateTime}) (#{item.siteName},#{item.siteCode},#{item.areaID},#{item.areaCode},#{item.areaName},#{item.proCode},#{item.cityCode},#{item.districtCode},#{item.siteIp},#{item.sitePort},#{item.longitude},#{item.latitude},#{item.siteTel},#{item.detailAddress},#{item.siteRemark},#{item.amWorkStartTime},#{item.amWorkEndTime},#{item.pmWorkStartTime},#{item.pmWorkEndTime},#{item.workday1},#{item.workday2},#{item.workday3},#{item.workday4},#{item.workday5},#{item.workday6},#{item.workday7},#{item.onlineTake},#{item.appointment},#{item.gowMap},#{item.level},#{item.building},#{item.logoPath},#{item.englishName},#{item.leadingOfficial},#{item.leadingOfficialTelephone},#{item.modelIds},#{item.govAffairStyle},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.complaintHotline})
</foreach> </foreach>
</insert> </insert>
...@@ -359,6 +363,9 @@ ...@@ -359,6 +363,9 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))"> <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime}, a.updateTime=#{data.updateTime},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('complaintHotline')) or (colPickMode==1 and !data.containsKey('complaintHotline'))">
a.complaintHotline=#{data.complaintHotline},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -716,6 +723,13 @@ ...@@ -716,6 +723,13 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="complaintHotline=(case" suffix="ELSE complaintHotline end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('complaintHotline')) or (colPickMode==1 and !item.containsKey('complaintHotline'))">
when a.id=#{item.id} then #{item.complaintHotline}
</if>
</foreach>
</trim>
</trim> </trim>
where id in where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")"> <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
...@@ -1745,6 +1759,27 @@ ...@@ -1745,6 +1759,27 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''"> <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
<if test="conditionParamRef.containsKey('complaintHotline')">
<if test="conditionParamRef.complaintHotline != null and conditionParamRef.complaintHotline != ''">
${_conditionType_} a.complaintHotline like #{${_conditionParam_}.complaintHotline}
</if>
<if test="conditionParamRef.complaintHotline == null">
${_conditionType_} a.complaintHotline is null
</if>
</if>
<if test="conditionParamRef.containsKey('complaintHotlineList') and conditionParamRef.complaintHotlineList.size() > 0">
${_conditionType_} a.complaintHotline in
<foreach collection="conditionParamRef.complaintHotlineList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('complaintHotlineNotList') and conditionParamRef.complaintHotlineNotList.size() > 0">
${_conditionType_} a.complaintHotline not in
<foreach collection="conditionParamRef.complaintHotlineNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -2159,6 +2194,11 @@ ...@@ -2159,6 +2194,11 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if> <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('complaintHotline')">
a.complaintHotline
<if test='orderCol.complaintHotline != null and "DESC".equalsIgnoreCase(orderCol.complaintHotline)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
......
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