4/18

PAS/src/main/java/cn/cslg/pas/common/model/dto/ProductQueryPageDTO.java

@@ -1,6 +1,7 @@
 package cn.cslg.pas.common.model.dto;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 /**
@@ -9,6 +10,7 @@ import lombok.experimental.Accessors;
  * @Author chenyu
  * @Date 2023/3/8
  */
+@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @Data
 public class ProductQueryPageDTO extends PageDTO2 {
@@ -37,8 +39,8 @@ public class ProductQueryPageDTO extends PageDTO2 {
      */
     private String groupBy;
     /**
-     * 租户id
+     * 产品创建人所属租户id
      */
-    private Integer tenantId;
+    private Integer createPersonTenantId;
 
 }

PAS/src/main/java/cn/cslg/pas/domain/PermissionRecord.java

@@ -56,6 +56,10 @@ public class PermissionRecord implements Serializable {
      */
     private Integer licenseType;
     /**
+     * 租户id
+     */
+    private Integer tenantId;
+    /**
      * 创建人id
      */
     private Integer createPersonId;

PAS/src/main/java/cn/cslg/pas/domain/Product.java

@@ -39,6 +39,10 @@ public class Product implements Serializable {
      */
     private Integer tenantId;
     /**
+     * 产品创建人所属租户id
+     */
+    private Integer createPersonTenantId;
+    /**
      * 产品说明
      */
     private String productExplain;

PAS/src/main/java/cn/cslg/pas/mapper/PermissionRecordMapper.java

@@ -43,9 +43,10 @@ public interface PermissionRecordMapper {
      * 根据专利号patentNo分页查询许可记录表数据
      *
      * @param patentNo 专利号
+     * @param tenantId 租户id
      * @return 返回查询到的数据
      */
-    List<PermissionRecordVO> queryAllInfo(String patentNo);
+    List<PermissionRecordVO> queryAllInfo(String patentNo, Integer tenantId);
 
 
     /**

PAS/src/main/java/cn/cslg/pas/service/impl/PermissionRecordServiceImpl.java

@@ -51,6 +51,7 @@ public class PermissionRecordServiceImpl implements IPermissionRecordService {
         //给实体类赋值登陆人id和姓名
         permissionRecord.setCreatePersonId(personnelVO.getId());
         permissionRecord.setCreatePersonName(personnelVO.getName());
+        permissionRecord.setTenantId(personnelVO.getTenantId());
         //数据入表
         log.info("数据入表");
         int rows = permissionRecordMapper.add(permissionRecord);
@@ -92,7 +93,9 @@ public class PermissionRecordServiceImpl implements IPermissionRecordService {
      */
     @Override
     public List<PermissionRecordVO> queryAllInfo(String patentNo) {
-        return permissionRecordMapper.queryAllInfo(patentNo);
+        PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
+        Integer tenantId = personnelVO.getTenantId();
+        return permissionRecordMapper.queryAllInfo(patentNo, tenantId);
     }
 
     /**
@@ -100,8 +103,10 @@ public class PermissionRecordServiceImpl implements IPermissionRecordService {
      */
     @Override
     public List<PermissionRecordVO> findAllByPage(QueryPREntity queryPREntity) {
+        PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
+        Integer tenantId = personnelVO.getTenantId();
         PageHelper.startPage(queryPREntity.getCurrent(), queryPREntity.getSize());
-        List<PermissionRecordVO> lists = permissionRecordMapper.queryAllInfo(queryPREntity.getPatentNo());
+        List<PermissionRecordVO> lists = permissionRecordMapper.queryAllInfo(queryPREntity.getPatentNo(), tenantId);
         return lists;
     }
 

PAS/src/main/java/cn/cslg/pas/service/impl/ProductServiceImpl.java

@@ -97,7 +97,8 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
         PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
         product
                 .setCreatePersonId(personnelVO.getId())
-                .setCreatePersonName(personnelVO.getName());
+                .setCreatePersonName(personnelVO.getName())
+                .setCreatePersonTenantId(personnelVO.getTenantId());
         //数据入产品表
         log.info("数据入产品表");
         int rows = productMapper.insert(product);
@@ -227,7 +228,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
         log.info("开始处理【查询产品】的业务，参数为：{}", productQueryPageDTO);
 
         PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        productQueryPageDTO.setTenantId(personnelVO.getTenantId());
+        productQueryPageDTO.setCreatePersonTenantId(personnelVO.getTenantId());
 
         Integer current = productQueryPageDTO.getCurrent();
         Integer size = productQueryPageDTO.getSize();
@@ -318,16 +319,21 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
         wrapper.eq(Structure::getProductId, id);
         ArrayList<Integer> structureIds = new ArrayList<>();
         List<Structure> structures = structureService.list(wrapper);
-        for (Structure structure : structures) {
-            structureIds.add(structure.getId());
+        if (structures != null && structures.size() > 0) {
+            for (Structure structure : structures) {
+                structureIds.add(structure.getId());
+            }
+            LambdaQueryWrapper<AssoStructurePicture> assoStructurePictureWrapper = new LambdaQueryWrapper<>();
+            assoStructurePictureWrapper.in(AssoStructurePicture::getStructureId, structureIds);
+            List<AssoStructurePicture> assoStructurePictures = assoStructurePictureService.list(assoStructurePictureWrapper);
+            if (assoStructurePictures != null && assoStructurePictures.size() > 0) {
+                log.info("架构图片关联表删除数据");
+                //删除架构图片关联表数据
+                assoStructurePictureService.remove(assoStructurePictureWrapper);
+            }
+            log.info("产品的架构表删除数据");
+            structureService.remove(wrapper);
         }
-        LambdaQueryWrapper<AssoStructurePicture> assoStructurePictureWrapper = new LambdaQueryWrapper<>();
-        assoStructurePictureWrapper.in(AssoStructurePicture::getStructureId, structureIds);
-        log.info("架构图片关联表删除数据");
-        //删除架构图片关联表数据
-        assoStructurePictureService.remove(assoStructurePictureWrapper);
-        log.info("产品的架构表删除数据");
-        structureService.remove(wrapper);
 
         //删除产品营销数据
         LambdaQueryWrapper<ProductMarketData> wrapper2 = new LambdaQueryWrapper<>();

PAS/src/main/resources/mapper/PermissionRecordMapper.xml

@@ -6,10 +6,10 @@
     <!--int add(PermissionRecord permissionRecord);-->
     <insert id="add" useGeneratedKeys="true" keyProperty="id">
         insert into permission_record(id, patent_no, licensor, licensee, licensee_country, license_time,
-                                      license_fee, license_dead_line, license_type, create_person_id,
+                                      license_fee, license_dead_line, license_type, tenant_id, create_person_id,
                                       create_person_name, create_time, modified_time)
         values (#{id}, #{patentNo}, #{licensor}, #{licensee}, #{licenseeCountry},
-                #{licenseTime}, #{licenseFee}, #{licenseDeadLine}, #{licenseType}, #{createPersonId},
+                #{licenseTime}, #{licenseFee}, #{licenseDeadLine}, #{licenseType}, #{tenantId}, #{createPersonId},
                 #{createPersonName}, #{createTime}, #{modifiedTime})
     </insert>
 
@@ -86,9 +86,11 @@
                license_time,
                license_fee,
                license_dead_line,
-               license_type
+               license_type,
+               tenant_id
         from permission_record
         where patent_no = #{patentNo}
+          and tenant_id = #{tenantId}
     </select>
 
     <!--根据专利号统计许可记录数量-->

PAS/src/main/resources/mapper/ProductMapper.xml

@@ -5,10 +5,10 @@
     <!--插入数据-->
     <!--int insert(Product product);-->
     <insert id="insert" useGeneratedKeys="true" keyProperty="id">
-        insert into product (product_name, market_time, company_name, tenant_id, product_explain,
-                             product_category_id, license_rate, create_person_id, create_person_name)
-        values (#{productName}, #{marketTime}, #{companyName}, #{tenantId}, #{productExplain}, #{productCategoryId},
-                #{licenseRate}, #{createPersonId}, #{createPersonName});
+        insert into product (product_name, market_time, company_name, tenant_id, create_person_tenant_id,
+                             product_explain, product_category_id, license_rate, create_person_id, create_person_name)
+        values (#{productName}, #{marketTime}, #{companyName}, #{tenantId}, #{createPersonTenantId}, #{productExplain},
+                #{productCategoryId}, #{licenseRate}, #{createPersonId}, #{createPersonName});
     </insert>
 
     <!--根据id删除产品-->
@@ -24,13 +24,15 @@
     <update id="updateById">
         update product
         <set>
-
             product_name = #{productName},
             market_time = #{marketTime},
             company_name = #{companyName},
             <if test="tenantId != null">
                 tenant_id = #{tenantId},
             </if>
+            <if test="createPersonTenantId != null">
+                create_person_tenant_id = #{createPersonTenantId},
+            </if>
             product_explain = #{productExplain},
             product_category_id = #{productCategoryId},
             license_rate = #{licenseRate},
@@ -97,6 +99,7 @@
         market_time,
         company_name,
         p.tenant_id,
+        create_person_tenant_id,
         product_explain,
         product_category_id,
         p.license_rate,
@@ -120,7 +123,7 @@
                 '%${productCategoryName}%')
             </if>
             <if test="true">
-                and p.tenant_id = #{tenantId}
+                and create_person_tenant_id = #{createPersonTenantId}
             </if>
         </where>
         order by
@@ -218,7 +221,7 @@
     <select id="queryByGroupProductCategoryId" resultMap="queryByGroupProductCategoryIdMap">
         select product_category_id pci,
         product_category_name,
-        p.tenant_id pTenantId,
+        p.create_person_tenant_id pCreatePersonTenantId,
         ifnull(#{orderBy}, '') orderBy,
         ifnull(#{orderType}, '') orderType,
         ifnull(#{productName}, '') productName,
@@ -247,7 +250,7 @@
                 '%${productCategoryName}%')
             </if>
             <if test="true">
-                and p.tenant_id = #{tenantId}
+                and p.create_person_tenant_id = #{createPersonTenantId}
             </if>
         </where>
         group by product_category_id
@@ -260,7 +263,7 @@
         <collection property="products" ofType="cn.cslg.pas.common.model.vo.ProductVO"
                     select="queryByGroupProductCategoryId2"
                     column="{pci=pci, orderBy=orderBy, orderType=orderType, productName=productName, companyName=companyName,
-                             patentNo=patentNo, productCategoryId=productCategoryId, productCategoryName=productCategoryName, pTenantId=pTenantId}">
+                             patentNo=patentNo, productCategoryId=productCategoryId, productCategoryName=productCategoryName, pCreatePersonTenantId=pCreatePersonTenantId}">
         </collection>
     </resultMap>
 
@@ -300,7 +303,7 @@
                 and product_category_id = #{pci}
             </if>
             <if test="true">
-                and p.tenant_id = #{pTenantId}
+                and p.create_person_tenant_id = #{pCreatePersonTenantId}
             </if>
         </where>
         order by
@@ -318,7 +321,7 @@
     <!--List<ProductGroupVO> queryByGroupCompanyName(ProductQueryPageDTO productQueryPageDTO);-->
     <select id="queryByGroupCompanyName" resultMap="queryByGroupCompanyNameMap">
         select company_name cn,
-        tenant_id pTenantId,
+        create_person_tenant_id CreatePersonTenantId,
         ifnull(#{orderBy}, '') orderBy,
         ifnull(#{orderType}, '') orderType,
         ifnull(#{productName}, '') productName,
@@ -349,7 +352,7 @@
                 and company_name is not null
             </if>
             <if test="true">
-                and tenant_id = #{tenantId}
+                and create_person_tenant_id = #{createPersonTenantId}
             </if>
         </where>
         group by company_name
@@ -361,7 +364,7 @@
         <collection property="products" ofType="cn.cslg.pas.common.model.vo.ProductVO"
                     select="queryByGroupCompanyNameMap2"
                     column="{cn=cn, orderBy=orderBy, orderType=orderType, productName=productName, companyName=companyName,
-                             patentNo=patentNo, productCategoryId=productCategoryId, productCategoryName=productCategoryName, pTenantId=pTenantId}">
+                             patentNo=patentNo, productCategoryId=productCategoryId, productCategoryName=productCategoryName, CreatePersonTenantId=CreatePersonTenantId}">
         </collection>
     </resultMap>
 
@@ -401,7 +404,7 @@
                 and company_name = #{cn}
             </if>
             <if test="true">
-                and p.tenant_id = #{pTenantId}
+                and p.create_person_tenant_id = #{CreatePersonTenantId}
             </if>
         </where>
         order by