Merge branch 'test_future_wangge' into test

CeDo

2021-06-08 b8c921ddc3ac548e97f7c60116768f04944e8a98

Merge branch 'test_future_wangge' into test

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoAddDTO.java

@@ -33,7 +33,7 @@
    @ApiModelProperty(value = "发生地址", hidden = false, example = "")
    private String happenAddr;

    @NotBlank() @Length(max=100)
    @NotBlank(message = "地址备注不能为空") @Length(max=100)
    @ApiModelProperty(value = "地址备注", hidden = false, example = "")
    private String addrRemark;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/ComActEasyPhotoEditDTO.java

@@ -36,7 +36,7 @@
    @ApiModelProperty(value = "发生地址", hidden = false, example = "")
    private String happenAddr;

    @NotBlank() @Length(max=100)
    @NotBlank(message = "地址备注不能为空") @Length(max=100)
    @ApiModelProperty(value = "地址备注", hidden = false, example = "")
    private String addrRemark;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageComActEasyPhotoDTO.java

@@ -60,7 +60,7 @@
    private String happenAddr;


    @NotBlank() @Length(max=100)
    @NotBlank(message = "地址备注不能为空") @Length(max=50)
    @ApiModelProperty(value = "地址备注", hidden = false, example = "")
    private String addrRemark;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PageEventDTO.java

@@ -126,7 +126,7 @@
    private String propagandaObject;


    @Length(max=10)
    @Length(max=8)
    @ApiModelProperty(value = "宣传人数", hidden = false, example = "")
    private String propagandaNum;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PagePublicityEventDTO.java

@@ -119,7 +119,7 @@
    private String propagandaObject;


    @Length(max=10)
    @Length(max=8)
    @ApiModelProperty(value = "宣传人数", hidden = false, example = "")
    private String propagandaNum;


 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PublicityEventAddDTO.java

@@ -75,7 +75,7 @@
    @NotNull(message = "宣传对象不能为空")
    private String propagandaObject;

    @Length(max=10)
    @Length(max=8)
    @ApiModelProperty(value = "宣传人数", hidden = false, example = "", required = true)
    @NotNull(message = "宣传人数不能为空")
    private String propagandaNum;

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/PublicityEventEditDTO.java

@@ -77,7 +77,7 @@
    @NotNull(message = "宣传对象不能为空")
    private String propagandaObject;

    @Length(max=10)
    @Length(max=8)
    @ApiModelProperty(value = "宣传人数", hidden = false, example = "", required = true)
    @NotNull(message = "宣传人数不能为空")
    private String propagandaNum;

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml

@@ -853,13 +853,13 @@
            AND e.event_type = 5
            AND e.event_process_status = 2
            <if test="statisticsDTO.gridId!=null">
                AND grid_id = #{statisticsDTO.gridId}
                AND e.grid_id = #{statisticsDTO.gridId}
            </if>
            <if test='statisticsDTO.startTime != null and statisticsDTO.startTime != &quot;&quot;'>
                AND create_at <![CDATA[ >= ]]> #{statisticsDTO.startTime}
                AND e.create_at <![CDATA[ >= ]]> #{statisticsDTO.startTime}
            </if>
            <if test='statisticsDTO.endTime != null and statisticsDTO.endTime != &quot;&quot;'>
                AND create_at <![CDATA[ <= ]]> #{statisticsDTO.endTime}
                AND e.create_at <![CDATA[ <= ]]> #{statisticsDTO.endTime}
            </if>
    </select>