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

huanghongfa

2021-10-18 af5991d41bb0c5fc516202a8ded9975781b93e7e

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

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/warehouse/ComActWarehouseDonatesDTO.java

@@ -34,7 +34,6 @@
    private String name;

    @ApiModelProperty("联系电话")
    @Pattern(groups = {AddGroup.class}, message = "联系电话格式错误", regexp = "^(13[0-9]|14[01456879]|15[0-3,5-9]|16[2567]|17[0-8]|18[0-9]|19[0-3,5-9])\\d{8}$")
    private String phone;

    @ApiModelProperty("捐赠物品")

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/warehouse/ExportDonatesVO.java

@@ -60,7 +60,7 @@
    }

    public void setStatus(String status) {
        if (StringUtils.isNumber(isAnonymous)) {
        if (StringUtils.isNumber(status)) {
            switch (status) {
                case "1":
                    this.status = "待签收";

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWarehouseDonatesServiceImpl.java

@@ -236,6 +236,9 @@
        }
        BeanUtils.copyProperties(comActWarehouseDonatesDTO, comActWarehouseDonates);
        Date nowDate = new Date();
        if (nonNull(comActWarehouseDonatesDTO.getQuantity())) {
            comActWarehouseDonates.setSurplusQuantity(comActWarehouseDonatesDTO.getQuantity());
        }
        comActWarehouseDonates.setSigningAt(nowDate);
        comActWarehouseDonates.setStatus(2);
        int result = this.baseMapper.updateById(comActWarehouseDonates);

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActWarehouseApplyMapper.xml

@@ -51,7 +51,7 @@
                and #{commonPage.endTime} >=t.actual_time
            </if>
        </where>
        order by t.actual_time desc
        order by t.create_time desc
    </select>

    <select id="selectStatics" resultType="com.panzhihua.common.model.vos.community.warehouse.ApplyStatistics">