diff --git a/jwtech-system/src/main/java/com/kms/enterprise/controller/BsSgcYxjdEnterpriseInfoController.java b/jwtech-system/src/main/java/com/kms/enterprise/controller/BsSgcYxjdEnterpriseInfoController.java index e73a9d5d..f967ec5d 100644 --- a/jwtech-system/src/main/java/com/kms/enterprise/controller/BsSgcYxjdEnterpriseInfoController.java +++ b/jwtech-system/src/main/java/com/kms/enterprise/controller/BsSgcYxjdEnterpriseInfoController.java @@ -180,6 +180,7 @@ public class BsSgcYxjdEnterpriseInfoController extends BaseController public AjaxResult add(@RequestBody BsSgcYxjdEnterpriseInfo bsSgcYxjdEnterpriseInfo) { BaseEntityUtils.preInsert(bsSgcYxjdEnterpriseInfo); + bsSgcYxjdEnterpriseInfo.setIsBlack("0"); return toAjax(bsSgcYxjdEnterpriseInfoService.save(bsSgcYxjdEnterpriseInfo)); } diff --git a/jwtech-system/src/main/java/com/kms/enterprise/controller/BsSgcYxjdQyhmdController.java b/jwtech-system/src/main/java/com/kms/enterprise/controller/BsSgcYxjdQyhmdController.java new file mode 100644 index 00000000..469e2b67 --- /dev/null +++ b/jwtech-system/src/main/java/com/kms/enterprise/controller/BsSgcYxjdQyhmdController.java @@ -0,0 +1,114 @@ +package com.kms.enterprise.controller; + +import java.util.Arrays; +import java.util.List; + +import com.jianwei.common.core.controller.BaseController; +import com.jianwei.common.core.domain.SearchParam; +import com.jianwei.common.utils.poi.ExcelUtil; +import com.kms.common.utils.BaseEntityUtils; + + +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.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jianwei.common.mybaitsplus.BeanToWrapper; + +import com.jianwei.common.annotation.Log; +import com.jianwei.common.core.domain.AjaxResult; +import com.jianwei.common.enums.BusinessType; +import com.kms.enterprise.domain.BsSgcYxjdQyhmd; +import com.kms.enterprise.service.BsSgcYxjdQyhmdService; + + +/** + * 企业黑名单Controller + * + * @author kms + * @date 2024-01-22 + */ +@RestController +@RequestMapping("/enterprise/qyhmd") +@Api(tags = "企业黑名单") +public class BsSgcYxjdQyhmdController extends BaseController +{ + @Autowired + private BsSgcYxjdQyhmdService bsSgcYxjdQyhmdService; + + /** + * 查询企业黑名单列表 + */ + @PostMapping("/list") + @ApiOperation("企业黑名单列表") + public IPage list(@RequestBody SearchParam sp) + { + return bsSgcYxjdQyhmdService.selectPage(sp); + } + + /** + * 导出企业黑名单列表 + */ + @Log(title = "企业黑名单导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ApiOperation("企业黑名单导出") + public AjaxResult export(@RequestBody BsSgcYxjdQyhmd bsSgcYxjdQyhmd) + { + List list = bsSgcYxjdQyhmdService.listByIds(bsSgcYxjdQyhmd.getIds()); + ExcelUtil util = new ExcelUtil<>(BsSgcYxjdQyhmd.class); + return util.exportExcel(list, "qyhmd"); + } + + /** + * 获取企业黑名单详细信息 + */ + @ApiOperation(" 企业黑名单详情") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") String id) + { + return AjaxResult.success(bsSgcYxjdQyhmdService.getById(id)); + } + + /** + * 新增企业黑名单 + */ + @Log(title = "企业黑名单新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("企业黑名单新增") + public AjaxResult add(@RequestBody BsSgcYxjdQyhmd bsSgcYxjdQyhmd) + { + BaseEntityUtils.preInsert(bsSgcYxjdQyhmd); + return toAjax(bsSgcYxjdQyhmdService.save(bsSgcYxjdQyhmd)); + } + + /** + * 修改企业黑名单 + */ + @ApiOperation("企业黑名单修改") + @Log(title = "企业黑名单修改", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody BsSgcYxjdQyhmd bsSgcYxjdQyhmd) + { + return toAjax(bsSgcYxjdQyhmdService.updateById(bsSgcYxjdQyhmd)); + } + + /** + * 删除企业黑名单 + */ + @ApiOperation("企业黑名单删除") + @Log(title = "企业黑名单删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable String[] ids) + { + return toAjax(bsSgcYxjdQyhmdService.removeByIds(Arrays.asList(ids))); + } +} diff --git a/jwtech-system/src/main/java/com/kms/enterprise/controller/CreditStatisticsController.java b/jwtech-system/src/main/java/com/kms/enterprise/controller/CreditStatisticsController.java index 06bda479..7e638f7d 100644 --- a/jwtech-system/src/main/java/com/kms/enterprise/controller/CreditStatisticsController.java +++ b/jwtech-system/src/main/java/com/kms/enterprise/controller/CreditStatisticsController.java @@ -5,6 +5,7 @@ import com.jianwei.common.core.domain.AjaxResult; import com.kms.enterprise.domain.BsSgcYxjdEnterpriseInfo; import com.kms.enterprise.domain.BsSgcYxjdPersonnelInfo; import com.kms.enterprise.domain.BsSgcYxjdQualifications; +import com.kms.enterprise.domain.dto.AreaDto; import com.kms.enterprise.domain.dto.LineChartDto; import com.kms.enterprise.domain.dto.LineResponseDto; import com.kms.enterprise.domain.dto.NumDto; @@ -86,4 +87,11 @@ public class CreditStatisticsController { } + @GetMapping("/getArea") + public AjaxResult getArea() { + AreaDto list = bsSgcYxjdEnterpriseInfoService.getArea(); + return AjaxResult.success(list); + } + + } diff --git a/jwtech-system/src/main/java/com/kms/enterprise/domain/BlackDto.java b/jwtech-system/src/main/java/com/kms/enterprise/domain/BlackDto.java new file mode 100644 index 00000000..e07442c5 --- /dev/null +++ b/jwtech-system/src/main/java/com/kms/enterprise/domain/BlackDto.java @@ -0,0 +1,19 @@ +package com.kms.enterprise.domain; + +import lombok.Data; + +@Data +public class BlackDto { + + private String enterpriseId; + + private String enterpriseName; + + private String qualificationCategory; + + private String adcd; + + private String dynamicCreditScore; + + +} diff --git a/jwtech-system/src/main/java/com/kms/enterprise/domain/BsSgcYxjdEnterpriseInfo.java b/jwtech-system/src/main/java/com/kms/enterprise/domain/BsSgcYxjdEnterpriseInfo.java index b3ac8bc7..f6b88ac5 100644 --- a/jwtech-system/src/main/java/com/kms/enterprise/domain/BsSgcYxjdEnterpriseInfo.java +++ b/jwtech-system/src/main/java/com/kms/enterprise/domain/BsSgcYxjdEnterpriseInfo.java @@ -1,6 +1,8 @@ package com.kms.enterprise.domain; import java.util.Date; + +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -170,4 +172,14 @@ public class BsSgcYxjdEnterpriseInfo extends BaseEntity private String enterpriseType; + @TableField(exist = false) + private String num; + + /** + * 0-是 + * 1-否 + */ + private String isBlack; + + } diff --git a/jwtech-system/src/main/java/com/kms/enterprise/domain/BsSgcYxjdQyhmd.java b/jwtech-system/src/main/java/com/kms/enterprise/domain/BsSgcYxjdQyhmd.java new file mode 100644 index 00000000..5a649641 --- /dev/null +++ b/jwtech-system/src/main/java/com/kms/enterprise/domain/BsSgcYxjdQyhmd.java @@ -0,0 +1,63 @@ +package com.kms.enterprise.domain; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.jianwei.common.annotation.Excel; + +import com.baomidou.mybatisplus.annotation.TableName; + + +import com.jianwei.common.core.domain.BaseEntity; + +/** + * 企业黑名单对象 bs_sgc_yxjd_qyhmd + * + * @author kms + * @date 2024-01-22 + */ +@TableName("bs_sgc_yxjd_qyhmd") +@Data +@ApiModel("企业黑名单") +public class BsSgcYxjdQyhmd extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 企业id */ + @Excel(name = "企业id") + @ApiModelProperty("企业id") + private String enterpriseId; + + /** 企业名称 */ + @Excel(name = "企业名称") + @ApiModelProperty("企业名称") + private String enterpriseName; + + /** 行为描述 */ + @Excel(name = "行为描述") + @ApiModelProperty("行为描述") + private String behavioralDescription; + + /** 文件依据 */ + @Excel(name = "文件依据") + @ApiModelProperty("文件依据") + private String documentBasis; + + /** $column.columnComment */ + @Excel(name = "文件依据") + @ApiModelProperty("文件依据") + private String owerDept; + + /** $column.columnComment */ + @Excel(name = "文件依据") + @ApiModelProperty("文件依据") + private String createUid; + + /** $column.columnComment */ + @Excel(name = "文件依据") + @ApiModelProperty("文件依据") + private String updateUid; + +} diff --git a/jwtech-system/src/main/java/com/kms/enterprise/domain/dto/AreaDto.java b/jwtech-system/src/main/java/com/kms/enterprise/domain/dto/AreaDto.java new file mode 100644 index 00000000..8452e372 --- /dev/null +++ b/jwtech-system/src/main/java/com/kms/enterprise/domain/dto/AreaDto.java @@ -0,0 +1,13 @@ +package com.kms.enterprise.domain.dto; + +import lombok.Data; + +import java.util.HashMap; +import java.util.List; + +@Data +public class AreaDto { + + private List> list; + +} diff --git a/jwtech-system/src/main/java/com/kms/enterprise/mapper/BsSgcYxjdEnterpriseInfoMapper.java b/jwtech-system/src/main/java/com/kms/enterprise/mapper/BsSgcYxjdEnterpriseInfoMapper.java index 13538ca1..60376812 100644 --- a/jwtech-system/src/main/java/com/kms/enterprise/mapper/BsSgcYxjdEnterpriseInfoMapper.java +++ b/jwtech-system/src/main/java/com/kms/enterprise/mapper/BsSgcYxjdEnterpriseInfoMapper.java @@ -1,9 +1,13 @@ package com.kms.enterprise.mapper; +import com.kms.enterprise.domain.BlackDto; +import com.kms.enterprise.domain.dto.AreaDto; import org.springframework.stereotype.Repository; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.enterprise.domain.BsSgcYxjdEnterpriseInfo; +import java.util.List; + /** * 企业基本信息Mapper接口 * @@ -13,4 +17,7 @@ import com.kms.enterprise.domain.BsSgcYxjdEnterpriseInfo; @Repository public interface BsSgcYxjdEnterpriseInfoMapper extends BaseMapper { + List getArea(); + + } diff --git a/jwtech-system/src/main/java/com/kms/enterprise/mapper/BsSgcYxjdQyhmdMapper.java b/jwtech-system/src/main/java/com/kms/enterprise/mapper/BsSgcYxjdQyhmdMapper.java new file mode 100644 index 00000000..3341e869 --- /dev/null +++ b/jwtech-system/src/main/java/com/kms/enterprise/mapper/BsSgcYxjdQyhmdMapper.java @@ -0,0 +1,16 @@ +package com.kms.enterprise.mapper; + +import org.springframework.stereotype.Repository; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.enterprise.domain.BsSgcYxjdQyhmd; + +/** + * 企业黑名单Mapper接口 + * + * @author kms + * @date 2024-01-22 + */ +@Repository +public interface BsSgcYxjdQyhmdMapper extends BaseMapper { + +} diff --git a/jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdEnterpriseInfoService.java b/jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdEnterpriseInfoService.java index 97417e01..b1369a9e 100644 --- a/jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdEnterpriseInfoService.java +++ b/jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdEnterpriseInfoService.java @@ -9,10 +9,15 @@ import com.jianwei.common.core.domain.AjaxResult; import com.jianwei.common.core.domain.SearchParam; import com.jianwei.common.utils.BeanUtils; import com.kms.earlyStage.domain.SpecialProjectInfo; +import com.kms.enterprise.domain.BlackDto; import com.kms.enterprise.domain.BsSgcYxjdQualifications; +import com.kms.enterprise.domain.dto.AreaDto; import com.kms.enterprise.domain.dto.CreditDto; import com.kms.enterprise.domain.dto.DisclosureDto; import com.kms.enterprise.mapper.BsSgcYxjdQualificationsMapper; +import com.kms.system.domain.SysXzqh; +import com.kms.system.mapper.SysXzqhMapper; +import com.kms.system.service.SysXzqhService; import org.springframework.stereotype.Service; import com.jianwei.common.core.service.BaseService; import com.kms.enterprise.mapper.BsSgcYxjdEnterpriseInfoMapper; @@ -20,6 +25,7 @@ import com.kms.enterprise.domain.BsSgcYxjdEnterpriseInfo; import javax.annotation.Resource; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -39,6 +45,9 @@ public class BsSgcYxjdEnterpriseInfoService extends BaseService sp, String adcd) { QueryWrapper queryWrapper = new QueryWrapper<>(); BsSgcYxjdEnterpriseInfo projectInfo = sp.getData(); @@ -85,17 +94,51 @@ public class BsSgcYxjdEnterpriseInfoService extends BaseService list = bsSgcYxjdQualificationsMapper.listByOne(); return AjaxResult.success(list); } else { - if (dto.getAdcd()!=null && dto.equals("省外")) { + if (dto.getAdcd() != null && dto.equals("省外")) { dto.setAdcd("44"); - List page = bsSgcYxjdQualificationsMapper.listThree(dto.getPageNum(),dto.getPageSize(),dto.getQualificationCategory(), - dto.getEnterpriseName(),dto.getAdcd()); + List page = bsSgcYxjdQualificationsMapper.listThree(dto.getPageNum(), dto.getPageSize(), dto.getQualificationCategory(), + dto.getEnterpriseName(), dto.getAdcd()); return AjaxResult.success(page); - }else { - List page = bsSgcYxjdQualificationsMapper.listTwo(dto.getPageNum(),dto.getPageSize(),dto.getQualificationCategory(), - dto.getEnterpriseName(),dto.getAdcd()); + } else { + List page = bsSgcYxjdQualificationsMapper.listTwo(dto.getPageNum(), dto.getPageSize(), dto.getQualificationCategory(), + dto.getEnterpriseName(), dto.getAdcd()); return AjaxResult.success(page); } } } + + public AreaDto getArea() { + List list = bsSgcYxjdEnterpriseInfoMapper.getArea(); + list.stream().filter(x->!x.getAdcd().substring(0,2).equals("44")) + .forEach(x->x.setAdcd("省外")); + + list.stream().filter(x->x.getAdcd().equals("4400")).forEach(x->x.setAdcd("省属")); + + List xzqhList = sysXzqhMapper.getArea(); + + for (BsSgcYxjdEnterpriseInfo bsSgcYxjdEnterpriseInfo : list) { + if (bsSgcYxjdEnterpriseInfo.getAdcd().substring(0, 2).equals("44")) { + for (SysXzqh sysXzqh : xzqhList) { + if (bsSgcYxjdEnterpriseInfo.getAdcd().equals(sysXzqh.getXzqhdm())) { + bsSgcYxjdEnterpriseInfo.setAdcd(sysXzqh.getName()); + } + } + } + } + + List> mapList = new ArrayList<>(); + + for (BsSgcYxjdEnterpriseInfo bsSgcYxjdEnterpriseInfo : list) { + HashMap map = new HashMap<>(); + map.put(bsSgcYxjdEnterpriseInfo.getAdcd(), bsSgcYxjdEnterpriseInfo.getNum()); + mapList.add(map); + } + + AreaDto areaDto = new AreaDto(); + areaDto.setList(mapList); + return areaDto; + } + + } diff --git a/jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdQyhmdService.java b/jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdQyhmdService.java new file mode 100644 index 00000000..b00911d9 --- /dev/null +++ b/jwtech-system/src/main/java/com/kms/enterprise/service/BsSgcYxjdQyhmdService.java @@ -0,0 +1,17 @@ +package com.kms.enterprise.service; + +import org.springframework.stereotype.Service; +import com.jianwei.common.core.service.BaseService; +import com.kms.enterprise.mapper.BsSgcYxjdQyhmdMapper; +import com.kms.enterprise.domain.BsSgcYxjdQyhmd; + +/** + * 企业黑名单Service接口 + * + * @author kms + * @date 2024-01-22 + */ +@Service +public class BsSgcYxjdQyhmdService extends BaseService{ + +} diff --git a/jwtech-system/src/main/java/com/kms/system/domain/SysXzqh.java b/jwtech-system/src/main/java/com/kms/system/domain/SysXzqh.java index fda44763..ec55c32c 100644 --- a/jwtech-system/src/main/java/com/kms/system/domain/SysXzqh.java +++ b/jwtech-system/src/main/java/com/kms/system/domain/SysXzqh.java @@ -1,6 +1,8 @@ package com.kms.system.domain; import java.math.BigDecimal; + +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -61,4 +63,8 @@ public class SysXzqh extends BaseEntity @ApiModelProperty("排序") private BigDecimal orderno; + @TableField(exist = false) + private String num; + + } diff --git a/jwtech-system/src/main/java/com/kms/system/mapper/SysXzqhMapper.java b/jwtech-system/src/main/java/com/kms/system/mapper/SysXzqhMapper.java index f4380fe1..90b94df3 100644 --- a/jwtech-system/src/main/java/com/kms/system/mapper/SysXzqhMapper.java +++ b/jwtech-system/src/main/java/com/kms/system/mapper/SysXzqhMapper.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.kms.system.domain.SysXzqh; import org.springframework.stereotype.Repository; +import java.util.List; + /** * 行政区划Mapper接口 @@ -14,4 +16,5 @@ import org.springframework.stereotype.Repository; @Repository public interface SysXzqhMapper extends BaseMapper { + List getArea(); } diff --git a/jwtech-system/src/main/java/com/kms/system/service/SysXzqhService.java b/jwtech-system/src/main/java/com/kms/system/service/SysXzqhService.java index a26fcbe1..b3822a08 100644 --- a/jwtech-system/src/main/java/com/kms/system/service/SysXzqhService.java +++ b/jwtech-system/src/main/java/com/kms/system/service/SysXzqhService.java @@ -5,6 +5,8 @@ import com.kms.system.mapper.SysXzqhMapper; import org.springframework.stereotype.Service; import com.jianwei.common.core.service.BaseService; +import java.util.List; + /** * 行政区划Service接口 @@ -15,4 +17,5 @@ import com.jianwei.common.core.service.BaseService; @Service public class SysXzqhService extends BaseService{ + } diff --git a/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml b/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml new file mode 100644 index 00000000..f45fd963 --- /dev/null +++ b/jwtech-system/src/main/resources/mapper/enterprise/BsSgcYxjdEnterpriseInfoMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jwtech-system/src/main/resources/mapper/system/SysXzqhMapper.xml b/jwtech-system/src/main/resources/mapper/system/SysXzqhMapper.xml new file mode 100644 index 00000000..8433da71 --- /dev/null +++ b/jwtech-system/src/main/resources/mapper/system/SysXzqhMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + +