From 181386c587013f1e53a9eb03be8050e14529bc4c Mon Sep 17 00:00:00 2001 From: Yen Date: Wed, 30 Aug 2023 16:39:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E7=AD=BE=E6=94=AF=E6=8C=81=E8=AF=84?= =?UTF-8?q?=E8=AE=BA=EF=BC=9B=E6=B7=BB=E5=8A=A0=E7=A8=8E=E5=8A=A1=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bms/controller/BmsDutyInfoController.java | 37 +++++++ .../serve/modules/bms/entity/BmsDutyInfo.java | 97 +++++++++++++++++++ .../modules/bms/mapper/BmsDutyInfoMapper.java | 14 +++ .../bms/service/BmsDutyInfoService.java | 14 +++ .../service/impl/BmsDutyInfoServiceImpl.java | 22 +++++ .../seeyon/entity/bo/CtpAddNodeDTO.java | 5 + .../seeyon/entity/bo/CtpAddNodeParam.java | 5 + .../TbsCostApplyOperationServiceImpl.java | 1 + 8 files changed, 195 insertions(+) create mode 100644 src/main/java/com/qs/serve/modules/bms/controller/BmsDutyInfoController.java create mode 100644 src/main/java/com/qs/serve/modules/bms/entity/BmsDutyInfo.java create mode 100644 src/main/java/com/qs/serve/modules/bms/mapper/BmsDutyInfoMapper.java create mode 100644 src/main/java/com/qs/serve/modules/bms/service/BmsDutyInfoService.java create mode 100644 src/main/java/com/qs/serve/modules/bms/service/impl/BmsDutyInfoServiceImpl.java diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsDutyInfoController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsDutyInfoController.java new file mode 100644 index 00000000..cee9107e --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsDutyInfoController.java @@ -0,0 +1,37 @@ +package com.qs.serve.modules.bms.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.qs.serve.common.model.dto.R; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.*; + +import com.qs.serve.modules.bms.entity.BmsDutyInfo; +import com.qs.serve.modules.bms.service.BmsDutyInfoService; + +import java.util.List; + +/** + * 基础档案 税务信息 + * @author YenHex + * @since 2023-08-30 + */ +@Slf4j +@AllArgsConstructor +@RestController +@RequestMapping("bms/dutyInfo") +public class BmsDutyInfoController { + + private BmsDutyInfoService bmsDutyInfoService; + + @GetMapping("/list") + public R> getList(){ + List list = bmsDutyInfoService.list( + new LambdaQueryWrapper() + .eq(BmsDutyInfo::getShowFlag,1) + ); + return R.ok(list); + } + +} + diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsDutyInfo.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsDutyInfo.java new file mode 100644 index 00000000..03961e0d --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsDutyInfo.java @@ -0,0 +1,97 @@ +package com.qs.serve.modules.bms.entity; + +import java.time.LocalDate; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import org.hibernate.validator.constraints.Length; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotNull; +import javax.validation.constraints.NotBlank; + +/** + * 税务信息表 实体类 + * @author YenHex + * @since 2023-08-30 + */ +@Data +@TableName("bms_duty_info") +public class BmsDutyInfo implements Serializable { + + private static final long serialVersionUID = 1L; + + /** id */ + @TableId(type = IdType.AUTO) + private Long id; + + /** 公司名称 */ + @Length(max = 255,message = "公司名称长度不能超过255字") + private String comName; + + /** 税号 */ + @Length(max = 255,message = "税号长度不能超过255字") + private String dutyCode; + + /** 是否显示 */ + private Integer showFlag; + + /** 备注 */ + @Length(max = 255,message = "备注长度不能超过255字") + private String remark; + + /** 创建时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @TableField(fill = FieldFill.INSERT) + private LocalDateTime createTime; + + /** 创建人 */ + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** 更新时间 */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @TableField(fill = FieldFill.UPDATE) + private LocalDateTime updateTime; + + /** 更新人 */ + @TableField(fill = FieldFill.UPDATE) + private String updateBy; + + /** 删除标识 */ + @JsonIgnore + @JsonProperty + private Boolean delFlag; + + /** */ + @JsonIgnore + @JsonProperty + private String tenantId; + + + public static BmsDutyInfo toNewObject(BmsDutyInfo source){ + BmsDutyInfo dutyInfo = new BmsDutyInfo(); + dutyInfo.setId(source.getId()); + dutyInfo.setComName(source.getComName()); + dutyInfo.setDutyCode(source.getDutyCode()); + dutyInfo.setShowFlag(source.getShowFlag()); + dutyInfo.setRemark(source.getRemark()); + dutyInfo.setCreateTime(source.getCreateTime()); + dutyInfo.setCreateBy(source.getCreateBy()); + dutyInfo.setUpdateTime(source.getUpdateTime()); + dutyInfo.setUpdateBy(source.getUpdateBy()); + dutyInfo.setDelFlag(source.getDelFlag()); + dutyInfo.setTenantId(source.getTenantId()); + return dutyInfo; + } + +} + diff --git a/src/main/java/com/qs/serve/modules/bms/mapper/BmsDutyInfoMapper.java b/src/main/java/com/qs/serve/modules/bms/mapper/BmsDutyInfoMapper.java new file mode 100644 index 00000000..c726194b --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bms/mapper/BmsDutyInfoMapper.java @@ -0,0 +1,14 @@ +package com.qs.serve.modules.bms.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.qs.serve.modules.bms.entity.BmsDutyInfo; + +/** + * 税务信息表 Mapper + * @author YenHex + * @date 2023-08-30 + */ +public interface BmsDutyInfoMapper extends BaseMapper { + +} + diff --git a/src/main/java/com/qs/serve/modules/bms/service/BmsDutyInfoService.java b/src/main/java/com/qs/serve/modules/bms/service/BmsDutyInfoService.java new file mode 100644 index 00000000..c4d1a7df --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bms/service/BmsDutyInfoService.java @@ -0,0 +1,14 @@ +package com.qs.serve.modules.bms.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.qs.serve.modules.bms.entity.BmsDutyInfo; + +/** + * 税务信息表 服务接口 + * @author YenHex + * @date 2023-08-30 + */ +public interface BmsDutyInfoService extends IService { + +} + diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsDutyInfoServiceImpl.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsDutyInfoServiceImpl.java new file mode 100644 index 00000000..35a93e2c --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsDutyInfoServiceImpl.java @@ -0,0 +1,22 @@ +package com.qs.serve.modules.bms.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import com.qs.serve.modules.bms.entity.BmsDutyInfo; +import com.qs.serve.modules.bms.service.BmsDutyInfoService; +import com.qs.serve.modules.bms.mapper.BmsDutyInfoMapper; + +/** + * 税务信息表 服务实现类 + * @author YenHex + * @since 2023-08-30 + */ +@Slf4j +@Service +@AllArgsConstructor +public class BmsDutyInfoServiceImpl extends ServiceImpl implements BmsDutyInfoService { + +} + diff --git a/src/main/java/com/qs/serve/modules/seeyon/entity/bo/CtpAddNodeDTO.java b/src/main/java/com/qs/serve/modules/seeyon/entity/bo/CtpAddNodeDTO.java index 105aa443..577b741e 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/entity/bo/CtpAddNodeDTO.java +++ b/src/main/java/com/qs/serve/modules/seeyon/entity/bo/CtpAddNodeDTO.java @@ -41,4 +41,9 @@ public class CtpAddNodeDTO { */ String targetId; + /** + * 评论(2023年8月30日添加) + */ + String comment; + } diff --git a/src/main/java/com/qs/serve/modules/seeyon/entity/bo/CtpAddNodeParam.java b/src/main/java/com/qs/serve/modules/seeyon/entity/bo/CtpAddNodeParam.java index febef91c..13cda24f 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/entity/bo/CtpAddNodeParam.java +++ b/src/main/java/com/qs/serve/modules/seeyon/entity/bo/CtpAddNodeParam.java @@ -26,4 +26,9 @@ public class CtpAddNodeParam { */ String targetId; + /** + * 评论(2023年8月30日添加) + */ + String comment; + } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java index 1d4e4a78..d1e3a624 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java @@ -121,6 +121,7 @@ public class TbsCostApplyOperationServiceImpl implements SeeYonOperationService CtpAddNodeDTO addNodeDTO = new CtpAddNodeDTO(); addNodeDTO.setBackToMe(param.getBackToMe()); addNodeDTO.setTargetId(param.getTargetId()); + addNodeDTO.setComment(param.getComment()); List selectUserIds = new ArrayList<>(); SysUser loginUser = getUserMapper().selectById(AuthContextUtils.getSysUserId()); for (String userId : param.getUserIds()) {