Skip to content

A
amos-boot-biz
Commit d90b3743 authored by 刘林's avatar 刘林
Browse files
Options

Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

parents 27a19ebc 53542046
Hide whitespace changes
Inline Side-by-side
Showing with 235 additions and 411 deletions
amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FeedbackSuggestionsDto.java
View file @ d90b3743
package com.yeejoin.amos.boot.module.common.api.dto;
import com.alibaba.fastjson.JSONArray;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......@@ -40,7 +41,7 @@ public class FeedbackSuggestionsDto extends BaseDto {
@ApiModelProperty(value = "管辖机构org_code")
private String superviseOrgCode;
@ApiModelProperty(value = "ed")
@ApiModelProperty(value = "管辖机构org_name")
private String superviseOrgName;
@ApiModelProperty(value = "上报企业统一信用代码")
......@@ -50,7 +51,7 @@ public class FeedbackSuggestionsDto extends BaseDto {
private String companyName;
@ApiModelProperty(value = "上报人员id")
private Integer reporterUserId;
private String reporterUserId;
@ApiModelProperty(value = "上报人员姓名")
private String reporterUserName;
......@@ -64,4 +65,7 @@ public class FeedbackSuggestionsDto extends BaseDto {
@ApiModelProperty(value = "回复状态（1：回复，0：未回复）")
private String status;
@ApiModelProperty(value = "附件")
private JSONArray files;
}
amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FeedbackReplies.java
View file @ d90b3743
......@@ -51,7 +51,7 @@ public class FeedbackReplies extends BaseEntity {
* 回复用户id
*/
@TableField("reply_user_id")
private Integer replyUserId;
private String replyUserId;
/**
* 回复用户姓名
......
amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FeedbackSuggestions.java
View file @ d90b3743
......@@ -60,7 +60,7 @@ public class FeedbackSuggestions extends BaseEntity {
private String superviseOrgCode;
/**
* ed
* 管辖机构org_name
*/
@TableField("supervise_org_name")
private String superviseOrgName;
......@@ -81,7 +81,7 @@ public class FeedbackSuggestions extends BaseEntity {
* 上报人员id
*/
@TableField("reporter_user_id")
private Integer reporterUserId;
private String reporterUserId;
/**
* 上报人员姓名
......@@ -107,4 +107,10 @@ public class FeedbackSuggestions extends BaseEntity {
@TableField("status")
private String status;
/**
* 附件
*/
@TableField("files")
private String files;
}
amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/FeedbackSuggestionsMapper.java
View file @ d90b3743
package com.yeejoin.amos.boot.module.common.api.mapper;
import com.yeejoin.amos.boot.module.common.api.entity.FeedbackSuggestions;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.boot.module.common.api.entity.FeedbackSuggestions;
/**
* 反馈建议表 Mapper 接口
......@@ -10,5 +10,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @date 2025-05-15
*/
public interface FeedbackSuggestionsMapper extends BaseMapper<FeedbackSuggestions> {
String getCompanyNameByOrgCode(String orgCode);
}
amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/resources/mapper/FeedbackSuggestionsMapper.xml
View file @ d90b3743
<?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.yeejoin.amos.boot.module.common.api.mapper.FeedbackSuggestionsMapper">
<select id="getCompanyNameByOrgCode" resultType="java.lang.String">
select company_name
from privilege_company
where org_code = #{orgCode}
limit 1
</select>
</mapper>
amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FeedbackRepliesController.java
View file @ d90b3743
package com.yeejoin.amos.boot.module.common.biz.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.common.api.entity.FeedbackReplies;
import com.yeejoin.amos.boot.module.common.biz.service.impl.FeedbackRepliesServiceImpl;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.servlet.http.HttpServletRequest;
import java.util.Date;
import java.util.List;
/**
*
* @author system_generator
* @date 2025-05-15
*/
......@@ -30,33 +34,62 @@ public class FeedbackRepliesController extends BaseController {
FeedbackRepliesServiceImpl feedbackRepliesServiceImpl;
/**
* 新增
* 根据suggestion seq查询
*
* @param suggestSeq suggestion主键
* @return result
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getRepliesListBySugSeq")
@ApiOperation(httpMethod = "GET", value = "根据反馈建议表sequenceNbr查询回复列表", notes = "根据反馈建议表sequenceNbr查询回复列表")
public ResponseModel<List<FeedbackReplies>> getRepliesListBySugSeq(@RequestParam("suggestSeq") Long suggestSeq) {
return ResponseHelper.buildResponse(feedbackRepliesServiceImpl.getRepliesListBySugSeq(suggestSeq));
}
/**
* 监管机构回复
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
public ResponseModel<FeedbackReplies> save(@RequestBody FeedbackReplies feedbackReplies) {
feedbackReplies = feedbackRepliesServiceImpl.createWithModel(feedbackReplies);
return ResponseHelper.buildResponse(feedbackReplies);
}
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "监管机构回复", notes = "监管机构回复")
public ResponseModel<FeedbackReplies> save(@RequestBody FeedbackReplies feedbackReplies) {
if (feedbackReplies.getReplyDescription() == null || feedbackReplies.getReplyDescription().isEmpty()
|| feedbackReplies.getSuggestionsSeq() == null || feedbackReplies.getSuggestionsSeq().isEmpty()
) {
throw new BadRequest("缺少必要参数");
}
ReginParams reginParams = getSelectedOrgInfo();
CompanyBo company = reginParams.getCompany();
AgencyUserModel userModel = reginParams.getUserModel();
feedbackReplies.setCreateUserId(userModel.getUserId());
feedbackReplies.setCreateUserName(userModel.getRealName());
feedbackReplies.setCreateDate(new Date());
feedbackReplies.setReplyUserId(userModel.getUserId());
feedbackReplies.setReplyUserName(userModel.getRealName());
feedbackReplies.setReadStatus("0");
feedbackReplies.setReplyCompanyCode(company.getCompanyCode());
feedbackReplies.setReplyCompanyName(company.getCompanyName());
feedbackReplies = feedbackRepliesServiceImpl.createWithModel(feedbackReplies);
return ResponseHelper.buildResponse(feedbackReplies);
}
/**
/**
* 根据sequenceNbr更新
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
public ResponseModel<FeedbackReplies> updateBySequenceNbrFeedbackReplies(@RequestBody FeedbackReplies entity,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
entity.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(feedbackRepliesServiceImpl.updateWithModel(entity));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
public ResponseModel<FeedbackReplies> updateBySequenceNbrFeedbackReplies(@RequestBody FeedbackReplies entity, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
entity.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(feedbackRepliesServiceImpl.updateWithModel(entity));
}
/**
/**
* 根据sequenceNbr删除
*
* @param sequenceNbr 主键
......@@ -65,50 +98,50 @@ public class FeedbackRepliesController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
return ResponseHelper.buildResponse(feedbackRepliesServiceImpl.removeById(sequenceNbr));
}
/**
* 根据sequenceNbr查询
*
* @param sequenceNbr 主键
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
public ResponseModel<FeedbackReplies> selectOne(@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(feedbackRepliesServiceImpl.queryBySeq(sequenceNbr));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
public ResponseModel<FeedbackReplies> selectOne(@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(feedbackRepliesServiceImpl.queryBySeq(sequenceNbr));
}
/**
/**
* 列表分页查询
*
* @param current 当前页
* @param current 每页大小
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "分页查询", notes = "分页查询")
public ResponseModel<Page<FeedbackReplies>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
(value = "size") int size) {
Page<FeedbackReplies> page = new Page<FeedbackReplies>();
page.setCurrent(current);
page.setSize(size);
return ResponseHelper.buildResponse(feedbackRepliesServiceImpl.queryForFeedbackRepliesPage(page));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询")
public ResponseModel<Page<FeedbackReplies>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
(value = "size") int size) {
Page<FeedbackReplies> page = new Page<FeedbackReplies>();
page.setCurrent(current);
page.setSize(size);
return ResponseHelper.buildResponse(feedbackRepliesServiceImpl.queryForFeedbackRepliesPage(page));
}
/**
* 列表全部数据查询
/**
* 列表全部数据查询
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/list")
public ResponseModel<List<FeedbackReplies>> selectForList() {
return ResponseHelper.buildResponse(feedbackRepliesServiceImpl.queryForFeedbackRepliesList());
}
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/list")
public ResponseModel<List<FeedbackReplies>> selectForList() {
return ResponseHelper.buildResponse(feedbackRepliesServiceImpl.queryForFeedbackRepliesList());
}
}
amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FeedbackSuggestionsController.java
View file @ d90b3743
package com.yeejoin.amos.boot.module.common.biz.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
import com.yeejoin.amos.boot.module.common.api.dto.FeedbackSuggestionsDto;
import com.yeejoin.amos.boot.module.common.api.entity.FeedbackSuggestions;
import com.yeejoin.amos.boot.module.common.api.enums.ProblemTypeEnum;
import com.yeejoin.amos.boot.module.common.biz.service.impl.FeedbackSuggestionsServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -13,11 +16,10 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;
/**
*
* @author system_generator
* @date 2025-05-15
*/
......@@ -35,80 +37,39 @@ public class FeedbackSuggestionsController extends BaseController {
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
public ResponseModel<FeedbackSuggestions> save(@RequestBody FeedbackSuggestions suggestions) {
suggestions = feedbackSuggestionsServiceImpl.createWithModel(suggestions);
return ResponseHelper.buildResponse(suggestions);
}
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
public ResponseModel<FeedbackSuggestions> save(@RequestBody FeedbackSuggestionsDto dto) {
return ResponseHelper.buildResponse(feedbackSuggestionsServiceImpl.saveFeedbackSuggestions(dto));
}
/**
* 根据sequenceNbr更新
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
public ResponseModel<FeedbackSuggestions> updateBySequenceNbrFeedbackSuggestions(@RequestBody FeedbackSuggestions entity,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
entity.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(feedbackSuggestionsServiceImpl.updateWithModel(entity));
}
/**
* 根据sequenceNbr删除
*
* @param sequenceNbr 主键
* @return
/**
* 问题类型list
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
return ResponseHelper.buildResponse(feedbackSuggestionsServiceImpl.removeById(sequenceNbr));
@GetMapping(value = "/problemTyperList")
@ApiOperation(httpMethod = "GET", value = "问题类型list", notes = "问题类型list")
public ResponseModel<List<JSONObject>> problemTyperList() {
List<JSONObject> result = new ArrayList<>();
for (ProblemTypeEnum value : ProblemTypeEnum.values()) {
result.add(new JSONObject().fluentPut("key", value.getId()).fluentPut("value", value.getId()).fluentPut("label", value.getDescription()));
}
return ResponseHelper.buildResponse(result);
}
/**
* 根据sequenceNbr查询
*
* @param sequenceNbr 主键
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
public ResponseModel<FeedbackSuggestions> selectOne(@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(feedbackSuggestionsServiceImpl.queryBySeq(sequenceNbr));
}
/**
* 列表分页查询
*
* @param current 当前页
* @param current 每页大小
* @return
* @param size 每页大小
* @return res
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "分页查询", notes = "分页查询")
public ResponseModel<Page<FeedbackSuggestions>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
(value = "size") int size) {
Page<FeedbackSuggestions> page = new Page<FeedbackSuggestions>();
page.setCurrent(current);
page.setSize(size);
return ResponseHelper.buildResponse(feedbackSuggestionsServiceImpl.queryForFeedbackSuggestionsPage(page));
}
/**
* 列表全部数据查询
*
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/list")
public ResponseModel<List<FeedbackSuggestions>> selectForList() {
return ResponseHelper.buildResponse(feedbackSuggestionsServiceImpl.queryForFeedbackSuggestionsList());
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询")
public ResponseModel<IPage<FeedbackSuggestions>> queryForPage(@RequestParam(value = "current") int current,
@RequestParam(value = "size") int size) {
return ResponseHelper.buildResponse(feedbackSuggestionsServiceImpl.queryForFeedbackSuggestionsPage(current, size));
}
}
amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FeedbackRepliesServiceImpl.java
View file @ d90b3743
......@@ -16,18 +16,32 @@ import java.util.List;
* @date 2025-05-15
*/
@Service
public class FeedbackRepliesServiceImpl extends BaseService<FeedbackReplies,FeedbackReplies,FeedbackRepliesMapper> implements IFeedbackRepliesService {
public class FeedbackRepliesServiceImpl extends BaseService<FeedbackReplies, FeedbackReplies, FeedbackRepliesMapper> implements IFeedbackRepliesService {
/**
* 分页查询
*/
public Page<FeedbackReplies> queryForFeedbackRepliesPage(Page<FeedbackReplies> page) {
public Page<FeedbackReplies> queryForFeedbackRepliesPage(Page<FeedbackReplies> page) {
return this.queryForPage(page, null, false);
}
/**
* 列表查询 示例
*/
public List<FeedbackReplies> queryForFeedbackRepliesList() {
return this.queryForList("" , false);
public List<FeedbackReplies> queryForFeedbackRepliesList() {
return this.queryForList("", false);
}
/**
* 根据反馈建议表sequenceNbr查询回复列表
*
* @param suggestSeq 反馈建议表sequenceNbr
* @return result
*/
public List<FeedbackReplies> getRepliesListBySugSeq(Long suggestSeq) {
return this.lambdaQuery()
.eq(FeedbackReplies::getSuggestionsSeq, suggestSeq)
.eq(FeedbackReplies::getIsDelete, Boolean.FALSE)
.orderByDesc(FeedbackReplies::getCreateDate)
.list();
}
}
\ No newline at end of file
amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FeedbackSuggestionsServiceImpl.java
View file @ d90b3743
package com.yeejoin.amos.boot.module.common.biz.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.common.api.dto.FeedbackSuggestionsDto;
import com.yeejoin.amos.boot.module.common.api.entity.FeedbackSuggestions;
import com.yeejoin.amos.boot.module.common.api.enums.ProblemTypeEnum;
import com.yeejoin.amos.boot.module.common.api.mapper.FeedbackSuggestionsMapper;
import com.yeejoin.amos.boot.module.common.api.service.IFeedbackSuggestionsService;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.util.List;
import java.util.Date;
import java.util.Objects;
/**
* 反馈建议表服务实现类
......@@ -17,17 +29,82 @@ import java.util.List;
*/
@Service
public class FeedbackSuggestionsServiceImpl extends BaseService<FeedbackSuggestions, FeedbackSuggestions, FeedbackSuggestionsMapper> implements IFeedbackSuggestionsService {
@Autowired
private RedisUtils redisUtils;
@Autowired
private FeedbackSuggestionsMapper feedbackSuggestionsMapper;
/**
* 分页查询
* 当前登录用户信息
*
* @return 当前登录用户信息
*/
protected ReginParams getSelectedOrgInfo() {
return JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
}
/**
* 保存反馈建议
*
* @param dto 实体
* @return result
*/
public Page<FeedbackSuggestions> queryForFeedbackSuggestionsPage(Page<FeedbackSuggestions> page) {
return this.queryForPage(page, null, false);
public FeedbackSuggestions saveFeedbackSuggestions(FeedbackSuggestionsDto dto) {
FeedbackSuggestions suggestions = new FeedbackSuggestions();
CompanyBo company = getSelectedOrgInfo().getCompany();
AgencyUserModel userModel = getSelectedOrgInfo().getUserModel();
suggestions.setCreateUserId(userModel.getUserId());
suggestions.setCreateUserName(userModel.getRealName());
suggestions.setCreateDate(new Date());
suggestions.setIsDelete(Boolean.FALSE);
suggestions.setSuperviseOrgCode(company.getOrgCode());
suggestions.setSuperviseOrgName(feedbackSuggestionsMapper.getCompanyNameByOrgCode(company.getOrgCode()));
suggestions.setCompanyCode(company.getCompanyCode());
suggestions.setCompanyName(company.getCompanyName());
suggestions.setReporterUserId(Objects.toString(userModel.getUserId()));
suggestions.setReporterUserName(userModel.getUserName());
suggestions.setProblemType(dto.getProblemType());
suggestions.setProblemDescription(dto.getProblemDescription());
suggestions.setContactPerson(dto.getContactPerson());
suggestions.setContactPhone(dto.getContactPhone());
suggestions.setFiles(JSONObject.toJSONString(dto.getFiles()));
// 回复状态（1：回复，0：未回复）
suggestions.setStatus(Objects.toString(0));
this.save(suggestions);
return suggestions;
}
/**
* 列表查询 示例
* 分页查询
*/
public List<FeedbackSuggestions> queryForFeedbackSuggestionsList() {
return this.queryForList("", false);
public IPage<FeedbackSuggestions> queryForFeedbackSuggestionsPage(int current, int size) {
CompanyBo company = this.getSelectedOrgInfo().getCompany();
String companyType = company.getCompanyType();
IPage<FeedbackSuggestions> page = new Page<>();
page.setCurrent(current);
page.setSize(size);
IPage<FeedbackSuggestions> result = new Page<>();
// 企业查询自己所有的反馈消息
if (!companyType.equals("监管机构")) {
result = this.lambdaQuery()
.eq(FeedbackSuggestions::getCompanyCode, company.getCompanyCode())
.orderByDesc(FeedbackSuggestions::getCreateDate)
.page(page);
}
// 监管单位查询自己管辖区域的所有反馈消息
if (companyType.equals("监管机构")) {
result = this.lambdaQuery()
.likeRight(FeedbackSuggestions::getSuperviseOrgCode, company.getOrgCode())
.orderByDesc(FeedbackSuggestions::getCreateDate)
.page(page);
}
result.getRecords().forEach(suggestions -> {
suggestions.setProblemType(ProblemTypeEnum.getById(Integer.parseInt(suggestions.getProblemType())).getDescription());
suggestions.setStatus("1".equals(suggestions.getStatus()) ? "已回复" : "待回复");
});
return result;
}
}
\ No newline at end of file
com/yeejoin/amos/boot/module/common/api/entity/FeedbackReplies.java deleted 100644 → 0
View file @ 27a19ebc
package com.yeejoin.amos.boot.module.common.api.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import java.time.LocalDateTime;
import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <p>
* 反馈回复表
* </p>
*
* @author system_generator
* @since 2025-05-15
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("tzs_feedback_replies")
@ApiModel(value="FeedbackReplies对象", description="反馈回复表")
public class FeedbackReplies extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "创建人id")
private String createUserId;
@ApiModelProperty(value = "创建人")
private String createUserName;
@ApiModelProperty(value = "创建时间（回复时间）")
private LocalDateTime createDate;
@ApiModelProperty(value = "回复描述")
private String replyDescription;
@ApiModelProperty(value = "回复用户id")
private Integer replyUserId;
@ApiModelProperty(value = "回复用户姓名")
private String replyUserName;
@ApiModelProperty(value = "反馈建议表seq")
private String suggestionsSeq;
@ApiModelProperty(value = "已读状态（1：已读，0：未读）")
private String readStatus;
@ApiModelProperty(value = "回复单位code")
private String replyCompanyCode;
@ApiModelProperty(value = "回复单位名称")
private String replyCompanyName;
}
com/yeejoin/amos/boot/module/common/api/entity/FeedbackSuggestions.java deleted 100644 → 0
View file @ 27a19ebc
package com.yeejoin.amos.boot.module.common.api.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import java.time.LocalDateTime;
import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <p>
* 反馈建议表
* </p>
*
* @author system_generator
* @since 2025-05-15
*/
@Data
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("tzs_feedback_suggestions")
@ApiModel(value="FeedbackSuggestions对象", description="反馈建议表")
public class FeedbackSuggestions extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "创建人id")
private String createUserId;
@ApiModelProperty(value = "创建人")
private String createUserName;
@ApiModelProperty(value = "创建时间（填报时间）")
private LocalDateTime createDate;
@ApiModelProperty(value = "问题类型（字典值）")
private String problemType;
@ApiModelProperty(value = "问题描述")
private String problemDescription;
@ApiModelProperty(value = "管辖机构org_code")
private String superviseOrgCode;
@ApiModelProperty(value = "ed")
private String superviseOrgName;
@ApiModelProperty(value = "上报企业统一信用代码")
private String companyCode;
@ApiModelProperty(value = "上报企业名称")
private String companyName;
@ApiModelProperty(value = "上报人员id")
private Integer reporterUserId;
@ApiModelProperty(value = "上报人员姓名")
private String reporterUserName;
@ApiModelProperty(value = "联系人")
private String contactPerson;
@ApiModelProperty(value = "联系电话")
private String contactPhone;
@ApiModelProperty(value = "回复状态（1：回复，0：未回复）")
private String status;
}
com/yeejoin/amos/boot/module/common/api/mapper/FeedbackRepliesMapper.java deleted 100644 → 0
View file @ 27a19ebc
package com.yeejoin.amos.boot.module.common.api.mapper;
import com.yeejoin.amos.boot.module.common.api.entity.FeedbackReplies;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* 反馈回复表 Mapper 接口
* </p>
*
* @author system_generator
* @since 2025-05-15
*/
public interface FeedbackRepliesMapper extends BaseMapper<FeedbackReplies> {
}
com/yeejoin/amos/boot/module/common/api/mapper/FeedbackSuggestionsMapper.java deleted 100644 → 0
View file @ 27a19ebc
package com.yeejoin.amos.boot.module.common.api.mapper;
import com.yeejoin.amos.boot.module.common.api.entity.FeedbackSuggestions;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
* 反馈建议表 Mapper 接口
* </p>
*
* @author system_generator
* @since 2025-05-15
*/
public interface FeedbackSuggestionsMapper extends BaseMapper<FeedbackSuggestions> {
}
com/yeejoin/amos/boot/module/common/api/service/IFeedbackRepliesService.java deleted 100644 → 0
View file @ 27a19ebc
package com.yeejoin.amos.boot.module.common.api.service;
import com.yeejoin.amos.boot.module.common.api.entity.FeedbackReplies;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 反馈回复表 服务类
* </p>
*
* @author system_generator
* @since 2025-05-15
*/
public interface IFeedbackRepliesService extends IService<FeedbackReplies> {
}
com/yeejoin/amos/boot/module/common/api/service/IFeedbackSuggestionsService.java deleted 100644 → 0
View file @ 27a19ebc
package com.yeejoin.amos.boot.module.common.api.service;
import com.yeejoin.amos.boot.module.common.api.entity.FeedbackSuggestions;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 反馈建议表 服务类
* </p>
*
* @author system_generator
* @since 2025-05-15
*/
public interface IFeedbackSuggestionsService extends IService<FeedbackSuggestions> {
}
com/yeejoin/amos/boot/module/common/biz/controller/FeedbackRepliesController.java deleted 100644 → 0
View file @ 27a19ebc
package com.yeejoin.amos.boot.module.common.biz.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
/**
* <p>
* 反馈回复表 前端控制器
* </p>
*
* @author system_generator
* @since 2025-05-15
*/
@RestController
@RequestMapping("/common/feedback-replies")
public class FeedbackRepliesController extends BaseController {
}
com/yeejoin/amos/boot/module/common/biz/controller/FeedbackSuggestionsController.java deleted 100644 → 0
View file @ 27a19ebc
package com.yeejoin.amos.boot.module.common.biz.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.yeejoin.amos.boot.biz.common.controller.BaseController;
/**
* <p>
* 反馈建议表 前端控制器
* </p>
*
* @author system_generator
* @since 2025-05-15
*/
@RestController
@RequestMapping("/common/feedback-suggestions")
public class FeedbackSuggestionsController extends BaseController {
}
com/yeejoin/amos/boot/module/common/biz/service/impl/FeedbackRepliesServiceImpl.java deleted 100644 → 0
View file @ 27a19ebc
package com.yeejoin.amos.boot.module.common.biz.service.impl;
import com.yeejoin.amos.boot.module.common.api.entity.FeedbackReplies;
import com.yeejoin.amos.boot.module.common.api.mapper.FeedbackRepliesMapper;
import com.yeejoin.amos.boot.module.common.api.service.IFeedbackRepliesService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 反馈回复表 服务实现类
* </p>
*
* @author system_generator
* @since 2025-05-15
*/
@Service
public class FeedbackRepliesServiceImpl extends ServiceImpl<FeedbackRepliesMapper, FeedbackReplies> implements IFeedbackRepliesService {
}
com/yeejoin/amos/boot/module/common/biz/service/impl/FeedbackSuggestionsServiceImpl.java deleted 100644 → 0
View file @ 27a19ebc
package com.yeejoin.amos.boot.module.common.biz.service.impl;
import com.yeejoin.amos.boot.module.common.api.entity.FeedbackSuggestions;
import com.yeejoin.amos.boot.module.common.api.mapper.FeedbackSuggestionsMapper;
import com.yeejoin.amos.boot.module.common.api.service.IFeedbackSuggestionsService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 反馈建议表 服务实现类
* </p>
*
* @author system_generator
* @since 2025-05-15
*/
@Service
public class FeedbackSuggestionsServiceImpl extends ServiceImpl<FeedbackSuggestionsMapper, FeedbackSuggestions> implements IFeedbackSuggestionsService {
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment