添加开票邮寄，包名调整
This commit is contained in:
梁琦涛
+1
@@ -50,6 +50,7 @@ public class PayCompanyManagementTemporaryServiceImpl extends ServiceImpl<PayCom
|
||||
str = JSONObject.toJSONString(payCompanyManagement);
|
||||
}
|
||||
PayCompanyManagementTemporary payCompanyManagementTemporary = JSON.parseObject(str,PayCompanyManagementTemporary.class);
|
||||
payCompanyManagementTemporary.setId("");
|
||||
payCompanyManagementTemporaryService.save(payCompanyManagementTemporary);
|
||||
return payCompanyManagementTemporary;
|
||||
}
|
||||
|
||||
+1
@@ -50,6 +50,7 @@ public class PayContactsManagementTemporaryServiceImpl extends ServiceImpl<PayCo
|
||||
str = JSONObject.toJSONString(payContactsManagement);
|
||||
}
|
||||
PayContactsManagementTemporary payContactsManagementTemporary = JSON.parseObject(str,PayContactsManagementTemporary.class);
|
||||
payContactsManagementTemporary.setId("");
|
||||
payContactsManagementTemporaryService.save(payContactsManagementTemporary);
|
||||
return payContactsManagementTemporary;
|
||||
}
|
||||
|
||||
+155
@@ -0,0 +1,155 @@
|
||||
package com.jero.mailBill.controller;
|
||||
|
||||
import java.util.Arrays;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.common.aspect.annotation.AutoLog;
|
||||
import com.jero.common.system.base.controller.JeroController;
|
||||
import com.jero.common.system.query.QueryGenerator;
|
||||
import com.jero.mailBill.entity.PayMailBill;
|
||||
import com.jero.mailBill.service.IPayMailBillService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
|
||||
/**
|
||||
* @Description: pay_mail_bill
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2021-08-31
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Api(tags="pay_mail_bill")
|
||||
@RestController
|
||||
@RequestMapping("/mailBill/payMailBill")
|
||||
@Slf4j
|
||||
public class PayMailBillController extends JeroController<PayMailBill, IPayMailBillService> {
|
||||
@Autowired
|
||||
private IPayMailBillService payMailBillService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
* @param payMailBill
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "pay_mail_bill-分页列表查询")
|
||||
@ApiOperation(value="pay_mail_bill-分页列表查询", notes="pay_mail_bill-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<?> queryPageList(PayMailBill payMailBill,
|
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<PayMailBill> queryWrapper = QueryGenerator.initQueryWrapper(payMailBill, req.getParameterMap());
|
||||
Page<PayMailBill> page = new Page<PayMailBill>(pageNo, pageSize);
|
||||
IPage<PayMailBill> pageList = payMailBillService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
* @param payMailBill
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "pay_mail_bill-添加")
|
||||
@ApiOperation(value="pay_mail_bill-添加", notes="pay_mail_bill-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<?> add(@RequestBody PayMailBill payMailBill) {
|
||||
payMailBillService.save(payMailBill);
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
* @param payMailBill
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "pay_mail_bill-编辑")
|
||||
@ApiOperation(value="pay_mail_bill-编辑", notes="pay_mail_bill-编辑")
|
||||
@PutMapping(value = "/edit")
|
||||
public Result<?> edit(@RequestBody PayMailBill payMailBill) {
|
||||
payMailBillService.updateById(payMailBill);
|
||||
return Result.OK("编辑成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id删除
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "pay_mail_bill-通过id删除")
|
||||
@ApiOperation(value="pay_mail_bill-通过id删除", notes="pay_mail_bill-通过id删除")
|
||||
@DeleteMapping(value = "/delete")
|
||||
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
|
||||
payMailBillService.removeById(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除
|
||||
*
|
||||
* @param ids
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "pay_mail_bill-批量删除")
|
||||
@ApiOperation(value="pay_mail_bill-批量删除", notes="pay_mail_bill-批量删除")
|
||||
@DeleteMapping(value = "/deleteBatch")
|
||||
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
||||
this.payMailBillService.removeByIds(Arrays.asList(ids.split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "pay_mail_bill-通过id查询")
|
||||
@ApiOperation(value="pay_mail_bill-通过id查询", notes="pay_mail_bill-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
|
||||
PayMailBill payMailBill = payMailBillService.getById(id);
|
||||
if(payMailBill==null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(payMailBill);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*
|
||||
* @param request
|
||||
* @param payMailBill
|
||||
*/
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, PayMailBill payMailBill) {
|
||||
return super.exportXls(request, payMailBill, PayMailBill.class, "pay_mail_bill");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过excel导入数据
|
||||
*
|
||||
* @param request
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
return super.importExcel(request, response, PayMailBill.class);
|
||||
}
|
||||
|
||||
}
|
||||
+156
@@ -0,0 +1,156 @@
|
||||
package com.jero.mailBill.controller;
|
||||
|
||||
import java.util.Arrays;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.common.aspect.annotation.AutoLog;
|
||||
import com.jero.common.system.base.controller.JeroController;
|
||||
import com.jero.common.system.query.QueryGenerator;
|
||||
import com.jero.mailBill.entity.PayMailBillProject;
|
||||
|
||||
import com.jero.mailBill.service.IPayMailBillProjectService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
|
||||
/**
|
||||
* @Description: pay_mail_bill_project
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2021-08-31
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Api(tags="pay_mail_bill_project")
|
||||
@RestController
|
||||
@RequestMapping("/mailBill/payMailBillProject")
|
||||
@Slf4j
|
||||
public class PayMailBillProjectController extends JeroController<PayMailBillProject, IPayMailBillProjectService> {
|
||||
@Autowired
|
||||
private IPayMailBillProjectService payMailBillProjectService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
* @param payMailBillProject
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "pay_mail_bill_project-分页列表查询")
|
||||
@ApiOperation(value="pay_mail_bill_project-分页列表查询", notes="pay_mail_bill_project-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<?> queryPageList(PayMailBillProject payMailBillProject,
|
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<PayMailBillProject> queryWrapper = QueryGenerator.initQueryWrapper(payMailBillProject, req.getParameterMap());
|
||||
Page<PayMailBillProject> page = new Page<PayMailBillProject>(pageNo, pageSize);
|
||||
IPage<PayMailBillProject> pageList = payMailBillProjectService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
* @param payMailBillProject
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "pay_mail_bill_project-添加")
|
||||
@ApiOperation(value="pay_mail_bill_project-添加", notes="pay_mail_bill_project-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<?> add(@RequestBody PayMailBillProject payMailBillProject) {
|
||||
payMailBillProjectService.save(payMailBillProject);
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
* @param payMailBillProject
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "pay_mail_bill_project-编辑")
|
||||
@ApiOperation(value="pay_mail_bill_project-编辑", notes="pay_mail_bill_project-编辑")
|
||||
@PutMapping(value = "/edit")
|
||||
public Result<?> edit(@RequestBody PayMailBillProject payMailBillProject) {
|
||||
payMailBillProjectService.updateById(payMailBillProject);
|
||||
return Result.OK("编辑成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id删除
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "pay_mail_bill_project-通过id删除")
|
||||
@ApiOperation(value="pay_mail_bill_project-通过id删除", notes="pay_mail_bill_project-通过id删除")
|
||||
@DeleteMapping(value = "/delete")
|
||||
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
|
||||
payMailBillProjectService.removeById(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除
|
||||
*
|
||||
* @param ids
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "pay_mail_bill_project-批量删除")
|
||||
@ApiOperation(value="pay_mail_bill_project-批量删除", notes="pay_mail_bill_project-批量删除")
|
||||
@DeleteMapping(value = "/deleteBatch")
|
||||
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
||||
this.payMailBillProjectService.removeByIds(Arrays.asList(ids.split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@AutoLog(value = "pay_mail_bill_project-通过id查询")
|
||||
@ApiOperation(value="pay_mail_bill_project-通过id查询", notes="pay_mail_bill_project-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
|
||||
PayMailBillProject payMailBillProject = payMailBillProjectService.getById(id);
|
||||
if(payMailBillProject==null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(payMailBillProject);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*
|
||||
* @param request
|
||||
* @param payMailBillProject
|
||||
*/
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, PayMailBillProject payMailBillProject) {
|
||||
return super.exportXls(request, payMailBillProject, PayMailBillProject.class, "pay_mail_bill_project");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过excel导入数据
|
||||
*
|
||||
* @param request
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
return super.importExcel(request, response, PayMailBillProject.class);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,80 @@
|
||||
package com.jero.mailBill.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
/**
|
||||
* @Description: pay_mail_bill
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2021-08-31
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("pay_mail_bill")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value="pay_mail_bill对象", description="pay_mail_bill")
|
||||
public class PayMailBill implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**id*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
@ApiModelProperty(value = "id")
|
||||
private java.lang.String id;
|
||||
/**创建人*/
|
||||
@ApiModelProperty(value = "创建人")
|
||||
private java.lang.String createBy;
|
||||
/**创建日期*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "创建日期")
|
||||
private java.util.Date createTime;
|
||||
/**更新人*/
|
||||
@ApiModelProperty(value = "更新人")
|
||||
private java.lang.String updateBy;
|
||||
/**更新日期*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "更新日期")
|
||||
private java.util.Date updateTime;
|
||||
/**票号*/
|
||||
@Excel(name = "票号", width = 15)
|
||||
@ApiModelProperty(value = "票号")
|
||||
private java.lang.String billNo;
|
||||
/**开票金额*/
|
||||
@Excel(name = "开票金额", width = 15)
|
||||
@ApiModelProperty(value = "开票金额")
|
||||
private java.lang.Integer invoiceAmount;
|
||||
/**邮寄状态(0:未邮寄，1::已邮寄)*/
|
||||
@Excel(name = "邮寄状态(0:未邮寄，1::已邮寄)", width = 15)
|
||||
@ApiModelProperty(value = "邮寄状态(0:未邮寄，1::已邮寄)")
|
||||
private java.lang.Integer postStatus;
|
||||
/**快递公司(1:EMS,2:顺丰)*/
|
||||
@Excel(name = "快递公司(1:EMS,2:顺丰)", width = 15)
|
||||
@ApiModelProperty(value = "快递公司(1:EMS,2:顺丰)")
|
||||
private java.lang.Integer sendMethod;
|
||||
/**快递单号*/
|
||||
@Excel(name = "快递单号", width = 15)
|
||||
@ApiModelProperty(value = "快递单号")
|
||||
private java.lang.String postno;
|
||||
/**邮寄时间*/
|
||||
@Excel(name = "邮寄时间", width = 15, format = "yyyy-MM-dd")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "邮寄时间")
|
||||
private java.util.Date senddate;
|
||||
/**备注*/
|
||||
@Excel(name = "备注", width = 15)
|
||||
@ApiModelProperty(value = "备注")
|
||||
private java.lang.String remark;
|
||||
}
|
||||
+44
@@ -0,0 +1,44 @@
|
||||
package com.jero.mailBill.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
/**
|
||||
* @Description: pay_mail_bill_project
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2021-08-31
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("pay_mail_bill_project")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value="pay_mail_bill_project对象", description="pay_mail_bill_project")
|
||||
public class PayMailBillProject implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**id*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
@ApiModelProperty(value = "id")
|
||||
private java.lang.String id;
|
||||
/**票据id*/
|
||||
@Excel(name = "票据id", width = 15)
|
||||
@ApiModelProperty(value = "票据id")
|
||||
private java.lang.String billId;
|
||||
/**项目id*/
|
||||
@Excel(name = "项目id", width = 15)
|
||||
@ApiModelProperty(value = "项目id")
|
||||
private java.lang.String projectId;
|
||||
/**项目类型*/
|
||||
@Excel(name = "项目类型", width = 15)
|
||||
@ApiModelProperty(value = "项目类型")
|
||||
private java.lang.Integer projectType;
|
||||
}
|
||||
+15
@@ -0,0 +1,15 @@
|
||||
package com.jero.mailBill.mapper;
|
||||
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.jero.mailBill.entity.PayMailBill;
|
||||
|
||||
/**
|
||||
* @Description: pay_mail_bill
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2021-08-31
|
||||
* @Version: V1.0
|
||||
*/
|
||||
public interface PayMailBillMapper extends BaseMapper<PayMailBill> {
|
||||
|
||||
}
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
package com.jero.mailBill.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.jero.mailBill.entity.PayMailBillProject;
|
||||
|
||||
/**
|
||||
* @Description: pay_mail_bill_project
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2021-08-31
|
||||
* @Version: V1.0
|
||||
*/
|
||||
public interface PayMailBillProjectMapper extends BaseMapper<PayMailBillProject> {
|
||||
|
||||
}
|
||||
+5
@@ -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="org.jeecg.modules.demo.mailBill.mapper.PayMailBillMapper">
|
||||
|
||||
</mapper>
|
||||
+5
@@ -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="org.jeecg.modules.demo.mailBill.mapper.PayMailBillProjectMapper">
|
||||
|
||||
</mapper>
|
||||
+15
@@ -0,0 +1,15 @@
|
||||
package com.jero.mailBill.service;
|
||||
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.jero.mailBill.entity.PayMailBillProject;
|
||||
|
||||
/**
|
||||
* @Description: pay_mail_bill_project
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2021-08-31
|
||||
* @Version: V1.0
|
||||
*/
|
||||
public interface IPayMailBillProjectService extends IService<PayMailBillProject> {
|
||||
|
||||
}
|
||||
+25
@@ -0,0 +1,25 @@
|
||||
package com.jero.mailBill.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.jero.mailBill.entity.PayMailBill;
|
||||
import com.jero.mailBill.vo.MailBillVO;
|
||||
|
||||
/**
|
||||
* @Description: pay_mail_bill
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2021-08-31
|
||||
* @Version: V1.0
|
||||
*/
|
||||
public interface IPayMailBillService extends IService<PayMailBill> {
|
||||
/**
|
||||
* @Description
|
||||
* @Author lqt
|
||||
* @Date 2021/8/31
|
||||
* @Param projectId 项目id
|
||||
* @Param projectType 项目类型
|
||||
* @Return
|
||||
* @Exception
|
||||
*/
|
||||
MailBillVO selectMailBillVO(String projectId,String projectType);
|
||||
|
||||
}
|
||||
+18
@@ -0,0 +1,18 @@
|
||||
package com.jero.mailBill.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.jero.mailBill.entity.PayMailBillProject;
|
||||
import com.jero.mailBill.mapper.PayMailBillProjectMapper;
|
||||
import com.jero.mailBill.service.IPayMailBillProjectService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
/**
|
||||
* @Description: pay_mail_bill_project
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2021-08-31
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Service
|
||||
public class PayMailBillProjectServiceImpl extends ServiceImpl<PayMailBillProjectMapper, PayMailBillProject> implements IPayMailBillProjectService {
|
||||
|
||||
}
|
||||
+29
@@ -0,0 +1,29 @@
|
||||
package com.jero.mailBill.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.jero.mailBill.entity.PayMailBill;
|
||||
import com.jero.mailBill.mapper.PayMailBillMapper;
|
||||
import com.jero.mailBill.service.IPayMailBillService;
|
||||
import com.jero.mailBill.vo.MailBillVO;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
/**
|
||||
* @Description: pay_mail_bill
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2021-08-31
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Service
|
||||
public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMailBill> implements IPayMailBillService {
|
||||
|
||||
@Resource
|
||||
private PayMailBillMapper payMailBillMapper;
|
||||
|
||||
@Override
|
||||
public MailBillVO selectMailBillVO(String projectId, String projectType) {
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
package com.jero.mailBill.vo;
|
||||
|
||||
import com.jero.mailBill.entity.PayMailBill;
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
public class MailBillVO extends PayMailBill implements Serializable{
|
||||
/**
|
||||
* 项目名称
|
||||
*/
|
||||
private List<String> list;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,210 @@
|
||||
<template>
|
||||
<a-card :bordered="false">
|
||||
<!-- 查询区域 -->
|
||||
<div class="table-page-search-wrapper">
|
||||
<a-form layout="inline" @keyup.enter.native="searchQuery">
|
||||
<a-row :gutter="24">
|
||||
</a-row>
|
||||
</a-form>
|
||||
</div>
|
||||
<!-- 查询区域-END -->
|
||||
|
||||
<!-- 操作按钮区域 -->
|
||||
<div class="table-operator">
|
||||
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
|
||||
<a-button type="primary" icon="download" @click="handleExportXls('pay_mail_bill')">导出</a-button>
|
||||
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
|
||||
<a-button type="primary" icon="import">导入</a-button>
|
||||
</a-upload>
|
||||
<!-- 高级查询区域 -->
|
||||
<j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
|
||||
<a-dropdown v-if="selectedRowKeys.length > 0">
|
||||
<a-menu slot="overlay">
|
||||
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
|
||||
</a-menu>
|
||||
<a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
|
||||
</a-dropdown>
|
||||
</div>
|
||||
|
||||
<!-- table区域-begin -->
|
||||
<div>
|
||||
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
|
||||
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
|
||||
<a style="margin-left: 24px" @click="onClearSelected">清空</a>
|
||||
</div>
|
||||
|
||||
<a-table
|
||||
ref="table"
|
||||
size="middle"
|
||||
:scroll="{x:true}"
|
||||
bordered
|
||||
rowKey="id"
|
||||
:columns="columns"
|
||||
:dataSource="dataSource"
|
||||
:pagination="ipagination"
|
||||
:loading="loading"
|
||||
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
|
||||
class="j-table-force-nowrap"
|
||||
@change="handleTableChange">
|
||||
|
||||
<template slot="htmlSlot" slot-scope="text">
|
||||
<div v-html="text"></div>
|
||||
</template>
|
||||
<template slot="imgSlot" slot-scope="text">
|
||||
<span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
|
||||
<img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
|
||||
</template>
|
||||
<template slot="fileSlot" slot-scope="text">
|
||||
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
|
||||
<a-button
|
||||
v-else
|
||||
:ghost="true"
|
||||
type="primary"
|
||||
icon="download"
|
||||
size="small"
|
||||
@click="downloadFile(text)">
|
||||
下载
|
||||
</a-button>
|
||||
</template>
|
||||
|
||||
<span slot="action" slot-scope="text, record">
|
||||
<a @click="handleEdit(record)">编辑</a>
|
||||
|
||||
<a-divider type="vertical" />
|
||||
<a-dropdown>
|
||||
<a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
|
||||
<a-menu slot="overlay">
|
||||
<a-menu-item>
|
||||
<a @click="handleDetail(record)">详情</a>
|
||||
</a-menu-item>
|
||||
<a-menu-item>
|
||||
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
|
||||
<a>删除</a>
|
||||
</a-popconfirm>
|
||||
</a-menu-item>
|
||||
</a-menu>
|
||||
</a-dropdown>
|
||||
</span>
|
||||
|
||||
</a-table>
|
||||
</div>
|
||||
|
||||
<pay-mail-bill-modal ref="modalForm" @ok="modalFormOk"></pay-mail-bill-modal>
|
||||
</a-card>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
import '@/assets/less/TableExpand.less'
|
||||
import { mixinDevice } from '@/utils/mixin'
|
||||
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
|
||||
import PayMailBillModal from './modules/PayMailBillModal'
|
||||
|
||||
export default {
|
||||
name: 'PayMailBillList',
|
||||
mixins:[JeecgListMixin, mixinDevice],
|
||||
components: {
|
||||
PayMailBillModal
|
||||
},
|
||||
data () {
|
||||
return {
|
||||
description: 'pay_mail_bill管理页面',
|
||||
// 表头
|
||||
columns: [
|
||||
{
|
||||
title: '#',
|
||||
dataIndex: '',
|
||||
key:'rowIndex',
|
||||
width:60,
|
||||
align:"center",
|
||||
customRender:function (t,r,index) {
|
||||
return parseInt(index)+1;
|
||||
}
|
||||
},
|
||||
{
|
||||
title:'票号',
|
||||
align:"center",
|
||||
dataIndex: 'billNo'
|
||||
},
|
||||
{
|
||||
title:'开票金额',
|
||||
align:"center",
|
||||
dataIndex: 'invoiceAmount'
|
||||
},
|
||||
{
|
||||
title:'邮寄状态(0:未邮寄，1::已邮寄)',
|
||||
align:"center",
|
||||
dataIndex: 'postStatus'
|
||||
},
|
||||
{
|
||||
title:'快递公司(1:EMS,2:顺丰)',
|
||||
align:"center",
|
||||
dataIndex: 'sendMethod'
|
||||
},
|
||||
{
|
||||
title:'快递单号',
|
||||
align:"center",
|
||||
dataIndex: 'postno'
|
||||
},
|
||||
{
|
||||
title:'邮寄时间',
|
||||
align:"center",
|
||||
dataIndex: 'senddate',
|
||||
customRender:function (text) {
|
||||
return !text?"":(text.length>10?text.substr(0,10):text)
|
||||
}
|
||||
},
|
||||
{
|
||||
title:'备注',
|
||||
align:"center",
|
||||
dataIndex: 'remark'
|
||||
},
|
||||
{
|
||||
title: '操作',
|
||||
dataIndex: 'action',
|
||||
align:"center",
|
||||
fixed:"right",
|
||||
width:147,
|
||||
scopedSlots: { customRender: 'action' }
|
||||
}
|
||||
],
|
||||
url: {
|
||||
list: "/mailBill/payMailBill/list",
|
||||
delete: "/mailBill/payMailBill/delete",
|
||||
deleteBatch: "/mailBill/payMailBill/deleteBatch",
|
||||
exportXlsUrl: "/mailBill/payMailBill/exportXls",
|
||||
importExcelUrl: "mailBill/payMailBill/importExcel",
|
||||
|
||||
},
|
||||
dictOptions:{},
|
||||
superFieldList:[],
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.getSuperFieldList();
|
||||
},
|
||||
computed: {
|
||||
importExcelUrl: function(){
|
||||
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
initDictConfig(){
|
||||
},
|
||||
getSuperFieldList(){
|
||||
let fieldList=[];
|
||||
fieldList.push({type:'string',value:'billNo',text:'票号'})
|
||||
fieldList.push({type:'int',value:'invoiceAmount',text:'开票金额'})
|
||||
fieldList.push({type:'int',value:'postStatus',text:'邮寄状态(0:未邮寄，1::已邮寄)'})
|
||||
fieldList.push({type:'int',value:'sendMethod',text:'快递公司(1:EMS,2:顺丰)'})
|
||||
fieldList.push({type:'string',value:'postno',text:'快递单号'})
|
||||
fieldList.push({type:'date',value:'senddate',text:'邮寄时间'})
|
||||
fieldList.push({type:'string',value:'remark',text:'备注'})
|
||||
this.superFieldList = fieldList
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<style scoped>
|
||||
@import '~@assets/less/common.less';
|
||||
</style>
|
||||
+183
@@ -0,0 +1,183 @@
|
||||
<template>
|
||||
<a-card :bordered="false">
|
||||
<!-- 查询区域 -->
|
||||
<div class="table-page-search-wrapper">
|
||||
<a-form layout="inline" @keyup.enter.native="searchQuery">
|
||||
<a-row :gutter="24">
|
||||
</a-row>
|
||||
</a-form>
|
||||
</div>
|
||||
<!-- 查询区域-END -->
|
||||
|
||||
<!-- 操作按钮区域 -->
|
||||
<div class="table-operator">
|
||||
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
|
||||
<a-button type="primary" icon="download" @click="handleExportXls('pay_mail_bill_project')">导出</a-button>
|
||||
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
|
||||
<a-button type="primary" icon="import">导入</a-button>
|
||||
</a-upload>
|
||||
<!-- 高级查询区域 -->
|
||||
<j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
|
||||
<a-dropdown v-if="selectedRowKeys.length > 0">
|
||||
<a-menu slot="overlay">
|
||||
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
|
||||
</a-menu>
|
||||
<a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
|
||||
</a-dropdown>
|
||||
</div>
|
||||
|
||||
<!-- table区域-begin -->
|
||||
<div>
|
||||
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
|
||||
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
|
||||
<a style="margin-left: 24px" @click="onClearSelected">清空</a>
|
||||
</div>
|
||||
|
||||
<a-table
|
||||
ref="table"
|
||||
size="middle"
|
||||
:scroll="{x:true}"
|
||||
bordered
|
||||
rowKey="id"
|
||||
:columns="columns"
|
||||
:dataSource="dataSource"
|
||||
:pagination="ipagination"
|
||||
:loading="loading"
|
||||
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
|
||||
class="j-table-force-nowrap"
|
||||
@change="handleTableChange">
|
||||
|
||||
<template slot="htmlSlot" slot-scope="text">
|
||||
<div v-html="text"></div>
|
||||
</template>
|
||||
<template slot="imgSlot" slot-scope="text">
|
||||
<span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
|
||||
<img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
|
||||
</template>
|
||||
<template slot="fileSlot" slot-scope="text">
|
||||
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
|
||||
<a-button
|
||||
v-else
|
||||
:ghost="true"
|
||||
type="primary"
|
||||
icon="download"
|
||||
size="small"
|
||||
@click="downloadFile(text)">
|
||||
下载
|
||||
</a-button>
|
||||
</template>
|
||||
|
||||
<span slot="action" slot-scope="text, record">
|
||||
<a @click="handleEdit(record)">编辑</a>
|
||||
|
||||
<a-divider type="vertical" />
|
||||
<a-dropdown>
|
||||
<a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
|
||||
<a-menu slot="overlay">
|
||||
<a-menu-item>
|
||||
<a @click="handleDetail(record)">详情</a>
|
||||
</a-menu-item>
|
||||
<a-menu-item>
|
||||
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
|
||||
<a>删除</a>
|
||||
</a-popconfirm>
|
||||
</a-menu-item>
|
||||
</a-menu>
|
||||
</a-dropdown>
|
||||
</span>
|
||||
|
||||
</a-table>
|
||||
</div>
|
||||
|
||||
<pay-mail-bill-project-modal ref="modalForm" @ok="modalFormOk"></pay-mail-bill-project-modal>
|
||||
</a-card>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
import '@/assets/less/TableExpand.less'
|
||||
import { mixinDevice } from '@/utils/mixin'
|
||||
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
|
||||
import PayMailBillProjectModal from './modules/PayMailBillProjectModal'
|
||||
|
||||
export default {
|
||||
name: 'PayMailBillProjectList',
|
||||
mixins:[JeecgListMixin, mixinDevice],
|
||||
components: {
|
||||
PayMailBillProjectModal
|
||||
},
|
||||
data () {
|
||||
return {
|
||||
description: 'pay_mail_bill_project管理页面',
|
||||
// 表头
|
||||
columns: [
|
||||
{
|
||||
title: '#',
|
||||
dataIndex: '',
|
||||
key:'rowIndex',
|
||||
width:60,
|
||||
align:"center",
|
||||
customRender:function (t,r,index) {
|
||||
return parseInt(index)+1;
|
||||
}
|
||||
},
|
||||
{
|
||||
title:'票据id',
|
||||
align:"center",
|
||||
dataIndex: 'billId'
|
||||
},
|
||||
{
|
||||
title:'项目id',
|
||||
align:"center",
|
||||
dataIndex: 'projectId'
|
||||
},
|
||||
{
|
||||
title:'项目类型',
|
||||
align:"center",
|
||||
dataIndex: 'projectType'
|
||||
},
|
||||
{
|
||||
title: '操作',
|
||||
dataIndex: 'action',
|
||||
align:"center",
|
||||
fixed:"right",
|
||||
width:147,
|
||||
scopedSlots: { customRender: 'action' }
|
||||
}
|
||||
],
|
||||
url: {
|
||||
list: "/mailBill/payMailBillProject/list",
|
||||
delete: "/mailBill/payMailBillProject/delete",
|
||||
deleteBatch: "/mailBill/payMailBillProject/deleteBatch",
|
||||
exportXlsUrl: "/mailBill/payMailBillProject/exportXls",
|
||||
importExcelUrl: "mailBill/payMailBillProject/importExcel",
|
||||
|
||||
},
|
||||
dictOptions:{},
|
||||
superFieldList:[],
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.getSuperFieldList();
|
||||
},
|
||||
computed: {
|
||||
importExcelUrl: function(){
|
||||
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
initDictConfig(){
|
||||
},
|
||||
getSuperFieldList(){
|
||||
let fieldList=[];
|
||||
fieldList.push({type:'string',value:'billId',text:'票据id'})
|
||||
fieldList.push({type:'string',value:'projectId',text:'项目id'})
|
||||
fieldList.push({type:'int',value:'projectType',text:'项目类型'})
|
||||
this.superFieldList = fieldList
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<style scoped>
|
||||
@import '~@assets/less/common.less';
|
||||
</style>
|
||||
+134
@@ -0,0 +1,134 @@
|
||||
<template>
|
||||
<a-spin :spinning="confirmLoading">
|
||||
<j-form-container :disabled="formDisabled">
|
||||
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
|
||||
<a-row>
|
||||
<a-col :span="24">
|
||||
<a-form-model-item label="票号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="billNo">
|
||||
<a-input v-model="model.billNo" placeholder="请输入票号" ></a-input>
|
||||
</a-form-model-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-model-item label="开票金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="invoiceAmount">
|
||||
<a-input-number v-model="model.invoiceAmount" placeholder="请输入开票金额" style="width: 100%" />
|
||||
</a-form-model-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-model-item label="邮寄状态(0:未邮寄，1::已邮寄)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="postStatus">
|
||||
<a-input-number v-model="model.postStatus" placeholder="请输入邮寄状态(0:未邮寄，1::已邮寄)" style="width: 100%" />
|
||||
</a-form-model-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-model-item label="快递公司(1:EMS,2:顺丰)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sendMethod">
|
||||
<a-input-number v-model="model.sendMethod" placeholder="请输入快递公司(1:EMS,2:顺丰)" style="width: 100%" />
|
||||
</a-form-model-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-model-item label="快递单号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="postno">
|
||||
<a-input v-model="model.postno" placeholder="请输入快递单号" ></a-input>
|
||||
</a-form-model-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-model-item label="邮寄时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="senddate">
|
||||
<j-date placeholder="请选择邮寄时间" v-model="model.senddate" style="width: 100%" />
|
||||
</a-form-model-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
|
||||
<a-input v-model="model.remark" placeholder="请输入备注" ></a-input>
|
||||
</a-form-model-item>
|
||||
</a-col>
|
||||
</a-row>
|
||||
</a-form-model>
|
||||
</j-form-container>
|
||||
</a-spin>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
import { httpAction, getAction } from '@/api/manage'
|
||||
import { validateDuplicateValue } from '@/utils/util'
|
||||
|
||||
export default {
|
||||
name: 'PayMailBillForm',
|
||||
components: {
|
||||
},
|
||||
props: {
|
||||
//表单禁用
|
||||
disabled: {
|
||||
type: Boolean,
|
||||
default: false,
|
||||
required: false
|
||||
}
|
||||
},
|
||||
data () {
|
||||
return {
|
||||
model:{
|
||||
},
|
||||
labelCol: {
|
||||
xs: { span: 24 },
|
||||
sm: { span: 5 },
|
||||
},
|
||||
wrapperCol: {
|
||||
xs: { span: 24 },
|
||||
sm: { span: 16 },
|
||||
},
|
||||
confirmLoading: false,
|
||||
validatorRules: {
|
||||
},
|
||||
url: {
|
||||
add: "/mailBill/payMailBill/add",
|
||||
edit: "/mailBill/payMailBill/edit",
|
||||
queryById: "/mailBill/payMailBill/queryById"
|
||||
}
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
formDisabled(){
|
||||
return this.disabled
|
||||
},
|
||||
},
|
||||
created () {
|
||||
//备份model原始值
|
||||
this.modelDefault = JSON.parse(JSON.stringify(this.model));
|
||||
},
|
||||
methods: {
|
||||
add () {
|
||||
this.edit(this.modelDefault);
|
||||
},
|
||||
edit (record) {
|
||||
this.model = Object.assign({}, record);
|
||||
this.visible = true;
|
||||
},
|
||||
submitForm () {
|
||||
const that = this;
|
||||
// 触发表单验证
|
||||
this.$refs.form.validate(valid => {
|
||||
if (valid) {
|
||||
that.confirmLoading = true;
|
||||
let httpurl = '';
|
||||
let method = '';
|
||||
if(!this.model.id){
|
||||
httpurl+=this.url.add;
|
||||
method = 'post';
|
||||
}else{
|
||||
httpurl+=this.url.edit;
|
||||
method = 'put';
|
||||
}
|
||||
httpAction(httpurl,this.model,method).then((res)=>{
|
||||
if(res.success){
|
||||
that.$message.success(res.message);
|
||||
that.$emit('ok');
|
||||
}else{
|
||||
that.$message.warning(res.message);
|
||||
}
|
||||
}).finally(() => {
|
||||
that.confirmLoading = false;
|
||||
})
|
||||
}
|
||||
|
||||
})
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
+60
@@ -0,0 +1,60 @@
|
||||
<template>
|
||||
<j-modal
|
||||
:title="title"
|
||||
:width="width"
|
||||
:visible="visible"
|
||||
switchFullscreen
|
||||
@ok="handleOk"
|
||||
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
|
||||
@cancel="handleCancel"
|
||||
cancelText="关闭">
|
||||
<pay-mail-bill-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></pay-mail-bill-form>
|
||||
</j-modal>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
import PayMailBillForm from './PayMailBillForm'
|
||||
export default {
|
||||
name: 'PayMailBillModal',
|
||||
components: {
|
||||
PayMailBillForm
|
||||
},
|
||||
data () {
|
||||
return {
|
||||
title:'',
|
||||
width:800,
|
||||
visible: false,
|
||||
disableSubmit: false
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
add () {
|
||||
this.visible=true
|
||||
this.$nextTick(()=>{
|
||||
this.$refs.realForm.add();
|
||||
})
|
||||
},
|
||||
edit (record) {
|
||||
this.visible=true
|
||||
this.$nextTick(()=>{
|
||||
this.$refs.realForm.edit(record);
|
||||
})
|
||||
},
|
||||
close () {
|
||||
this.$emit('close');
|
||||
this.visible = false;
|
||||
},
|
||||
handleOk () {
|
||||
this.$refs.realForm.submitForm();
|
||||
},
|
||||
submitCallback(){
|
||||
this.$emit('ok');
|
||||
this.visible = false;
|
||||
},
|
||||
handleCancel () {
|
||||
this.close()
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
+84
@@ -0,0 +1,84 @@
|
||||
<template>
|
||||
<a-drawer
|
||||
:title="title"
|
||||
:width="width"
|
||||
placement="right"
|
||||
:closable="false"
|
||||
@close="close"
|
||||
destroyOnClose
|
||||
:visible="visible">
|
||||
<pay-mail-bill-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></pay-mail-bill-form>
|
||||
<div class="drawer-footer">
|
||||
<a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
|
||||
<a-button v-if="!disableSubmit" @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
|
||||
</div>
|
||||
</a-drawer>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
import PayMailBillForm from './PayMailBillForm'
|
||||
|
||||
export default {
|
||||
name: 'PayMailBillModal',
|
||||
components: {
|
||||
PayMailBillForm
|
||||
},
|
||||
data () {
|
||||
return {
|
||||
title:"操作",
|
||||
width:800,
|
||||
visible: false,
|
||||
disableSubmit: false
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
add () {
|
||||
this.visible=true
|
||||
this.$nextTick(()=>{
|
||||
this.$refs.realForm.add();
|
||||
})
|
||||
},
|
||||
edit (record) {
|
||||
this.visible=true
|
||||
this.$nextTick(()=>{
|
||||
this.$refs.realForm.edit(record);
|
||||
});
|
||||
},
|
||||
close () {
|
||||
this.$emit('close');
|
||||
this.visible = false;
|
||||
},
|
||||
submitCallback(){
|
||||
this.$emit('ok');
|
||||
this.visible = false;
|
||||
},
|
||||
handleOk () {
|
||||
this.$refs.realForm.submitForm();
|
||||
},
|
||||
handleCancel () {
|
||||
this.close()
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="less" scoped>
|
||||
/** Button按钮间距 */
|
||||
.ant-btn {
|
||||
margin-left: 30px;
|
||||
margin-bottom: 30px;
|
||||
float: right;
|
||||
}
|
||||
.drawer-footer{
|
||||
position: absolute;
|
||||
bottom: -8px;
|
||||
width: 100%;
|
||||
border-top: 1px solid #e8e8e8;
|
||||
padding: 10px 16px;
|
||||
text-align: right;
|
||||
left: 0;
|
||||
background: #fff;
|
||||
border-radius: 0 0 2px 2px;
|
||||
}
|
||||
</style>
|
||||
+114
@@ -0,0 +1,114 @@
|
||||
<template>
|
||||
<a-spin :spinning="confirmLoading">
|
||||
<j-form-container :disabled="formDisabled">
|
||||
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
|
||||
<a-row>
|
||||
<a-col :span="24">
|
||||
<a-form-model-item label="票据id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="billId">
|
||||
<a-input v-model="model.billId" placeholder="请输入票据id" ></a-input>
|
||||
</a-form-model-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-model-item label="项目id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="projectId">
|
||||
<a-input v-model="model.projectId" placeholder="请输入项目id" ></a-input>
|
||||
</a-form-model-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-model-item label="项目类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="projectType">
|
||||
<a-input-number v-model="model.projectType" placeholder="请输入项目类型" style="width: 100%" />
|
||||
</a-form-model-item>
|
||||
</a-col>
|
||||
</a-row>
|
||||
</a-form-model>
|
||||
</j-form-container>
|
||||
</a-spin>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
import { httpAction, getAction } from '@/api/manage'
|
||||
import { validateDuplicateValue } from '@/utils/util'
|
||||
|
||||
export default {
|
||||
name: 'PayMailBillProjectForm',
|
||||
components: {
|
||||
},
|
||||
props: {
|
||||
//表单禁用
|
||||
disabled: {
|
||||
type: Boolean,
|
||||
default: false,
|
||||
required: false
|
||||
}
|
||||
},
|
||||
data () {
|
||||
return {
|
||||
model:{
|
||||
},
|
||||
labelCol: {
|
||||
xs: { span: 24 },
|
||||
sm: { span: 5 },
|
||||
},
|
||||
wrapperCol: {
|
||||
xs: { span: 24 },
|
||||
sm: { span: 16 },
|
||||
},
|
||||
confirmLoading: false,
|
||||
validatorRules: {
|
||||
},
|
||||
url: {
|
||||
add: "/mailBill/payMailBillProject/add",
|
||||
edit: "/mailBill/payMailBillProject/edit",
|
||||
queryById: "/mailBill/payMailBillProject/queryById"
|
||||
}
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
formDisabled(){
|
||||
return this.disabled
|
||||
},
|
||||
},
|
||||
created () {
|
||||
//备份model原始值
|
||||
this.modelDefault = JSON.parse(JSON.stringify(this.model));
|
||||
},
|
||||
methods: {
|
||||
add () {
|
||||
this.edit(this.modelDefault);
|
||||
},
|
||||
edit (record) {
|
||||
this.model = Object.assign({}, record);
|
||||
this.visible = true;
|
||||
},
|
||||
submitForm () {
|
||||
const that = this;
|
||||
// 触发表单验证
|
||||
this.$refs.form.validate(valid => {
|
||||
if (valid) {
|
||||
that.confirmLoading = true;
|
||||
let httpurl = '';
|
||||
let method = '';
|
||||
if(!this.model.id){
|
||||
httpurl+=this.url.add;
|
||||
method = 'post';
|
||||
}else{
|
||||
httpurl+=this.url.edit;
|
||||
method = 'put';
|
||||
}
|
||||
httpAction(httpurl,this.model,method).then((res)=>{
|
||||
if(res.success){
|
||||
that.$message.success(res.message);
|
||||
that.$emit('ok');
|
||||
}else{
|
||||
that.$message.warning(res.message);
|
||||
}
|
||||
}).finally(() => {
|
||||
that.confirmLoading = false;
|
||||
})
|
||||
}
|
||||
|
||||
})
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
+60
@@ -0,0 +1,60 @@
|
||||
<template>
|
||||
<j-modal
|
||||
:title="title"
|
||||
:width="width"
|
||||
:visible="visible"
|
||||
switchFullscreen
|
||||
@ok="handleOk"
|
||||
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
|
||||
@cancel="handleCancel"
|
||||
cancelText="关闭">
|
||||
<pay-mail-bill-project-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></pay-mail-bill-project-form>
|
||||
</j-modal>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
import PayMailBillProjectForm from './PayMailBillProjectForm'
|
||||
export default {
|
||||
name: 'PayMailBillProjectModal',
|
||||
components: {
|
||||
PayMailBillProjectForm
|
||||
},
|
||||
data () {
|
||||
return {
|
||||
title:'',
|
||||
width:800,
|
||||
visible: false,
|
||||
disableSubmit: false
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
add () {
|
||||
this.visible=true
|
||||
this.$nextTick(()=>{
|
||||
this.$refs.realForm.add();
|
||||
})
|
||||
},
|
||||
edit (record) {
|
||||
this.visible=true
|
||||
this.$nextTick(()=>{
|
||||
this.$refs.realForm.edit(record);
|
||||
})
|
||||
},
|
||||
close () {
|
||||
this.$emit('close');
|
||||
this.visible = false;
|
||||
},
|
||||
handleOk () {
|
||||
this.$refs.realForm.submitForm();
|
||||
},
|
||||
submitCallback(){
|
||||
this.$emit('ok');
|
||||
this.visible = false;
|
||||
},
|
||||
handleCancel () {
|
||||
this.close()
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
+84
@@ -0,0 +1,84 @@
|
||||
<template>
|
||||
<a-drawer
|
||||
:title="title"
|
||||
:width="width"
|
||||
placement="right"
|
||||
:closable="false"
|
||||
@close="close"
|
||||
destroyOnClose
|
||||
:visible="visible">
|
||||
<pay-mail-bill-project-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></pay-mail-bill-project-form>
|
||||
<div class="drawer-footer">
|
||||
<a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
|
||||
<a-button v-if="!disableSubmit" @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
|
||||
</div>
|
||||
</a-drawer>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
import PayMailBillProjectForm from './PayMailBillProjectForm'
|
||||
|
||||
export default {
|
||||
name: 'PayMailBillProjectModal',
|
||||
components: {
|
||||
PayMailBillProjectForm
|
||||
},
|
||||
data () {
|
||||
return {
|
||||
title:"操作",
|
||||
width:800,
|
||||
visible: false,
|
||||
disableSubmit: false
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
add () {
|
||||
this.visible=true
|
||||
this.$nextTick(()=>{
|
||||
this.$refs.realForm.add();
|
||||
})
|
||||
},
|
||||
edit (record) {
|
||||
this.visible=true
|
||||
this.$nextTick(()=>{
|
||||
this.$refs.realForm.edit(record);
|
||||
});
|
||||
},
|
||||
close () {
|
||||
this.$emit('close');
|
||||
this.visible = false;
|
||||
},
|
||||
submitCallback(){
|
||||
this.$emit('ok');
|
||||
this.visible = false;
|
||||
},
|
||||
handleOk () {
|
||||
this.$refs.realForm.submitForm();
|
||||
},
|
||||
handleCancel () {
|
||||
this.close()
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="less" scoped>
|
||||
/** Button按钮间距 */
|
||||
.ant-btn {
|
||||
margin-left: 30px;
|
||||
margin-bottom: 30px;
|
||||
float: right;
|
||||
}
|
||||
.drawer-footer{
|
||||
position: absolute;
|
||||
bottom: -8px;
|
||||
width: 100%;
|
||||
border-top: 1px solid #e8e8e8;
|
||||
padding: 10px 16px;
|
||||
text-align: right;
|
||||
left: 0;
|
||||
background: #fff;
|
||||
border-radius: 0 0 2px 2px;
|
||||
}
|
||||
</style>
|
||||
+148
@@ -0,0 +1,148 @@
|
||||
package com.jero.paymentRecord.controller;
|
||||
|
||||
import java.util.Arrays;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.common.system.base.controller.JeroController;
|
||||
import com.jero.common.system.query.QueryGenerator;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.jero.paymentRecord.entity.PayPaymentRecord;
|
||||
import com.jero.paymentRecord.service.IPayPaymentRecordService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import org.springframework.web.servlet.ModelAndView;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
|
||||
/**
|
||||
* @Description: pay_payment_record
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2021-08-31
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Api(tags="pay_payment_record")
|
||||
@RestController
|
||||
@RequestMapping("/paymentRecord/payPaymentRecord")
|
||||
@Slf4j
|
||||
public class PayPaymentRecordController extends JeroController<PayPaymentRecord, IPayPaymentRecordService> {
|
||||
@Autowired
|
||||
private IPayPaymentRecordService payPaymentRecordService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
*
|
||||
* @param payPaymentRecord
|
||||
* @param pageNo
|
||||
* @param pageSize
|
||||
* @param req
|
||||
* @return
|
||||
*/
|
||||
@ApiOperation(value="pay_payment_record-分页列表查询", notes="pay_payment_record-分页列表查询")
|
||||
@GetMapping(value = "/list")
|
||||
public Result<?> queryPageList(PayPaymentRecord payPaymentRecord,
|
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
QueryWrapper<PayPaymentRecord> queryWrapper = QueryGenerator.initQueryWrapper(payPaymentRecord, req.getParameterMap());
|
||||
Page<PayPaymentRecord> page = new Page<PayPaymentRecord>(pageNo, pageSize);
|
||||
IPage<PayPaymentRecord> pageList = payPaymentRecordService.page(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加
|
||||
*
|
||||
* @param payPaymentRecord
|
||||
* @return
|
||||
*/
|
||||
@ApiOperation(value="pay_payment_record-添加", notes="pay_payment_record-添加")
|
||||
@PostMapping(value = "/add")
|
||||
public Result<?> add(@RequestBody PayPaymentRecord payPaymentRecord) {
|
||||
payPaymentRecordService.save(payPaymentRecord);
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
*
|
||||
* @param payPaymentRecord
|
||||
* @return
|
||||
*/
|
||||
@ApiOperation(value="pay_payment_record-编辑", notes="pay_payment_record-编辑")
|
||||
@PutMapping(value = "/edit")
|
||||
public Result<?> edit(@RequestBody PayPaymentRecord payPaymentRecord) {
|
||||
payPaymentRecordService.updateById(payPaymentRecord);
|
||||
return Result.OK("编辑成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id删除
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@ApiOperation(value="pay_payment_record-通过id删除", notes="pay_payment_record-通过id删除")
|
||||
@DeleteMapping(value = "/delete")
|
||||
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
|
||||
payPaymentRecordService.removeById(id);
|
||||
return Result.OK("删除成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除
|
||||
*
|
||||
* @param ids
|
||||
* @return
|
||||
*/
|
||||
@ApiOperation(value="pay_payment_record-批量删除", notes="pay_payment_record-批量删除")
|
||||
@DeleteMapping(value = "/deleteBatch")
|
||||
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
||||
this.payPaymentRecordService.removeByIds(Arrays.asList(ids.split(",")));
|
||||
return Result.OK("批量删除成功!");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过id查询
|
||||
*
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@ApiOperation(value="pay_payment_record-通过id查询", notes="pay_payment_record-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
|
||||
PayPaymentRecord payPaymentRecord = payPaymentRecordService.getById(id);
|
||||
if(payPaymentRecord==null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
return Result.OK(payPaymentRecord);
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出excel
|
||||
*
|
||||
* @param request
|
||||
* @param payPaymentRecord
|
||||
*/
|
||||
@RequestMapping(value = "/exportXls")
|
||||
public ModelAndView exportXls(HttpServletRequest request, PayPaymentRecord payPaymentRecord) {
|
||||
return super.exportXls(request, payPaymentRecord, PayPaymentRecord.class, "pay_payment_record");
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过excel导入数据
|
||||
*
|
||||
* @param request
|
||||
* @param response
|
||||
* @return
|
||||
*/
|
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
|
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
|
||||
return super.importExcel(request, response, PayPaymentRecord.class);
|
||||
}
|
||||
|
||||
}
|
||||
+68
@@ -0,0 +1,68 @@
|
||||
package com.jero.paymentRecord.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import lombok.Data;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
import org.jeecgframework.poi.excel.annotation.Excel;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.experimental.Accessors;
|
||||
|
||||
/**
|
||||
* @Description: pay_payment_record
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2021-08-31
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("pay_payment_record")
|
||||
@Accessors(chain = true)
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@ApiModel(value="pay_payment_record对象", description="pay_payment_record")
|
||||
public class PayPaymentRecord implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**id*/
|
||||
@TableId(type = IdType.ASSIGN_ID)
|
||||
@ApiModelProperty(value = "id")
|
||||
private java.lang.String id;
|
||||
/**项目id*/
|
||||
@Excel(name = "项目id", width = 15)
|
||||
@ApiModelProperty(value = "项目id")
|
||||
private java.lang.String projectId;
|
||||
/**到账金额*/
|
||||
@Excel(name = "到账金额", width = 15)
|
||||
@ApiModelProperty(value = "到账金额")
|
||||
private java.lang.Integer amountReceived;
|
||||
/**来款日期*/
|
||||
@Excel(name = "来款日期", width = 15, format = "yyyy-MM-dd")
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "来款日期")
|
||||
private java.util.Date paymentDate;
|
||||
/**备注*/
|
||||
@Excel(name = "备注", width = 15)
|
||||
@ApiModelProperty(value = "备注")
|
||||
private java.lang.String remark;
|
||||
/**创建人*/
|
||||
@ApiModelProperty(value = "创建人")
|
||||
private java.lang.String createBy;
|
||||
/**创建日期*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "创建日期")
|
||||
private java.util.Date createTime;
|
||||
/**更新人*/
|
||||
@ApiModelProperty(value = "更新人")
|
||||
private java.lang.String updateBy;
|
||||
/**更新日期*/
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
@ApiModelProperty(value = "更新日期")
|
||||
private java.util.Date updateTime;
|
||||
}
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
package com.jero.paymentRecord.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.jero.paymentRecord.entity.PayPaymentRecord;
|
||||
|
||||
/**
|
||||
* @Description: pay_payment_record
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2021-08-31
|
||||
* @Version: V1.0
|
||||
*/
|
||||
public interface PayPaymentRecordMapper extends BaseMapper<PayPaymentRecord> {
|
||||
|
||||
}
|
||||
+5
@@ -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.jero.paymentRecord.mapper.PayPaymentRecordMapper">
|
||||
|
||||
</mapper>
|
||||
+14
@@ -0,0 +1,14 @@
|
||||
package com.jero.paymentRecord.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.jero.paymentRecord.entity.PayPaymentRecord;
|
||||
|
||||
/**
|
||||
* @Description: pay_payment_record
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2021-08-31
|
||||
* @Version: V1.0
|
||||
*/
|
||||
public interface IPayPaymentRecordService extends IService<PayPaymentRecord> {
|
||||
|
||||
}
|
||||
+18
@@ -0,0 +1,18 @@
|
||||
package com.jero.paymentRecord.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.jero.paymentRecord.entity.PayPaymentRecord;
|
||||
import com.jero.paymentRecord.mapper.PayPaymentRecordMapper;
|
||||
import com.jero.paymentRecord.service.IPayPaymentRecordService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
/**
|
||||
* @Description: pay_payment_record
|
||||
* @Author: jeecg-boot
|
||||
* @Date: 2021-08-31
|
||||
* @Version: V1.0
|
||||
*/
|
||||
@Service
|
||||
public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMapper, PayPaymentRecord> implements IPayPaymentRecordService {
|
||||
|
||||
}
|
||||
+192
@@ -0,0 +1,192 @@
|
||||
<template>
|
||||
<a-card :bordered="false">
|
||||
<!-- 查询区域 -->
|
||||
<div class="table-page-search-wrapper">
|
||||
<a-form layout="inline" @keyup.enter.native="searchQuery">
|
||||
<a-row :gutter="24">
|
||||
</a-row>
|
||||
</a-form>
|
||||
</div>
|
||||
<!-- 查询区域-END -->
|
||||
|
||||
<!-- 操作按钮区域 -->
|
||||
<div class="table-operator">
|
||||
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
|
||||
<a-button type="primary" icon="download" @click="handleExportXls('pay_payment_record')">导出</a-button>
|
||||
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
|
||||
<a-button type="primary" icon="import">导入</a-button>
|
||||
</a-upload>
|
||||
<!-- 高级查询区域 -->
|
||||
<j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
|
||||
<a-dropdown v-if="selectedRowKeys.length > 0">
|
||||
<a-menu slot="overlay">
|
||||
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
|
||||
</a-menu>
|
||||
<a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
|
||||
</a-dropdown>
|
||||
</div>
|
||||
|
||||
<!-- table区域-begin -->
|
||||
<div>
|
||||
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
|
||||
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
|
||||
<a style="margin-left: 24px" @click="onClearSelected">清空</a>
|
||||
</div>
|
||||
|
||||
<a-table
|
||||
ref="table"
|
||||
size="middle"
|
||||
:scroll="{x:true}"
|
||||
bordered
|
||||
rowKey="id"
|
||||
:columns="columns"
|
||||
:dataSource="dataSource"
|
||||
:pagination="ipagination"
|
||||
:loading="loading"
|
||||
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
|
||||
class="j-table-force-nowrap"
|
||||
@change="handleTableChange">
|
||||
|
||||
<template slot="htmlSlot" slot-scope="text">
|
||||
<div v-html="text"></div>
|
||||
</template>
|
||||
<template slot="imgSlot" slot-scope="text">
|
||||
<span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
|
||||
<img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
|
||||
</template>
|
||||
<template slot="fileSlot" slot-scope="text">
|
||||
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
|
||||
<a-button
|
||||
v-else
|
||||
:ghost="true"
|
||||
type="primary"
|
||||
icon="download"
|
||||
size="small"
|
||||
@click="downloadFile(text)">
|
||||
下载
|
||||
</a-button>
|
||||
</template>
|
||||
|
||||
<span slot="action" slot-scope="text, record">
|
||||
<a @click="handleEdit(record)">编辑</a>
|
||||
|
||||
<a-divider type="vertical" />
|
||||
<a-dropdown>
|
||||
<a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
|
||||
<a-menu slot="overlay">
|
||||
<a-menu-item>
|
||||
<a @click="handleDetail(record)">详情</a>
|
||||
</a-menu-item>
|
||||
<a-menu-item>
|
||||
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
|
||||
<a>删除</a>
|
||||
</a-popconfirm>
|
||||
</a-menu-item>
|
||||
</a-menu>
|
||||
</a-dropdown>
|
||||
</span>
|
||||
|
||||
</a-table>
|
||||
</div>
|
||||
|
||||
<pay-payment-record-modal ref="modalForm" @ok="modalFormOk"></pay-payment-record-modal>
|
||||
</a-card>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
import '@/assets/less/TableExpand.less'
|
||||
import { mixinDevice } from '@/utils/mixin'
|
||||
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
|
||||
import PayPaymentRecordModal from './modules/PayPaymentRecordModal'
|
||||
|
||||
export default {
|
||||
name: 'PayPaymentRecordList',
|
||||
mixins:[JeecgListMixin, mixinDevice],
|
||||
components: {
|
||||
PayPaymentRecordModal
|
||||
},
|
||||
data () {
|
||||
return {
|
||||
description: 'pay_payment_record管理页面',
|
||||
// 表头
|
||||
columns: [
|
||||
{
|
||||
title: '#',
|
||||
dataIndex: '',
|
||||
key:'rowIndex',
|
||||
width:60,
|
||||
align:"center",
|
||||
customRender:function (t,r,index) {
|
||||
return parseInt(index)+1;
|
||||
}
|
||||
},
|
||||
{
|
||||
title:'项目id',
|
||||
align:"center",
|
||||
dataIndex: 'projectId'
|
||||
},
|
||||
{
|
||||
title:'到账金额',
|
||||
align:"center",
|
||||
dataIndex: 'amountReceived'
|
||||
},
|
||||
{
|
||||
title:'来款日期',
|
||||
align:"center",
|
||||
dataIndex: 'paymentDate',
|
||||
customRender:function (text) {
|
||||
return !text?"":(text.length>10?text.substr(0,10):text)
|
||||
}
|
||||
},
|
||||
{
|
||||
title:'备注',
|
||||
align:"center",
|
||||
dataIndex: 'remark'
|
||||
},
|
||||
{
|
||||
title: '操作',
|
||||
dataIndex: 'action',
|
||||
align:"center",
|
||||
fixed:"right",
|
||||
width:147,
|
||||
scopedSlots: { customRender: 'action' }
|
||||
}
|
||||
],
|
||||
url: {
|
||||
list: "/paymentRecord/payPaymentRecord/list",
|
||||
delete: "/paymentRecord/payPaymentRecord/delete",
|
||||
deleteBatch: "/paymentRecord/payPaymentRecord/deleteBatch",
|
||||
exportXlsUrl: "/paymentRecord/payPaymentRecord/exportXls",
|
||||
importExcelUrl: "paymentRecord/payPaymentRecord/importExcel",
|
||||
|
||||
},
|
||||
dictOptions:{},
|
||||
superFieldList:[],
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.getSuperFieldList();
|
||||
},
|
||||
computed: {
|
||||
importExcelUrl: function(){
|
||||
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
initDictConfig(){
|
||||
},
|
||||
getSuperFieldList(){
|
||||
let fieldList=[];
|
||||
fieldList.push({type:'string',value:'projectId',text:'项目id'})
|
||||
fieldList.push({type:'int',value:'amountReceived',text:'到账金额'})
|
||||
fieldList.push({type:'date',value:'paymentDate',text:'来款日期'})
|
||||
fieldList.push({type:'string',value:'remark',text:'备注'})
|
||||
this.superFieldList = fieldList
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<style scoped>
|
||||
@import '~@assets/less/common.less';
|
||||
</style>
|
||||
+119
@@ -0,0 +1,119 @@
|
||||
<template>
|
||||
<a-spin :spinning="confirmLoading">
|
||||
<j-form-container :disabled="formDisabled">
|
||||
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
|
||||
<a-row>
|
||||
<a-col :span="24">
|
||||
<a-form-model-item label="项目id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="projectId">
|
||||
<a-input v-model="model.projectId" placeholder="请输入项目id" ></a-input>
|
||||
</a-form-model-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-model-item label="到账金额" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="amountReceived">
|
||||
<a-input-number v-model="model.amountReceived" placeholder="请输入到账金额" style="width: 100%" />
|
||||
</a-form-model-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-model-item label="来款日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="paymentDate">
|
||||
<j-date placeholder="请选择来款日期" v-model="model.paymentDate" style="width: 100%" />
|
||||
</a-form-model-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
|
||||
<a-input v-model="model.remark" placeholder="请输入备注" ></a-input>
|
||||
</a-form-model-item>
|
||||
</a-col>
|
||||
</a-row>
|
||||
</a-form-model>
|
||||
</j-form-container>
|
||||
</a-spin>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
import { httpAction, getAction } from '@/api/manage'
|
||||
import { validateDuplicateValue } from '@/utils/util'
|
||||
|
||||
export default {
|
||||
name: 'PayPaymentRecordForm',
|
||||
components: {
|
||||
},
|
||||
props: {
|
||||
//表单禁用
|
||||
disabled: {
|
||||
type: Boolean,
|
||||
default: false,
|
||||
required: false
|
||||
}
|
||||
},
|
||||
data () {
|
||||
return {
|
||||
model:{
|
||||
},
|
||||
labelCol: {
|
||||
xs: { span: 24 },
|
||||
sm: { span: 5 },
|
||||
},
|
||||
wrapperCol: {
|
||||
xs: { span: 24 },
|
||||
sm: { span: 16 },
|
||||
},
|
||||
confirmLoading: false,
|
||||
validatorRules: {
|
||||
},
|
||||
url: {
|
||||
add: "/paymentRecord/payPaymentRecord/add",
|
||||
edit: "/paymentRecord/payPaymentRecord/edit",
|
||||
queryById: "/paymentRecord/payPaymentRecord/queryById"
|
||||
}
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
formDisabled(){
|
||||
return this.disabled
|
||||
},
|
||||
},
|
||||
created () {
|
||||
//备份model原始值
|
||||
this.modelDefault = JSON.parse(JSON.stringify(this.model));
|
||||
},
|
||||
methods: {
|
||||
add () {
|
||||
this.edit(this.modelDefault);
|
||||
},
|
||||
edit (record) {
|
||||
this.model = Object.assign({}, record);
|
||||
this.visible = true;
|
||||
},
|
||||
submitForm () {
|
||||
const that = this;
|
||||
// 触发表单验证
|
||||
this.$refs.form.validate(valid => {
|
||||
if (valid) {
|
||||
that.confirmLoading = true;
|
||||
let httpurl = '';
|
||||
let method = '';
|
||||
if(!this.model.id){
|
||||
httpurl+=this.url.add;
|
||||
method = 'post';
|
||||
}else{
|
||||
httpurl+=this.url.edit;
|
||||
method = 'put';
|
||||
}
|
||||
httpAction(httpurl,this.model,method).then((res)=>{
|
||||
if(res.success){
|
||||
that.$message.success(res.message);
|
||||
that.$emit('ok');
|
||||
}else{
|
||||
that.$message.warning(res.message);
|
||||
}
|
||||
}).finally(() => {
|
||||
that.confirmLoading = false;
|
||||
})
|
||||
}
|
||||
|
||||
})
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
+60
@@ -0,0 +1,60 @@
|
||||
<template>
|
||||
<j-modal
|
||||
:title="title"
|
||||
:width="width"
|
||||
:visible="visible"
|
||||
switchFullscreen
|
||||
@ok="handleOk"
|
||||
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
|
||||
@cancel="handleCancel"
|
||||
cancelText="关闭">
|
||||
<pay-payment-record-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></pay-payment-record-form>
|
||||
</j-modal>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
import PayPaymentRecordForm from './PayPaymentRecordForm'
|
||||
export default {
|
||||
name: 'PayPaymentRecordModal',
|
||||
components: {
|
||||
PayPaymentRecordForm
|
||||
},
|
||||
data () {
|
||||
return {
|
||||
title:'',
|
||||
width:800,
|
||||
visible: false,
|
||||
disableSubmit: false
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
add () {
|
||||
this.visible=true
|
||||
this.$nextTick(()=>{
|
||||
this.$refs.realForm.add();
|
||||
})
|
||||
},
|
||||
edit (record) {
|
||||
this.visible=true
|
||||
this.$nextTick(()=>{
|
||||
this.$refs.realForm.edit(record);
|
||||
})
|
||||
},
|
||||
close () {
|
||||
this.$emit('close');
|
||||
this.visible = false;
|
||||
},
|
||||
handleOk () {
|
||||
this.$refs.realForm.submitForm();
|
||||
},
|
||||
submitCallback(){
|
||||
this.$emit('ok');
|
||||
this.visible = false;
|
||||
},
|
||||
handleCancel () {
|
||||
this.close()
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
+84
@@ -0,0 +1,84 @@
|
||||
<template>
|
||||
<a-drawer
|
||||
:title="title"
|
||||
:width="width"
|
||||
placement="right"
|
||||
:closable="false"
|
||||
@close="close"
|
||||
destroyOnClose
|
||||
:visible="visible">
|
||||
<pay-payment-record-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></pay-payment-record-form>
|
||||
<div class="drawer-footer">
|
||||
<a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
|
||||
<a-button v-if="!disableSubmit" @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
|
||||
</div>
|
||||
</a-drawer>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
import PayPaymentRecordForm from './PayPaymentRecordForm'
|
||||
|
||||
export default {
|
||||
name: 'PayPaymentRecordModal',
|
||||
components: {
|
||||
PayPaymentRecordForm
|
||||
},
|
||||
data () {
|
||||
return {
|
||||
title:"操作",
|
||||
width:800,
|
||||
visible: false,
|
||||
disableSubmit: false
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
add () {
|
||||
this.visible=true
|
||||
this.$nextTick(()=>{
|
||||
this.$refs.realForm.add();
|
||||
})
|
||||
},
|
||||
edit (record) {
|
||||
this.visible=true
|
||||
this.$nextTick(()=>{
|
||||
this.$refs.realForm.edit(record);
|
||||
});
|
||||
},
|
||||
close () {
|
||||
this.$emit('close');
|
||||
this.visible = false;
|
||||
},
|
||||
submitCallback(){
|
||||
this.$emit('ok');
|
||||
this.visible = false;
|
||||
},
|
||||
handleOk () {
|
||||
this.$refs.realForm.submitForm();
|
||||
},
|
||||
handleCancel () {
|
||||
this.close()
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="less" scoped>
|
||||
/** Button按钮间距 */
|
||||
.ant-btn {
|
||||
margin-left: 30px;
|
||||
margin-bottom: 30px;
|
||||
float: right;
|
||||
}
|
||||
.drawer-footer{
|
||||
position: absolute;
|
||||
bottom: -8px;
|
||||
width: 100%;
|
||||
border-top: 1px solid #e8e8e8;
|
||||
padding: 10px 16px;
|
||||
text-align: right;
|
||||
left: 0;
|
||||
background: #fff;
|
||||
border-radius: 0 0 2px 2px;
|
||||
}
|
||||
</style>
|
||||
+15
-15
@@ -1,4 +1,4 @@
|
||||
package com.jero.commonProject.common;
|
||||
package com.jero.project.common;
|
||||
|
||||
public class PayProjectCommon {
|
||||
|
||||
@@ -11,40 +11,40 @@ public class PayProjectCommon {
|
||||
*/
|
||||
public final static Integer PACKAGING0 = 0;
|
||||
/**
|
||||
* 到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））
|
||||
* 到账（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志））
|
||||
*/
|
||||
public final static Integer IN_ACCOUNT0 = 0;
|
||||
/**
|
||||
* 到账（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志））
|
||||
*/
|
||||
public final static Integer IN_ACCOUNT1 = 1;
|
||||
/**
|
||||
* 到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））
|
||||
* 到账（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志））
|
||||
*/
|
||||
public final static Integer IN_ACCOUNT2 = 2;
|
||||
/**
|
||||
* 到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））
|
||||
* 开票（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志））
|
||||
*/
|
||||
public final static Integer IN_ACCOUNT3 = 3;
|
||||
public final static Integer MAKE_INVOICE0 = 0;
|
||||
/**
|
||||
* 开票（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））
|
||||
* 开票（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志））
|
||||
*/
|
||||
public final static Integer MAKE_INVOICE1 = 1;
|
||||
/**
|
||||
* 开票（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））
|
||||
* 开票（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志））
|
||||
*/
|
||||
public final static Integer MAKE_INVOICE2 = 2;
|
||||
/**
|
||||
* 开票（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））
|
||||
* 邮寄（（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志）））
|
||||
*/
|
||||
public final static Integer MAKE_INVOICE3 = 3;
|
||||
public final static Integer MAIL0 = 0;
|
||||
/**
|
||||
* 邮寄（（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志）））
|
||||
* 邮寄（（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志）））
|
||||
*/
|
||||
public final static Integer MAIL1 = 1;
|
||||
/**
|
||||
* 邮寄（（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志）））
|
||||
* 邮寄（（1：全额（对勾），0：0（X），2：>0 && <总金额（半满标志）））
|
||||
*/
|
||||
public final static Integer MAIL2 = 2;
|
||||
/**
|
||||
* 邮寄（（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志）））
|
||||
*/
|
||||
public final static Integer MAIL3 = 3;
|
||||
|
||||
}
|
||||
+31
-12
@@ -1,29 +1,31 @@
|
||||
package com.jero.commonProject.controller;
|
||||
package com.jero.project.controller;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.common.exception.JeroBootException;
|
||||
import com.jero.common.system.base.controller.JeroController;
|
||||
import com.jero.common.util.ValidUtil;
|
||||
import com.jero.commonProject.common.PayProjectCommon;
|
||||
import com.jero.commonProject.service.IPayCommonProjectService;
|
||||
import com.jero.commonProject.entity.PayCommonProject;
|
||||
import com.jero.project.common.PayProjectCommon;
|
||||
import com.jero.project.service.IPayCommonProjectService;
|
||||
import com.jero.project.entity.PayCommonProject;
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.jero.company.service.IPayCompanyManagementService;
|
||||
import com.jero.company.service.IPayContactsManagementService;
|
||||
import com.jero.companyTemporary.entity.PayCompanyManagementTemporary;
|
||||
import com.jero.companyTemporary.entity.PayContactsManagementTemporary;
|
||||
import com.jero.companyTemporary.service.IPayCompanyManagementTemporaryService;
|
||||
import com.jero.companyTemporary.service.IPayContactsManagementTemporaryService;
|
||||
import com.jero.modules.system.entity.SysUser;
|
||||
import com.jero.modules.system.service.ISysUserService;
|
||||
import com.jero.paymentRecord.entity.PayPaymentRecord;
|
||||
import com.jero.paymentRecord.service.IPayPaymentRecordService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -52,8 +54,8 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
|
||||
private IPayCompanyManagementTemporaryService payCompanyManagementTemporaryService;
|
||||
@Autowired
|
||||
private IPayContactsManagementTemporaryService payContactsManagementTemporaryService;
|
||||
|
||||
|
||||
@Autowired
|
||||
private IPayPaymentRecordService payPaymentRecordService;
|
||||
|
||||
/**
|
||||
* 分页列表查询
|
||||
@@ -110,10 +112,10 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
|
||||
return Result.error("来款项目已存在！");
|
||||
}
|
||||
payCommonProject = setPayCommonProject(payCommonProject);
|
||||
payCommonProject.setPackaging(PayProjectCommon.PACKAGING0);
|
||||
payCommonProject.setInAccount(PayProjectCommon.IN_ACCOUNT2);
|
||||
payCommonProject.setMakeInvoice(PayProjectCommon.MAKE_INVOICE2);
|
||||
payCommonProject.setMail(PayProjectCommon.MAIL2);
|
||||
payCommonProject.setPack(PayProjectCommon.PACKAGING0);
|
||||
payCommonProject.setInAccount(PayProjectCommon.IN_ACCOUNT0);
|
||||
payCommonProject.setMakeInvoice(PayProjectCommon.MAKE_INVOICE0);
|
||||
payCommonProject.setMail(PayProjectCommon.MAIL0);
|
||||
payCommonProjectService.save(payCommonProject);
|
||||
return Result.OK("添加成功！");
|
||||
}
|
||||
@@ -244,10 +246,27 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
|
||||
@ApiOperation(value="普通项目管理-通过id查询", notes="普通项目管理-通过id查询")
|
||||
@GetMapping(value = "/queryById")
|
||||
public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
|
||||
if(StringUtils.isBlank(id)){
|
||||
return Result.error("id不能为空!");
|
||||
}
|
||||
PayCommonProject payCommonProject = payCommonProjectService.getById(id);
|
||||
if(payCommonProject==null) {
|
||||
return Result.error("未找到对应数据");
|
||||
}
|
||||
JSONObject json = new JSONObject();
|
||||
// 企业信息
|
||||
PayCompanyManagementTemporary payCompanyManagementTemporary = payCompanyManagementTemporaryService.getById(payCommonProject.getChargeCompanyId());
|
||||
json.put("company",payCompanyManagementTemporary);
|
||||
// 联系人信息c
|
||||
PayContactsManagementTemporary payContactsManagementTemporary = payContactsManagementTemporaryService.getById(payCommonProject.getContactsId());
|
||||
json.put("contacts",payContactsManagementTemporary);
|
||||
// 到账信息
|
||||
LambdaQueryWrapper<PayPaymentRecord> queryWrapperPayPaymentRecord = new LambdaQueryWrapper<>();
|
||||
queryWrapperPayPaymentRecord.eq(PayPaymentRecord::getProjectId,payCommonProject.getId());
|
||||
List<PayPaymentRecord> payPaymentRecordList = payPaymentRecordService.list(queryWrapperPayPaymentRecord);
|
||||
json.put("payPaymentRecord",payPaymentRecordList);
|
||||
// todo 开票邮寄记录
|
||||
// json.put("payPaymentRecord",payPaymentRecordList);
|
||||
return Result.OK(payCommonProject);
|
||||
}
|
||||
|
||||
+3
-4
@@ -1,4 +1,4 @@
|
||||
package com.jero.commonProject.controller;
|
||||
package com.jero.project.controller;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
@@ -12,9 +12,8 @@ import com.jero.common.exception.JeroBootException;
|
||||
import com.jero.common.system.base.controller.JeroController;
|
||||
import com.jero.common.system.query.QueryGenerator;
|
||||
import com.jero.common.util.ValidUtil;
|
||||
import com.jero.commonProject.entity.PayCommonProject;
|
||||
import com.jero.commonProject.service.IPayWorkingGroupService;
|
||||
import com.jero.commonProject.entity.PayWorkingGroup;
|
||||
import com.jero.project.service.IPayWorkingGroupService;
|
||||
import com.jero.project.entity.PayWorkingGroup;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
+3
-3
@@ -1,4 +1,4 @@
|
||||
package com.jero.commonProject.controller;
|
||||
package com.jero.project.controller;
|
||||
|
||||
import java.util.Arrays;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
@@ -7,8 +7,8 @@ import javax.servlet.http.HttpServletResponse;
|
||||
import com.jero.common.api.vo.Result;
|
||||
import com.jero.common.system.base.controller.JeroController;
|
||||
import com.jero.common.system.query.QueryGenerator;
|
||||
import com.jero.commonProject.entity.PayWorkingGroupSubitem;
|
||||
import com.jero.commonProject.service.IPayWorkingGroupSubitemService;
|
||||
import com.jero.project.entity.PayWorkingGroupSubitem;
|
||||
import com.jero.project.service.IPayWorkingGroupSubitemService;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
+3
-3
@@ -1,4 +1,4 @@
|
||||
package com.jero.commonProject.entity;
|
||||
package com.jero.project.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
@@ -108,12 +108,12 @@ public class PayCommonProject implements Serializable {
|
||||
/**打包（1：是，0：否）*/
|
||||
@Excel(name = "打包（1：是，0：否）", width = 15)
|
||||
@ApiModelProperty(value = "打包（1：是，0：否）")
|
||||
private Integer packaging;
|
||||
private Integer pack;
|
||||
/**需要发票（1：增值税普通发票，2：增值税专用发票，3：否）*/
|
||||
@Excel(name = "需要发票（1：增值税普通发票，2：增值税专用发票，3：否）", width = 15)
|
||||
@ApiModelProperty(value = "需要发票（1：增值税普通发票，2：增值税专用发票，3：否）")
|
||||
@NotNull(message = "需要发票不能为空！")
|
||||
private Integer invoice;
|
||||
private Integer needInvoice;
|
||||
/**到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））*/
|
||||
@Excel(name = "到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））", width = 15)
|
||||
@ApiModelProperty(value = "到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））")
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.jero.commonProject.entity;
|
||||
package com.jero.project.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.sql.Date;
|
||||
+3
-3
@@ -1,4 +1,4 @@
|
||||
package com.jero.commonProject.entity;
|
||||
package com.jero.project.entity;
|
||||
|
||||
import java.io.Serializable;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
@@ -102,11 +102,11 @@ public class PayWorkingGroupSubitem implements Serializable {
|
||||
/**打包（1：是，0：否）*/
|
||||
@Excel(name = "打包（1：是，0：否）", width = 15)
|
||||
@ApiModelProperty(value = "打包（1：是，0：否）")
|
||||
private java.lang.Integer packaging;
|
||||
private java.lang.Integer pack;
|
||||
/**需要发票（1：增值税普通发票，2：增值税专用发票，3：否）*/
|
||||
@Excel(name = "需要发票（1：增值税普通发票，2：增值税专用发票，3：否）", width = 15)
|
||||
@ApiModelProperty(value = "需要发票（1：增值税普通发票，2：增值税专用发票，3：否）")
|
||||
private java.lang.Integer invoice;
|
||||
private java.lang.Integer needInvoice;
|
||||
/**到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））*/
|
||||
@Excel(name = "到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））", width = 15)
|
||||
@ApiModelProperty(value = "到账（1：全额（对勾），2：0（X），3：>0 && <总金额（半满标志））")
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
package com.jero.commonProject.mapper;
|
||||
package com.jero.project.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.jero.commonProject.entity.PayCommonProject;
|
||||
import com.jero.project.entity.PayCommonProject;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.jero.commonProject.mapper;
|
||||
package com.jero.project.mapper;
|
||||
|
||||
import com.jero.commonProject.entity.PayWorkingGroup;
|
||||
import com.jero.project.entity.PayWorkingGroup;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
|
||||
/**
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.jero.commonProject.mapper;
|
||||
package com.jero.project.mapper;
|
||||
|
||||
import com.jero.commonProject.entity.PayWorkingGroupSubitem;
|
||||
import com.jero.project.entity.PayWorkingGroupSubitem;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
|
||||
/**
|
||||
+4
-4
@@ -1,8 +1,8 @@
|
||||
<?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.jero.commonProject.mapper.PayCommonProjectMapper">
|
||||
<mapper namespace="com.jero.project.mapper.PayCommonProjectMapper">
|
||||
|
||||
<select id="queryPageList" resultType="com.jero.commonProject.entity.PayCommonProject">
|
||||
<select id="queryPageList" resultType="com.jero.project.entity.PayCommonProject">
|
||||
SELECT
|
||||
pcp.id,
|
||||
pcp.charge_project AS chargeProject,
|
||||
@@ -18,8 +18,8 @@
|
||||
pcp.paid_amount AS paidAmount,
|
||||
pcp.mail_contacts_id AS mailContactsId,
|
||||
pcp.mail_contacts_name AS mailContactsName,
|
||||
pcp.packaging,
|
||||
pcp.invoice,
|
||||
pcp.pack,
|
||||
pcp.need_invoice AS needInvoice,
|
||||
pcp.in_account AS inAccount,
|
||||
pcp.make_invoice AS makeInvoice,
|
||||
pcp.mail,
|
||||
+1
-1
@@ -1,5 +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.jero.commonProject.mapper.PayWorkingGroupMapper">
|
||||
<mapper namespace="com.jero.project.mapper.PayWorkingGroupMapper">
|
||||
|
||||
</mapper>
|
||||
+1
-1
@@ -1,5 +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.jero.commonProject.mapper.PayWorkingGroupSubitemMapper">
|
||||
<mapper namespace="com.jero.project.mapper.PayWorkingGroupSubitemMapper">
|
||||
|
||||
</mapper>
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
package com.jero.commonProject.service;
|
||||
package com.jero.project.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.jero.commonProject.entity.PayCommonProject;
|
||||
import com.jero.project.entity.PayCommonProject;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
||||
/**
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.jero.commonProject.service;
|
||||
package com.jero.project.service;
|
||||
|
||||
import com.jero.commonProject.entity.PayWorkingGroup;
|
||||
import com.jero.project.entity.PayWorkingGroup;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
||||
/**
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.jero.commonProject.service;
|
||||
package com.jero.project.service;
|
||||
|
||||
import com.jero.commonProject.entity.PayWorkingGroupSubitem;
|
||||
import com.jero.project.entity.PayWorkingGroupSubitem;
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
|
||||
/**
|
||||
+4
-4
@@ -1,10 +1,10 @@
|
||||
package com.jero.commonProject.service.impl;
|
||||
package com.jero.project.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.jero.commonProject.service.IPayCommonProjectService;
|
||||
import com.jero.commonProject.entity.PayCommonProject;
|
||||
import com.jero.commonProject.mapper.PayCommonProjectMapper;
|
||||
import com.jero.project.service.IPayCommonProjectService;
|
||||
import com.jero.project.entity.PayCommonProject;
|
||||
import com.jero.project.mapper.PayCommonProjectMapper;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
+4
-4
@@ -1,8 +1,8 @@
|
||||
package com.jero.commonProject.service.impl;
|
||||
package com.jero.project.service.impl;
|
||||
|
||||
import com.jero.commonProject.service.IPayWorkingGroupService;
|
||||
import com.jero.commonProject.entity.PayWorkingGroup;
|
||||
import com.jero.commonProject.mapper.PayWorkingGroupMapper;
|
||||
import com.jero.project.service.IPayWorkingGroupService;
|
||||
import com.jero.project.entity.PayWorkingGroup;
|
||||
import com.jero.project.mapper.PayWorkingGroupMapper;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
+4
-4
@@ -1,8 +1,8 @@
|
||||
package com.jero.commonProject.service.impl;
|
||||
package com.jero.project.service.impl;
|
||||
|
||||
import com.jero.commonProject.service.IPayWorkingGroupSubitemService;
|
||||
import com.jero.commonProject.entity.PayWorkingGroupSubitem;
|
||||
import com.jero.commonProject.mapper.PayWorkingGroupSubitemMapper;
|
||||
import com.jero.project.service.IPayWorkingGroupSubitemService;
|
||||
import com.jero.project.entity.PayWorkingGroupSubitem;
|
||||
import com.jero.project.mapper.PayWorkingGroupSubitemMapper;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
Reference in New Issue
Block a user