Merge branch 'main' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/Suzhouyingji3Java

ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/BPlanEnterpriseController.java

@@ -169,7 +169,7 @@ public class BPlanEnterpriseController extends BaseController {
     public void exportplan(HttpServletResponse response, BPlanEnterprise bPlanEnterprise) {
         List<BPlanEnterpriseResponse> list = bPlanEnterpriseService.selectBPlanEnterpriseList(bPlanEnterprise);
         ExcelUtil<BPlanEnterpriseResponse> util = new ExcelUtil<BPlanEnterpriseResponse>(BPlanEnterpriseResponse.class);
-        util.exportExcel(response,list, "计划管理数据");
+        util.exportExcel(list, "计划管理数据");
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BPlanEnterprise.java

@@ -170,6 +170,15 @@ public class BPlanEnterprise {
     @ApiModelProperty(value = "0：草稿 1：正式")
     private Integer status;
 
+
+    /**
+     * 安全风险等级
+     */
+    @TableField(exist = false)
+    @Excel(name="安全风险等级")
+    @ApiModelProperty(value = "安全风险等级")
+    private String riskLevel;
+
     /**
      * 企业主表名称
      */
@@ -213,12 +222,6 @@ public class BPlanEnterprise {
     private Integer RISK_LEVEL;
 
 
-    /**
-     * 安全风险等级
-     */
-    @TableField(exist = false)
-    @ApiModelProperty(value = "安全风险等级")
-    private String riskLevel;
 
 
     /**
@@ -242,8 +245,6 @@ public class BPlanEnterprise {
     private Date checkTime;
 
 
-
-
     /**
      * 企业信用代码
      */
@@ -251,6 +252,5 @@ public class BPlanEnterprise {
     private String uuto;
 
 
-
 }
 

ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterpriseResponse.java

@@ -149,6 +149,11 @@ public class BPlanEnterpriseResponse extends BaseEntity {
     private String lawLevel;
 
 
+    /**
+     * 安全风险等级
+     */
+
+    @Excel(name="安全风险等级")
     @ApiModelProperty(value = "安全风险等级")
     private String riskLevel;
 
@@ -160,6 +165,13 @@ public class BPlanEnterpriseResponse extends BaseEntity {
     private String lawHierarchy;
 
 
+    /**
+     * 执法排序
+     */
+    @Excel(name = "执法排序")
+
+    @ApiModelProperty(value = "执法排序")
+    private Long lawSort;
     /**
      * 0：草稿 1：正式
      */
@@ -175,11 +187,7 @@ public class BPlanEnterpriseResponse extends BaseEntity {
     private String entprName;
 
 
-    /**
+
-     * 执法排序
-     */
-    @ApiModelProperty(value = "执法排序")
-    private Long lawSort;
 
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/BEnterpriseNewServiceImpl.java

@@ -1,15 +1,11 @@
 package com.ruoyi.programManagement.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.programManagement.entity.BEnterpriseNew;
-import com.ruoyi.programManagement.entity.BPlanEnterprise;
 import com.ruoyi.programManagement.entity.request.BEnterpriseNewRequest;
 import com.ruoyi.programManagement.entity.response.BEnterpriseNewReponse;
 import com.ruoyi.programManagement.mapper.BEnterpriseNewMapper;
-import com.ruoyi.programManagement.mapper.BPlanEnterpriseMapper;
-import com.ruoyi.programManagement.service.BPlanEnterpriseService;
 import com.ruoyi.programManagement.service.IBEnterpriseNewService;
 import org.springframework.stereotype.Service;
 
@@ -23,7 +19,7 @@ import java.util.List;
  * @since 2023-12-12
  */
 @Service
-public class BEnterpriseNewServiceImpl extends ServiceImpl<BEnterpriseNewMapper, BEnterpriseNew> implements IBEnterpriseNewService  {
+public class BEnterpriseNewServiceImpl extends ServiceImpl<BEnterpriseNewMapper, BEnterpriseNew> implements IBEnterpriseNewService {
     @Resource
     private BEnterpriseNewMapper bEnterpriseNewMapper;
 
@@ -58,8 +54,16 @@ public class BEnterpriseNewServiceImpl extends ServiceImpl<BEnterpriseNewMapper,
      */
     @Override
     public int insertBEnterpriseNew(BEnterpriseNew bEnterpriseNew) {
+        BEnterpriseNewRequest bEnterpriseNewRequest = new BEnterpriseNewRequest();
+        bEnterpriseNewRequest.setEnterpriseName(bEnterpriseNew.getEnterpriseName());
+        bEnterpriseNewRequest.setEnterpriseId(bEnterpriseNew.getEnterpriseId());
+        List<BEnterpriseNewReponse> list = bEnterpriseNewMapper.selectBEnterpriseNewList(bEnterpriseNewRequest);
+        if (!list.isEmpty()) {
+            throw new ServiceException("该企业已存在");
+        } else {
+            return bEnterpriseNewMapper.insertBEnterpriseNew(bEnterpriseNew);
+        }
 
-        return bEnterpriseNewMapper.insertBEnterpriseNew(bEnterpriseNew);
     }
 
     /**

ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml

@@ -65,7 +65,7 @@
         a.check_status,
         a.check_id,
         a.check_ageing,
-        c.risk_level,
+        c.risk_level ,
         CONCAT(d.district,'-', d.county) AS districtcounty
         FROM b_plan_enterprise a
         left join b_administrative_division d on a.district=d.county_code