From e88eeea5d000e814e6bdc2c9c6bf8aa66fa98b3c Mon Sep 17 00:00:00 2001 From: linfso Date: Thu, 24 Oct 2024 17:00:30 +0800 Subject: [PATCH] md --- .../web/emis/EmisCommissionDtlController.java | 134 ++++++++++++ .../erp/emis/domain/EmisCommissionDtl.java | 75 +++++++ .../erp/emis/domain/EmisCommissionProfit.java | 53 ++--- .../emis/mapper/EmisCommissionDtlMapper.java | 80 +++++++ .../service/IEmisCommissionDtlService.java | 78 +++++++ .../impl/EmisCommissionDtlServiceImpl.java | 117 ++++++++++ .../service/impl/EmisWaybillServiceImpl.java | 5 +- .../mapper/EmisCommissionDtlMapper.xml | 206 ++++++++++++++++++ .../mapper/EmisCommissionProfitMapper.xml | 144 +++--------- 9 files changed, 743 insertions(+), 149 deletions(-) create mode 100644 emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionDtlController.java create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionDtl.java create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCommissionDtlMapper.java create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCommissionDtlService.java create mode 100644 emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionDtlServiceImpl.java create mode 100644 emis-biz/src/main/resources/mapper/EmisCommissionDtlMapper.xml diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionDtlController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionDtlController.java new file mode 100644 index 000000000..c54b487a5 --- /dev/null +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionDtlController.java @@ -0,0 +1,134 @@ + +/** + * @Project: emis + * @Title: EmisCommissionDtlController.java + * @author linfso + * @date 2024-10-24 08:54:59 + * @Copyright: ShangHai Duta 2022 All rights reserved. + * @version v1.0 + * @Description:

员工提成明细表 控制器

+ */ + +package com.xdadan.erp.web.emis; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.xdadan.erp.common.annotation.Log; +import com.xdadan.erp.common.core.controller.BaseController; +import com.xdadan.erp.common.core.domain.AjaxResult; +import com.xdadan.erp.common.core.page.TableDataInfo; +import com.xdadan.erp.common.enums.BusinessType; +import com.xdadan.erp.common.utils.StringUtils; +import com.xdadan.erp.common.utils.poi.ExcelUtil; + +import com.xdadan.erp.emis.domain.EmisCommissionDtl; +import com.xdadan.erp.emis.service.IEmisCommissionDtlService; + +/** + * 员工提成明细表Controller + * + * @author linfso + * @date 2024-10-24 08:54:59 + */ +@RestController +@RequestMapping("/emis/emisCommissionDtl") +public class EmisCommissionDtlController extends BaseController +{ + @Autowired + private IEmisCommissionDtlService emisCommissionDtlService; + + /** + * 查询员工提成明细表列表 + */ + @PreAuthorize("@ss.hasPermi('emis:emisCommissionDtl:list')") + @GetMapping("/list") + public TableDataInfo list(EmisCommissionDtl emisCommissionDtl) + { + startPage(); + List list = emisCommissionDtlService.selectEmisCommissionDtlList(emisCommissionDtl); + return getDataTable(list); + } + + + /** + * 检查是否重复 + * + * @param emisCommissionDtl + * @return 数量 + */ + @PreAuthorize("@ss.hasPermi('emis:emisCommissionDtl:list')") + @GetMapping("/checkUnique") + public AjaxResult checkUnique(EmisCommissionDtl emisCommissionDtl) + { + int cnt=emisCommissionDtlService.checkUnique(emisCommissionDtl); + return AjaxResult.success("检查成功",cnt); + } + + + /** + * 导出员工提成明细表列表 + */ + @PreAuthorize("@ss.hasPermi('emis:emisCommissionDtl:export')") + @Log(title = "员工提成明细表", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, EmisCommissionDtl emisCommissionDtl) + { + List list = emisCommissionDtlService.selectEmisCommissionDtlList(emisCommissionDtl); + ExcelUtil util = new ExcelUtil(EmisCommissionDtl.class); + util.exportExcel(response, list, "员工提成明细表数据"); + } + + /** + * 获取员工提成明细表详细信息 + */ + @PreAuthorize("@ss.hasPermi('emis:emisCommissionDtl:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(emisCommissionDtlService.selectEmisCommissionDtlById(id)); + } + + /** + * 新增员工提成明细表 + */ + @PreAuthorize("@ss.hasPermi('emis:emisCommissionDtl:add')") + @Log(title = "员工提成明细表", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody EmisCommissionDtl emisCommissionDtl) + { + return toAjax(emisCommissionDtlService.insertEmisCommissionDtl(emisCommissionDtl)); + } + + /** + * 修改员工提成明细表 + */ + @PreAuthorize("@ss.hasPermi('emis:emisCommissionDtl:edit')") + @Log(title = "员工提成明细表", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody EmisCommissionDtl emisCommissionDtl) + { + return toAjax(emisCommissionDtlService.updateEmisCommissionDtl(emisCommissionDtl)); + } + + /** + * 删除员工提成明细表 + */ + @PreAuthorize("@ss.hasPermi('emis:emisCommissionDtl:remove')") + @Log(title = "员工提成明细表", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(emisCommissionDtlService.deleteEmisCommissionDtlByIds(ids)); + } +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionDtl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionDtl.java new file mode 100644 index 000000000..e72efcca5 --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionDtl.java @@ -0,0 +1,75 @@ +/** + * @Project: emis + * @Title: EmisCommissionDtl.java + * @author linfso + * @date 2024-10-24 08:54:58 + * @Copyright: ShangHai Duta 2022 All rights reserved. + * @version v1.0 + * @Description:

员工提成明细表 实体类

+ */ + +package com.xdadan.erp.emis.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.xdadan.erp.common.annotation.Excel; +import com.xdadan.erp.common.core.domain.BaseEntity; +import com.xdadan.erp.common.core.domain.TreeEntity; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import lombok.Data; + + +/** + * @ClassName EmisCommissionDtl + * @Description 员工提成明细表 + * @author linfso + * @date 2024-10-24 08:54:58 + */ + @Data +public class EmisCommissionDtl extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /* id */ + private Long id; + /* 提成费用类型 */ + private String feeType; + /* 提成金额 */ + private BigDecimal money; + /* 月份 202402 */ + private String billMonth; + /* 运单号 */ + private String billCode; + /* 费用备注 */ + private String feeRemark; + /* 员工编号 */ + private String empCode; + /* 员工名称 */ + private String empName; + /* 财务确认状态 0-待确认 1-已确认 2-驳回 */ + private String blConfirmCenter; + /* 财务确认日期 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date confirmCenterDate; + /* 财务确认备注 */ + private String confirmCenterNote; + /* 财务确认人 */ + private String confirmCenterManCode; + /* 财务确认站点 */ + private String confirmCenterCode; + /* 站点确认状态 0-待确认 1-已确认 2-驳回 */ + private String blConfirmSite; + /* 站点确认日期 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date confirmSiteDate; + /* 站点确认人 */ + private String confirmSiteManCode; + /* 网点确认备注 */ + private String confirmSiteNote; + /* 确认网点代码 */ + private String confirmSiteCode; + +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionProfit.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionProfit.java index 29494e30f..7e40f01f1 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionProfit.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionProfit.java @@ -1,10 +1,10 @@ -/** +/** * @Project: emis * @Title: EmisCommissionProfit.java * @author linfso - * @date 2024-10-24 01:46:35 + * @date 2024-10-24 08:58:38 * @Copyright: ShangHai Duta 2022 All rights reserved. - * @version v1.0 + * @version v1.0 * @Description:

员工提成表 实体类

*/ @@ -26,9 +26,9 @@ import lombok.Data; * @ClassName EmisCommissionProfit * @Description 员工提成表 * @author linfso - * @date 2024-10-24 01:46:35 + * @date 2024-10-24 08:58:38 */ - @Data +@Data public class EmisCommissionProfit extends BaseEntity { private static final long serialVersionUID = 1L; @@ -37,45 +37,18 @@ public class EmisCommissionProfit extends BaseEntity private Long id; /* 提成编号 */ private String profitNo; - /* 提成名称 */ - private String profitName; - /* 提成类型 */ - private String settleType; - /* 月份 202402 */ - private String billMonth; - /* 结算开始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date startDate; - /* 结算结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date endDate; - /* 提成金额 */ - private BigDecimal money; /* 员工编号 */ private String empCode; /* 员工名称 */ private String empName; - /* 是否已提 1-是 0-否 */ - private String blHasProfit; - /* 审核状态 0-未审核 1-审核通过 2-审核驳回 */ - private String blAudit; - /* 财务确认日期 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date auditDate; - /* 财务确认备注 */ - private String auditNote; - /* 财务确认人 */ - private String auditManCode; - /* 总票数 */ - private Integer sendPieceSum; - /* 总件数 */ - private Integer pieceNumber; - /* 总重量 */ - private BigDecimal feeWeight; - /* 销售回款人 */ - private String payee; - /* 销售联系人 */ - private String salesmen; + /* 月份 202402 */ + private String billMonth; + /* 预估提成金额 */ + private BigDecimal money; + /* 实际提成金额 */ + private BigDecimal realMoney; + /* 已发放金额 */ + private BigDecimal payedMoney; /* 财务确认状态 0-待确认 1-已确认 2-驳回 */ private String blConfirmCenter; /* 财务确认日期 */ diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCommissionDtlMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCommissionDtlMapper.java new file mode 100644 index 000000000..b00dac7d7 --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCommissionDtlMapper.java @@ -0,0 +1,80 @@ +/** + * @Project: emis + * @Title: EmisCommissionDtlMapper.java + * @author linfso + * @date 2024-10-24 08:54:58 + * @Copyright: ShangHai Doitinfo 2022 All rights reserved. + * @version v1.0 + * @Description:

员工提成明细表 Mapper 接口

+ * Warning : This file is generate by ai tools,don't edit!!! + */ +package com.xdadan.erp.emis.mapper; + +import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.xdadan.erp.emis.domain.EmisCommissionDtl; +/** + * @ClassName EmisCommissionDtlMapper + * @Description

员工提成明细表 Mapper 接口

+ * @author linfso + * @date 2024-10-24 08:54:58 + */ +public interface EmisCommissionDtlMapper extends BaseMapper +{ + /** + * 主键查询 + * @param id + * @return + */ + public EmisCommissionDtl selectEmisCommissionDtlById(Long id); + + /** + * 查询列表 + * + * @param emisCommissionDtl + * @return 集合 + */ + public List selectEmisCommissionDtlList(EmisCommissionDtl emisCommissionDtl); + + + /** + * 检查是否重复 + * + * @param emisCommissionDtl + * @return 数量 + */ + public int checkUnique(EmisCommissionDtl emisCommissionDtl); + + + /** + * 新增 + * + * @param emisCommissionDtl + * @return + */ + public int insertEmisCommissionDtl(EmisCommissionDtl emisCommissionDtl); + + /** + * 修改 + * + * @param emisCommissionDtl + * @return + */ + public int updateEmisCommissionDtl(EmisCommissionDtl emisCommissionDtl); + + /** + * 删除 + * + * @param id 主键 + * @return 结果 + */ + public int deleteEmisCommissionDtlById(Long id); + + /** + * 批量删除 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteEmisCommissionDtlByIds(Long[] ids); +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCommissionDtlService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCommissionDtlService.java new file mode 100644 index 000000000..3ee848cef --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCommissionDtlService.java @@ -0,0 +1,78 @@ + /** + * @Project: emis + * @Title: EmisCommissionDtlService.java + * @author linfso + * @date 2024-10-24 08:54:58 + * @Copyright: ShangHai Duta 2022 All rights reserved. + * @version v1.0 + * @Description:

员工提成明细表 服务类接口

+ */ +package com.xdadan.erp.emis.service; + +import java.util.List; +import com.xdadan.erp.emis.domain.EmisCommissionDtl; + +/** + * @ClassName EmisCommissionDtlService + * @Description 员工提成明细表 + * @author linfso + * @date 2024-10-24 08:54:58 + */ +public interface IEmisCommissionDtlService +{ + /** + * 主键查询 + * @param id + * @return + */ + public EmisCommissionDtl selectEmisCommissionDtlById(Long id); + + /** + * 查询员工提成明细表列表 + * + * @param emisCommissionDtl 员工提成明细表 + * @return 员工提成明细表集合 + */ + public List selectEmisCommissionDtlList(EmisCommissionDtl emisCommissionDtl); + + + /** + * 检查是否重复 + * + * @param emisCommissionDtl + * @return 数量 + */ + public int checkUnique(EmisCommissionDtl emisCommissionDtl); + + /** + * 新增员工提成明细表 + * + * @param emisCommissionDtl 员工提成明细表 + * @return 结果 + */ + public int insertEmisCommissionDtl(EmisCommissionDtl emisCommissionDtl); + + /** + * 修改员工提成明细表 + * + * @param emisCommissionDtl 员工提成明细表 + * @return 结果 + */ + public int updateEmisCommissionDtl(EmisCommissionDtl emisCommissionDtl); + + /** + * 批量删除员工提成明细表 + * + * @param ids 需要删除的员工提成明细表主键集合 + * @return 结果 + */ + public int deleteEmisCommissionDtlByIds(Long[] ids); + + /** + * 删除员工提成明细表信息 + * + * @param id 员工提成明细表主键 + * @return 结果 + */ + public int deleteEmisCommissionDtlById(Long id); +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionDtlServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionDtlServiceImpl.java new file mode 100644 index 000000000..edc35759c --- /dev/null +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionDtlServiceImpl.java @@ -0,0 +1,117 @@ + /** + * @Project: emis + * @Title: EmisCommissionDtlServiceImpl.java + * @author linfso + * @date 2024-10-24 08:54:58 + * @Copyright: ShangHai Duta 2022 All rights reserved. + * @version v1.0 + * @Description:

员工提成明细表 实体类

+ */ + +package com.xdadan.erp.emis.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.xdadan.erp.emis.domain.EmisCommissionDtl; +import com.xdadan.erp.emis.mapper.EmisCommissionDtlMapper; +import com.xdadan.erp.emis.service.IEmisCommissionDtlService; + +/** + * 员工提成明细表Service业务层处理 + * + * @author linfso + * @date 2024-10-24 08:54:58 + */ +@Service +public class EmisCommissionDtlServiceImpl implements IEmisCommissionDtlService +{ + @Autowired + private EmisCommissionDtlMapper emisCommissionDtlMapper; + + /** + * 查询员工提成明细表 + * + * @param id 员工提成明细表主键 + * @return 员工提成明细表 + */ + @Override + public EmisCommissionDtl selectEmisCommissionDtlById(Long id) + { + return emisCommissionDtlMapper.selectEmisCommissionDtlById(id); + } + + + /** + * 查询员工提成明细表列表 + * + * @param emisCommissionDtl 员工提成明细表 + * @return 员工提成明细表 + */ + @Override + public List selectEmisCommissionDtlList(EmisCommissionDtl emisCommissionDtl) + { + return emisCommissionDtlMapper.selectEmisCommissionDtlList(emisCommissionDtl); + } + + /** + * 检查是否重复 + * + * @param emisCommissionDtl + * @return 数量 + */ + @Override + public int checkUnique(EmisCommissionDtl emisCommissionDtl) + { + return emisCommissionDtlMapper.checkUnique(emisCommissionDtl); + } + + /** + * 新增员工提成明细表 + * + * @param emisCommissionDtl 员工提成明细表 + * @return 结果 + */ + @Override + public int insertEmisCommissionDtl(EmisCommissionDtl emisCommissionDtl) + { + return emisCommissionDtlMapper.insertEmisCommissionDtl(emisCommissionDtl); + } + + /** + * 修改员工提成明细表 + * + * @param emisCommissionDtl 员工提成明细表 + * @return 结果 + */ + @Override + public int updateEmisCommissionDtl(EmisCommissionDtl emisCommissionDtl) + { + return emisCommissionDtlMapper.updateEmisCommissionDtl(emisCommissionDtl); + } + + /** + * 批量删除员工提成明细表 + * + * @param ids 需要删除的员工提成明细表主键 + * @return 结果 + */ + @Override + public int deleteEmisCommissionDtlByIds(Long[] ids) + { + return emisCommissionDtlMapper.deleteEmisCommissionDtlByIds(ids); + } + + /** + * 删除员工提成明细表信息 + * + * @param id 员工提成明细表主键 + * @return 结果 + */ + @Override + public int deleteEmisCommissionDtlById(Long id) + { + return emisCommissionDtlMapper.deleteEmisCommissionDtlById(id); + } + +} diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java index 39b54c104..628b85184 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java @@ -2413,6 +2413,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb // 设定为业务开单 emisWaybillSave.setOrderType("1"); + emisWaybillSave.setOrderDate(new Date()); // 公共计算部分 calcWayBillCommonInfo(emisWaybillSave,null,true); @@ -2552,8 +2553,9 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb */ private void addNewWaybillByOms(EmisWaybill emisWaybillSave) throws EmisBizError { - // 设定为客户下单 + // 设定为客户下单,下单时间为当前时间 emisWaybillSave.setOrderType("0"); + emisWaybillSave.setOrderDate(new Date()); // 如果是孟加拉单子，把运单号变为 12位 if("0880".equals(emisWaybillSave.getReceiveCountry()) || "0880".equals(emisWaybillSave.getSendCountry())){ @@ -2641,6 +2643,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb // api 开单 emisWaybillSave.setOrderType("1"); + emisWaybillSave.setOrderDate(new Date()); // 公共计算部分 calcWayBillCommonInfoByApi(emisWaybillSave,true); diff --git a/emis-biz/src/main/resources/mapper/EmisCommissionDtlMapper.xml b/emis-biz/src/main/resources/mapper/EmisCommissionDtlMapper.xml new file mode 100644 index 000000000..c5a8beda0 --- /dev/null +++ b/emis-biz/src/main/resources/mapper/EmisCommissionDtlMapper.xml @@ -0,0 +1,206 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, fee_type, money, bill_month, bill_code, fee_remark, emp_code, emp_name, bl_confirm_center, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_commission_dtl + + + + + + + + + + insert into emis_commission_dtl + + id, + fee_type, + money, + bill_month, + bill_code, + fee_remark, + emp_code, + emp_name, + bl_confirm_center, + confirm_center_date, + confirm_center_note, + confirm_center_man_code, + confirm_center_code, + bl_confirm_site, + confirm_site_date, + confirm_site_man_code, + confirm_site_note, + confirm_site_code, + remark, + del_flag, + create_by, + create_time, + update_by, + update_time, + create_site, + update_site, + + + #{id}, + #{feeType}, + #{money}, + #{billMonth}, + #{billCode}, + #{feeRemark}, + #{empCode}, + #{empName}, + #{blConfirmCenter}, + #{confirmCenterDate}, + #{confirmCenterNote}, + #{confirmCenterManCode}, + #{confirmCenterCode}, + #{blConfirmSite}, + #{confirmSiteDate}, + #{confirmSiteManCode}, + #{confirmSiteNote}, + #{confirmSiteCode}, + #{remark}, + #{delFlag}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{createSite}, + #{updateSite}, + + + + + update emis_commission_dtl + + fee_type = #{feeType}, + money = #{money}, + bill_month = #{billMonth}, + bill_code = #{billCode}, + fee_remark = #{feeRemark}, + emp_code = #{empCode}, + emp_name = #{empName}, + bl_confirm_center = #{blConfirmCenter}, + confirm_center_date = #{confirmCenterDate}, + confirm_center_note = #{confirmCenterNote}, + confirm_center_man_code = #{confirmCenterManCode}, + confirm_center_code = #{confirmCenterCode}, + bl_confirm_site = #{blConfirmSite}, + confirm_site_date = #{confirmSiteDate}, + confirm_site_man_code = #{confirmSiteManCode}, + confirm_site_note = #{confirmSiteNote}, + confirm_site_code = #{confirmSiteCode}, + remark = #{remark}, + del_flag = #{delFlag}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + create_site = #{createSite}, + update_site = #{updateSite}, + + where id = #{id} + + + + delete from emis_commission_dtl where id = #{id} + + + + delete from emis_commission_dtl where id in + + #{id} + + + \ No newline at end of file diff --git a/emis-biz/src/main/resources/mapper/EmisCommissionProfitMapper.xml b/emis-biz/src/main/resources/mapper/EmisCommissionProfitMapper.xml index ba73cee7b..331339f54 100644 --- a/emis-biz/src/main/resources/mapper/EmisCommissionProfitMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisCommissionProfitMapper.xml @@ -1,30 +1,18 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + - - - - - - - - - - - - - - - - + + + + @@ -38,33 +26,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, profit_no, profit_name, settle_type, bill_month, start_date, end_date, money, emp_code, emp_name, bl_has_profit, bl_audit, audit_date, audit_note, audit_man_code, send_piece_sum, piece_number, fee_weight, payee, salesmen, bl_confirm_center, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_commission_profit + select id, profit_no, emp_code, emp_name, bill_month, money, real_money, payed_money, bl_confirm_center, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_commission_profit - + - + insert into emis_commission_profit id, profit_no, - profit_name, - settle_type, - bill_month, - start_date, - end_date, - money, emp_code, emp_name, - bl_has_profit, - bl_audit, - audit_date, - audit_note, - audit_man_code, - send_piece_sum, - piece_number, - fee_weight, - payee, - salesmen, + bill_month, + money, + real_money, + payed_money, bl_confirm_center, confirm_center_date, confirm_center_note, @@ -178,28 +130,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time, create_site, update_site, - + #{id}, #{profitNo}, - #{profitName}, - #{settleType}, - #{billMonth}, - #{startDate}, - #{endDate}, - #{money}, #{empCode}, #{empName}, - #{blHasProfit}, - #{blAudit}, - #{auditDate}, - #{auditNote}, - #{auditManCode}, - #{sendPieceSum}, - #{pieceNumber}, - #{feeWeight}, - #{payee}, - #{salesmen}, + #{billMonth}, + #{money}, + #{realMoney}, + #{payedMoney}, #{blConfirmCenter}, #{confirmCenterDate}, #{confirmCenterNote}, @@ -218,31 +158,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updateTime}, #{createSite}, #{updateSite}, - + update emis_commission_profit profit_no = #{profitNo}, - profit_name = #{profitName}, - settle_type = #{settleType}, - bill_month = #{billMonth}, - start_date = #{startDate}, - end_date = #{endDate}, - money = #{money}, emp_code = #{empCode}, emp_name = #{empName}, - bl_has_profit = #{blHasProfit}, - bl_audit = #{blAudit}, - audit_date = #{auditDate}, - audit_note = #{auditNote}, - audit_man_code = #{auditManCode}, - send_piece_sum = #{sendPieceSum}, - piece_number = #{pieceNumber}, - fee_weight = #{feeWeight}, - payee = #{payee}, - salesmen = #{salesmen}, + bill_month = #{billMonth}, + money = #{money}, + real_money = #{realMoney}, + payed_money = #{payedMoney}, bl_confirm_center = #{blConfirmCenter}, confirm_center_date = #{confirmCenterDate}, confirm_center_note = #{confirmCenterNote}, @@ -270,7 +198,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from emis_commission_profit where id in + delete from emis_commission_profit where id in #{id}