hanfucheng 11 月之前
父节点
当前提交
453f69ed03

+ 2 - 2
src/main/java/com/sooka/sponest/data/housingconstruction/domain/CenterdataTHousingconstructionSteelcylinderLog.java

@@ -2,7 +2,7 @@ package com.sooka.sponest.data.housingconstruction.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.annotation.Excel;
-import com.ruoyi.common.core.web.domain.BaseEntity;
+import com.sooka.sponest.data.base.domain.BaseBusinessEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -14,7 +14,7 @@ import java.util.Date;
  * @author ruoyi
  * @date 2024-07-30
  */
-public class CenterdataTHousingconstructionSteelcylinderLog extends BaseEntity {
+public class CenterdataTHousingconstructionSteelcylinderLog extends BaseBusinessEntity {
     private static final long serialVersionUID = 1L;
 
     /**

+ 3 - 0
src/main/java/com/sooka/sponest/data/housingconstruction/service/impl/CenterdataTHousingconstructionSteelcylinderLogServiceImpl.java

@@ -2,6 +2,7 @@ package com.sooka.sponest.data.housingconstruction.service.impl;
 
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
+import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
 import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
 import com.sooka.sponest.data.housingconstruction.domain.CenterdataTHousingconstructionSteelcylinderLog;
 import com.sooka.sponest.data.housingconstruction.mapper.CenterdataTHousingconstructionSteelcylinderLogMapper;
@@ -40,7 +41,9 @@ public class CenterdataTHousingconstructionSteelcylinderLogServiceImpl extends B
      * @return 钢瓶日志
      */
     @Override
+    @DataScopeMutiDept(deptAlias = "d")
     public List<CenterdataTHousingconstructionSteelcylinderLog> selectCenterdataTHousingconstructionSteelcylinderLogList(CenterdataTHousingconstructionSteelcylinderLog centerdataTHousingconstructionSteelcylinderLog) {
+        setSookaDataBase(centerdataTHousingconstructionSteelcylinderLog);
         return centerdataTHousingconstructionSteelcylinderLogMapper.selectCenterdataTHousingconstructionSteelcylinderLogList(centerdataTHousingconstructionSteelcylinderLog);
     }
 

+ 1 - 1
src/main/resources/mapper/housingconstruction/CenterdataTHousingconstructionViewMapper.xml

@@ -312,7 +312,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             a.state = 'state_4'
         <if test="enterpriseId != null  and enterpriseId != ''"> and a.enterprise_id = #{enterpriseId}</if>
-        <if test="steelcylinderNumber != null  and steelcylinderNumber != ''"> and a.steelcylinder_number = #{steelcylinderNumber}</if>
+        <if test="steelcylinderNumber != null  and steelcylinderNumber != ''"> and a.steelcylinder_number like concat('%', #{steelcylinderNumber}, '%')</if>
             ${params.dataScope}
     </select>