34 changed files with 384 additions and 397 deletions
@ -0,0 +1,24 @@ |
|||||
|
package com.epmet.screen.dto.form; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
|
||||
|
import javax.validation.constraints.NotBlank; |
||||
|
import java.io.Serializable; |
||||
|
|
||||
|
/** |
||||
|
* @Author zxc |
||||
|
* @DateTime 2020/8/19 1:25 下午 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class ProjectFormDTO implements Serializable { |
||||
|
|
||||
|
private static final long serialVersionUID = 7114390205886348751L; |
||||
|
|
||||
|
public interface Project{} |
||||
|
|
||||
|
/** |
||||
|
* 机关ID |
||||
|
*/ |
||||
|
@NotBlank(message = "机关ID不能为空",groups = {Project.class}) |
||||
|
private String agencyId; |
||||
|
} |
@ -0,0 +1,24 @@ |
|||||
|
package com.epmet.screen.dto.form; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
|
||||
|
import javax.validation.constraints.NotBlank; |
||||
|
import java.io.Serializable; |
||||
|
|
||||
|
/** |
||||
|
* @Author zxc |
||||
|
* @DateTime 2020/8/19 1:43 下午 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class TopProfileFormDTO implements Serializable { |
||||
|
|
||||
|
private static final long serialVersionUID = -287352242311433250L; |
||||
|
|
||||
|
public interface TopProfile{} |
||||
|
|
||||
|
/** |
||||
|
* 机关ID |
||||
|
*/ |
||||
|
@NotBlank(message = "机关ID不能为空",groups = {TopProfile.class}) |
||||
|
private String agencyId; |
||||
|
} |
@ -0,0 +1,45 @@ |
|||||
|
package com.epmet.screen.dto.result; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
|
||||
|
import java.io.Serializable; |
||||
|
|
||||
|
/** |
||||
|
* @Author zxc |
||||
|
* @DateTime 2020/8/19 1:27 下午 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class ProjectResultDTO implements Serializable { |
||||
|
|
||||
|
private static final long serialVersionUID = 7130615407473171093L; |
||||
|
|
||||
|
/** |
||||
|
* 项目标题 |
||||
|
*/ |
||||
|
private String projectTitle = ""; |
||||
|
|
||||
|
/** |
||||
|
* red, green,yellow |
||||
|
*/ |
||||
|
private String color = ""; |
||||
|
|
||||
|
/** |
||||
|
* 项目id |
||||
|
*/ |
||||
|
private String projectId = ""; |
||||
|
|
||||
|
/** |
||||
|
* 网格名称 |
||||
|
*/ |
||||
|
private String orgName = ""; |
||||
|
|
||||
|
/** |
||||
|
* 经度 |
||||
|
*/ |
||||
|
private Double longitude = 0.0; |
||||
|
|
||||
|
/** |
||||
|
* 纬度 |
||||
|
*/ |
||||
|
private Double latitude = 0.0; |
||||
|
} |
@ -0,0 +1,45 @@ |
|||||
|
package com.epmet.screen.dto.result; |
||||
|
|
||||
|
import lombok.Data; |
||||
|
|
||||
|
import java.io.Serializable; |
||||
|
|
||||
|
/** |
||||
|
* @Author zxc |
||||
|
* @DateTime 2020/8/19 1:46 下午 |
||||
|
*/ |
||||
|
@Data |
||||
|
public class TopProfileResultDTO implements Serializable { |
||||
|
|
||||
|
private static final long serialVersionUID = -5081563117620857359L; |
||||
|
|
||||
|
/** |
||||
|
* 用户总数 |
||||
|
*/ |
||||
|
private Integer userNum = 0; |
||||
|
|
||||
|
/** |
||||
|
* 党员总数 |
||||
|
*/ |
||||
|
private Integer partyMemberNum = 0; |
||||
|
|
||||
|
/** |
||||
|
* 党群总数 |
||||
|
*/ |
||||
|
private Integer groupNum = 0; |
||||
|
|
||||
|
/** |
||||
|
* 话题总数 |
||||
|
*/ |
||||
|
private Integer topicNum = 0; |
||||
|
|
||||
|
/** |
||||
|
* 议题总数 |
||||
|
*/ |
||||
|
private Integer issueNum = 0; |
||||
|
|
||||
|
/** |
||||
|
* 项目总数 |
||||
|
*/ |
||||
|
private Integer projectNum = 0; |
||||
|
} |
@ -1,61 +0,0 @@ |
|||||
package com.epmet.dto.screencoll.form; |
|
||||
|
|
||||
import lombok.Data; |
|
||||
|
|
||||
import java.io.Serializable; |
|
||||
|
|
||||
/** |
|
||||
* 13、党建引领-志愿活动服务数据 入参 |
|
||||
* @Auther: zhangyong |
|
||||
* @Date: 2020-08-18 09:59 |
|
||||
*/ |
|
||||
@Data |
|
||||
public class VoluntaryActivityDataFormDTO implements Serializable { |
|
||||
|
|
||||
private static final long serialVersionUID = 1L; |
|
||||
|
|
||||
/** |
|
||||
* 客户id |
|
||||
*/ |
|
||||
private String customerId; |
|
||||
|
|
||||
/** |
|
||||
* yyyy |
|
||||
*/ |
|
||||
private String yearId; |
|
||||
|
|
||||
/** |
|
||||
* yyyyMM |
|
||||
*/ |
|
||||
private String monthId; |
|
||||
|
|
||||
/** |
|
||||
* 组织类别 agency:组织;部门:department;网格:grid |
|
||||
*/ |
|
||||
private String orgType; |
|
||||
|
|
||||
/** |
|
||||
* 组织Id 可以为网格,机关id |
|
||||
*/ |
|
||||
private String orgId; |
|
||||
|
|
||||
/** |
|
||||
* 上级组织Id |
|
||||
*/ |
|
||||
private String parentId; |
|
||||
|
|
||||
/** |
|
||||
* 组织名称 |
|
||||
*/ |
|
||||
private String orgName; |
|
||||
|
|
||||
/** |
|
||||
* 组织活动次数 |
|
||||
*/ |
|
||||
private Integer activetyCount; |
|
||||
|
|
||||
/** |
|
||||
* 活动参与人数 |
|
||||
*/ |
|
||||
private Integer joinUserCount; |
|
||||
} |
|
@ -1,62 +0,0 @@ |
|||||
/** |
|
||||
* Copyright 2018 人人开源 https://www.renren.io
|
|
||||
* <p> |
|
||||
* This program is free software: you can redistribute it and/or modify |
|
||||
* it under the terms of the GNU General Public License as published by |
|
||||
* the Free Software Foundation, either version 3 of the License, or |
|
||||
* (at your option) any later version. |
|
||||
* <p> |
|
||||
* This program is distributed in the hope that it will be useful, |
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
||||
* GNU General Public License for more details. |
|
||||
* <p> |
|
||||
* You should have received a copy of the GNU General Public License |
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||
*/ |
|
||||
|
|
||||
package com.epmet.dao.screen; |
|
||||
|
|
||||
import com.epmet.commons.mybatis.dao.BaseDao; |
|
||||
import com.epmet.dto.screencoll.form.VoluntaryActivityDataFormDTO; |
|
||||
import com.epmet.entity.screen.ScreenVoluntaryActivityDataEntity; |
|
||||
import org.apache.ibatis.annotations.Mapper; |
|
||||
import org.apache.ibatis.annotations.Param; |
|
||||
|
|
||||
import java.util.List; |
|
||||
|
|
||||
/** |
|
||||
* 党建引领-志愿活动服务数据 |
|
||||
* |
|
||||
* @author generator generator@elink-cn.com |
|
||||
* @since v1.0.0 2020-08-18 |
|
||||
*/ |
|
||||
@Mapper |
|
||||
public interface ScreenVoluntaryActivityDataDao extends BaseDao<ScreenVoluntaryActivityDataEntity> { |
|
||||
|
|
||||
/** |
|
||||
* 13、党建引领-志愿活动服务数据 |
|
||||
* 1) 根据CUSTOMER_ID、YEAR_ID、MONTH_ID、ORG_ID进行查询,如果有数据,则先进行物理删除 |
|
||||
* |
|
||||
* @param customerId |
|
||||
* @param yearId |
|
||||
* @param monthId |
|
||||
* @param orgIds 组织Id集合 |
|
||||
* @Author zhangyong |
|
||||
* @Date 10:52 2020-08-18 |
|
||||
**/ |
|
||||
void deleteVoluntaryActivityData(@Param("customerId") String customerId, |
|
||||
@Param("yearId") String yearId, |
|
||||
@Param("monthId") String monthId, |
|
||||
@Param("orgIds") String[] orgIds); |
|
||||
|
|
||||
/** |
|
||||
* 13、党建引领-志愿活动服务数据 |
|
||||
* 2) 在批量新增 |
|
||||
* |
|
||||
* @param list |
|
||||
* @Author zhangyong |
|
||||
* @Date 10:52 2020-08-18 |
|
||||
**/ |
|
||||
void batchInsertVoluntaryActivityData(@Param("list") List<VoluntaryActivityDataFormDTO> list); |
|
||||
} |
|
@ -1,86 +0,0 @@ |
|||||
/** |
|
||||
* Copyright 2018 人人开源 https://www.renren.io
|
|
||||
* <p> |
|
||||
* This program is free software: you can redistribute it and/or modify |
|
||||
* it under the terms of the GNU General Public License as published by |
|
||||
* the Free Software Foundation, either version 3 of the License, or |
|
||||
* (at your option) any later version. |
|
||||
* <p> |
|
||||
* This program is distributed in the hope that it will be useful, |
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
||||
* GNU General Public License for more details. |
|
||||
* <p> |
|
||||
* You should have received a copy of the GNU General Public License |
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||
*/ |
|
||||
|
|
||||
package com.epmet.entity.screen; |
|
||||
|
|
||||
import com.baomidou.mybatisplus.annotation.TableName; |
|
||||
|
|
||||
import com.epmet.commons.mybatis.entity.BaseEpmetEntity; |
|
||||
import lombok.Data; |
|
||||
import lombok.EqualsAndHashCode; |
|
||||
|
|
||||
import java.util.Date; |
|
||||
|
|
||||
/** |
|
||||
* 党建引领-志愿活动服务数据 |
|
||||
* |
|
||||
* @author generator generator@elink-cn.com |
|
||||
* @since v1.0.0 2020-08-18 |
|
||||
*/ |
|
||||
@Data |
|
||||
@EqualsAndHashCode(callSuper=false) |
|
||||
@TableName("screen_voluntary_activity_data") |
|
||||
public class ScreenVoluntaryActivityDataEntity extends BaseEpmetEntity { |
|
||||
|
|
||||
private static final long serialVersionUID = 1L; |
|
||||
|
|
||||
/** |
|
||||
* 客户Id |
|
||||
*/ |
|
||||
private String customerId; |
|
||||
|
|
||||
/** |
|
||||
* 年Id |
|
||||
*/ |
|
||||
private String yearId; |
|
||||
|
|
||||
/** |
|
||||
* 月份Id |
|
||||
*/ |
|
||||
private String monthId; |
|
||||
|
|
||||
/** |
|
||||
* 组织类别 agency:组织;部门:department;网格:grid |
|
||||
*/ |
|
||||
private String orgType; |
|
||||
|
|
||||
/** |
|
||||
* 组织Id 可以为网格,机关id |
|
||||
*/ |
|
||||
private String orgId; |
|
||||
|
|
||||
/** |
|
||||
* 上级组织Id |
|
||||
*/ |
|
||||
private String parentId; |
|
||||
|
|
||||
/** |
|
||||
* 组织名称 |
|
||||
*/ |
|
||||
private String orgName; |
|
||||
|
|
||||
/** |
|
||||
* 组织活动次数 |
|
||||
*/ |
|
||||
private Integer activetyCount; |
|
||||
|
|
||||
/** |
|
||||
* 活动参与人数 |
|
||||
*/ |
|
||||
private Integer joinUserCount; |
|
||||
|
|
||||
} |
|
@ -1,57 +0,0 @@ |
|||||
<?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.epmet.dao.screen.ScreenVoluntaryActivityDataDao"> |
|
||||
|
|
||||
<delete id="deleteVoluntaryActivityData"> |
|
||||
delete from screen_voluntary_activity_data |
|
||||
where CUSTOMER_ID = #{customerId} AND YEAR_ID = #{yearId} AND MONTH_ID = #{monthId} |
|
||||
AND ORG_ID IN |
|
||||
<foreach item="item" collection="orgIds" open="(" separator="," close=")"> |
|
||||
#{item} |
|
||||
</foreach> |
|
||||
</delete> |
|
||||
|
|
||||
<insert id="batchInsertVoluntaryActivityData" parameterType="java.util.List"> |
|
||||
insert into screen_voluntary_activity_data |
|
||||
( |
|
||||
ID, |
|
||||
CUSTOMER_ID, |
|
||||
YEAR_ID, |
|
||||
MONTH_ID, |
|
||||
ORG_TYPE, |
|
||||
ORG_ID, |
|
||||
PARENT_ID, |
|
||||
ORG_NAME, |
|
||||
ACTIVETY_COUNT, |
|
||||
JOIN_USER_COUNT, |
|
||||
DEL_FLAG, |
|
||||
REVISION, |
|
||||
CREATED_BY, |
|
||||
CREATED_TIME, |
|
||||
UPDATED_BY, |
|
||||
UPDATED_TIME |
|
||||
) values |
|
||||
<foreach collection="list" item="item" index="index" separator=","> |
|
||||
( |
|
||||
(SELECT REPLACE(UUID(), '-', '') AS id), |
|
||||
#{item.customerId}, |
|
||||
#{item.yearId}, |
|
||||
#{item.monthId}, |
|
||||
#{item.orgType}, |
|
||||
#{item.orgId}, |
|
||||
#{item.parentId}, |
|
||||
#{item.orgName}, |
|
||||
#{item.activetyCount}, |
|
||||
#{item.joinUserCount}, |
|
||||
0, |
|
||||
0, |
|
||||
'APP_USER', |
|
||||
now(), |
|
||||
'APP_USER', |
|
||||
now() |
|
||||
) |
|
||||
</foreach> |
|
||||
</insert> |
|
||||
|
|
||||
</mapper> |
|
Loading…
Reference in new issue