Browse Source

Merge remote-tracking branch 'origin/master'

master
WendyYang 1 year ago
parent
commit
c705ad4c41
14 changed files with 138 additions and 136 deletions
  1. +1
    -1
      ningda-generator/src/main/java/com/ningdatech/generator/config/GeneratorCodeKingbaseConfig.java
  2. +31
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/ding/task/GovBusinessStripsTask.java
  3. +0
    -2
      pmapi/src/main/java/com/ningdatech/pmapi/expert/assembler/ExpertInfoCmdAssembler.java
  4. +0
    -1
      pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/DingOrganizationController.java
  5. +20
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/GovBusinessStripController.java
  6. +19
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/MetaOrganizationLineTagController.java
  7. +2
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/OrganizationTagController.java
  8. +38
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/organization/entity/GovBusinessStrip.java
  9. +0
    -105
      pmapi/src/main/java/com/ningdatech/pmapi/organization/entity/OrganizationTag.java
  10. +3
    -3
      pmapi/src/main/java/com/ningdatech/pmapi/organization/mapper/GovBusinessStripMapper.java
  11. +1
    -1
      pmapi/src/main/java/com/ningdatech/pmapi/organization/mapper/GovBusinessStripMapper.xml
  12. +3
    -3
      pmapi/src/main/java/com/ningdatech/pmapi/organization/service/IGovBusinessStripService.java
  13. +20
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/organization/service/impl/GovBusinessStripServiceImpl.java
  14. +0
    -20
      pmapi/src/main/java/com/ningdatech/pmapi/organization/service/impl/OrganizationTagServiceImpl.java

+ 1
- 1
ningda-generator/src/main/java/com/ningdatech/generator/config/GeneratorCodeKingbaseConfig.java View File

@@ -56,7 +56,7 @@ public class GeneratorCodeKingbaseConfig {
}

public static void main(String[] args) {
generate("Liuxinxin", "organization", PATH_LXX, "organization_tag");
generate("Liuxinxin", "organization", PATH_LXX, "gov_business_strip");
}

}

+ 31
- 0
pmapi/src/main/java/com/ningdatech/pmapi/ding/task/GovBusinessStripsTask.java View File

@@ -0,0 +1,31 @@
package com.ningdatech.pmapi.ding.task;

import com.ningdatech.pmapi.organization.service.IGovBusinessStripService;
import com.ningdatech.zwdd.client.ZwddClient;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;

/**
* @author liuxinxin
* @date 2023/3/8 下午2:55
*/

@Component
public class GovBusinessStripsTask {

private final static Integer PAGE_SIZE = 20;

private final static Integer GROUP_SIZE = 100;

@Autowired
private ZwddClient zwddClient;

private IGovBusinessStripService iGovBusinessStripService;

@Transactional(rollbackFor = Exception.class)
public void batchGetGovBusinessStripsTask() {

}

}

+ 0
- 2
pmapi/src/main/java/com/ningdatech/pmapi/expert/assembler/ExpertInfoCmdAssembler.java View File

@@ -46,8 +46,6 @@ public class ExpertInfoCmdAssembler {
}




private static List<ExpertAvoidCompanyDTO> buildExpertAvoidCompanyList(ExpertProfessionalInfo professionalInfo) {
List<ExpertAvoidCompanyDTO> expertAvoidCompanyList = new ArrayList<>();
List<ExpertAvoidCompanyInfo> avoidCompanyList = professionalInfo.getAvoidCompanyList();


+ 0
- 1
pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/DingOrganizationController.java View File

@@ -47,5 +47,4 @@ public class DingOrganizationController {
public List<OrganizationTreeVO> getChildOrganizationList(@RequestParam(value = "parentCode", required = false) String parentCode) {
return organizationManage.getChildOrganizationList(parentCode);
}

}

+ 20
- 0
pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/GovBusinessStripController.java View File

@@ -0,0 +1,20 @@
package com.ningdatech.pmapi.organization.controller;


import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.stereotype.Controller;

/**
* <p>
* 前端控制器
* </p>
*
* @author Liuxinxin
* @since 2023-03-08
*/
@Controller
@RequestMapping("/pmapi.organization/gov-business-strip")
public class GovBusinessStripController {

}

+ 19
- 0
pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/MetaOrganizationLineTagController.java View File

@@ -0,0 +1,19 @@
package com.ningdatech.pmapi.organization.controller;


import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;

/**
* <p>
* 前端控制器
* </p>
*
* @author Liuxinxin
* @since 2023-03-08
*/
@Controller
@RequestMapping("/pmapi.organization/meta-organization-line-tag")
public class MetaOrganizationLineTagController {

}

+ 2
- 0
pmapi/src/main/java/com/ningdatech/pmapi/organization/controller/OrganizationTagController.java View File

@@ -18,5 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping("/api/v1/organization-tag")
public class OrganizationTagController {

// @PostMapping("条线单位")
// private

}

+ 38
- 0
pmapi/src/main/java/com/ningdatech/pmapi/organization/entity/GovBusinessStrip.java View File

@@ -0,0 +1,38 @@
package com.ningdatech.pmapi.organization.entity;

import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import lombok.Data;

import java.io.Serializable;
import java.time.LocalDateTime;

/**
* <p>
*
* </p>
*
* @author Liuxinxin
* @since 2023-03-08
*/
@TableName("gov_business_strip")
@Data
@ApiModel(value = "GovBusinessStrip对象", description = "")
public class GovBusinessStrip implements Serializable {

private static final long serialVersionUID = 1L;

private Long id;

private LocalDateTime createOn;

private LocalDateTime updateOn;

private Long createBy;

private Long updateBy;

private String businessStripCode;

private String businessStripName;
}

+ 0
- 105
pmapi/src/main/java/com/ningdatech/pmapi/organization/entity/OrganizationTag.java View File

@@ -1,105 +0,0 @@
package com.ningdatech.pmapi.organization.entity;

import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;

import java.io.Serializable;
import java.time.LocalDateTime;

/**
* <p>
*
* </p>
*
* @author Liuxinxin
* @since 2023-03-06
*/
@TableName("organization_tag")
@ApiModel(value = "OrganizationTag对象", description = "")
public class OrganizationTag implements Serializable {

private static final long serialVersionUID = 1L;

private Long id;

private LocalDateTime createOn;

private LocalDateTime updateOn;

private Long createBy;

private Long updateBy;

private String organizationCode;

private String tagCode;

public Long getId() {
return id;
}

public void setId(Long id) {
this.id = id;
}

public LocalDateTime getCreateOn() {
return createOn;
}

public void setCreateOn(LocalDateTime createOn) {
this.createOn = createOn;
}

public LocalDateTime getUpdateOn() {
return updateOn;
}

public void setUpdateOn(LocalDateTime updateOn) {
this.updateOn = updateOn;
}

public Long getCreateBy() {
return createBy;
}

public void setCreateBy(Long createBy) {
this.createBy = createBy;
}

public Long getUpdateBy() {
return updateBy;
}

public void setUpdateBy(Long updateBy) {
this.updateBy = updateBy;
}

public String getOrganizationCode() {
return organizationCode;
}

public void setOrganizationCode(String organizationCode) {
this.organizationCode = organizationCode;
}

public String getTagCode() {
return tagCode;
}

public void setTagCode(String tagCode) {
this.tagCode = tagCode;
}

@Override
public String toString() {
return "OrganizationTag{" +
"id=" + id +
", createOn=" + createOn +
", updateOn=" + updateOn +
", createBy=" + createBy +
", updateBy=" + updateBy +
", organizationCode=" + organizationCode +
", tagCode=" + tagCode +
"}";
}
}

pmapi/src/main/java/com/ningdatech/pmapi/organization/mapper/OrganizationTagMapper.java → pmapi/src/main/java/com/ningdatech/pmapi/organization/mapper/GovBusinessStripMapper.java View File

@@ -1,6 +1,6 @@
package com.ningdatech.pmapi.organization.mapper;

import com.ningdatech.pmapi.organization.entity.OrganizationTag;
import com.ningdatech.pmapi.organization.entity.GovBusinessStrip;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* </p>
*
* @author Liuxinxin
* @since 2023-03-06
* @since 2023-03-08
*/
public interface OrganizationTagMapper extends BaseMapper<OrganizationTag> {
public interface GovBusinessStripMapper extends BaseMapper<GovBusinessStrip> {

}

pmapi/src/main/java/com/ningdatech/pmapi/organization/mapper/OrganizationTagMapper.xml → pmapi/src/main/java/com/ningdatech/pmapi/organization/mapper/GovBusinessStripMapper.xml View File

@@ -1,5 +1,5 @@
<?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.ningdatech.pmapi.organization.mapper.OrganizationTagMapper">
<mapper namespace="com.ningdatech.pmapi.organization.mapper.GovBusinessStripMapper">

</mapper>

pmapi/src/main/java/com/ningdatech/pmapi/organization/service/IOrganizationTagService.java → pmapi/src/main/java/com/ningdatech/pmapi/organization/service/IGovBusinessStripService.java View File

@@ -1,6 +1,6 @@
package com.ningdatech.pmapi.organization.service;

import com.ningdatech.pmapi.organization.entity.OrganizationTag;
import com.ningdatech.pmapi.organization.entity.GovBusinessStrip;
import com.baomidou.mybatisplus.extension.service.IService;

/**
@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
* </p>
*
* @author Liuxinxin
* @since 2023-03-06
* @since 2023-03-08
*/
public interface IOrganizationTagService extends IService<OrganizationTag> {
public interface IGovBusinessStripService extends IService<GovBusinessStrip> {

}

+ 20
- 0
pmapi/src/main/java/com/ningdatech/pmapi/organization/service/impl/GovBusinessStripServiceImpl.java View File

@@ -0,0 +1,20 @@
package com.ningdatech.pmapi.organization.service.impl;

import com.ningdatech.pmapi.organization.entity.GovBusinessStrip;
import com.ningdatech.pmapi.organization.mapper.GovBusinessStripMapper;
import com.ningdatech.pmapi.organization.service.IGovBusinessStripService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
* <p>
* 服务实现类
* </p>
*
* @author Liuxinxin
* @since 2023-03-08
*/
@Service
public class GovBusinessStripServiceImpl extends ServiceImpl<GovBusinessStripMapper, GovBusinessStrip> implements IGovBusinessStripService {

}

+ 0
- 20
pmapi/src/main/java/com/ningdatech/pmapi/organization/service/impl/OrganizationTagServiceImpl.java View File

@@ -1,20 +0,0 @@
package com.ningdatech.pmapi.organization.service.impl;

import com.ningdatech.pmapi.organization.entity.OrganizationTag;
import com.ningdatech.pmapi.organization.mapper.OrganizationTagMapper;
import com.ningdatech.pmapi.organization.service.IOrganizationTagService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
* <p>
* 服务实现类
* </p>
*
* @author Liuxinxin
* @since 2023-03-06
*/
@Service
public class OrganizationTagServiceImpl extends ServiceImpl<OrganizationTagMapper, OrganizationTag> implements IOrganizationTagService {

}

Loading…
Cancel
Save