platformx-device-api/src/main/java/com/by4cloud/platformx/device/entity/DeviceClass.java

@@ -57,5 +57,5 @@

    @Transient
    @TableField(exist = false)
    private Integer parentId;
    private Long parentId;
}

 platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceClassController.java

@@ -90,7 +90,7 @@
    @GetMapping("/{id}" )
    public R getById(@PathVariable("id" ) Long id) {
        DeviceClass byId = deviceClassService.getById(id);
        byId.setParentId(byId.getPId().intValue());
        byId.setParentId(byId.getPId());
        return R.ok(byId);
    }

@@ -107,7 +107,7 @@
            return R.failed("上级分类未选择！");
        }
        deviceClass.setNumber(maxSizeService.nextNo(MaxSizeContant.DEVICE_CLASS_NUM));
        deviceClass.setPId(deviceClass.getParentId().longValue());
        deviceClass.setPId(deviceClass.getParentId());
        return R.ok(deviceClassService.save(deviceClass));
    }

@@ -124,7 +124,7 @@
        if(deviceClass.getParentId()==null){
            return R.failed("上级分类未选择！");
        }
        deviceClass.setPId(deviceClass.getParentId().longValue());
        deviceClass.setPId(deviceClass.getParentId());
        return R.ok(deviceClassService.updateById(deviceClass));
    }


 platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/DeviceDemandPlanController.java

@@ -85,7 +85,8 @@
    public R page2(@ParameterObject Page page, @ParameterObject DeviceDemandPlan deviceDemandPlan) {
        LambdaQueryWrapper<DeviceDemandPlan> wrapper = Wrappers.lambdaQuery();
        wrapper.eq(deviceDemandPlan.getDeclareCompId() !=null,DeviceDemandPlan::getDeclareCompId,deviceDemandPlan.getDeclareCompId());
        wrapper.eq(deviceDemandPlan.getReleasePerson() !=null,DeviceDemandPlan::getReleasePerson,deviceDemandPlan.getReleasePerson());
        wrapper.eq(deviceDemandPlan.getCompId() !=null,DeviceDemandPlan::getCompId,deviceDemandPlan.getCompId());
        wrapper.like(deviceDemandPlan.getReleasePerson() !=null,DeviceDemandPlan::getReleasePerson,deviceDemandPlan.getReleasePerson());
        wrapper.eq(deviceDemandPlan.getYear() !=null,DeviceDemandPlan::getYear,deviceDemandPlan.getYear());
        wrapper.eq(deviceDemandPlan.getStatus() !=null,DeviceDemandPlan::getStatus,deviceDemandPlan.getStatus());
        wrapper.eq(DeviceDemandPlan::getType2,1);
@@ -115,6 +116,18 @@
    @PostMapping
    @PreAuthorize("@pms.hasPermission('platformx_deviceDemandPlan_add')" )
    public R save(@RequestBody DeviceDemandPlan deviceDemandPlan) {

        QueryWrapper<DeviceDemandPlan> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("declare_comp_id", deviceDemandPlan.getDeclareCompId());
        queryWrapper.eq("year", deviceDemandPlan.getYear());
        queryWrapper.eq("type",deviceDemandPlan.getType());
        List<DeviceDemandPlan> list = deviceDemandPlanService.list(queryWrapper);
        if (list.size() > 0) {
            if (deviceDemandPlan.getType()==0) {
                return R.failed(deviceDemandPlan.getDeclareCompName() + deviceDemandPlan.getYear() + "年度计划已存在");
            }
            return R.failed(deviceDemandPlan.getDeclareCompName() + deviceDemandPlan.getYear() + "调整计划已存在");
        }
        deviceDemandPlan.setNumber(maxSizeService.nextNo(MaxSizeContant.PLAN_NUM));
        deviceDemandPlan.setType2(0);
        return R.ok(deviceDemandPlanService.save(deviceDemandPlan));
@@ -148,6 +161,9 @@
        plan.setReleasePerson(name);
        plan.setStatus(3);
        plan.setType2(1);
        plan.setSendDate(new Date());
        plan.setDeclareCompId(plan.getCompId());
        plan.setDeclareCompName(plan.getCompName());
        if(subs.size()>0){
            deviceDemandPlanService.updateById(plan);
            return R.ok("提交成功");

 platformx-device-biz/src/main/java/com/by4cloud/platformx/device/controller/PurchaseTendrOrderController.java

@@ -141,8 +141,8 @@
    }

    /**
     * 通过id删除招标采购单
     * @param ids id列表
     * 通过id完成招标采购单
     * @param id列表
     * @return R
     */
    @Operation(summary = "通过id完成招标采购单" , description = "通过id完成招标采购单" )

 platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/PurchaseTendrOrderServiceImpl.java

@@ -1,6 +1,7 @@
package com.by4cloud.platformx.device.service.impl;

import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.by4cloud.platformx.device.constant.MaxSizeContant;
import com.by4cloud.platformx.device.entity.PurchaseTendrOrderEntity;
@@ -12,6 +13,7 @@
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;

import java.awt.geom.QuadCurve2D;
import java.util.List;

/**
@@ -46,7 +48,9 @@

    @Override
    public List<PurchaseTendrOrderEntity> getPurchaseRenderList() {
        List<PurchaseTendrOrderEntity> list = baseMapper.selectList(null);
        QueryWrapper<PurchaseTendrOrderEntity> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("status","2");
        List<PurchaseTendrOrderEntity> list = baseMapper.selectList(queryWrapper);
        return list;
    }


 platformx-device-biz/src/main/java/com/by4cloud/platformx/device/service/impl/PurchaseWinningLetterServiceImpl.java

@@ -36,7 +36,7 @@
        baseMapper.insert(purchaseWinningLetter);
        PurchaseTendrOrderEntity orderEntity = orderMapper.selectById(purchaseWinningLetter.getOrderId());
        if (orderEntity!=null){
            orderEntity.setStatus("2");
            orderEntity.setStatus("3");
            orderMapper.updateById(orderEntity);
        }
        return R.ok();