优化了企业端历史执法信息

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntEnforcementRegistrationController.java

@@ -10,6 +10,7 @@ import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.web.core.BaseController;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnforcementRegistrationServiceImpl.java

@@ -7,10 +7,12 @@ import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zdxt.enforcementcode.common.annotation.DataScope;
+import com.zdxt.enforcementcode.common.commonenum.PlatformTypeEnums;
 import com.zdxt.enforcementcode.domain.*;
 import com.zdxt.enforcementcode.domain.bo.EnforcementRegistrationBo;
 import com.zdxt.enforcementcode.domain.bo.EnforcementRegistrationQueryBo;
 import com.zdxt.enforcementcode.domain.vo.EnterpriseEvaluateVo;
+import com.zdxt.enforcementcode.domain.vo.EnterpriseInformationVo;
 import com.zdxt.enforcementcode.domain.vo.enterprise.EnforcementRegistrationDetailVo;
 import com.zdxt.enforcementcode.domain.vo.enterprise.EnforcementRegistrationInfoVo;
 import com.zdxt.enforcementcode.domain.vo.enterprise.EnforcementRegistrationListVo;
@@ -66,6 +68,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
     private final LinkageDictMapper linkageDictMapper;
     private final ZdxtFileMapper zdxtFileMapper;
     private final SysDeptMapper sysDeptMapper;
+    private final EnterpriseInformationMapper enterpriseInformationMapper;
 
     /**
      * 查询企业端-执法登记记录
@@ -395,6 +398,18 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
      */
     @Override
     public TableDataInfo<EnforcementRegistrationListVo> queryEnforcementRegistrationPageList(EnforcementRegistrationQueryBo bo, PageQuery pageQuery) {
+
+        Integer platformTypelan = LoginHelper.getPlatformType();
+        if(platformTypelan == PlatformTypeEnums.ENTERPRISE.getKey()){
+            String companyid =  LoginHelper.getDeptId();//企业端
+            EnterpriseInformationVo enterpriseInformationVo = enterpriseInformationMapper.selectVoById(companyid);
+            if(enterpriseInformationVo != null){
+                bo.setEnterpriseNumber(enterpriseInformationVo.getEnterpriseNumber());
+            }
+        }
+
+
+
         Page<EnforcementRegistrationListVo> page = pageQuery.build();
         IPage<EnforcementRegistrationListVo> result = baseMapper.selectEnforcementRegistrationPage(page, bo);
          List<EnforcementRegistrationListVo> records = result.getRecords();

zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml

@@ -219,7 +219,7 @@
 <!--            </if>-->
             AND is_delete = 0
         </where>
-        ORDER BY update_time DESC
+        ORDER BY update_time DESC,create_time DESC
     </select>