Browse Source

Merge remote-tracking branch 'origin/master'

master
CMM 1 year ago
parent
commit
4afaf4fa6d
24 changed files with 544 additions and 26 deletions
  1. +1
    -1
      pmapi/src/main/java/com/ningdatech/pmapi/expert/helper/ExpertManageHelper.java
  2. +7
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/fiscal/controller/CompanyFiscalCodeController.java
  3. +52
    -17
      pmapi/src/main/java/com/ningdatech/pmapi/fiscal/manage/CompanyFiscalCodeManage.java
  4. +1
    -1
      pmapi/src/main/java/com/ningdatech/pmapi/fiscal/model/po/ReqCompanyFiscalCodeAndSealSnPO.java
  5. +18
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/fiscal/model/po/ReqGetCompanyFiscalCodeAndSealSnPO.java
  6. +33
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/fiscal/model/vo/ResCompanyFiscalCodeAndSealSnVO.java
  7. +3
    -2
      pmapi/src/main/java/com/ningdatech/pmapi/fiscal/service/ICompanyFiscalCodeService.java
  8. +15
    -2
      pmapi/src/main/java/com/ningdatech/pmapi/fiscal/service/impl/CompanyFiscalCodeServiceImpl.java
  9. +41
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/IrsController.java
  10. +51
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/IrsManage.java
  11. +16
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/mapper/IrsApplicationMapper.java
  12. +5
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/mapper/IrsApplicationMapper.xml
  13. +17
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/mapper/NdPiotTasksMapper.java
  14. +5
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/mapper/NdPiotTasksMapper.xml
  15. +45
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/entity/IrsApplication.java
  16. +55
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/entity/NdPiotTasks.java
  17. +41
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/IrsApplicationVO.java
  18. +50
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/PiotTasksVO.java
  19. +16
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/service/INdPiotTasksService.java
  20. +16
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/service/IrsApplicationService.java
  21. +21
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/service/impl/IrsApplicationServiceImpl.java
  22. +21
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/service/impl/NdPiotTasksServiceImpl.java
  23. +2
    -1
      pmapi/src/main/java/com/ningdatech/pmapi/signature/service/ICompanySignatureService.java
  24. +12
    -2
      pmapi/src/main/java/com/ningdatech/pmapi/signature/service/impl/CompanySignatureServiceImpl.java

+ 1
- 1
pmapi/src/main/java/com/ningdatech/pmapi/expert/helper/ExpertManageHelper.java View File

@@ -65,7 +65,7 @@ public class ExpertManageHelper {
tagFieldInfoList.addAll(goodAt);
tagFieldInfoList.addAll(technicalExpertise);
tagFieldInfoList.addAll(industrySector);
if(CollUtil.isNotEmpty(expertSource)){
if (CollUtil.isNotEmpty(expertSource)) {
tagFieldInfoList.addAll(expertSource);
}
for (TagFieldInfo tagFieldInfo : tagFieldInfoList) {


+ 7
- 0
pmapi/src/main/java/com/ningdatech/pmapi/fiscal/controller/CompanyFiscalCodeController.java View File

@@ -3,6 +3,7 @@ package com.ningdatech.pmapi.fiscal.controller;

import com.ningdatech.pmapi.fiscal.manage.CompanyFiscalCodeManage;
import com.ningdatech.pmapi.fiscal.model.po.ReqCompanyFiscalCodeAndSealSnPO;
import com.ningdatech.pmapi.fiscal.model.po.ReqGetCompanyFiscalCodeAndSealSnPO;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping;
@@ -34,4 +35,10 @@ public class CompanyFiscalCodeController {
companyFiscalCodeManage.fiscalCodeConfigure(reqCompanyFiscalCodeAndSealSnPO);
}

@ApiOperation(value = "获取财政编码/配置", notes = "获取财政编码配置")
@PostMapping("/fiscal-and-seal/get-configure/")
public void getFiscalAndSealCodeConfigure(@Valid @RequestBody ReqGetCompanyFiscalCodeAndSealSnPO request) {
companyFiscalCodeManage.getFiscalCodeConfigure(request);
}

}

+ 52
- 17
pmapi/src/main/java/com/ningdatech/pmapi/fiscal/manage/CompanyFiscalCodeManage.java View File

@@ -3,14 +3,18 @@ package com.ningdatech.pmapi.fiscal.manage;
import com.ningdatech.pmapi.common.helper.UserInfoHelper;
import com.ningdatech.pmapi.fiscal.entity.CompanyFiscalCode;
import com.ningdatech.pmapi.fiscal.model.po.ReqCompanyFiscalCodeAndSealSnPO;
import com.ningdatech.pmapi.fiscal.model.po.ReqGetCompanyFiscalCodeAndSealSnPO;
import com.ningdatech.pmapi.fiscal.model.vo.ResCompanyFiscalCodeAndSealSnVO;
import com.ningdatech.pmapi.fiscal.service.ICompanyFiscalCodeService;
import com.ningdatech.pmapi.signature.entity.CompanySignature;
import com.ningdatech.pmapi.signature.service.ICompanySignatureService;
import com.ningdatech.pmapi.user.util.LoginUserUtil;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;

import java.time.LocalDateTime;
import java.util.Objects;

/**
* @author liuxinxin
@@ -28,29 +32,60 @@ public class CompanyFiscalCodeManage {

public void fiscalCodeConfigure(ReqCompanyFiscalCodeAndSealSnPO reqCompanyFiscalCodeAndSealSnPO) {
Long userId = LoginUserUtil.getUserId();
String organizationCode = userInfoHelper.getOrganizationCode(userId);

String organizationCode = reqCompanyFiscalCodeAndSealSnPO.getOrganizationCode();
if (StringUtils.isBlank(organizationCode)) {
organizationCode = userInfoHelper.getOrganizationCode(userId);
}
// TODO 校验用户权限

// 保存财政编码配置
CompanyFiscalCode companyFiscalCode = iCompanyFiscalCodeService.getByOrganizationCode(organizationCode);
if (Objects.isNull(companyFiscalCode)) {
companyFiscalCode = new CompanyFiscalCode();
companyFiscalCode.setOrganizationCode(organizationCode);
companyFiscalCode.setCreateOn(LocalDateTime.now());
companyFiscalCode.setCreateBy(userId);
}
String fiscalCode = reqCompanyFiscalCodeAndSealSnPO.getFiscalCode();
CompanyFiscalCode companyFiscalCodeSaveRecord = new CompanyFiscalCode();
companyFiscalCodeSaveRecord.setFiscalCode(fiscalCode);
companyFiscalCodeSaveRecord.setOrganizationCode(organizationCode);
companyFiscalCodeSaveRecord.setCreateOn(LocalDateTime.now());
companyFiscalCodeSaveRecord.setUpdateOn(LocalDateTime.now());
companyFiscalCodeSaveRecord.setCreateBy(userId);
companyFiscalCodeSaveRecord.setUpdateBy(userId);
iCompanyFiscalCodeService.save(companyFiscalCodeSaveRecord);
companyFiscalCode.setFiscalCode(fiscalCode);
companyFiscalCode.setUpdateOn(LocalDateTime.now());
companyFiscalCode.setUpdateBy(userId);
iCompanyFiscalCodeService.save(companyFiscalCode);


// 保存印章配置
CompanySignature companySignature = iCompanySignatureService.getByOrganizationCode(organizationCode);
if (Objects.isNull(companySignature)) {
companySignature = new CompanySignature();
companySignature.setOrganizationCode(organizationCode);
companySignature.setCreateOn(LocalDateTime.now());
}
String sealSn = reqCompanyFiscalCodeAndSealSnPO.getSealSn();
CompanySignature companySignatureSaveRecord = new CompanySignature();
companySignatureSaveRecord.setSealSn(sealSn);
companySignatureSaveRecord.setOrganizationCode(organizationCode);
companySignatureSaveRecord.setCreateOn(LocalDateTime.now());
companySignatureSaveRecord.setUpdateOn(LocalDateTime.now());
companySignatureSaveRecord.setCreateBy(userId);
companySignatureSaveRecord.setUpdateBy(userId);
iCompanySignatureService.save(companySignatureSaveRecord);
companySignature.setSealSn(sealSn);
companySignature.setUpdateOn(LocalDateTime.now());
companySignature.setCreateBy(userId);
companySignature.setUpdateBy(userId);
iCompanySignatureService.save(companySignature);
}

public ResCompanyFiscalCodeAndSealSnVO getFiscalCodeConfigure(ReqGetCompanyFiscalCodeAndSealSnPO request) {
Long userId = LoginUserUtil.getUserId();
String organizationCode = request.getOrganizationCode();
if (StringUtils.isBlank(organizationCode)) {
organizationCode = userInfoHelper.getOrganizationCode(userId);
}
CompanySignature companySignature = iCompanySignatureService.getByOrganizationCode(organizationCode);
CompanyFiscalCode companyFiscalCode = iCompanyFiscalCodeService.getByOrganizationCode(organizationCode);

ResCompanyFiscalCodeAndSealSnVO returnVO = new ResCompanyFiscalCodeAndSealSnVO();
if (Objects.isNull(companySignature)) {
return null;
}
returnVO.setCreateTime(companySignature.getCreateOn());
returnVO.setUpdateTime(companySignature.getUpdateOn());
returnVO.setFiscalCode(companyFiscalCode.getFiscalCode());
returnVO.setSealSn(companySignature.getSealSn());
return returnVO;
}
}

+ 1
- 1
pmapi/src/main/java/com/ningdatech/pmapi/fiscal/model/po/ReqCompanyFiscalCodeAndSealSnPO.java View File

@@ -14,7 +14,7 @@ import javax.validation.constraints.NotBlank;
@ApiModel("财政编码配置")
public class ReqCompanyFiscalCodeAndSealSnPO {

@NotBlank(message = "组织编码 不能为空")
// @NotBlank(message = "组织编码 不能为空")
@ApiModelProperty("组织编码")
private String organizationCode;



+ 18
- 0
pmapi/src/main/java/com/ningdatech/pmapi/fiscal/model/po/ReqGetCompanyFiscalCodeAndSealSnPO.java View File

@@ -0,0 +1,18 @@
package com.ningdatech.pmapi.fiscal.model.po;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
* @author liuxinxin
* @date 2023/2/10 下午4:24
*/
@Data
@ApiModel("获取财政编码配置")
public class ReqGetCompanyFiscalCodeAndSealSnPO {

@ApiModelProperty("组织编码")
private String organizationCode;

}

+ 33
- 0
pmapi/src/main/java/com/ningdatech/pmapi/fiscal/model/vo/ResCompanyFiscalCodeAndSealSnVO.java View File

@@ -0,0 +1,33 @@
package com.ningdatech.pmapi.fiscal.model.vo;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.time.LocalDateTime;

/**
* @author liuxinxin
* @date 2023/3/23 上午10:58
*/

@Data
@ApiModel("财政编码配置VO")
public class ResCompanyFiscalCodeAndSealSnVO {

@ApiModelProperty("组织编码")
private String organizationCode;

@ApiModelProperty("财政编码")
private String fiscalCode;

@ApiModelProperty("印章编号")
private String sealSn;

@ApiModelProperty("创建时间")
private LocalDateTime createTime;

@ApiModelProperty("更新时间")
private LocalDateTime updateTime;

}

+ 3
- 2
pmapi/src/main/java/com/ningdatech/pmapi/fiscal/service/ICompanyFiscalCodeService.java View File

@@ -1,11 +1,11 @@
package com.ningdatech.pmapi.fiscal.service;

import com.ningdatech.pmapi.fiscal.entity.CompanyFiscalCode;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ningdatech.pmapi.fiscal.entity.CompanyFiscalCode;

/**
* <p>
* 服务类
* 服务类
* </p>
*
* @author Lierbao
@@ -13,4 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface ICompanyFiscalCodeService extends IService<CompanyFiscalCode> {

CompanyFiscalCode getByOrganizationCode(String orgCode);
}

+ 15
- 2
pmapi/src/main/java/com/ningdatech/pmapi/fiscal/service/impl/CompanyFiscalCodeServiceImpl.java View File

@@ -1,20 +1,33 @@
package com.ningdatech.pmapi.fiscal.service.impl;

import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ningdatech.pmapi.fiscal.entity.CompanyFiscalCode;
import com.ningdatech.pmapi.fiscal.mapper.NdCompanyFiscalCodeMapper;
import com.ningdatech.pmapi.fiscal.service.ICompanyFiscalCodeService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
* <p>
* 服务实现类
* 服务实现类
* </p>
*
* @author Lierbao
* @since 2023-02-10
*/
@Service

public class CompanyFiscalCodeServiceImpl extends ServiceImpl<NdCompanyFiscalCodeMapper, CompanyFiscalCode> implements ICompanyFiscalCodeService {


@Override
public CompanyFiscalCode getByOrganizationCode(String orgCode) {
if (StringUtils.isBlank(orgCode)) {
return null;
}
return this.getOne(Wrappers.lambdaQuery(CompanyFiscalCode.class)
.eq(CompanyFiscalCode::getOrganizationCode, orgCode));

}
}

+ 41
- 0
pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/IrsController.java View File

@@ -0,0 +1,41 @@
package com.ningdatech.pmapi.projectdeclared.controller;

import com.ningdatech.pmapi.projectdeclared.manage.IrsManage;
import com.ningdatech.pmapi.projectdeclared.model.vo.IrsApplicationVO;
import com.ningdatech.pmapi.projectdeclared.model.vo.PiotTasksVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;

/**
* @Classname IrsController
* @Description irs 一些下拉框信息
* @Date 2023/3/13 9:53
* @Author PoffyZhang
*/
@Slf4j
@Validated
@RestController
@RequestMapping("/api/v1/irs")
@Api(value = "irs", tags = "irs-信息查询")
@RequiredArgsConstructor
public class IrsController {

private final IrsManage irsManage;

@ApiOperation(value = "irs应用列表", notes = "irs应用列表")
@GetMapping("/application-list")
public List<IrsApplicationVO> applicationList() {
return irsManage.applicationList();
}

@ApiOperation(value = "试点任务列表", notes = "试点任务列表")
@GetMapping("/piot-tasks")
public List<PiotTasksVO> piotTasks() {
return irsManage.listPiotTasks();
}
}

+ 51
- 0
pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/IrsManage.java View File

@@ -0,0 +1,51 @@
package com.ningdatech.pmapi.projectdeclared.manage;

import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import com.ningdatech.basic.util.CollUtils;
import com.ningdatech.pmapi.projectdeclared.model.entity.IrsApplication;
import com.ningdatech.pmapi.projectdeclared.model.entity.NdPiotTasks;
import com.ningdatech.pmapi.projectdeclared.model.vo.IrsApplicationVO;
import com.ningdatech.pmapi.projectdeclared.model.vo.PiotTasksVO;
import com.ningdatech.pmapi.projectdeclared.service.INdPiotTasksService;
import com.ningdatech.pmapi.projectdeclared.service.IrsApplicationService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;

/**
* @Classname IrsManage
* @Description
* @Date 2023/3/1 14:48
* @Author PoffyZhang
*/
@Component
@Slf4j
@RequiredArgsConstructor
public class IrsManage {

private final IrsApplicationService irsApplicationService;

private final INdPiotTasksService piotTasksService;


public List<IrsApplicationVO> applicationList() {
List<IrsApplication> list = irsApplicationService.list();
if(CollUtil.isEmpty(list)){
return Collections.emptyList();
}
return CollUtils.convert(list,app -> BeanUtil.copyProperties(app,IrsApplicationVO.class));
}

public List<PiotTasksVO> listPiotTasks() {
List<NdPiotTasks> list = piotTasksService.list();
if(CollUtil.isEmpty(list)){
return Collections.emptyList();
}
return CollUtils.convert(list,task -> BeanUtil.copyProperties(task,PiotTasksVO.class));
}
}

+ 16
- 0
pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/mapper/IrsApplicationMapper.java View File

@@ -0,0 +1,16 @@
package com.ningdatech.pmapi.projectdeclared.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ningdatech.pmapi.projectdeclared.model.entity.IrsApplication;

/**
* <p>
* Mapper 接口
* </p>
*
* @author zpf
* @since 2023-02-05
*/
public interface IrsApplicationMapper extends BaseMapper<IrsApplication> {

}

+ 5
- 0
pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/mapper/IrsApplicationMapper.xml View File

@@ -0,0 +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.projectdeclared.mapper.IrsApplicationMapper">

</mapper>

+ 17
- 0
pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/mapper/NdPiotTasksMapper.java View File

@@ -0,0 +1,17 @@
package com.ningdatech.pmapi.projectdeclared.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ningdatech.pmapi.projectdeclared.model.entity.IrsApplication;
import com.ningdatech.pmapi.projectdeclared.model.entity.NdPiotTasks;

/**
* <p>
* Mapper 接口
* </p>
*
* @author zpf
* @since 2023-02-05
*/
public interface NdPiotTasksMapper extends BaseMapper<NdPiotTasks> {

}

+ 5
- 0
pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/mapper/NdPiotTasksMapper.xml View File

@@ -0,0 +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.projectdeclared.mapper.NdPiotTasksMapper">

</mapper>

+ 45
- 0
pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/entity/IrsApplication.java View File

@@ -0,0 +1,45 @@
package com.ningdatech.pmapi.projectdeclared.model.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.time.LocalDateTime;

/**
* <p>
* irs项目
* </p>
*
* @author zpf
* @since 2023-03-06
*/
@TableName("irs_application")
@ApiModel(value = "irs_application对象", description = "irs项目对象")
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class IrsApplication implements Serializable {

private static final long serialVersionUID = 1L;

@ApiModelProperty("id")
@TableId(type = IdType.AUTO)
private Long id;

@ApiModelProperty("应用名称")
private String applicationName;

@ApiModelProperty("应用编码")
private String applicationCode;

private LocalDateTime createOn;
private LocalDateTime updateOn;
}

+ 55
- 0
pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/entity/NdPiotTasks.java View File

@@ -0,0 +1,55 @@
package com.ningdatech.pmapi.projectdeclared.model.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;

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

/**
* <p>
* irs任务对象
* </p>
*
* @author zpf
* @since 2023-03-06
*/
@TableName("nd_piot_tasks")
@ApiModel(value = "irs_piot_tasks对象", description = "irs任务对象")
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class NdPiotTasks implements Serializable {

private static final long serialVersionUID = 1L;

@ApiModelProperty("id")
@TableId(type = IdType.AUTO)
private Long id;

@ApiModelProperty("试点任务名称")
private String taskName;

@ApiModelProperty("试点任务编号")
private String taskCode;

@ApiModelProperty("所属重大应用名称")
private String importantTaskName;

@ApiModelProperty("所属重大应用编号")
private String importantTaskCode;

@ApiModelProperty("所属子场景应用名称")
private String subSceneApplicationName;

private LocalDateTime createOn;
private LocalDateTime updateOn;
}

+ 41
- 0
pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/IrsApplicationVO.java View File

@@ -0,0 +1,41 @@
package com.ningdatech.pmapi.projectdeclared.model.vo;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;

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

/**
* <p>
* irs项目
* </p>
*
* @author zpf
* @since 2023-03-06
*/
@ApiModel(value = "irs_application对象", description = "irs项目对象")
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class IrsApplicationVO implements Serializable {

private static final long serialVersionUID = 1L;

@ApiModelProperty("id")
private Long id;

@ApiModelProperty("应用名称")
private String applicationName;

@ApiModelProperty("应用编码")
private String applicationCode;

private LocalDateTime createOn;
private LocalDateTime updateOn;
}

+ 50
- 0
pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/model/vo/PiotTasksVO.java View File

@@ -0,0 +1,50 @@
package com.ningdatech.pmapi.projectdeclared.model.vo;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;

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

/**
* <p>
* irs任务对象
* </p>
*
* @author zpf
* @since 2023-03-06
*/
@ApiModel(value = "irs_piot_tasks对象", description = "irs任务对象")
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class PiotTasksVO implements Serializable {

private static final long serialVersionUID = 1L;

@ApiModelProperty("id")
private Long id;

@ApiModelProperty("试点任务名称")
private String taskName;

@ApiModelProperty("试点任务编号")
private String taskCode;

@ApiModelProperty("所属重大应用名称")
private String importantTaskName;

@ApiModelProperty("所属重大应用编号")
private String importantTaskCode;

@ApiModelProperty("所属子场景应用名称")
private String subSceneApplicationName;

private LocalDateTime createOn;
private LocalDateTime updateOn;
}

+ 16
- 0
pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/service/INdPiotTasksService.java View File

@@ -0,0 +1,16 @@
package com.ningdatech.pmapi.projectdeclared.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ningdatech.pmapi.projectdeclared.model.entity.NdPiotTasks;

/**
* <p>
* 服务类
* </p>
*
* @author zpf
* @since 2023-02-05
*/
public interface INdPiotTasksService extends IService<NdPiotTasks> {

}

+ 16
- 0
pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/service/IrsApplicationService.java View File

@@ -0,0 +1,16 @@
package com.ningdatech.pmapi.projectdeclared.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ningdatech.pmapi.projectdeclared.model.entity.IrsApplication;

/**
* <p>
* 服务类
* </p>
*
* @author zpf
* @since 2023-02-05
*/
public interface IrsApplicationService extends IService<IrsApplication> {

}

+ 21
- 0
pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/service/impl/IrsApplicationServiceImpl.java View File

@@ -0,0 +1,21 @@
package com.ningdatech.pmapi.projectdeclared.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ningdatech.pmapi.projectdeclared.mapper.IrsApplicationMapper;
import com.ningdatech.pmapi.projectdeclared.model.entity.IrsApplication;
import com.ningdatech.pmapi.projectdeclared.service.IrsApplicationService;
import org.springframework.stereotype.Service;

/**
* <p>
* 服务实现类
* </p>
*
* @author zpf
* @since 2023-02-05
*/
@Service
public class IrsApplicationServiceImpl extends ServiceImpl<IrsApplicationMapper, IrsApplication>
implements IrsApplicationService {

}

+ 21
- 0
pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/service/impl/NdPiotTasksServiceImpl.java View File

@@ -0,0 +1,21 @@
package com.ningdatech.pmapi.projectdeclared.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ningdatech.pmapi.projectdeclared.mapper.NdPiotTasksMapper;
import com.ningdatech.pmapi.projectdeclared.model.entity.NdPiotTasks;
import com.ningdatech.pmapi.projectdeclared.service.INdPiotTasksService;
import org.springframework.stereotype.Service;

/**
* <p>
* 服务实现类
* </p>
*
* @author zpf
* @since 2023-02-05
*/
@Service
public class NdPiotTasksServiceImpl extends ServiceImpl<NdPiotTasksMapper, NdPiotTasks>
implements INdPiotTasksService {

}

+ 2
- 1
pmapi/src/main/java/com/ningdatech/pmapi/signature/service/ICompanySignatureService.java View File

@@ -1,7 +1,7 @@
package com.ningdatech.pmapi.signature.service;

import com.ningdatech.pmapi.signature.entity.CompanySignature;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ningdatech.pmapi.signature.entity.CompanySignature;

/**
* <p>
@@ -13,4 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface ICompanySignatureService extends IService<CompanySignature> {

CompanySignature getByOrganizationCode(String orgCode);
}

+ 12
- 2
pmapi/src/main/java/com/ningdatech/pmapi/signature/service/impl/CompanySignatureServiceImpl.java View File

@@ -1,14 +1,16 @@
package com.ningdatech.pmapi.signature.service.impl;

import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ningdatech.pmapi.signature.entity.CompanySignature;
import com.ningdatech.pmapi.signature.mapper.CompanySignatureMapper;
import com.ningdatech.pmapi.signature.service.ICompanySignatureService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
* <p>
* 服务实现类
* 服务实现类
* </p>
*
* @author Lierbao
@@ -17,4 +19,12 @@ import org.springframework.stereotype.Service;
@Service
public class CompanySignatureServiceImpl extends ServiceImpl<CompanySignatureMapper, CompanySignature> implements ICompanySignatureService {

@Override
public CompanySignature getByOrganizationCode(String orgCode) {
if (StringUtils.isBlank(orgCode)) {
return null;
}
return this.getOne(Wrappers.lambdaQuery(CompanySignature.class)
.eq(CompanySignature::getOrganizationCode, orgCode));
}
}

Loading…
Cancel
Save