Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys...

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司

dsk-admin/src/main/java/com/dsk/web/schedule/PushTask.java

@@ -6,7 +6,9 @@ import com.dsk.common.constant.PushConstants;
 import com.dsk.common.utils.DateUtils;
 import com.dsk.system.domain.SysConfig;
 import com.dsk.system.domain.SysPush;
+import com.dsk.system.domain.SysPushRecord;
 import com.dsk.system.domain.SysStatutoryHoliday;
+import com.dsk.system.mapper.SysPushRecordMapper;
 import com.dsk.system.mapper.SysStatutoryHolidayMapper;
 import com.dsk.system.service.ISysConfigService;
 import com.dsk.system.service.ISysPushService;
@@ -20,10 +22,7 @@ import org.springframework.util.ObjectUtils;
 import javax.annotation.Resource;
 import java.time.DayOfWeek;
 import java.time.LocalDate;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 推送相关定时任务
@@ -45,6 +44,9 @@ public class PushTask {
     @Resource
     private SysStatutoryHolidayMapper statutoryHolidayMapper;
 
+    @Resource
+    private SysPushRecordMapper pushRecordMapper;
+
     /**
      * 供应商不良推送(每分钟)
      */
@@ -54,15 +56,22 @@ public class PushTask {
         if (!isPush()) return;
         //2.推送数据（当前时段是否存在数据）
 
+        List<SysPushRecord> records = new ArrayList<>();
         //3.推送人员
         List<SysPush> list = pushService.list(Wrappers.<SysPush>lambdaQuery().eq(SysPush::getStatus, 0));
         if (CollectionUtils.isNotEmpty(list)) {
+            SysPushRecord record = new SysPushRecord();
+
             list.parallelStream().forEach(item -> {
                 Map<String, Object> param = new HashMap<>();
                 param.put("name", item.getName());
 
             });
+
+            records.add(record);
         }
+        //4.添加推送记录
+        records.forEach(item -> pushRecordMapper.insert(item));
     }
 
     //是否推送

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

@@ -163,6 +163,7 @@ tenant:
     - sys_user_file_record
     - sys_oss_config
     - sys_region
+    - sys_push_record
     - d_customer
     - d_project
     - d_subcontract
@@ -181,6 +182,7 @@ tenant:
     - d_customer_qualification_certificate
     - d_customer_safety_certificate
     - d_customer_tax_certificate
+    - f_supplier_limited
 
 
 # MyBatisPlus配置

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/DProjectTypeController.java

+package com.dsk.cscec.controller;
+
+import com.dsk.cscec.service.DProjectTypeService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * 维表：工程类型，源于IPM(DProjectType)表控制层
+ *
+ * @author sxk
+ * @since 2024-01-05 11:45:43
+ */
+@RestController
+@RequestMapping("dProjectType")
+public class DProjectTypeController {
+    /**
+     * 服务对象
+     */
+    @Resource
+    private DProjectTypeService dProjectTypeService;
+
+
+}
+

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/FSupplierLimitedController.java

+package com.dsk.cscec.controller;
+
+import com.dsk.cscec.service.FSupplierLimitedService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * 供应商限制信息表(FSupplierLimited)表控制层
+ *
+ * @author sxk
+ * @since 2024-01-05 11:34:19
+ */
+@RestController
+@RequestMapping("fSupplierLimited")
+public class FSupplierLimitedController {
+    /**
+     * 服务对象
+     */
+    @Resource
+    private FSupplierLimitedService fSupplierLimitedService;
+
+}
+

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/DProjectType.java

+package com.dsk.cscec.domain;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * 维表：工程类型，源于IPM(DProjectType)实体类
+ *
+ * @author sxk
+ * @since 2024-01-05 11:45:46
+ */
+@Data
+public class DProjectType implements Serializable {
+    private static final long serialVersionUID = -28204467748448386L;
+    /**
+     * 工程类型主键
+     */
+    private Long projectTypeKey;
+    /**
+     * 工程类型编码
+     */
+    private String projectTypeCode;
+    /**
+     * 工程类型名称
+     */
+    private String projectTypeName;
+    /**
+     * 工程类型上级名称1
+     */
+    private String projectTypeName1;
+    /**
+     * 工程类型上级名称2
+     */
+    private String projectTypeName2;
+    /**
+     * 工程类型层级
+     */
+    private Long levelNo;
+    /**
+     * 是否叶子节点
+     */
+    private String isleaf;
+    /**
+     * 是否有效
+     */
+    private String isvalid;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 工程类型ID
+     */
+    private String projectTypeId;
+    /**
+     * 工程类型父ID
+     */
+    private String parentId;
+    /**
+     * 数据加载时间
+     */
+    private Date loadTime;
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/FSupplierLimited.java

+package com.dsk.cscec.domain;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * 供应商限制信息表(FSupplierLimited)实体类
+ *
+ * @author sxk
+ * @since 2024-01-05 11:34:22
+ */
+@Data
+public class FSupplierLimited implements Serializable {
+    private static final long serialVersionUID = 868547854171128623L;
+
+    private String fid;
+    /**
+     * 版本
+     */
+    private Long version;
+    /**
+     * 单据编号
+     */
+    private String frecordno;
+    /**
+     * 子企业
+     */
+    private String fjobunitname;
+    /**
+     * 子企业id
+     */
+    private String fjobunitid;
+    /**
+     * 供应商名称
+     */
+    private String fsuppliername;
+    /**
+     * 供应商统一社会信用代码
+     */
+    private String funifiedsocialcreditcode;
+    /**
+     * 限用情形
+     */
+    private String flimitsituation;
+    /**
+     * 禁用情形
+     */
+    private String fdisablesituation;
+    /**
+     * 限用/禁用状态
+     */
+    private String fstate;
+    /**
+     * 解除前状态
+     */
+    private String fbeforestate;
+    /**
+     * 限用日期
+     */
+    private Date flimitdate;
+    /**
+     * 解除限用理由
+     */
+    private String frelievereason;
+    /**
+     * 附件
+     */
+    private String fattachment;
+    /**
+     * 备注
+     */
+    private String fremarks;
+    /**
+     * 流程状态
+     */
+    private String fbizstate;
+    /**
+     * 流程状态名称
+     */
+    private String fbizstatename;
+    /**
+     * 数据类型
+     */
+    private String fdatatype;
+    /**
+     * 时间戳
+     */
+    private Date fts;
+    /**
+     * 创建时间
+     */
+    private Date fcreatetime;
+    /**
+     * 创建人fullid
+     */
+    private String fcreatepsnfid;
+    /**
+     * 创建人fullname
+     */
+    private String fcreatepsnfname;
+    /**
+     * 是否为局名义被诉案件
+     */
+    private String fisgroupcase;
+
+    private String fcategoryname;
+    /**
+     * 劳务分包id
+     */
+    private String flaowufbid;
+    /**
+     * 专业分包id
+     */
+    private String fzhuanyefbid;
+    /**
+     * 分供id
+     */
+    private String ffgid;
+    /**
+     * 租赁id
+     */
+    private String fzlid;
+    /**
+     * 数据加载时间
+     */
+    private Date loadTime;
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/mapper/DProjectTypeMapper.java

+package com.dsk.cscec.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsk.cscec.domain.DProjectType;
+
+/**
+ * 维表：工程类型，源于IPM(DProjectType)表数据库访问层
+ *
+ * @author sxk
+ * @since 2024-01-05 11:45:43
+ */
+public interface DProjectTypeMapper extends BaseMapper<DProjectType> {
+
+
+}
+

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/mapper/FSupplierLimitedMapper.java

+package com.dsk.cscec.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsk.cscec.domain.FSupplierLimited;
+
+/**
+ * 供应商限制信息表(FSupplierLimited)表数据库访问层
+ *
+ * @author sxk
+ * @since 2024-01-05 11:34:19
+ */
+public interface FSupplierLimitedMapper extends BaseMapper<FSupplierLimited> {
+
+
+}
+

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/DProjectTypeService.java

+package com.dsk.cscec.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsk.cscec.domain.DProjectType;
+
+/**
+ * 维表：工程类型，源于IPM(DProjectType)表服务接口
+ *
+ * @author sxk
+ * @since 2024-01-05 11:45:49
+ */
+public interface DProjectTypeService extends IService<DProjectType> {
+
+
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/FSupplierLimitedService.java

+package com.dsk.cscec.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsk.cscec.domain.FSupplierLimited;
+
+/**
+ * 供应商限制信息表(FSupplierLimited)表服务接口
+ *
+ * @author sxk
+ * @since 2024-01-05 11:34:23
+ */
+public interface FSupplierLimitedService extends IService<FSupplierLimited> {
+
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/DProjectTypeServiceImpl.java

+package com.dsk.cscec.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsk.cscec.domain.DProjectType;
+import com.dsk.cscec.mapper.DProjectTypeMapper;
+import com.dsk.cscec.service.DProjectTypeService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * 维表：工程类型，源于IPM(DProjectType)表服务实现类
+ *
+ * @author sxk
+ * @since 2024-01-05 11:45:49
+ */
+@Service("dProjectTypeService")
+public class DProjectTypeServiceImpl extends ServiceImpl<DProjectTypeMapper, DProjectType> implements DProjectTypeService {
+    @Resource
+    private DProjectTypeMapper baseMapper;
+
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/FSupplierLimitedServiceImpl.java

+package com.dsk.cscec.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsk.cscec.domain.FSupplierLimited;
+import com.dsk.cscec.mapper.FSupplierLimitedMapper;
+import com.dsk.cscec.service.FSupplierLimitedService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+/**
+ * 供应商限制信息表(FSupplierLimited)表服务实现类
+ *
+ * @author sxk
+ * @since 2024-01-05 11:34:23
+ */
+@Service("fSupplierLimitedService")
+public class FSupplierLimitedServiceImpl extends ServiceImpl<FSupplierLimitedMapper, FSupplierLimited> implements FSupplierLimitedService {
+    @Resource
+    private FSupplierLimitedMapper baseMapper;
+
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/EnterpriseService.java

@@ -43,6 +43,9 @@ public class EnterpriseService {
     @Autowired
     private ICustomerInfoService iCustomerInfoService;
 
+    @Autowired
+    private CompanyRelationTableV1Service relationTableV1Service;
+
     public R label(EnterpriseInfoLabelBody body) throws Exception {
         List<Map<String, Object>> mapList = new ArrayList<>();
         if (body.isVaildCid()) {
@@ -137,6 +140,27 @@ public class EnterpriseService {
         if (code.equals(HttpStatus.OK.value())) {
             statisticMapData.put("combineMember", MapUtils.getMap(combineMemberMap, "data", null));
         }
+        // 咨询业务往来
+        JskCompanyRelationTableV1Dto v1Dto = new JskCompanyRelationTableV1Dto();
+        Map<String, Object> businessTransactionsMap = new HashMap<>();
+        v1Dto.setCompanyId(body.getCompanyId());
+        v1Dto.setCompanyType(1);
+        TableDataInfo page1 = relationTableV1Service.page(v1Dto);
+        long total1 = page1.getTotal();
+        businessTransactionsMap.put("owner", total1);
+        v1Dto.setCompanyType(2);
+        TableDataInfo page2 = relationTableV1Service.page(v1Dto);
+        long total2 = page2.getTotal();
+        businessTransactionsMap.put("construction", total2);
+        v1Dto.setCompanyType(3);
+        TableDataInfo page3 = relationTableV1Service.page(v1Dto);
+        long total3 = page3.getTotal();
+        businessTransactionsMap.put("combine", total3);
+        if (total1+total2+total3 >0) {
+            statisticMapData.put("businessTransactions", businessTransactionsMap);
+        } else {
+            statisticMapData.put("businessTransactions", null);
+        }
         return R.ok(statisticMapData);
     }
 

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/DProjectTypeMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dsk.cscec.mapper.DProjectTypeMapper">
+
+
+</mapper>
+

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/FSupplierLimitedMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dsk.cscec.mapper.FSupplierLimitedMapper">
+
+
+</mapper>
+

dsk-system/src/main/java/com/dsk/system/domain/SysPush.java

@@ -4,6 +4,7 @@ import java.util.Date;
 import java.io.Serializable;
 
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 /**
@@ -13,6 +14,7 @@ import lombok.Data;
  * @since 2023-12-14 10:09:24
  */
 @Data
+@TableName("sys_push")
 public class SysPush implements Serializable {
 
     private static final long serialVersionUID = 1L;

dsk-system/src/main/java/com/dsk/system/domain/SysPushRecord.java

+package com.dsk.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 推送记录
+ *
+ * @Author lcl
+ * @Data 2024/1/2 17:02
+ */
+@Data
+@TableName("sys_push_record")
+public class SysPushRecord implements Serializable {
+
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * 数据id
+     */
+    private String dataId;
+    /**
+     * 推送类型code
+     */
+    private String push_type_code;
+    /**
+     * 推送时间
+     */
+    private Date pushTime;
+
+}

dsk-system/src/main/java/com/dsk/system/mapper/SysPushRecordMapper.java

+package com.dsk.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsk.system.domain.SysPush;
+import com.dsk.system.domain.SysPushRecord;
+
+/**
+ * 系统推送记录(SysPushRecord)表数据库访问层
+ *
+ * @author lcl
+ * @since 2023-12-14 10:09:24
+ */
+public interface SysPushRecordMapper extends BaseMapper<SysPushRecord> {
+
+}
+