列名修改

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActSiginInCodeDTO.java → epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActSignInCodeDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.resi.group.dto.act;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -29,7 +30,7 @@ import lombok.Data;
  * @since v1.0.0 2021-04-16
  */
 @Data
-public class ActSiginInCodeDTO implements Serializable {
+public class ActSignInCodeDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActSiginInRecordDTO.java → epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActSignInRecordDTO.java

@@ -30,7 +30,7 @@ import java.util.Date;
  * @since v1.0.0 2021-04-16
  */
 @Data
-public class ActSiginInRecordDTO implements Serializable {
+public class ActSignInRecordDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -52,12 +52,12 @@ public class ActSiginInRecordDTO implements Serializable {
     /**
      * 签到用户id
      */
-	private String siginUserId;
+	private String signUserId;
 
     /**
      * 签到地点
      */
-	private String siginInAddress;
+	private String signInAddress;
 
     /**
      * 签到地点-经度

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActSummaryDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.resi.group.dto.act;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -56,7 +57,7 @@ public class ActSummaryDTO implements Serializable {
     /**
      * 已签到人数
      */
-	private Integer siginInNum;
+	private Integer signInNum;
 
     /**
      * 已签到人员姓名列表、分隔

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/GroupActInfoDTO.java

@@ -17,11 +17,11 @@
 
 package com.epmet.resi.group.dto.act;
 
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 组织活动信息
@@ -122,12 +122,12 @@ public class GroupActInfoDTO implements Serializable {
     /**
      * 签到开始时间
      */
-	private Date siginInStartTime;
+	private Date signInStartTime;
 
     /**
      * 签到截止时间
      */
-	private Date siginInEndTime;
+	private Date signInEndTime;
 
     /**
      * 是否填写总结？1：已填写；0：未填写
@@ -137,12 +137,12 @@ public class GroupActInfoDTO implements Serializable {
     /**
      * 已签到人数（有人签到自动+1）
      */
-	private Integer siginedInNum;
+	private Integer signedInNum;
 
     /**
      * 取消时间
      */
-	private Date canceldTime;
+	private Date canceledTime;
 
     /**
      * 关闭时间

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActSiginInRecordController.java → epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/controller/ActSignInRecordController.java

@@ -17,7 +17,7 @@
 
 package com.epmet.modules.act.controller;
 
-import com.epmet.modules.act.service.ActSiginInRecordService;
+import com.epmet.modules.act.service.ActSignInRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -30,10 +30,10 @@ import org.springframework.web.bind.annotation.RestController;
  * @since v1.0.0 2021-04-16
  */
 @RestController
-@RequestMapping("actsigin")
-public class ActSiginInRecordController {
+@RequestMapping("actsign")
+public class ActSignInRecordController {
     
     @Autowired
-    private ActSiginInRecordService actSiginInRecordService;
+    private ActSignInRecordService actSignInRecordService;
 
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActSiginInCodeDao.java → epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActSignInCodeDao.java

@@ -18,7 +18,7 @@
 package com.epmet.modules.act.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.modules.act.entity.ActSiginInCodeEntity;
+import com.epmet.modules.act.entity.ActSignInCodeEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -28,6 +28,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @since v1.0.0 2021-04-16
  */
 @Mapper
-public interface ActSiginInCodeDao extends BaseDao<ActSiginInCodeEntity> {
+public interface ActSignInCodeDao extends BaseDao<ActSignInCodeEntity> {
 	
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActSiginInRecordDao.java → epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/ActSignInRecordDao.java

@@ -18,7 +18,7 @@
 package com.epmet.modules.act.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.modules.act.entity.ActSiginInRecordEntity;
+import com.epmet.modules.act.entity.ActSignInRecordEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -28,6 +28,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @since v1.0.0 2021-04-16
  */
 @Mapper
-public interface ActSiginInRecordDao extends BaseDao<ActSiginInRecordEntity> {
+public interface ActSignInRecordDao extends BaseDao<ActSignInRecordEntity> {
 	
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActSiginInCodeEntity.java → epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActSignInCodeEntity.java

@@ -30,8 +30,8 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper=false)
-@TableName("act_sigin_in_code")
-public class ActSiginInCodeEntity extends BaseEpmetEntity {
+@TableName("act_sign_in_code")
+public class ActSignInCodeEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;
 

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActSiginInRecordEntity.java → epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActSignInRecordEntity.java

@@ -32,8 +32,8 @@ import java.math.BigDecimal;
  */
 @Data
 @EqualsAndHashCode(callSuper=false)
-@TableName("act_sigin_in_record")
-public class ActSiginInRecordEntity extends BaseEpmetEntity {
+@TableName("act_sign_in_record")
+public class ActSignInRecordEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;
 
@@ -50,12 +50,12 @@ public class ActSiginInRecordEntity extends BaseEpmetEntity {
     /**
      * 签到用户id
      */
-	private String siginUserId;
+	private String signUserId;
 
     /**
      * 签到地点
      */
-	private String siginInAddress;
+	private String signInAddress;
 
     /**
      * 签到地点-经度

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActSummaryEntity.java

@@ -53,7 +53,7 @@ public class ActSummaryEntity extends BaseEpmetEntity {
     /**
      * 已签到人数
      */
-	private Integer siginInNum;
+	private Integer signInNum;
 
     /**
      * 已签到人员姓名列表、分隔

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/GroupActInfoEntity.java

@@ -121,12 +121,12 @@ public class GroupActInfoEntity extends BaseEpmetEntity {
     /**
      * 签到开始时间
      */
-	private Date siginInStartTime;
+	private Date signInStartTime;
 
     /**
      * 签到截止时间
      */
-	private Date siginInEndTime;
+	private Date signInEndTime;
 
     /**
      * 是否填写总结？1：已填写；0：未填写
@@ -136,12 +136,12 @@ public class GroupActInfoEntity extends BaseEpmetEntity {
     /**
      * 已签到人数（有人签到自动+1）
      */
-	private Integer siginedInNum;
+	private Integer signedInNum;
 
     /**
      * 取消时间
      */
-	private Date canceldTime;
+	private Date canceledTime;
 
     /**
      * 关闭时间

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActSiginInCodeService.java → epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActSignInCodeService.java

@@ -18,7 +18,7 @@
 package com.epmet.modules.act.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
-import com.epmet.modules.act.entity.ActSiginInCodeEntity;
+import com.epmet.modules.act.entity.ActSignInCodeEntity;
 
 /**
  * 组织活动签到码
@@ -26,6 +26,6 @@ import com.epmet.modules.act.entity.ActSiginInCodeEntity;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-04-16
  */
-public interface ActSiginInCodeService extends BaseService<ActSiginInCodeEntity> {
+public interface ActSignInCodeService extends BaseService<ActSignInCodeEntity> {
 
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActSiginInRecordService.java → epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/ActSignInRecordService.java

@@ -18,7 +18,7 @@
 package com.epmet.modules.act.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
-import com.epmet.modules.act.entity.ActSiginInRecordEntity;
+import com.epmet.modules.act.entity.ActSignInRecordEntity;
 
 /**
  * 组织活动签到记录
@@ -26,6 +26,6 @@ import com.epmet.modules.act.entity.ActSiginInRecordEntity;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-04-16
  */
-public interface ActSiginInRecordService extends BaseService<ActSiginInRecordEntity> {
+public interface ActSignInRecordService extends BaseService<ActSignInRecordEntity> {
 
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSiginInCodeServiceImpl.java → epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSignInCodeServiceImpl.java

@@ -18,9 +18,9 @@
 package com.epmet.modules.act.service.impl;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
-import com.epmet.modules.act.dao.ActSiginInCodeDao;
-import com.epmet.modules.act.entity.ActSiginInCodeEntity;
-import com.epmet.modules.act.service.ActSiginInCodeService;
+import com.epmet.modules.act.dao.ActSignInCodeDao;
+import com.epmet.modules.act.entity.ActSignInCodeEntity;
+import com.epmet.modules.act.service.ActSignInCodeService;
 import org.springframework.stereotype.Service;
 
 /**
@@ -30,7 +30,7 @@ import org.springframework.stereotype.Service;
  * @since v1.0.0 2021-04-16
  */
 @Service
-public class ActSiginInCodeServiceImpl extends BaseServiceImpl<ActSiginInCodeDao, ActSiginInCodeEntity> implements ActSiginInCodeService {
+public class ActSignInCodeServiceImpl extends BaseServiceImpl<ActSignInCodeDao, ActSignInCodeEntity> implements ActSignInCodeService {
 
 
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSiginInRecordServiceImpl.java → epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSignInRecordServiceImpl.java

@@ -18,9 +18,9 @@
 package com.epmet.modules.act.service.impl;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
-import com.epmet.modules.act.dao.ActSiginInRecordDao;
-import com.epmet.modules.act.entity.ActSiginInRecordEntity;
-import com.epmet.modules.act.service.ActSiginInRecordService;
+import com.epmet.modules.act.dao.ActSignInRecordDao;
+import com.epmet.modules.act.entity.ActSignInRecordEntity;
+import com.epmet.modules.act.service.ActSignInRecordService;
 import org.springframework.stereotype.Service;
 
 /**
@@ -30,7 +30,7 @@ import org.springframework.stereotype.Service;
  * @since v1.0.0 2021-04-16
  */
 @Service
-public class ActSiginInRecordServiceImpl extends BaseServiceImpl<ActSiginInRecordDao, ActSiginInRecordEntity> implements ActSiginInRecordService {
+public class ActSignInRecordServiceImpl extends BaseServiceImpl<ActSignInRecordDao, ActSignInRecordEntity> implements ActSignInRecordService {
 
 
 }

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActSiginInCodeDao.xml → epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActSignInCodeDao.xml

@@ -1,7 +1,7 @@
 <?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.modules.act.dao.ActSiginInCodeDao">
+<mapper namespace="com.epmet.modules.act.dao.ActSignInCodeDao">
 
 
 

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActSiginInRecordDao.xml → epmet-module/resi-group/resi-group-server/src/main/resources/mapper/act/ActSignInRecordDao.xml

@@ -1,7 +1,7 @@
 <?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.modules.act.dao.ActSiginInRecordDao">
+<mapper namespace="com.epmet.modules.act.dao.ActSignInRecordDao">