add 会员管理日志，权限
This commit is contained in:
lijiarao
+1
-1
@@ -43,7 +43,7 @@
|
||||
</where>
|
||||
<!-- 标协会员项目-->
|
||||
UNION ALL
|
||||
select tmsub.id,tmember.project_name,tmsub.charge_use,'','','',tmsub.liaison_man,tmsub.company_name,tmsub.amount_receivable,tmsub.paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5,tmsub.mobile,tmsub.email,'','',tmsub.company_id,tmsub.payment_method,''
|
||||
select tmsub.id,tmember.project_name,tmsub.charge_use,'','',tmsub.liaison_man_id,tmsub.liaison_man,tmsub.company_name,tmsub.amount_receivable,tmsub.paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5,tmsub.mobile,tmsub.email,'','',tmsub.company_id,tmsub.payment_method,''
|
||||
from tb_member_project tmember
|
||||
inner join tb_member_project_subitem tmsub on tmember.id=tmsub.project_id
|
||||
<where>
|
||||
|
||||
+13
-7
@@ -29,6 +29,7 @@ import lombok.extern.slf4j.Slf4j;
|
||||
import com.jero.common.system.base.controller.JeroController;
|
||||
import org.apache.commons.collections.CollectionUtils;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
@@ -62,7 +63,7 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
|
||||
/**
|
||||
* 分页列表查询
|
||||
*/
|
||||
@AutoLog(value = "会员项目表-根据成员单位列表查询")
|
||||
@RequiresPermissions("memberProject:search")
|
||||
@ApiOperation(value="会员项目表-根据成员单位列表查询", notes="会员项目表-根据成员单位列表查询")
|
||||
@GetMapping(value = "/page")
|
||||
public Result<?> queryPageList(PayMemberProject payMemberProject,
|
||||
@@ -86,7 +87,7 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
|
||||
* @Return
|
||||
* @Exception
|
||||
*/
|
||||
@AutoLog(value = "会员项目表-收入合同列表分页查询")
|
||||
@RequiresPermissions("memberProject:search")
|
||||
@ApiOperation(value="会员项目表-收入合同列表分页查询", notes="会员项目表-收入合同列表分页查询")
|
||||
@GetMapping(value = "/queryListByCompany")
|
||||
public Result<?> queryListByCompany(
|
||||
@@ -134,7 +135,7 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
|
||||
/**
|
||||
* 收入合同-查询非企业id的项目
|
||||
*/
|
||||
@AutoLog(value = "会员项目表-收入合同-查询非企业id的项目")
|
||||
@RequiresPermissions("memberProject:search")
|
||||
@ApiOperation(value="会员项目表-收入合同-查询非企业id的项目", notes="会员项目表-收入合同-查询非企业id的项目")
|
||||
@GetMapping(value = "/queryListByNotCompany")
|
||||
public Result<?> queryListByNotCompany(@RequestParam(name = "companyId") String companyId) {
|
||||
@@ -159,7 +160,7 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
|
||||
/**
|
||||
* 列表查询
|
||||
*/
|
||||
@AutoLog(value = "会员项目表-列表查询")
|
||||
@RequiresPermissions("memberProject:search")
|
||||
@ApiOperation(value="会员项目表-列表查询", notes="会员项目表-列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<List<PayMemberProject>> queryList() {
|
||||
@@ -170,6 +171,7 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
|
||||
/**
|
||||
* 添加
|
||||
*/
|
||||
@RequiresPermissions("memberProject:add")
|
||||
@AutoLog(value = "会员项目表-添加")
|
||||
@ApiOperation(value="会员项目表-添加", notes="会员项目表-添加")
|
||||
@PostMapping(value = "/add")
|
||||
@@ -181,6 +183,7 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
|
||||
/**
|
||||
* 编辑
|
||||
*/
|
||||
@RequiresPermissions("memberProject:edit")
|
||||
@AutoLog(value = "会员项目表-编辑")
|
||||
@ApiOperation(value="会员项目表-编辑", notes="会员项目表-编辑")
|
||||
@PostMapping(value = "/edit")
|
||||
@@ -192,6 +195,7 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
|
||||
/**
|
||||
* 通过id删除
|
||||
*/
|
||||
@RequiresPermissions("memberProject:delete")
|
||||
@AutoLog(value = "会员项目表-通过id删除")
|
||||
@ApiOperation(value="会员项目表-通过id删除", notes="会员项目表-通过id删除")
|
||||
@GetMapping(value = "/delete")
|
||||
@@ -203,6 +207,7 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
|
||||
/**
|
||||
* 批量删除
|
||||
*/
|
||||
@RequiresPermissions("memberProject:batchDel")
|
||||
@AutoLog(value = "会员项目表-批量删除")
|
||||
@ApiOperation(value="会员项目表-批量删除", notes="会员项目表-批量删除")
|
||||
@GetMapping(value = "/deleteBatch")
|
||||
@@ -214,7 +219,7 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
|
||||
/**
|
||||
* 通过id查询
|
||||
*/
|
||||
@AutoLog(value = "会员项目表-通过id查询")
|
||||
@RequiresPermissions("memberProject:search")
|
||||
@ApiOperation(value="会员项目表-通过id查询", notes="会员项目表-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<?> queryById(@RequestParam(name="id") String id) {
|
||||
@@ -228,6 +233,7 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
|
||||
/**
|
||||
* 导出excel
|
||||
*/
|
||||
@RequiresPermissions("memberProject:export")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, PayMemberProject payMemberProject) {
|
||||
return super.exportXls(request, payMemberProject, PayMemberProject.class, "会员项目表");
|
||||
@@ -236,9 +242,9 @@ public class PayMemberProjectController extends JeroController<PayMemberProject,
|
||||
/**
|
||||
* 通过excel导入数据
|
||||
*/
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
/*@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
return super.importExcel(request, response, PayMemberProject.class);
|
||||
}
|
||||
}*/
|
||||
|
||||
}
|
||||
|
||||
+163
-150
@@ -6,6 +6,7 @@ import java.util.stream.Collectors;
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import cn.hutool.core.util.NumberUtil;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.common.exception.JeroBootException;
|
||||
@@ -21,6 +22,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.jero.member.vo.PayMemberProjectSubitemExcel;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import com.jero.common.system.base.controller.JeroController;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
@@ -29,181 +31,192 @@ import io.swagger.annotations.ApiOperation;
|
||||
import com.jero.common.aspect.annotation.AutoLog;
|
||||
|
||||
|
||||
/**
|
||||
/**
|
||||
* @Description: 会员项目成员表
|
||||
* @Author: jero-boot
|
||||
* @Date: 2021-08-26
|
||||
* @Date: 2021-08-26
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Api(tags="会员项目成员表")
|
||||
@Api(tags = "会员项目成员表")
|
||||
@RestController
|
||||
@RequestMapping("/jero/memberProjectSubitem")
|
||||
@Slf4j
|
||||
public class PayMemberProjectSubitemController extends JeroController<PayMemberProjectSubitem, IPayMemberProjectSubitemService> {
|
||||
@Resource
|
||||
private IPayMemberProjectSubitemService memberProjectSubitemService;
|
||||
@Resource
|
||||
private ISysBaseAPI sysBaseAPI;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*/
|
||||
@AutoLog(value = "会员项目成员表-分页列表查询")
|
||||
@ApiOperation(value="会员项目成员表-分页列表查询", notes="会员项目成员表-分页列表查询")
|
||||
@GetMapping(value = "/page")
|
||||
public Result<?> queryPageList(PayMemberProjectSubitem payMemberProjectSubitem,
|
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<PayMemberProjectSubitem> queryWrapper = QueryGenerator.initQueryWrapper(payMemberProjectSubitem, req.getParameterMap());
|
||||
Page<PayMemberProjectSubitem> page = new Page<>(pageNo, pageSize);
|
||||
IPage<PayMemberProjectSubitem> pageList = memberProjectSubitemService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
@Resource
|
||||
private IPayMemberProjectSubitemService memberProjectSubitemService;
|
||||
@Resource
|
||||
private ISysBaseAPI sysBaseAPI;
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*/
|
||||
@AutoLog(value = "会员项目成员表-列表查询")
|
||||
@ApiOperation(value="会员项目成员表-列表查询", notes="会员项目成员表-列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<List<PayMemberProjectSubitem>> queryList() {
|
||||
* 分页列表查询
|
||||
*/
|
||||
@RequiresPermissions("safeguardMember:search")
|
||||
@ApiOperation(value = "会员项目成员表-分页列表查询", notes = "会员项目成员表-分页列表查询")
|
||||
@GetMapping(value = "/page")
|
||||
public Result<?> queryPageList(PayMemberProjectSubitem payMemberProjectSubitem,
|
||||
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<PayMemberProjectSubitem> queryWrapper = QueryGenerator.initQueryWrapper(payMemberProjectSubitem, req.getParameterMap());
|
||||
Page<PayMemberProjectSubitem> page = new Page<>(pageNo, pageSize);
|
||||
IPage<PayMemberProjectSubitem> pageList = memberProjectSubitemService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*/
|
||||
@RequiresPermissions("safeguardMember:search")
|
||||
@ApiOperation(value = "会员项目成员表-列表查询", notes = "会员项目成员表-列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<List<PayMemberProjectSubitem>> queryList() {
|
||||
List<PayMemberProjectSubitem> list = memberProjectSubitemService.queryList();
|
||||
return Result.OK(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*/
|
||||
@AutoLog(value = "会员项目成员表-添加")
|
||||
@ApiOperation(value="会员项目成员表-添加", notes="会员项目成员表-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<?> add(@RequestBody PayMemberProjectSubitem payMemberProjectSubitem) {
|
||||
ValidUtil.validate(payMemberProjectSubitem);
|
||||
memberProjectSubitemService.add(payMemberProjectSubitem);
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*/
|
||||
@AutoLog(value = "会员项目成员表-编辑")
|
||||
@ApiOperation(value="会员项目成员表-编辑", notes="会员项目成员表-编辑")
|
||||
@PostMapping(value = "/edit")
|
||||
public Result<?> edit(@RequestBody PayMemberProjectSubitem payMemberProjectSubitem) {
|
||||
ValidUtil.validate(payMemberProjectSubitem);
|
||||
memberProjectSubitemService.editById(payMemberProjectSubitem);
|
||||
return Result.OK("编辑成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id删除
|
||||
*/
|
||||
@AutoLog(value = "会员项目成员表-通过id删除")
|
||||
@ApiOperation(value="会员项目成员表-通过id删除", notes="会员项目成员表-通过id删除")
|
||||
@GetMapping(value = "/delete")
|
||||
public Result<?> delete(@RequestParam(name="id") String id) {
|
||||
memberProjectSubitemService.deleteById(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除
|
||||
*/
|
||||
@AutoLog(value = "会员项目成员表-批量删除")
|
||||
@ApiOperation(value="会员项目成员表-批量删除", notes="会员项目成员表-批量删除")
|
||||
@GetMapping(value = "/deleteBatch")
|
||||
public Result<?> deleteBatch(@RequestParam(name="ids") String ids) {
|
||||
this.memberProjectSubitemService.deleteByIds(Arrays.asList(ids.split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*/
|
||||
@AutoLog(value = "会员项目成员表-通过id查询")
|
||||
@ApiOperation(value="会员项目成员表-通过id查询", notes="会员项目成员表-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<?> queryById(@RequestParam(name="id") String id) {
|
||||
PayMemberProjectSubitem payMemberProjectSubitem = memberProjectSubitemService.queryById(id);
|
||||
if(payMemberProjectSubitem ==null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(payMemberProjectSubitem);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*/
|
||||
* 添加
|
||||
*/
|
||||
@RequiresPermissions("safeguardMember:add")
|
||||
@AutoLog(value = "会员项目成员表-添加")
|
||||
@ApiOperation(value = "会员项目成员表-添加", notes = "会员项目成员表-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<?> add(@RequestBody PayMemberProjectSubitem payMemberProjectSubitem) {
|
||||
ValidUtil.validate(payMemberProjectSubitem);
|
||||
memberProjectSubitemService.add(payMemberProjectSubitem);
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*/
|
||||
@RequiresPermissions("safeguardMember:edit")
|
||||
@AutoLog(value = "会员项目成员表-编辑")
|
||||
@ApiOperation(value = "会员项目成员表-编辑", notes = "会员项目成员表-编辑")
|
||||
@PostMapping(value = "/edit")
|
||||
public Result<?> edit(@RequestBody PayMemberProjectSubitem payMemberProjectSubitem) {
|
||||
ValidUtil.validate(payMemberProjectSubitem);
|
||||
memberProjectSubitemService.editById(payMemberProjectSubitem);
|
||||
return Result.OK("编辑成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id删除
|
||||
*/
|
||||
@RequiresPermissions("safeguardMember:delete")
|
||||
@AutoLog(value = "会员项目成员表-通过id删除")
|
||||
@ApiOperation(value = "会员项目成员表-通过id删除", notes = "会员项目成员表-通过id删除")
|
||||
@GetMapping(value = "/delete")
|
||||
public Result<?> delete(@RequestParam(name = "id") String id) {
|
||||
memberProjectSubitemService.deleteById(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除
|
||||
*/
|
||||
@RequiresPermissions("safeguardMember:batchDel")
|
||||
@AutoLog(value = "会员项目成员表-批量删除")
|
||||
@ApiOperation(value = "会员项目成员表-批量删除", notes = "会员项目成员表-批量删除")
|
||||
@GetMapping(value = "/deleteBatch")
|
||||
public Result<?> deleteBatch(@RequestParam(name = "ids") String ids) {
|
||||
this.memberProjectSubitemService.deleteByIds(Arrays.asList(ids.split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*/
|
||||
@RequiresPermissions("safeguardMember:search")
|
||||
@ApiOperation(value = "会员项目成员表-通过id查询", notes = "会员项目成员表-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<?> queryById(@RequestParam(name = "id") String id) {
|
||||
PayMemberProjectSubitem payMemberProjectSubitem = memberProjectSubitemService.queryById(id);
|
||||
if (payMemberProjectSubitem == null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(payMemberProjectSubitem);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*/
|
||||
@RequiresPermissions("safeguardMember:export")
|
||||
@AutoLog(value = "会员项目成员表-导出数据")
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, PayMemberProjectSubitem payMemberProjectSubitem) {
|
||||
return super.exportXls(request, payMemberProjectSubitem, PayMemberProjectSubitem.class, "会员项目成员表");
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel模板
|
||||
*/
|
||||
@RequestMapping(value = "/exportTemplate")
|
||||
public ModelAndView exportTemplate() {
|
||||
return super.exportTemplate(PayMemberProjectSubitem.class, "会员项目成员表");
|
||||
}
|
||||
/**
|
||||
* 导出excel模板
|
||||
*/
|
||||
@RequiresPermissions("safeguardMember:downTemplate")
|
||||
@AutoLog(value = "会员项目成员表-导出excel模板")
|
||||
@RequestMapping(value = "/exportTemplate")
|
||||
public ModelAndView exportTemplate() {
|
||||
return super.exportTemplate(PayMemberProjectSubitem.class, "会员项目成员表");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过excel导入数据
|
||||
*/
|
||||
* 通过excel导入数据
|
||||
*/
|
||||
@RequiresPermissions("safeguardMember:import")
|
||||
@AutoLog(value = "会员项目成员表-导入数据")
|
||||
@ApiOperation(value = "会员项目成员表-导入数据", notes = "会员项目成员表-通过id查询")
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
List<Object> excelData = super.getExcelData(request, PayMemberProjectSubitemExcel.class);
|
||||
if (excelData.isEmpty()){
|
||||
throw new JeroBootException("导入数据为空，请填写数据之后重新导入！");
|
||||
}
|
||||
int errorRowNum = 2;
|
||||
List<String> errorMessage = new ArrayList<>();
|
||||
for (Object obj :excelData) {
|
||||
errorRowNum += 1;
|
||||
//复制属性
|
||||
PayMemberProjectSubitemExcel projectSubitemExcel = (PayMemberProjectSubitemExcel)obj;
|
||||
PayMemberProjectSubitem projectSubitem = new PayMemberProjectSubitem();
|
||||
List<Object> excelData = super.getExcelData(request, PayMemberProjectSubitemExcel.class);
|
||||
if (excelData.isEmpty()) {
|
||||
throw new JeroBootException("导入数据为空，请填写数据之后重新导入！");
|
||||
}
|
||||
int errorRowNum = 2;
|
||||
List<String> errorMessage = new ArrayList<>();
|
||||
for (Object obj : excelData) {
|
||||
errorRowNum += 1;
|
||||
//复制属性
|
||||
PayMemberProjectSubitemExcel projectSubitemExcel = (PayMemberProjectSubitemExcel) obj;
|
||||
PayMemberProjectSubitem projectSubitem = new PayMemberProjectSubitem();
|
||||
|
||||
//应收金额
|
||||
String amountReceivable = projectSubitemExcel.getAmountReceivable();
|
||||
if (!NumberUtil.isNumber(amountReceivable)) {
|
||||
errorMessage.add("第"+errorRowNum+"行：应收金额不符合规范");
|
||||
}else {
|
||||
projectSubitem.setAmountReceivable(new BigDecimal(amountReceivable));
|
||||
}
|
||||
//来款方式
|
||||
List<DictModel> paymentType = sysBaseAPI.queryDictItemsByCode("payment_type");
|
||||
Map<String, String> paymentTypeMap = paymentType.stream().collect(Collectors.toMap(DictModel::getText, DictModel::getValue));
|
||||
String paymentMethod = projectSubitemExcel.getPaymentMethod();
|
||||
if (paymentTypeMap.containsKey(paymentMethod)){
|
||||
projectSubitem.setPaymentMethod(Integer.parseInt(paymentTypeMap.get(paymentMethod)));
|
||||
}else {
|
||||
errorMessage.add("第"+errorRowNum+"行：来款方式不符合规范");
|
||||
}
|
||||
//需要发票
|
||||
List<DictModel> invoiceType = sysBaseAPI.queryDictItemsByCode("invoice_type");
|
||||
Map<String, String> invoiceTypeMap = invoiceType.stream().collect(Collectors.toMap(DictModel::getText, DictModel::getValue));
|
||||
String needInvoice = projectSubitemExcel.getNeedInvoice();
|
||||
if (invoiceTypeMap.containsKey(needInvoice)){
|
||||
projectSubitem.setNeedInvoice(Integer.parseInt(invoiceTypeMap.get(needInvoice)));
|
||||
}else {
|
||||
errorMessage.add("第"+errorRowNum+"行：需要发票不符合规范");
|
||||
}
|
||||
//复制属性
|
||||
BeanUtils.copyProperties(projectSubitemExcel,projectSubitem);
|
||||
//应收金额
|
||||
String amountReceivable = projectSubitemExcel.getAmountReceivable();
|
||||
if (!NumberUtil.isNumber(amountReceivable)) {
|
||||
errorMessage.add("第" + errorRowNum + "行：应收金额不符合规范");
|
||||
} else {
|
||||
projectSubitem.setAmountReceivable(new BigDecimal(amountReceivable));
|
||||
}
|
||||
//来款方式
|
||||
List<DictModel> paymentType = sysBaseAPI.queryDictItemsByCode("payment_type");
|
||||
Map<String, String> paymentTypeMap = paymentType.stream().collect(Collectors.toMap(DictModel::getText, DictModel::getValue));
|
||||
String paymentMethod = projectSubitemExcel.getPaymentMethod();
|
||||
if (paymentTypeMap.containsKey(paymentMethod)) {
|
||||
projectSubitem.setPaymentMethod(Integer.parseInt(paymentTypeMap.get(paymentMethod)));
|
||||
} else {
|
||||
errorMessage.add("第" + errorRowNum + "行：来款方式不符合规范");
|
||||
}
|
||||
//需要发票
|
||||
List<DictModel> invoiceType = sysBaseAPI.queryDictItemsByCode("invoice_type");
|
||||
Map<String, String> invoiceTypeMap = invoiceType.stream().collect(Collectors.toMap(DictModel::getText, DictModel::getValue));
|
||||
String needInvoice = projectSubitemExcel.getNeedInvoice();
|
||||
if (invoiceTypeMap.containsKey(needInvoice)) {
|
||||
projectSubitem.setNeedInvoice(Integer.parseInt(invoiceTypeMap.get(needInvoice)));
|
||||
} else {
|
||||
errorMessage.add("第" + errorRowNum + "行：需要发票不符合规范");
|
||||
}
|
||||
//复制属性
|
||||
BeanUtils.copyProperties(projectSubitemExcel, projectSubitem);
|
||||
|
||||
try {
|
||||
ValidUtil.validate(projectSubitem);
|
||||
memberProjectSubitemService.add(projectSubitem);
|
||||
}catch (JeroBootException e){
|
||||
errorMessage.add("第"+errorRowNum+"行："+e.getMessage());
|
||||
}
|
||||
}
|
||||
if (!errorMessage.isEmpty()) {
|
||||
throw new JeroBootException("excel导入失败，错误信息为"+errorMessage);
|
||||
}
|
||||
return Result.OK("文件导入成功！");
|
||||
try {
|
||||
ValidUtil.validate(projectSubitem);
|
||||
memberProjectSubitemService.add(projectSubitem);
|
||||
} catch (JeroBootException e) {
|
||||
errorMessage.add("第" + errorRowNum + "行：" + e.getMessage());
|
||||
}
|
||||
}
|
||||
if (!errorMessage.isEmpty()) {
|
||||
throw new JeroBootException("excel导入失败，错误信息为" + errorMessage);
|
||||
}
|
||||
return Result.OK("文件导入成功！");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+2
-94
@@ -14,6 +14,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import com.jero.common.system.base.controller.JeroController;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
@@ -39,7 +40,7 @@ public class TbMemberProjectController extends JeroController<TbMemberProject, I
|
||||
/**
|
||||
* 分页列表查询
|
||||
*/
|
||||
@AutoLog(value = "标协会员项目表-分页列表查询")
|
||||
@RequiresPermissions("stardsMember:search")
|
||||
@ApiOperation(value="标协会员项目表-分页列表查询", notes="标协会员项目表-分页列表查询")
|
||||
@GetMapping(value = "/page")
|
||||
public Result<?> queryPageList(TbMemberProject tbMemberProject,
|
||||
@@ -52,97 +53,4 @@ public class TbMemberProjectController extends JeroController<TbMemberProject, I
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*/
|
||||
@AutoLog(value = "标协会员项目表-列表查询")
|
||||
@ApiOperation(value="标协会员项目表-列表查询", notes="标协会员项目表-列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<List<TbMemberProject>> queryList() {
|
||||
List<TbMemberProject> list = tbMemberProjectService.queryList();
|
||||
return Result.OK(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*/
|
||||
@AutoLog(value = "标协会员项目表-添加")
|
||||
@ApiOperation(value="标协会员项目表-添加", notes="标协会员项目表-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<?> add(@Validated @RequestBody TbMemberProject tbMemberProject) {
|
||||
tbMemberProjectService.add(tbMemberProject);
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*/
|
||||
@AutoLog(value = "标协会员项目表-编辑")
|
||||
@ApiOperation(value="标协会员项目表-编辑", notes="标协会员项目表-编辑")
|
||||
@PostMapping(value = "/edit")
|
||||
public Result<?> edit(@Validated @RequestBody TbMemberProject tbMemberProject) {
|
||||
tbMemberProjectService.editById(tbMemberProject);
|
||||
return Result.OK("编辑成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id删除
|
||||
*/
|
||||
@AutoLog(value = "标协会员项目表-通过id删除")
|
||||
@ApiOperation(value="标协会员项目表-通过id删除", notes="标协会员项目表-通过id删除")
|
||||
@GetMapping(value = "/delete")
|
||||
public Result<?> delete(@RequestParam(name="id") String id) {
|
||||
tbMemberProjectService.deleteById(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除
|
||||
*/
|
||||
@AutoLog(value = "标协会员项目表-批量删除")
|
||||
@ApiOperation(value="标协会员项目表-批量删除", notes="标协会员项目表-批量删除")
|
||||
@GetMapping(value = "/deleteBatch")
|
||||
public Result<?> deleteBatch(@RequestParam(name="ids") String ids) {
|
||||
this.tbMemberProjectService.deleteByIds(Arrays.asList(ids.split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*/
|
||||
@AutoLog(value = "标协会员项目表-通过id查询")
|
||||
@ApiOperation(value="标协会员项目表-通过id查询", notes="标协会员项目表-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<?> queryById(@RequestParam(name="id") String id) {
|
||||
TbMemberProject tbMemberProject = tbMemberProjectService.queryById(id);
|
||||
if(tbMemberProject==null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(tbMemberProject);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*/
|
||||
@GetMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, TbMemberProject tbMemberProject) {
|
||||
return super.exportXls(request, tbMemberProject, TbMemberProject.class, "标协会员项目表");
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel模板
|
||||
*/
|
||||
@GetMapping(value = "/exportTemplate")
|
||||
public ModelAndView exportTemplate() {
|
||||
return super.exportTemplate(TbMemberProject.class, "标协会员项目表");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过excel导入数据
|
||||
*/
|
||||
@PostMapping(value = "/importExcel")
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
return super.importExcel(request, response, TbMemberProject.class);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+3
-86
@@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import com.jero.common.system.base.controller.JeroController;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
@@ -40,7 +41,7 @@ public class TbMemberProjectSubitemController extends JeroController<TbMemberPro
|
||||
/**
|
||||
* 分页列表查询
|
||||
*/
|
||||
@AutoLog(value = "标协会员项目成员表-分页列表查询")
|
||||
@RequiresPermissions("safeguardStardsMember:search")
|
||||
@ApiOperation(value="标协会员项目成员表-分页列表查询", notes="标协会员项目成员表-分页列表查询")
|
||||
@GetMapping(value = "/page")
|
||||
public Result<?> queryPageList(TbMemberProjectSubitem tbMemberProjectSubitem,
|
||||
@@ -57,97 +58,13 @@ public class TbMemberProjectSubitemController extends JeroController<TbMemberPro
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 列表查询
|
||||
*/
|
||||
@AutoLog(value = "标协会员项目成员表-列表查询")
|
||||
@ApiOperation(value="标协会员项目成员表-列表查询", notes="标协会员项目成员表-列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<List<TbMemberProjectSubitem>> queryList() {
|
||||
List<TbMemberProjectSubitem> list = tbMemberProjectSubitemService.queryList();
|
||||
return Result.OK(list);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*/
|
||||
@AutoLog(value = "标协会员项目成员表-添加")
|
||||
@ApiOperation(value="标协会员项目成员表-添加", notes="标协会员项目成员表-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<?> add(@Validated @RequestBody TbMemberProjectSubitem tbMemberProjectSubitem) {
|
||||
tbMemberProjectSubitemService.add(tbMemberProjectSubitem);
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*/
|
||||
@AutoLog(value = "标协会员项目成员表-编辑")
|
||||
@ApiOperation(value="标协会员项目成员表-编辑", notes="标协会员项目成员表-编辑")
|
||||
@PostMapping(value = "/edit")
|
||||
public Result<?> edit(@Validated @RequestBody TbMemberProjectSubitem tbMemberProjectSubitem) {
|
||||
tbMemberProjectSubitemService.editById(tbMemberProjectSubitem);
|
||||
return Result.OK("编辑成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id删除
|
||||
*/
|
||||
@AutoLog(value = "标协会员项目成员表-通过id删除")
|
||||
@ApiOperation(value="标协会员项目成员表-通过id删除", notes="标协会员项目成员表-通过id删除")
|
||||
@GetMapping(value = "/delete")
|
||||
public Result<?> delete(@RequestParam(name="id") String id) {
|
||||
tbMemberProjectSubitemService.deleteById(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除
|
||||
*/
|
||||
@AutoLog(value = "标协会员项目成员表-批量删除")
|
||||
@ApiOperation(value="标协会员项目成员表-批量删除", notes="标协会员项目成员表-批量删除")
|
||||
@GetMapping(value = "/deleteBatch")
|
||||
public Result<?> deleteBatch(@RequestParam(name="ids") String ids) {
|
||||
this.tbMemberProjectSubitemService.deleteByIds(Arrays.asList(ids.split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*/
|
||||
@AutoLog(value = "标协会员项目成员表-通过id查询")
|
||||
@ApiOperation(value="标协会员项目成员表-通过id查询", notes="标协会员项目成员表-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<?> queryById(@RequestParam(name="id") String id) {
|
||||
TbMemberProjectSubitem tbMemberProjectSubitem = tbMemberProjectSubitemService.queryById(id);
|
||||
if(tbMemberProjectSubitem==null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(tbMemberProjectSubitem);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*/
|
||||
@RequiresPermissions("safeguardStardsMember:export")
|
||||
@GetMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, TbMemberProjectSubitem tbMemberProjectSubitem) {
|
||||
return super.exportXls(request, tbMemberProjectSubitem, TbMemberProjectSubitem.class, "标协会员项目成员表");
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel模板
|
||||
*/
|
||||
@GetMapping(value = "/exportTemplate")
|
||||
public ModelAndView exportTemplate() {
|
||||
return super.exportTemplate(TbMemberProjectSubitem.class, "标协会员项目成员表");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过excel导入数据
|
||||
*/
|
||||
@PostMapping(value = "/importExcel")
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
return super.importExcel(request, response, TbMemberProjectSubitem.class);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user