正式环境修改

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/component/TimingRemindImpl.java

@@ -2,8 +2,9 @@ package com.ruoyi.jjh.declaration.component;
 
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.jjh.declaration.service.IBmsEnterpriseBasicInfoService;
-import com.ruoyi.jjh.ent.entity.JEnterpriseContact;
+import com.ruoyi.jjh.ent.entity.JContacts;
 import com.ruoyi.jjh.ent.entity.JSmartDeclaration;
+import com.ruoyi.jjh.ent.service.JContactsService;
 import com.ruoyi.jjh.ent.service.JEnterpriseContactService;
 import com.ruoyi.jjh.ent.service.JSmartDeclarationService;
 import com.ruoyi.jjh.ent.service.SmsAlertsService;
@@ -45,6 +46,12 @@ public class TimingRemindImpl implements TimingRemindService {
     @Resource
     private JEnterpriseContactService jEnterpriseContactService;
 
+    /**
+     * 企业联系人 多个
+     */
+    @Resource
+    private JContactsService jContactsService;
+
     /**
      * 是否是正式环境
      */
@@ -88,12 +95,21 @@ public class TimingRemindImpl implements TimingRemindService {
      */
     public void getContact(String code, String s) {
         if (isTiming) {
-            List<JEnterpriseContact> list1 = jEnterpriseContactService.lambdaQuery().eq(JEnterpriseContact::getEnterpriseCode, code).list();
+//            List<JEnterpriseContact> list1 = jEnterpriseContactService.lambdaQuery().eq(JEnterpriseContact::getEnterpriseCode, code).list();
-            list1.forEach(y -> {
+//            list1.forEach(y -> {
+//                //先添加工单再发送短信
+//                //可在导入或者新增的时候将该常用联系人的手机号添加进工单
+//                smsAlertsService.enterSms(y.getEnterpriseName(), s, y.getContactPhone());
+//                log.info(y.getEnterpriseName() + "发送短信成功!");
+//            });
+            List<JContacts> list = jContactsService.lambdaQuery().eq(JContacts::getTyshxydm, code)
+                    .eq(JContacts::getDefaultcontact, "1").list();
+            list.forEach(y -> {
                 //先添加工单再发送短信
+                smsAlertsService.addSsmPhone(y.getTyshxydm());
                 //可在导入或者新增的时候将该常用联系人的手机号添加进工单
-                smsAlertsService.enterSms(y.getEnterpriseName(), s, y.getContactPhone());
+                smsAlertsService.enterSms(y.getQymc(), s, y.getTyshxydm());
-                log.info(y.getEnterpriseName() + "发送短信成功!");
+                log.info(y.getQymc() + "发送短信成功!");
             });
         }
     }
@@ -108,7 +124,7 @@ public class TimingRemindImpl implements TimingRemindService {
         SysUser user = new SysUser();
         user.setUserType("02");
         for (SysUser x : sysUserMapper.selectUserList(user)) {
-            if("0".equals(x.getDelFlag()) & "0".equals(x.getStatus())){
+            if ("0".equals(x.getDelFlag()) & "0".equals(x.getStatus())) {
                 JSmartDeclaration sd = new JSmartDeclaration();
                 sd.setIsRead(1);
                 sd.setAlertTime(LocalDateTime.parse(t));

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsEnterpriseBasicInfoController.java

@@ -9,22 +9,21 @@ import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo;
+import com.ruoyi.jjh.declaration.entity.request.EnterpriseInfoRequest;
 import com.ruoyi.jjh.declaration.entity.request.EnterpriseInfoWorkRequest;
 import com.ruoyi.jjh.declaration.service.IBmsEnterpriseBasicInfoService;
+import com.ruoyi.jjh.ent.entity.JHeadQuartersRevenue;
+import com.ruoyi.jjh.ent.service.JHeadQuartersRevenueService;
+import com.ruoyi.jjh.ent.service.JServicesListService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RequestPart;
-import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
@@ -42,6 +41,11 @@ public class BmsEnterpriseBasicInfoController extends BaseController {
     @Autowired
     private IBmsEnterpriseBasicInfoService bmsEnterpriseBasicInfoService;
 
+    @Resource
+    private JServicesListService jServicesListService;
+
+    @Resource
+    private JHeadQuartersRevenueService jHeadQuartersRevenueService;
 
     /**
      * 查询企业基础信息列表
@@ -49,8 +53,8 @@ public class BmsEnterpriseBasicInfoController extends BaseController {
     @PreAuthorize("@ss.hasAnyRoles('admin,other-gov,gov,sightseer')")
     @ApiOperation(value = "查询企业基础信息列表", response = BmsEnterpriseBasicInfo.class)
     @GetMapping("/list")
-    public AjaxResult list(Page<BmsEnterpriseBasicInfo> page, BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo) {
+    public AjaxResult list(Page<BmsEnterpriseBasicInfo> page, EnterpriseInfoRequest e) {
-        return success(bmsEnterpriseBasicInfoService.page(page, bmsEnterpriseBasicInfo));
+        return success(bmsEnterpriseBasicInfoService.page(page, e));
     }
 
     /**
@@ -70,8 +74,8 @@ public class BmsEnterpriseBasicInfoController extends BaseController {
     @ApiOperation(value = "导出企业基础信息列表")
     @Log(title = "企业基础信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo) {
+    public void export(HttpServletResponse response, EnterpriseInfoRequest e) {
-        List<BmsEnterpriseBasicInfo> list = bmsEnterpriseBasicInfoService.page(bmsEnterpriseBasicInfo);
+        List<BmsEnterpriseBasicInfo> list = bmsEnterpriseBasicInfoService.page(e);
         ExcelUtil<BmsEnterpriseBasicInfo> util = new ExcelUtil<BmsEnterpriseBasicInfo>(BmsEnterpriseBasicInfo.class);
         util.exportExcel(response, list, "企业基础信息数据");
     }
@@ -84,7 +88,7 @@ public class BmsEnterpriseBasicInfoController extends BaseController {
     @ApiOperation(value = "导入企业基础信息列表")
     @Log(title = "导入企业基础信息列表", businessType = BusinessType.IMPORT)
     @PostMapping(value = "/importEnterprise", consumes = "multipart/form-data")
-    public AjaxResult importEnterprise(@RequestPart("file") MultipartFile file) throws Exception {
+    public AjaxResult importEnterprise(@RequestPart("file") MultipartFile file, String type) throws Exception {
         List<BmsEnterpriseBasicInfo> allList = bmsEnterpriseBasicInfoService.list();
         ExcelUtil<BmsEnterpriseBasicInfo> util = new ExcelUtil<>(BmsEnterpriseBasicInfo.class);
         List<BmsEnterpriseBasicInfo> proList = util.importExcel(file.getInputStream());
@@ -92,11 +96,11 @@ public class BmsEnterpriseBasicInfoController extends BaseController {
         if (proList == null || proList.isEmpty()) {
             throw new ServiceException("企业导入数据不能为空");
         } else {
-            proList.forEach(entityA ->{
+            proList.forEach(entityA -> {
-                entityA.setType(2);
+                entityA.setType(type != null ? type : "2");
                 boolean b = allList.stream().anyMatch(entityB -> entityB.getTyshxydm().equals(entityA.getTyshxydm()));
-                if(b){
+                if (b) {
-                    throw new ServiceException(entityA.getQymc()+"在企业库已重复,无法新增!");
+                    throw new ServiceException(entityA.getQymc() + "在企业库已重复,无法新增!");
                 }
             });
             bmsEnterpriseBasicInfoService.saveBatch(proList);
@@ -138,4 +142,56 @@ public class BmsEnterpriseBasicInfoController extends BaseController {
         return success(bmsEnterpriseBasicInfoService.getById(id));
     }
 
+    /**
+     * 将企业库企业更改分类
+     */
+//    @ApiOperation(value = "将企业库企业更改分类", response = BmsEnterpriseBasicInfo.class)
+//    @GetMapping(value = "/changeType")
+//    public AjaxResult changeType() {
+//        List<BmsEnterpriseBasicInfo> list = bmsEnterpriseBasicInfoService.list();
+        //生产性服务业
+//        List<JServicesList> list1 = jServicesListService.lambdaQuery().eq(JServicesList::getServicesType, 1).list();
+        //限上批零住餐
+//        List<JServicesList> list2 = jServicesListService.lambdaQuery().eq(JServicesList::getServicesType, 4).list();
+//        //总部企业
+//        List<JHeadQuartersRevenue> list3 = jHeadQuartersRevenueService.list();
+//        for (BmsEnterpriseBasicInfo x : list) {
+//            for (JServicesList y : list1) {
+//                if(x.getTyshxydm().equals(y.getTyshxydm())){
+//                    if(x.getType()==null){
+//                        x.setType("5");
+//                    }else {
+//                        x.setType(x.getType()+","+"5");
+//                    }
+//                    bmsEnterpriseBasicInfoService.updateById(x);
+//                }
+//            }
+//        }
+//        for (BmsEnterpriseBasicInfo x : list) {
+//            for (JServicesList y : list2) {
+//                if(x.getTyshxydm().equals(y.getTyshxydm())){
+//                    if(x.getType()==null){
+//                        x.setType("6");
+//                    }else {
+//                        x.setType(x.getType()+","+"6");
+//                    }
+//                    bmsEnterpriseBasicInfoService.updateById(x);
+//                }
+//            }
+//        }
+//        for (BmsEnterpriseBasicInfo x : list) {
+//            for (JHeadQuartersRevenue y : list3) {
+//                if (x.getTyshxydm().equals(y.getTyshxydm())) {
+//                    if (x.getType() == null) {
+//                        x.setType("4");
+//                    } else {
+//                        x.setType(x.getType() + "," + "4");
+//                    }
+//                    bmsEnterpriseBasicInfoService.updateById(x);
+//                }
+//            }
+//        }
+//        return success();
+//    }
+
 }

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/controller/BmsEnterpriseDirectoryController.java

@@ -6,26 +6,30 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo;
 import com.ruoyi.jjh.declaration.entity.BmsEnterpriseDirectory;
+import com.ruoyi.jjh.declaration.service.IBmsEnterpriseBasicInfoService;
 import com.ruoyi.jjh.declaration.service.IBmsEnterpriseDirectoryService;
+import com.ruoyi.jjh.ent.entity.JContacts;
+import com.ruoyi.jjh.ent.service.JContactsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * 企业名录Controller
  *
  * @author farben
- * @date 2023-08-31
+ * @date 2023-08-3100
  */
 @Api(tags = "企业名录")
 @RestController
@@ -34,6 +38,12 @@ public class BmsEnterpriseDirectoryController extends BaseController {
     @Autowired
     private IBmsEnterpriseDirectoryService bmsEnterpriseDirectoryService;
 
+    @Resource
+    private IBmsEnterpriseBasicInfoService iBmsEnterpriseBasicInfoService;
+
+    @Resource
+    private JContactsService jContactsService;
+
     /**
      * 查询企业名录列表
      */
@@ -97,4 +107,59 @@ public class BmsEnterpriseDirectoryController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(bmsEnterpriseDirectoryService.deleteBmsEnterpriseDirectoryByIds(ids));
     }
+
+    /**
+     * 导出用名字和企业库名字做对比企业库没有的企业
+     */
+//    @PreAuthorize("@ss.hasAnyRoles('admin')")
+//    @ApiOperation(value = "导出用名字和企业库名字做对比企业库没有的企业")
+//    @PostMapping(value = "/check", consumes = "multipart/form-data")
+//    public void check(@RequestPart("file") MultipartFile file, HttpServletResponse response) throws Exception {
+//        //利用企业名录的东西来获取所有企业
+//        ExcelUtil<BmsEnterpriseDirectory> util = new ExcelUtil<>(BmsEnterpriseDirectory.class);
+//        List<BmsEnterpriseDirectory> proList = util.importExcel(file.getInputStream());
+//        //获取企业库的所有企业
+//        List<BmsEnterpriseBasicInfo> list = iBmsEnterpriseBasicInfoService.list();
+//        Set<String> bNames = list.stream()
+//                .map(BmsEnterpriseBasicInfo::getQymc)
+//                .collect(Collectors.toSet());
+//        List<BmsEnterpriseDirectory> filteredList = proList.stream()
+//                .filter(a -> !bNames.contains(a.getEnterpriseName()))
+//                .collect(Collectors.toList());
+////        System.out.println(filteredList.size());
+//        //导出
+//        util.exportExcel(response, filteredList, "企业名录数据");
+//    }
+
+    /**
+     * 查询联系人
+     */
+//    @PreAuthorize("@ss.hasAnyRoles('admin')")
+//    @ApiOperation(value = "查询联系人")
+//    @PostMapping(value = "/searchContact", consumes = "multipart/form-data")
+//    public AjaxResult searchContact(@RequestPart("file") MultipartFile file) throws Exception {
+//        //利用企业名录的东西来获取所有企业
+//        ExcelUtil<BmsEnterpriseDirectory> util = new ExcelUtil<>(BmsEnterpriseDirectory.class);
+//        List<BmsEnterpriseDirectory> proList = util.importExcel(file.getInputStream());
+//        //获取企业库的所有企业
+//        List<BmsEnterpriseBasicInfo> list = iBmsEnterpriseBasicInfoService.list();
+//        Set<String> bNames = proList.stream()
+//                .map(BmsEnterpriseDirectory::getEnterpriseName)
+//                .collect(Collectors.toSet());
+//        List<BmsEnterpriseBasicInfo> filteredList = list.stream()
+//                .filter(a -> bNames.contains(a.getQymc()))
+//                .collect(Collectors.toList());
+////        System.out.println(filteredList.size());
+////        System.out.println(proList.size());
+//        filteredList.forEach(x -> {
+//            List<JContacts> list1 = jContactsService.lambdaQuery().eq(JContacts::getTyshxydm, x.getTyshxydm()).list();
+//            if (!list1.isEmpty()) {
+//                System.out.println(x.getQymc() + "----" + list1.size());
+//            } else {
+//                System.out.println(x.getQymc() + "----" + 0);
+//            }
+//        });
+//        return success();
+//    }
+
 }

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/BmsEnterpriseBasicInfo.java

@@ -9,6 +9,7 @@ import com.ruoyi.common.annotation.Excels;
 import com.ruoyi.jjh.common.entity.BaseInfoEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import liquibase.pro.packaged.S;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -38,12 +39,12 @@ public class BmsEnterpriseBasicInfo extends BaseInfoEntity {
     private Integer multiple;
 
     /**
-     * 分类 1.规上服务业 2其他
+     * 分类 1.规上服务业 2其他 3规上工业 4总部企业 5生产性服务业 6限上批零住餐
      */
-    @ApiModelProperty("分类 1.规上服务业 2其他")
+    @ApiModelProperty("分类 1.规上服务业 2其他 3规上工业 4总部企业 5生产性服务业 6限上批零住餐")
     @JSONField(serialize = false)
-    @Excel(name = "分类", readConverterExp = "1=规上服务业,2=其他")
+    @Excel(name = "分类", readConverterExp = "1.规上服务业 2其他 3规上工业 4总部企业 5生产性服务业 6限上批零住餐")
-    private Integer type;
+    private String type;
 
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/entity/request/EnterpriseInfoRequest.java

@@ -0,0 +1,40 @@
+package com.ruoyi.jjh.declaration.entity.request;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 企业库查询请求体
+ * @author du
+ * @since 2024/11/21 9:10
+ */
+@Data
+@ApiModel("企业库查询请求体")
+public class EnterpriseInfoRequest {
+
+    /**
+     * 分类 1.规上服务业 2其他 3规上工业 4总部企业 5生产性服务业 6限上批零住餐
+     */
+    @ApiModelProperty("分类 1.规上服务业 2其他 3规上工业 4总部企业 5生产性服务业 6限上批零住餐")
+    private Integer type;
+
+    /**
+     * 企业名称
+     */
+    @ApiModelProperty("企业名称")
+    private String qymc;
+
+    /**
+     * 统一社会信用代码
+     */
+    @ApiModelProperty("统一社会信用代码")
+    private String tyshxydm;
+
+    /**
+     * 是否删除：0，未删除；1，已删除
+     */
+    @ApiModelProperty("是否删除：0，未删除；1，已删除")
+    private Long isDeleted;
+
+}

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/mapper/BmsEnterpriseBasicInfoMapper.java

@@ -3,6 +3,7 @@ package com.ruoyi.jjh.declaration.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo;
+import com.ruoyi.jjh.declaration.entity.request.EnterpriseInfoRequest;
 import com.ruoyi.jjh.declaration.entity.request.EnterpriseInfoWorkRequest;
 import org.apache.ibatis.annotations.Param;
 
@@ -21,7 +22,7 @@ public interface BmsEnterpriseBasicInfoMapper extends BaseMapper<BmsEnterpriseBa
      * @param bmsEnterpriseBasicInfo 企业基础信息
      * @return 企业基础信息集合
      */
-    public Page<BmsEnterpriseBasicInfo> page(Page<BmsEnterpriseBasicInfo> page, @Param("req") BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo);
+    public Page<BmsEnterpriseBasicInfo> page(Page<BmsEnterpriseBasicInfo> page, @Param("req") EnterpriseInfoRequest bmsEnterpriseBasicInfo);
 
 
     /**
@@ -30,7 +31,7 @@ public interface BmsEnterpriseBasicInfoMapper extends BaseMapper<BmsEnterpriseBa
      * @param bmsEnterpriseBasicInfo 企业基础信息
      * @return 企业基础信息集合
      */
-    List<BmsEnterpriseBasicInfo> page(@Param("req") BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo);
+    List<BmsEnterpriseBasicInfo> page(@Param("req") EnterpriseInfoRequest bmsEnterpriseBasicInfo);
 
     /**
      * 作业台查询企业信息

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/regular/TimeChange.java

@@ -25,6 +25,7 @@ import com.ruoyi.jjh.ent.service.JSmartRemindersService;
 import com.ruoyi.jjh.ent.service.SmsAlertsService;
 import com.ruoyi.quartz.service.ISysJobService;
 import com.ruoyi.system.mapper.SysUserMapper;
+import liquibase.pro.packaged.S;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
@@ -197,7 +198,7 @@ public class TimeChange {
                         if (total > 0) {
                             // 直接转换第一个元素为BmsEnterpriseBasicInfo对象
                             BmsEnterpriseBasicInfo res = JSONUtil.toBean(arr.getJSONObject(0).toString(), BmsEnterpriseBasicInfo.class);
-                            if(items.getType() != 1){
+                            if(!"1".equals(items.getType())){
                                 res.setQygm("其他");
                             }
                             res.setId(items.getId());
@@ -240,7 +241,15 @@ public class TimeChange {
                             JContacts res = JSONUtil.toBean(o.toString(), JContacts.class);
                             allList.add(res);
                         }
-                        jContactsService.saveOrUpdateBatch(allList);
+                        List<JContacts> list1 = jContactsService.lambdaQuery().eq(JContacts::getTyshxydm, items.getTyshxydm()).list();
+                        List<String> str = new ArrayList<>();
+                        list1.forEach(x-> str.add(x.getDwAgencykey()));
+                        if(!list1.isEmpty()){
+                            jContactsService.removeBatchByIds(str);
+                            jContactsService.saveBatch(allList);
+                        }else {
+                            jContactsService.saveBatch(allList);
+                        }
                     }
                 }
             }

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/IBmsEnterpriseBasicInfoService.java

@@ -3,6 +3,7 @@ package com.ruoyi.jjh.declaration.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo;
+import com.ruoyi.jjh.declaration.entity.request.EnterpriseInfoRequest;
 import com.ruoyi.jjh.declaration.entity.request.EnterpriseInfoWorkRequest;
 
 import java.util.List;
@@ -19,18 +20,18 @@ public interface IBmsEnterpriseBasicInfoService extends IService<BmsEnterpriseBa
     /**
      * 查询企业基础信息列表
      *
-     * @param bmsEnterpriseBasicInfo 企业基础信息
+     * @param e 企业基础信息
      * @return 企业基础信息集合
      */
-    Page<BmsEnterpriseBasicInfo> page(Page<BmsEnterpriseBasicInfo> page, BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo);
+    Page<BmsEnterpriseBasicInfo> page(Page<BmsEnterpriseBasicInfo> page, EnterpriseInfoRequest e);
 
     /**
      * 查询企业基础信息列表所有
      *
-     * @param bmsEnterpriseBasicInfo 企业基础信息
+     * @param e 企业基础信息
      * @return 企业基础信息集合
      */
-    List<BmsEnterpriseBasicInfo> page(BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo);
+    List<BmsEnterpriseBasicInfo> page(EnterpriseInfoRequest e);
 
 
     List<BmsEnterpriseBasicInfo> workSearch(EnterpriseInfoWorkRequest enterpriseInfoWorkRequest);

ruoyi-admin/src/main/java/com/ruoyi/jjh/declaration/service/impl/BmsEnterpriseBasicInfoServiceImpl.java

@@ -3,6 +3,7 @@ package com.ruoyi.jjh.declaration.service.impl;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo;
+import com.ruoyi.jjh.declaration.entity.request.EnterpriseInfoRequest;
 import com.ruoyi.jjh.declaration.entity.request.EnterpriseInfoWorkRequest;
 import com.ruoyi.jjh.declaration.mapper.BmsEnterpriseBasicInfoMapper;
 import com.ruoyi.jjh.declaration.service.IBmsEnterpriseBasicInfoService;
@@ -23,23 +24,23 @@ public class BmsEnterpriseBasicInfoServiceImpl extends ServiceImpl<BmsEnterprise
     /**
      * 查询企业基础信息列表
      *
-     * @param bmsEnterpriseBasicInfo 企业基础信息
+     * @param e 企业基础信息
      * @return 企业基础信息
      */
     @Override
-    public Page<BmsEnterpriseBasicInfo> page(Page<BmsEnterpriseBasicInfo> page, BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo) {
+    public Page<BmsEnterpriseBasicInfo> page(Page<BmsEnterpriseBasicInfo> page, EnterpriseInfoRequest e) {
-        return baseMapper.page(page, bmsEnterpriseBasicInfo);
+        return baseMapper.page(page, e);
     }
 
     /**
      * 查询企业基础信息列表所有
      *
-     * @param bmsEnterpriseBasicInfo 企业基础信息
+     * @param e 企业基础信息
      * @return 企业基础信息
      */
     @Override
-    public List<BmsEnterpriseBasicInfo> page(BmsEnterpriseBasicInfo bmsEnterpriseBasicInfo) {
+    public List<BmsEnterpriseBasicInfo> page(EnterpriseInfoRequest e) {
-        return baseMapper.page(bmsEnterpriseBasicInfo);
+        return baseMapper.page(e);
     }
 
 

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JMemorandumController.java

@@ -1,6 +1,11 @@
 package com.ruoyi.jjh.ent.controller;
 
 
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
@@ -8,12 +13,15 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo;
 import com.ruoyi.jjh.declaration.regular.TimeChange;
+import com.ruoyi.jjh.ent.entity.JContacts;
 import com.ruoyi.jjh.ent.entity.JMemorandum;
 import com.ruoyi.jjh.ent.entity.request.JMemorandumRequest;
 import com.ruoyi.jjh.ent.service.JMemorandumService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -25,6 +33,8 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -46,6 +56,9 @@ public class JMemorandumController extends BaseController {
     @Resource
     private TimeChange ts;
 
+    @Value("${enterpriseUrl}")
+    private String enterpriseUrl;
+
     /**
      * 分页查询所有数据
      *
@@ -75,6 +88,31 @@ public class JMemorandumController extends BaseController {
         return AjaxResult.success();
     }
 
+    @PreAuthorize("@ss.hasAnyRoles('admin')")
+    @ApiOperation(value = "查看法人库-企业联络人员")
+    @GetMapping("/getOneContacts/{tyshxydm}")
+    public AjaxResult selectAll3(@PathVariable String tyshxydm) {
+            String contacts = enterpriseUrl + "/645383/qyllrytyshxydm";
+            JSONArray arr = null;
+            HashMap<String, String> headers = new HashMap<>();//存放请求头，可以存放多个请求头
+            headers.put("Content-Type", "application/json;charset=utf-8");
+            //请求体
+            JSONObject jsonObject = new JSONObject();//存放参数
+            jsonObject.set("tyshxydm", tyshxydm);
+            jsonObject.set("pageIndex", 0);
+            HttpResponse response = HttpRequest.post(contacts)
+                    .addHeaders(headers)
+                    .body(jsonObject.toString())
+                    .execute();
+            if (response.getStatus() == 200) {
+                JSONObject jsonObj = JSONUtil.parseObj(response.body());
+                if ("200".equals(jsonObj.get("code"))) {
+                    JSONObject reqData = JSONUtil.parseObj(jsonObj.get("data"));
+                     arr = JSONUtil.parseArray(reqData.get("data"));
+                }
+            }
+        return AjaxResult.success(arr);
+    }
 
     /**
      * 根据关联项目库ID或者企业库ID查询该ID下的备忘录

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JContacts.java

@@ -43,6 +43,8 @@ public class JContacts extends BaseInfoEntity {
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateId;
 
+
+
     /**
      * 企业名称
      */
@@ -64,6 +66,12 @@ public class JContacts extends BaseInfoEntity {
     @ApiModelProperty("统一社会信用代码")
     private String tyshxydm;
 
+    /**
+     * 默认联系人
+     */
+    @ApiModelProperty("默认联系人")
+    private String defaultcontact;
+
     /**
      * 组织机构代码
      */

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/entity/JHeadQuartersRevenue.java

@@ -1,5 +1,6 @@
 package com.ruoyi.jjh.ent.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -32,6 +33,7 @@ public class JHeadQuartersRevenue {
      */
 
     @ApiModelProperty("总部类别")
+    @TableField(exist = false)
     private String type;
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/service/impl/SmsAlertsServiceImpl.java

@@ -78,7 +78,7 @@ public class SmsAlertsServiceImpl implements SmsAlertsService {
         //请求体
         JSONObject params = new JSONObject();//存放参数
         params.set("param1", param1);
-        params.set("param2", param2);
+        params.set("param2", param2+"登录网址为:https://idp.sipac.gov.cn/bms/#/login");
         jsonObject.set("type", paramType);
         jsonObject.set("empowerCode", smsV);
         jsonObject.set("numbers", numbers);

ruoyi-admin/src/main/resources/application.yml

@@ -16,8 +16,8 @@ ruoyi:
 # 日志配置
 logging:
   level:
-    com.ruoyi: debug
+    com.ruoyi: error
-    org.springframework: warn
+    org.springframework: error
 
 # 用户配置
 user:

ruoyi-admin/src/main/resources/mapper/jjh/declaration/BmsEnterpriseBasicInfoMapper.xml

@@ -23,7 +23,7 @@
     <select id="page" resultType="com.ruoyi.jjh.declaration.entity.BmsEnterpriseBasicInfo">
         select * from bms_enterprise_basic_info
         <where>
-            <if test="req.type != null  and req.type != ''">and type = #{req.type}</if>
+            <if test="req.type != null">and type like concat('%',#{req.type},'%') </if>
             <if test="req.qymc != null  and req.qymc != ''">and qymc like concat('%', #{req.qymc}, '%')</if>
             <if test="req.tyshxydm != null  and req.tyshxydm != ''">and tyshxydm = #{req.tyshxydm}</if>
             <if test="req.isDeleted != null ">and is_deleted = #{req.isDeleted}</if>

ruoyi-admin/src/main/resources/mapper/jjh/ent/JServicesListMapper.xml

@@ -41,7 +41,7 @@
             b.years
         FROM
             bms_enterprise_basic_info a
-                LEFT JOIN j_business_revenue b ON a.tyshxydm = b.tyshxydm COLLATE utf8mb4_general_ci
+                LEFT JOIN j_business_revenue b ON a.tyshxydm = b.tyshxydm
         <where>
             a.type = 1
             <if test="req.qymc != null and req.qymc != '' ">
@@ -72,10 +72,10 @@ SELECT
     IFNULL( ROUND( a.add_value, 1 ), '-' ) AS addValue,
     a.type AS servicesType,
     CASE
-
         WHEN a.type = 3 THEN
                 ( SELECT COUNT(*) FROM bms_enterprise_basic_info WHERE type = 1 ) ELSE b.qyCount
         END AS qyCount
+
 FROM
     j_total_revenue a
         LEFT JOIN ( SELECT a.services_type, COUNT(*) AS qyCount FROM j_services_list a GROUP BY a.services_type ) AS b ON a.type = b.services_type