Merge remote-tracking branch 'origin/master'

feige

2024-08-28 8429b26635252973e325d020af1a4485a0bbfdb0

Merge remote-tracking branch 'origin/master'

 zhang-content/src/main/java/com/ruoyi/domain/ZfClean.java

@@ -31,7 +31,7 @@
    /**
     * 0：保洁，1：收纳
     */
    @Excel(name = "类型",readConverterExp = "0=保洁,1=收纳")
    @Excel(name = "类型(必须是保洁或者收纳)",readConverterExp = "0=保洁,1=收纳")
    private Integer kind;

    /**

 zhang-content/src/main/java/com/ruoyi/domain/ZfProperty.java

@@ -62,7 +62,7 @@
    /**
     * 发生时间
     */
    @Excel(name = "发生时间", dateFormat = "yyyy-MM-dd")
    @Excel(name = "时间", dateFormat = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
    private Date happenTime;


 zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java

@@ -326,6 +326,9 @@
    @Override
    public AjaxResult addData(ZfClean zfClean) {


        if(zfClean.getKind()==null)
            zfClean.setKind(0);
//        String familyIds = listFamilyIds();
//        boolean flag = false;//判断当前用户的id是否有权加入当前家庭id的对象
//        if (familyIds.contains(",")) {

 zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java

@@ -447,7 +447,10 @@
        log.info("资产列表为：{}", propertyList);

        for (ZfEquipment zfEquipment : propertyList) {
            zfEquipmentService.addData(zfEquipment);
            if (zfEquipment.getName().length() != 0  && zfEquipment.getContent().length() != 0 && zfEquipment.getBuyer() .length() != 0){
                zfEquipmentService.addData(zfEquipment);
            }

        }

        return AjaxResult.success("导入数据成功");