Merge remote-tracking branch 'origin/dev_question_naire' into dev_question_naire

# Conflicts:
#	epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SelectExpandStruct.java
#	epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java

@@ -32,6 +32,9 @@ public interface DataSourceConstant {
     String EVALUATION_INDEX = "evaluationIndex";
 
     String OPERCUSTOMIZE="opercustomize";
+
     String EPMET_MESSAGE="epmetmessage";
+
+    String EPMET_T_DUCK = "epmettduck";
     String EPMETTDUCK="epmettduck";
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/AcUserAuthorizeDTO.java

@@ -51,14 +51,35 @@ public class AcUserAuthorizeDTO implements Serializable {
      */
 	private String userInfo;
 
+
     /**
-     * 
+     * 删除标识 1删除；0未删除
      */
-	private Date createTime;
+    private String delFlag;
 
     /**
-     * 
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
      */
-	private Date updateTime;
+    private Date updatedTime;
 
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/AcUserDTO.java

@@ -89,18 +89,33 @@ public class AcUserDTO implements Serializable {
 	private String lastLoginIp;
 
     /**
-     * 状态
+     * 删除标识 1删除；0未删除
      */
-	private Integer deleted;
+    private String delFlag;
 
     /**
-     * 
+     * 乐观锁
      */
-	private Date createTime;
+    private Integer revision;
 
     /**
-     * 
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
      */
-	private Date updateTime;
+    private Date updatedTime;
 
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateCategoryDTO.java

@@ -36,7 +36,7 @@ public class PrProjectTemplateCategoryDTO implements Serializable {
     /**
      * 
      */
-	private Long id;
+	private String id;
 
     /**
      * 客户Id
@@ -54,13 +54,32 @@ public class PrProjectTemplateCategoryDTO implements Serializable {
 	private Integer sort;
 
     /**
-     * 更新时间
+     * 删除标识 1删除；0未删除
+     */
+    private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
      */
-	private Date updateTime;
+    private String createdBy;
 
     /**
      * 创建时间
      */
-	private Date createTime;
+    private Date createdTime;
 
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateDTO.java

@@ -79,13 +79,33 @@ public class PrProjectTemplateDTO implements Serializable {
 	private Integer status;
 
     /**
-     * 更新时间
+     * 删除标识 1删除；0未删除
+     */
+    private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
      */
-	private Date updateTime;
+    private String createdBy;
 
     /**
      * 创建时间
      */
-	private Date createTime;
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
 
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectTemplateItemDTO.java

@@ -104,14 +104,34 @@ public class PrProjectTemplateItemDTO implements Serializable {
 	private String regList;
 
     /**
-     * 更新时间
+     * 删除标识 1删除；0未删除
+     */
+    private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
      */
-	private Date updateTime;
+    private String createdBy;
 
     /**
      * 创建时间
      */
-	private Date createTime;
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
 
     /**
      * 展示类型组件

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrProjectThemeDTO.java

@@ -70,13 +70,32 @@ public class PrProjectThemeDTO implements Serializable {
 	private String btnsColor;
 
     /**
-     * 更新时间
+     * 删除标识 1删除；0未删除
+     */
+    private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
      */
-	private Date updateTime;
+    private String createdBy;
 
     /**
      * 创建时间
      */
-	private Date createTime;
+    private Date createdTime;
 
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrPublishRangeDTO.java

@@ -64,18 +64,33 @@ public class PrPublishRangeDTO implements Serializable {
 	private String orgType;
 
     /**
-     * 状态
+     * 删除标识 1删除；0未删除
      */
-	private Integer deleted;
+    private String delFlag;
 
     /**
-     * 
+     * 乐观锁
      */
-	private Date createTime;
+    private Integer revision;
 
     /**
-     * 
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
      */
-	private Date updateTime;
+    private Date updatedTime;
 
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrResultExtDTO.java

@@ -69,18 +69,33 @@ public class PrResultExtDTO implements Serializable {
 	private String fromOrgType;
 
     /**
-     * 状态
+     * 删除标识 1删除；0未删除
      */
-	private Integer deleted;
+    private String delFlag;
 
     /**
-     * 
+     * 乐观锁
      */
-	private Date createTime;
+    private Integer revision;
 
     /**
-     * 
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
      */
-	private Date updateTime;
+    private Date updatedTime;
 
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectDTO.java

@@ -89,18 +89,33 @@ public class PrUserProjectDTO implements Serializable {
 	private String client;
 
     /**
-     * 是否删除
+     * 删除标识 1删除；0未删除
      */
-	private Integer isDeleted;
+    private String delFlag;
 
     /**
-     * 更新时间
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
      */
-	private Date updateTime;
+    private String createdBy;
 
     /**
      * 创建时间
      */
-	private Date createTime;
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
 
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectItemDTO.java

@@ -109,13 +109,33 @@ public class PrUserProjectItemDTO implements Serializable {
 	private String regList;
 
     /**
-     * 更新时间
+     * 删除标识 1删除；0未删除
+     */
+    private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
      */
-	private Date updateTime;
+    private String createdBy;
 
     /**
      * 创建时间
      */
-	private Date createTime;
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
 
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectLogicDTO.java

@@ -63,14 +63,34 @@ public class PrUserProjectLogicDTO implements Serializable {
      */
 	private String conditionList;
 
+    /**
+     * 删除标识 1删除；0未删除
+     */
+    private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
     /**
      * 创建时间
      */
-	private Date createTime;
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
 
     /**
      * 更新时间
      */
-	private Date updateTime;
+    private Date updatedTime;
 
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectResultDTO.java

@@ -108,14 +108,34 @@ public class PrUserProjectResultDTO implements Serializable {
      */
 	private String wxUserInfo;
 
+    /**
+     * 删除标识 1删除；0未删除
+     */
+    private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
     /**
      * 创建时间
      */
-	private Date createTime;
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
 
     /**
      * 更新时间
      */
-	private Date updateTime;
+    private Date updatedTime;
 
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectSettingDTO.java

@@ -154,13 +154,33 @@ public class PrUserProjectSettingDTO implements Serializable {
 	private String shareDesc;
 
     /**
-     * 更新时间
+     * 删除标识 1删除；0未删除
+     */
+    private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
      */
-	private Date updateTime;
+    private String createdBy;
 
     /**
      * 创建时间
      */
-	private Date createTime;
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
 
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrUserProjectThemeDTO.java

@@ -94,13 +94,33 @@ public class PrUserProjectThemeDTO implements Serializable {
 	private Integer showNumber;
 
     /**
-     * 更新时间
+     * 删除标识 1删除；0未删除
+     */
+    private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
      */
-	private Date updateTime;
+    private String createdBy;
 
     /**
      * 创建时间
      */
-	private Date createTime;
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
 
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/PrVistRecordDTO.java

@@ -59,18 +59,33 @@ public class PrVistRecordDTO implements Serializable {
 	private String projectKey;
 
     /**
-     * 状态
+     * 删除标识 1删除；0未删除
      */
-	private Integer deleted;
+    private String delFlag;
 
     /**
-     * 
+     * 乐观锁
      */
-	private Date createTime;
+    private Integer revision;
 
     /**
-     * 
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
      */
-	private Date updateTime;
+    private Date updatedTime;
 
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/ProjectItemTypeEnum.java

@@ -0,0 +1,72 @@
+package com.epmet.dataaggre.dto.epmettduck;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import com.epmet.dataaggre.dto.epmettduck.struct.*;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/9/16 2:28 下午
+ * @DESC
+ */
+@AllArgsConstructor
+@Getter
+public enum ProjectItemTypeEnum {
+
+    INPUT("INPUT", "单行文本", InputExpandStruct.class),
+    TEXTAREA("TEXTAREA", "多行文本", TextareaExpandStruct.class),
+    PASSWORD_INPUT("PASSWORD_INPUT", "密码输入", null),
+    NUMBER_INPUT("NUMBER_INPUT", "数字输入", NumberExpandStruct.class),
+    SELECT("SELECT", "下拉框", SelectExpandStruct.class),
+    CASCADER("CASCADER", "级联选择", CascaderExpandStruct.class),
+    RADIO("RADIO", "单选框", RadioExpandStruct.class),
+    CHECKBOX("CHECKBOX", "多选框", CheckboxExpandStruct.class),
+    SWITCH("SWITCH", "开关", SwitchExpandStruct.class),
+    SLIDER("SLIDER", "滑块", SliderExpandStruct.class),
+    TIME("TIME", "时间选择", TimeExpandStruct.class),
+    TIME_RANGE("TIME_RANGE", "时间范围", TimeRangeExpandStruct.class),
+    DATE("DATE", "日期选择", DateExpandStruct.class),
+    DATE_RANGE("DATE_RANGE", "日期范围", DateRangeExpandStruct.class),
+    RATE("RATE", "评分", RateExpandStruct.class),
+    COLOR("COLOR", "颜色", ColorExpandStruct.class),
+    UPLOAD("UPLOAD", "文件上传组件", UploadExpandStruct.class),
+    IMAGE("IMAGE", "图片展示", ImageExpandStruct.class),
+    IMAGE_SELECT("IMAGE_SELECT", "图片选择", ImageSelectExpandStruct.class),
+    IMAGE_CAROUSEL("IMAGE_CAROUSEL", "图片轮播", ImageCarouselExpandStruct.class),
+    DESC_TEXT("DESC_TEXT", "文字描述", DescTextExpandStruct.class),
+    SIGN_PAD("SIGN_PAD", "手写签名", SignPadExpandStruct.class),
+    PAGINATION("PAGINATION", "分页", PaginationExpandStruct.class),
+    DIVIDER("DIVIDER", "分割线", DividerExpandStruct.class),
+    PROVINCE_CITY("PROVINCE_CITY", "省市联动", EmptyExpandStruct.class),
+    PHONE_VERIFICATION("PHONE_VERIFICATION", "手机号验证", EmptyExpandStruct.class),
+    INPUT_MAP("INPUT_MAP", "地理位置", EmptyExpandStruct.class);
+
+    @EnumValue
+    @JsonValue
+    private String value;
+
+    private String desc;
+    /**
+     * 扩展属性类
+     */
+    private Class expandClass;
+
+    /**
+     * 枚举入参注解
+     *
+     * @param value
+     * @return
+     */
+    @JsonCreator
+    public static ProjectItemTypeEnum getByValue(String value) {
+        for (ProjectItemTypeEnum typeEnum : values()) {
+            if (typeEnum.getValue().equals(value)) {
+                return typeEnum;
+            }
+        }
+        return null;
+    }
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/WxMpUserDTO.java

@@ -94,13 +94,33 @@ public class WxMpUserDTO implements Serializable {
 	private String userId;
 
     /**
-     * 更新时间
+     * 删除标识 1删除；0未删除
+     */
+    private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
      */
-	private Date updateTime;
+    private String createdBy;
 
     /**
      * 创建时间
      */
-	private Date createTime;
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
 
 }

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckDetailFormDTO.java

@@ -0,0 +1,31 @@
+package com.epmet.dataaggre.dto.epmettduck.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/9/16 2:00 下午
+ * @DESC
+ */
+@Data
+public class TDuckDetailFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 3793280475377993346L;
+
+    public interface TDuckDetailForm{}
+
+    /**
+     * 项目key
+     */
+    @NotBlank(message = "项目key不能为空",groups = TDuckDetailForm.class)
+    private String key;
+    /**
+     * 是否显示类型
+     */
+    @NotNull(message = "是否显示类型不能为空",groups = TDuckDetailForm.class)
+    private Boolean displayType;
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/SelectExpandStruct.java

@@ -1,4 +1,5 @@
 package com.epmet.dataaggre.dto.epmettduck.struct;
+
 import lombok.Data;
 
 import java.util.List;

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java

@@ -1,5 +1,15 @@
 package com.epmet.dataaggre.controller;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dataaggre.dto.epmettduck.form.TDuckDetailFormDTO;
+import com.epmet.dataaggre.entity.epmettduck.PrUserProjectItemEntity;
+import com.epmet.dataaggre.service.epmettduck.PrUserProjectItemService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dataaggre.dto.epmettduck.form.ProjectKeyCommonDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.AnalysisReportResDTO;
@@ -23,6 +33,8 @@ import java.util.List;
 public class EpmetTDuckController {
     @Autowired
     private PrUserProjectService prUserProjectService;
+    @Autowired
+    private PrUserProjectItemService projectItemService;
 
 
     /**
@@ -38,6 +50,17 @@ public class EpmetTDuckController {
         return new Result<ProjectProfileResultDTO>().ok(prUserProjectService.queryProjectProfile(formDTO.getProjectKey()));
     }
 
+    /**
+     * @Description 问卷调查详情
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/9/16 2:51 下午
+     */
+    @PostMapping("detail")
+    public Result<List<PrUserProjectItemEntity>> queryProjectItem(@RequestBody TDuckDetailFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, TDuckDetailFormDTO.TDuckDetailForm.class);
+        return new Result<List<PrUserProjectItemEntity>>().ok(projectItemService.queryProjectItem(formDTO));
+    }
     /**
      * 分析报告
      *

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/AcUserAuthorizeEntity.java

@@ -73,14 +73,4 @@ public class AcUserAuthorizeEntity extends BaseEpmetEntity {
      */
 	private String userInfo;
 
-    /**
-     * 
-     */
-	private Date createTime;
-
-    /**
-     * 
-     */
-	private Date updateTime;
-
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/AcUserEntity.java

@@ -93,19 +93,5 @@ public class AcUserEntity extends BaseEpmetEntity {
      */
 	private String lastLoginIp;
 
-    /**
-     * 状态
-     */
-	private Integer deleted;
-
-    /**
-     * 
-     */
-	private Date createTime;
-
-    /**
-     * 
-     */
-	private Date updateTime;
 
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectTemplateCategoryEntity.java

@@ -34,14 +34,14 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper=false)
 @TableName("pr_project_template_category")
-public class PrProjectTemplateCategoryEntity{
+public class PrProjectTemplateCategoryEntity extends BaseEpmetEntity{
 
 	private static final long serialVersionUID = 1L;
 
     /**
      * 
      */
-	private Long id;
+	private String id;
 
     /**
      * 客户Id
@@ -58,14 +58,5 @@ public class PrProjectTemplateCategoryEntity{
      */
 	private Integer sort;
 
-    /**
-     * 更新时间
-     */
-	private Date updateTime;
-
-    /**
-     * 创建时间
-     */
-	private Date createTime;
 
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectTemplateEntity.java

@@ -83,14 +83,5 @@ public class PrProjectTemplateEntity extends BaseEpmetEntity {
      */
 	private Integer status;
 
-    /**
-     * 更新时间
-     */
-	private Date updateTime;
-
-    /**
-     * 创建时间
-     */
-	private Date createTime;
 
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectTemplateItemEntity.java

@@ -108,16 +108,6 @@ public class PrProjectTemplateItemEntity extends BaseEpmetEntity {
      */
 	private String regList;
 
-    /**
-     * 更新时间
-     */
-	private Date updateTime;
-
-    /**
-     * 创建时间
-     */
-	private Date createTime;
-
     /**
      * 展示类型组件
      */

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrProjectThemeEntity.java

@@ -74,14 +74,4 @@ public class PrProjectThemeEntity extends BaseEpmetEntity {
      */
 	private String btnsColor;
 
-    /**
-     * 更新时间
-     */
-	private Date updateTime;
-
-    /**
-     * 创建时间
-     */
-	private Date createTime;
-
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrPublishRangeEntity.java

@@ -68,19 +68,4 @@ public class PrPublishRangeEntity extends BaseEpmetEntity {
      */
 	private String orgType;
 
-    /**
-     * 状态
-     */
-	private Integer deleted;
-
-    /**
-     * 
-     */
-	private Date createTime;
-
-    /**
-     * 
-     */
-	private Date updateTime;
-
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrResultExtEntity.java

@@ -73,19 +73,4 @@ public class PrResultExtEntity extends BaseEpmetEntity {
      */
 	private String fromOrgType;
 
-    /**
-     * 状态
-     */
-	private Integer deleted;
-
-    /**
-     * 
-     */
-	private Date createTime;
-
-    /**
-     * 
-     */
-	private Date updateTime;
-
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectEntity.java

@@ -93,19 +93,4 @@ public class PrUserProjectEntity extends BaseEpmetEntity {
      */
 	private String client;
 
-    /**
-     * 是否删除
-     */
-	private Integer isDeleted;
-
-    /**
-     * 更新时间
-     */
-	private Date updateTime;
-
-    /**
-     * 创建时间
-     */
-	private Date createTime;
-
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectItemEntity.java

@@ -17,13 +17,22 @@
 
 package com.epmet.dataaggre.entity.epmettduck;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import com.epmet.dataaggre.dto.epmettduck.ProjectItemTypeEnum;
+import com.epmet.dataaggre.dto.epmettduck.struct.ItemDefaultValueStruct;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import lombok.experimental.FieldNameConstants;
+import org.apache.ibatis.type.EnumTypeHandler;
 
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 项目表单项
@@ -33,16 +42,13 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper=false)
-@TableName("pr_user_project_item")
+@Accessors(chain = true)
-public class PrUserProjectItemEntity extends BaseEpmetEntity {
+@TableName(value = "pr_user_project_item", autoResultMap = true)
+@FieldNameConstants
+public class PrUserProjectItemEntity extends BaseEpmetEntity{
 
 	private static final long serialVersionUID = 1L;
 
-    /**
-     * 
-     */
-	private String id;
-
     /**
      * 客户Id
      */
@@ -61,7 +67,8 @@ public class PrUserProjectItemEntity extends BaseEpmetEntity {
     /**
      * 表单项类型 
      */
-	private String type;
+	@TableField(typeHandler = EnumTypeHandler.class)
+	private ProjectItemTypeEnum type;
 
     /**
      * 表单项标题
@@ -71,22 +78,24 @@ public class PrUserProjectItemEntity extends BaseEpmetEntity {
     /**
      * 展示类型组件
      */
-	private Integer isDisplayType;
+	@TableField("is_display_type")
+	private Integer displayType;
 
     /**
      * 是否显示标签
      */
-	private Integer showLabel;
+	private Boolean showLabel;
 
     /**
      * 表单项默认值
      */
-	private String defaultValue;
+	@TableField(value = "default_value",typeHandler = JacksonTypeHandler.class)
+	private ItemDefaultValueStruct defaultValue;
 
     /**
      * 是否必填
      */
-	private Integer required;
+	private Boolean required;
 
     /**
      * 输入型提示文字
@@ -106,21 +115,14 @@ public class PrUserProjectItemEntity extends BaseEpmetEntity {
     /**
      * 扩展字段 表单项独有字段
      */
-	private String expand;
+	@TableField(typeHandler = JacksonTypeHandler.class)
+	private Map<String, Object> expand;
 
     /**
      * 正则表达式 
      */
-	private String regList;
+	@TableField(typeHandler = JacksonTypeHandler.class)
-
+	private List<Map<String, Object>> regList;
-    /**
-     * 更新时间
-     */
-	private Date updateTime;
 
-    /**
-     * 创建时间
-     */
-	private Date createTime;
 
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectLogicEntity.java

@@ -68,14 +68,4 @@ public class PrUserProjectLogicEntity extends BaseEpmetEntity {
      */
 	private String conditionList;
 
-    /**
-     * 创建时间
-     */
-	private Date createTime;
-
-    /**
-     * 更新时间
-     */
-	private Date updateTime;
-
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectResultEntity.java

@@ -113,14 +113,4 @@ public class PrUserProjectResultEntity extends BaseEpmetEntity {
      */
 	private String wxUserInfo;
 
-    /**
-     * 创建时间
-     */
-	private Date createTime;
-
-    /**
-     * 更新时间
-     */
-	private Date updateTime;
-
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectSettingEntity.java

@@ -158,14 +158,4 @@ public class PrUserProjectSettingEntity extends BaseEpmetEntity {
      */
 	private String shareDesc;
 
-    /**
-     * 更新时间
-     */
-	private Date updateTime;
-
-    /**
-     * 创建时间
-     */
-	private Date createTime;
-
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrUserProjectThemeEntity.java

@@ -98,14 +98,4 @@ public class PrUserProjectThemeEntity extends BaseEpmetEntity {
      */
 	private Integer showNumber;
 
-    /**
-     * 更新时间
-     */
-	private Date updateTime;
-
-    /**
-     * 创建时间
-     */
-	private Date createTime;
-
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/PrVistRecordEntity.java

@@ -63,19 +63,4 @@ public class PrVistRecordEntity extends BaseEpmetEntity {
      */
 	private String projectKey;
 
-    /**
-     * 状态
-     */
-	private Integer deleted;
-
-    /**
-     * 
-     */
-	private Date createTime;
-
-    /**
-     * 
-     */
-	private Date updateTime;
-
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmettduck/WxMpUserEntity.java

@@ -98,14 +98,4 @@ public class WxMpUserEntity extends BaseEpmetEntity {
      */
 	private String userId;
 
-    /**
-     * 更新时间
-     */
-	private Date updateTime;
-
-    /**
-     * 创建时间
-     */
-	private Date createTime;
-
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectItemService.java

@@ -1,25 +1,10 @@
-/**
- * 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.dataaggre.service.epmettduck;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dataaggre.dto.epmettduck.PrUserProjectItemDTO;
+import com.epmet.dataaggre.dto.epmettduck.form.TDuckDetailFormDTO;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectItemEntity;
 
 import java.util.List;
@@ -31,65 +16,13 @@ import java.util.Map;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-09-15
  */
-public interface PrUserProjectItemService extends BaseService<PrUserProjectItemEntity> {
+public interface PrUserProjectItemService extends IService<PrUserProjectItemEntity> {
-
-    /**
-     * 默认分页
-     *
-     * @param params
-     * @return PageData<PrUserProjectItemDTO>
-     * @author generator
-     * @date 2021-09-15
-     */
-    PageData<PrUserProjectItemDTO> page(Map<String, Object> params);
-
-    /**
-     * 默认查询
-     *
-     * @param params
-     * @return java.util.List<PrUserProjectItemDTO>
-     * @author generator
-     * @date 2021-09-15
-     */
-    List<PrUserProjectItemDTO> list(Map<String, Object> params);
-
-    /**
-     * 单条查询
-     *
-     * @param id
-     * @return PrUserProjectItemDTO
-     * @author generator
-     * @date 2021-09-15
-     */
-    PrUserProjectItemDTO get(String id);
-
-    /**
-     * 默认保存
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2021-09-15
-     */
-    void save(PrUserProjectItemDTO dto);
-
-    /**
-     * 默认更新
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2021-09-15
-     */
-    void update(PrUserProjectItemDTO dto);
 
     /**
-     * 批量删除
+     * @Description 问卷调查详情
-     *
+     * @Param formDTO
-     * @param ids
+     * @author zxc
-     * @return void
+     * @date 2021/9/16 2:51 下午
-     * @author generator
-     * @date 2021-09-15
      */
-    void delete(String[] ids);
+    List<PrUserProjectItemEntity> queryProjectItem(TDuckDetailFormDTO formDTO);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectItemServiceImpl.java

@@ -17,26 +17,20 @@
 
 package com.epmet.dataaggre.service.epmettduck.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
-import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.epmet.commons.tools.constant.FieldConstant;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.epmettduck.PrUserProjectItemDao;
-import com.epmet.dataaggre.dto.epmettduck.PrUserProjectItemDTO;
+import com.epmet.dataaggre.dto.epmettduck.form.TDuckDetailFormDTO;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectItemEntity;
 import com.epmet.dataaggre.service.epmettduck.PrUserProjectItemService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
-import java.util.Arrays;
+import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 项目表单项
@@ -44,61 +38,27 @@ import java.util.Map;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-09-15
  */
-@Slf4j
-@DataSource(DataSourceConstant.EPMETTDUCK)
 @Service
-public class PrUserProjectItemServiceImpl extends BaseServiceImpl<PrUserProjectItemDao, PrUserProjectItemEntity> implements PrUserProjectItemService {
+@Slf4j
+@DataSource(DataSourceConstant.EPMET_T_DUCK)
+public class PrUserProjectItemServiceImpl extends ServiceImpl<PrUserProjectItemDao, PrUserProjectItemEntity> implements PrUserProjectItemService {
 
+    /**
+     * @Description 问卷调查详情
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/9/16 2:51 下午
+     */
     @Override
-    public PageData<PrUserProjectItemDTO> page(Map<String, Object> params) {
+    public List<PrUserProjectItemEntity> queryProjectItem(TDuckDetailFormDTO formDTO) {
-        IPage<PrUserProjectItemEntity> page = baseDao.selectPage(
+        List<PrUserProjectItemEntity> itemEntityList = list(Wrappers.<PrUserProjectItemEntity>lambdaQuery()
-                getPage(params, FieldConstant.CREATED_TIME, false),
+                .eq(PrUserProjectItemEntity::getProjectKey, formDTO.getKey())
-                getWrapper(params)
+                .eq(PrUserProjectItemEntity::getDisplayType,formDTO.getDisplayType())
+                .orderByAsc(PrUserProjectItemEntity::getSort)
         );
-        return getPageData(page, PrUserProjectItemDTO.class);
+        if (CollectionUtils.isEmpty(itemEntityList)){
-    }
+            return new ArrayList<>();
-
+        }
-    @Override
+        return itemEntityList;
-    public List<PrUserProjectItemDTO> list(Map<String, Object> params) {
-        List<PrUserProjectItemEntity> entityList = baseDao.selectList(getWrapper(params));
-
-        return ConvertUtils.sourceToTarget(entityList, PrUserProjectItemDTO.class);
     }
-
-    private QueryWrapper<PrUserProjectItemEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
-
-        QueryWrapper<PrUserProjectItemEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
-        return wrapper;
-    }
-
-    @Override
-    public PrUserProjectItemDTO get(String id) {
-        PrUserProjectItemEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, PrUserProjectItemDTO.class);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void save(PrUserProjectItemDTO dto) {
-        PrUserProjectItemEntity entity = ConvertUtils.sourceToTarget(dto, PrUserProjectItemEntity.class);
-        insert(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(PrUserProjectItemDTO dto) {
-        PrUserProjectItemEntity entity = ConvertUtils.sourceToTarget(dto, PrUserProjectItemEntity.class);
-        updateById(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void delete(String[] ids) {
-        // 逻辑删除（@TableLogic 注解）
-        baseDao.deleteBatchIds(Arrays.asList(ids));
-    }
-
 }