花城E+防疫相关修改

101captain

2022-04-13 c2b6f80062ecea55a35f3fea594c83274b3ddd7e

花城E+防疫相关修改

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -9597,6 +9597,14 @@


    /**
     * 5项常规统计
     * @return
     */
    @GetMapping("/comActAcidRecord/fiveCount")
    R comActAcidRecordFiveCount();


    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActAcidRecordApi.java

@@ -12,6 +12,7 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordExcelVO;
import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
import com.panzhihua.common.model.vos.community.reserve.FiveCount;
import com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseApplyExcelVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.SFTPUtil;
@@ -174,4 +175,15 @@
        }
        return r;
    }


    /**
     * 5项常规统计
     * @return
     */
    @ApiOperation(value = "5项常规统计",response = FiveCount.class)
    @GetMapping("fiveCount")
    public R fiveCount(){
        return this.communityService.comActAcidRecordFiveCount();
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActAcidRecordApi.java

@@ -75,9 +75,7 @@
     */
    @PostMapping
    public R insert(@RequestBody ComActAcidRecordVO comActAcidRecordVO) {
        ComActAcidRecord comActAcidRecord=new ComActAcidRecord();
        BeanUtils.copyProperties(comActAcidRecordVO,comActAcidRecord);
        return R.ok(this.comActAcidRecordService.save(comActAcidRecord));
        return this.comActAcidRecordService.insertRecord(comActAcidRecordVO);
    }

    /**
@@ -103,4 +101,13 @@
    public R delete(@RequestParam("id") Long id) {
        return R.ok(this.comActAcidRecordService.removeById(id));
    }

    /**
     * 5项常规统计
     * @return
     */
    @GetMapping("fiveCount")
    public R fiveCount(){
        return this.comActAcidRecordService.fiveCount();
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActAcidRecordDao.java

@@ -7,6 +7,7 @@
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordExcelVO;
import com.panzhihua.common.model.vos.community.acid.ComActAcidRecordVO;
import com.panzhihua.common.model.vos.community.reserve.FiveCount;
import org.apache.ibatis.annotations.Mapper;
import com.panzhihua.service_community.entity.ComActAcidRecord;
import org.apache.ibatis.annotations.Param;
@@ -37,4 +38,10 @@
     * @return
     */
    List<ComActAcidRecordExcelVO> export(@Param("commonPage")ComActAcidRecordDTO comActAcidRecordDTO);

    /**
     * 5项统计
     * @return
     */
    FiveCount fiveCount();
}

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActAcidRecordService.java

@@ -37,4 +37,10 @@
     * @return
     */
    R insertRecord(ComActAcidRecordVO comActAcidRecordVO);

    /**
     * 5项统计
     * @return
     */
    R fiveCount();
}

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

@@ -53,4 +53,9 @@
        BeanUtils.copyProperties(comActAcidRecordVO,comActAcidRecord);
        return R.ok(this.save(comActAcidRecord));
    }

    @Override
    public R fiveCount() {
        return null;
    }
}

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

@@ -82,4 +82,12 @@
        order by create_time desc
    </select>

    <select id="fiveCount" resultType="com.panzhihua.common.model.vos.community.reserve.FiveCount">
        select (select count(*) from com_act_acid_record) allCount,
               (select count(*) from com_act_acid_record where danger_area = '是') dangerCount,
               (select count(*) from com_act_acid_record where color_mark = '绿码') greenMark,
               (select count(*) from com_act_acid_record where color_mark = '红码') redMark,
               (select count(*) from com_act_acid_record where color_mark = '黄码') yellowMark
    </select>

</mapper>