20240904 导出任务修改

src/main/java/cn/cslg/pas/domain/business/ProductMarketData.java

@@ -37,19 +37,19 @@ public class ProductMarketData extends BaseEntity<ProductMarketData> {
      * 销售量
      */
     @TableField(value = "sale_count")
-    private double saleCount;
+    private Double saleCount;
 
     /**
      * 销售额（万元）
      */
     @TableField(value = "sale_money")
-    private double saleMoney;
+    private Double saleMoney;
 
     /**
      * 自定义许可费率
      */
     @TableField(value = "custom_license_rate")
-    private double customLicenseRate;
+    private Double customLicenseRate;
 
     /**
      * 创建人

src/main/java/cn/cslg/pas/service/business/ProductCategoryService.java

@@ -116,7 +116,7 @@ public class ProductCategoryService extends ServiceImpl<ProductCategoryMapper, P
                 .eq(ProductCategory::getTenant,personnelVO.getTenantId());
         List<ProductCategory> productCategories = this.list(queryWrapper);
         if (productCategories != null && productCategories.size() != 0) {
-            throw new XiaoShiException("参数错误");
+            throw new XiaoShiException("名称重复");
         }
         //产品类别入表
         ProductCategory productCategory = new ProductCategory();

src/main/java/cn/cslg/pas/service/business/ProductMarketDataService.java

@@ -26,6 +26,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
+
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

src/main/resources/mapper/CustomAnalyseMapper.xml

@@ -3,11 +3,13 @@
 <mapper namespace="cn.cslg.pas.mapper.CustomAnalysisItemMapper">
 
     <sql id="Base_Column_Analyse_Item">
-        id,uid,name,parent_id,permissions,project_id,tenant_id,sort,type,status,create_id,create_name,create_time,update_time
+        id
+        ,uid,name,parent_id,permissions,project_id,tenant_id,sort,type,status,create_id,create_name,create_time,update_time
     </sql>
 
     <select id="queryAnalyseGroup" resultType="cn.cslg.pas.common.dto.customAnalyse.SelectCustomAnalyseListDTO">
-        select <include refid="Base_Column_Analyse_Item"/>
+        select
+        <include refid="Base_Column_Analyse_Item"/>
         from os_custom_analysis_item
         <where>
             and (
@@ -27,6 +29,7 @@
                 /*数据库私有*/
                 or (permissions = 4 AND create_id = #{vo.creatorId} AND project_id = #{vo.projectId})
             </if>
+            or (permissions = 5)
             )
         </where>
         order by sort asc