一帕拉功能（一边想四月里大哥一边写的）

fengjin

2023-09-19 2bd9debe1829fdce93c62028aa97716a1cb2defe

 springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/UnionInspectionApi.java

@@ -3,7 +3,9 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.panzhihua.common.model.dtos.equipment.UnionInspectionDto;
import com.panzhihua.common.model.dtos.equipment.UnionReportDto;
import com.panzhihua.common.model.dtos.equipment.UnionUserDto;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_equipment.annotation.CurrentUser;
import com.panzhihua.service_equipment.model.dos.UnionReport;
import com.panzhihua.service_equipment.service.UnionInspectionService;
import com.panzhihua.service_equipment.service.UnionReportService;
@@ -25,7 +27,6 @@
    private UnionInspectionService unionInspectionService;



    /**
     * 新增户外劳工站巡查
     *
@@ -33,8 +34,19 @@
     * @return 新增结果
     */
    @PostMapping("/add")
    public R add(@RequestBody UnionInspectionDto unionInspectionDto) {
        return  unionInspectionService.add(unionInspectionDto);
    public R add(@RequestBody UnionInspectionDto unionInspectionDto, @CurrentUser UnionUserDto unionUserDto) {
        if (unionInspectionDto.getIsApplets().equals(1)) {
            log.info("小程序进入无需验证");
            return unionInspectionService.add(unionInspectionDto);
        } else {
            log.info("h5或者后台进入");
            if (unionUserDto != null) {
                unionInspectionDto.setCreateUnionUserId(unionUserDto.getId());
                return unionInspectionService.add(unionInspectionDto);
            } else {
                return R.fail("请重新登录");
            }
        }
    }


@@ -45,7 +57,18 @@
     * @return 动态结果
     */
    @PostMapping("/query")
    public R<IPage<UnionReport>> query(@RequestBody UnionInspectionDto unionInspectionDto) {
        return unionInspectionService.query(unionInspectionDto);
    public R<IPage<UnionReport>> query(@RequestBody UnionInspectionDto unionInspectionDto, @CurrentUser UnionUserDto unionUserDto) {
        if (unionInspectionDto.getIsApplets().equals(1)) {
            log.info("小程序进入无需验证");
            return unionInspectionService.query(unionInspectionDto);
        } else {
            log.info("h5或者后台进入");
            if (unionUserDto != null) {
                unionInspectionDto.setCreateUnionUserId(unionUserDto.getId());
                return unionInspectionService.query(unionInspectionDto);
            } else {
                return R.fail("请重新登录");
            }
        }
    }
}