From 97741b30c55286b898d2e3cf7e8a3cc3d91a5bc5 Mon Sep 17 00:00:00 2001 From: Yen Date: Mon, 18 Sep 2023 10:12:30 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=BF=A1=E6=81=AF=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BmsApplyMessageController.java | 114 ++++++++++++++++++ .../modules/bms/entity/BmsApplyMessage.java | 105 ++++++++++++++++ .../bms/mapper/BmsApplyMessageMapper.java | 14 +++ .../bms/service/BmsApplyMessageService.java | 14 +++ .../impl/BmsApplyMessageServiceImpl.java | 22 ++++ .../modules/seeyon/SeeYonController.java | 11 +- .../seeyon/entity/bo/SeeYonApproveQuery.java | 6 + .../qs/serve/modules/tag/entity/TagInfo.java | 3 + 8 files changed, 285 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/qs/serve/modules/bms/controller/BmsApplyMessageController.java create mode 100644 src/main/java/com/qs/serve/modules/bms/entity/BmsApplyMessage.java create mode 100644 src/main/java/com/qs/serve/modules/bms/mapper/BmsApplyMessageMapper.java create mode 100644 src/main/java/com/qs/serve/modules/bms/service/BmsApplyMessageService.java create mode 100644 src/main/java/com/qs/serve/modules/bms/service/impl/BmsApplyMessageServiceImpl.java diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsApplyMessageController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsApplyMessageController.java new file mode 100644 index 00000000..63222177 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsApplyMessageController.java @@ -0,0 +1,114 @@ +package com.qs.serve.modules.bms.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.qs.serve.common.model.annotation.SysLog; +import com.qs.serve.common.model.dto.PageVo; +import com.qs.serve.common.model.dto.R; +import com.qs.serve.common.model.enums.BizType; +import com.qs.serve.common.model.enums.SystemModule; +import com.qs.serve.common.util.PageUtil; +import com.qs.serve.common.util.CopierUtil; +import com.qs.serve.common.util.StringUtils; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import com.qs.serve.modules.bms.entity.BmsApplyMessage; +import com.qs.serve.modules.bms.service.BmsApplyMessageService; + +import javax.validation.Valid; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * 基础档案 申请信息 + * @author YenHex + * @since 2023-09-18 + */ +@Slf4j +@AllArgsConstructor +@RestController +@RequestMapping("bms/applyMessage") +public class BmsApplyMessageController { + + private BmsApplyMessageService bmsApplyMessageService; + + /** + * 业务类型 下拉框 + * @return + */ + @GetMapping("/option") + public R option(){ + Map options = new HashMap<>(); + options.put("CostBill","费用申请"); + options.put("CheckCost","核销申请"); + options.put("ReleasePolicy","政策申请"); + return R.ok(options); + } + + /** + * 翻页 + * @param param + * @return + */ + @GetMapping("/page") + public R> getPage(BmsApplyMessage param){ + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(param); + PageUtil.startPage(); + List list = bmsApplyMessageService.list(lqw); + return R.byPageHelperList(list); + } + + /** + * ID查询 + * @param id + * @return + */ + @GetMapping("/getById/{id}") + @SysLog(module = SystemModule.BASE, title = "申请信息", biz = BizType.QUERY) + public R getById(@PathVariable("id") String id){ + BmsApplyMessage bmsApplyMessage = bmsApplyMessageService.getById(id); + return R.ok(bmsApplyMessage); + } + + /** + * 更新 + * @param param + * @return + */ + @PostMapping("/updateById") + @SysLog(module = SystemModule.BASE, title = "申请信息", biz = BizType.UPDATE) + public R updateById(@RequestBody @Valid BmsApplyMessage param){ + boolean result = bmsApplyMessageService.updateById(param); + return R.isTrue(result); + } + + /** + * 新增 + * @param param + * @return + */ + @PostMapping("/save") + @SysLog(module = SystemModule.BASE, title = "申请信息", biz = BizType.INSERT) + public R save(@RequestBody @Valid BmsApplyMessage param){ + boolean result = bmsApplyMessageService.save(param); + return R.isTrue(result); + } + + /** + * 删除 + * @param ids + * @return + */ + @DeleteMapping("/deleteById/{ids}") + @SysLog(module = SystemModule.BASE, title = "申请信息", biz = BizType.DELETE) + public R deleteById(@PathVariable("ids") String ids){ + List idsLong = StringUtils.splitIdLong(ids); + boolean result = bmsApplyMessageService.removeByIds(idsLong); + return R.isTrue(result); + } + +} + diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsApplyMessage.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsApplyMessage.java new file mode 100644 index 00000000..aebdcb6e --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsApplyMessage.java @@ -0,0 +1,105 @@ +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-09-18 + */ +@Data +@TableName("bms_apply_message") +public class BmsApplyMessage implements Serializable { + + private static final long serialVersionUID = 1L; + + /** id */ + @TableId(type = IdType.AUTO) + private Long id; + + /** 业务类型 */ + @NotBlank(message = "业务类型不能为空") + @Length(max = 30,message = "业务类型长度不能超过30字") + private String type; + + /** 表达式 */ + @NotBlank(message = "表达式不能为空") + @Length(max = 255,message = "表达式长度不能超过255字") + private String express; + + /** 启用状态 */ + private Integer enableFlag; + + /** 信息 */ + @NotBlank(message = "信息不能为空") + @Length(max = 255,message = "信息长度不能超过255字") + private String message; + + /** 备注 */ + @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; + + /** 最后更新时间 */ + @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; + + /** 所属租户 */ + @JsonIgnore + @JsonProperty + private String tenantId; + + /** 创建人 */ + @TableField(fill = FieldFill.INSERT) + private String createBy; + + /** 更新人 */ + @TableField(fill = FieldFill.UPDATE) + private String updateBy; + + /** 逻辑删除标记（0：显示；1：隐藏） */ + @JsonIgnore + @JsonProperty + private String delFlag; + + + public static BmsApplyMessage toNewObject(BmsApplyMessage source){ + BmsApplyMessage applyMessage = new BmsApplyMessage(); + applyMessage.setId(source.getId()); + applyMessage.setType(source.getType()); + applyMessage.setExpress(source.getExpress()); + applyMessage.setEnableFlag(source.getEnableFlag()); + applyMessage.setMessage(source.getMessage()); + applyMessage.setRemark(source.getRemark()); + applyMessage.setCreateTime(source.getCreateTime()); + applyMessage.setUpdateTime(source.getUpdateTime()); + applyMessage.setTenantId(source.getTenantId()); + applyMessage.setCreateBy(source.getCreateBy()); + applyMessage.setUpdateBy(source.getUpdateBy()); + applyMessage.setDelFlag(source.getDelFlag()); + return applyMessage; + } + +} + diff --git a/src/main/java/com/qs/serve/modules/bms/mapper/BmsApplyMessageMapper.java b/src/main/java/com/qs/serve/modules/bms/mapper/BmsApplyMessageMapper.java new file mode 100644 index 00000000..74f96591 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bms/mapper/BmsApplyMessageMapper.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.BmsApplyMessage; + +/** + * 申请信息 Mapper + * @author YenHex + * @date 2023-09-18 + */ +public interface BmsApplyMessageMapper extends BaseMapper { + +} + diff --git a/src/main/java/com/qs/serve/modules/bms/service/BmsApplyMessageService.java b/src/main/java/com/qs/serve/modules/bms/service/BmsApplyMessageService.java new file mode 100644 index 00000000..1d79a6ce --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bms/service/BmsApplyMessageService.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.BmsApplyMessage; + +/** + * 申请信息 服务接口 + * @author YenHex + * @date 2023-09-18 + */ +public interface BmsApplyMessageService extends IService { + +} + diff --git a/src/main/java/com/qs/serve/modules/bms/service/impl/BmsApplyMessageServiceImpl.java b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsApplyMessageServiceImpl.java new file mode 100644 index 00000000..7c3da579 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/bms/service/impl/BmsApplyMessageServiceImpl.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.BmsApplyMessage; +import com.qs.serve.modules.bms.service.BmsApplyMessageService; +import com.qs.serve.modules.bms.mapper.BmsApplyMessageMapper; + +/** + * 申请信息 服务实现类 + * @author YenHex + * @since 2023-09-18 + */ +@Slf4j +@Service +@AllArgsConstructor +public class BmsApplyMessageServiceImpl extends ServiceImpl implements BmsApplyMessageService { + +} + diff --git a/src/main/java/com/qs/serve/modules/seeyon/SeeYonController.java b/src/main/java/com/qs/serve/modules/seeyon/SeeYonController.java index 558b4e37..ab070cec 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/SeeYonController.java +++ b/src/main/java/com/qs/serve/modules/seeyon/SeeYonController.java @@ -3,10 +3,7 @@ package com.qs.serve.modules.seeyon; import com.qs.serve.common.config.properties.ProjectProperties; import com.qs.serve.common.model.dto.PageVo; import com.qs.serve.common.model.dto.R; -import com.qs.serve.common.util.AuthContextUtils; -import com.qs.serve.common.util.CollectionUtil; -import com.qs.serve.common.util.JsonUtil; -import com.qs.serve.common.util.ServletUtils; +import com.qs.serve.common.util.*; import com.qs.serve.controller.util.SyKeyLoginUtil; import com.qs.serve.modules.seeyon.entity.CtpAffair; import com.qs.serve.modules.seeyon.entity.bo.CheckTargetDTO; @@ -196,6 +193,12 @@ public class SeeYonController { */ @GetMapping("listCheckList") public R> listAllCha(SeeYonApproveQuery query){ + String orderType = PageUtil.getOrderType(); + String orderProp = PageUtil.getOrderProp(); + if(orderProp==null||orderType==null){ + query.setOrderType(null); + query.setOrderProp(null); + } R result = seeYonRequestBaseService.postBase(TbsSeeYonConst.API_LIST_CHECK,query,""); if(result.getStatus()==200){ PageVo pageVo = JsonUtil.jsonToPojo(result.getData(),PageVo.class); diff --git a/src/main/java/com/qs/serve/modules/seeyon/entity/bo/SeeYonApproveQuery.java b/src/main/java/com/qs/serve/modules/seeyon/entity/bo/SeeYonApproveQuery.java index a2632fea..1af4e70e 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/entity/bo/SeeYonApproveQuery.java +++ b/src/main/java/com/qs/serve/modules/seeyon/entity/bo/SeeYonApproveQuery.java @@ -79,4 +79,10 @@ public class SeeYonApproveQuery { private Integer pageSize; + /** 排序字段(该接口，只支持 applyTime、commitTime) */ + private String orderProp; + + /** 排序类型：asc，desc */ + private String orderType; + } diff --git a/src/main/java/com/qs/serve/modules/tag/entity/TagInfo.java b/src/main/java/com/qs/serve/modules/tag/entity/TagInfo.java index d7f981f1..1f6974f5 100644 --- a/src/main/java/com/qs/serve/modules/tag/entity/TagInfo.java +++ b/src/main/java/com/qs/serve/modules/tag/entity/TagInfo.java @@ -32,10 +32,12 @@ public class TagInfo implements Serializable { private Long id; /** 标签名 */ + @TableField(condition = SqlCondition.LIKE) private String tagCode; /** 标签名 */ @Length(max = 255,message = "标签名长度不能超过255字") + @TableField(condition = SqlCondition.LIKE) private String tagName; /** 标签类目id */ @@ -43,6 +45,7 @@ public class TagInfo implements Serializable { /** 标签类目名称 */ @Length(max = 255,message = "标签类目名称长度不能超过255字") + @TableField(condition = SqlCondition.LIKE) private String tagCategoryName; /** 工作类别 */