aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-10-24 17:00:30 +08:00
parent 91b9317392
commit e88eeea5d0
9 changed files with 743 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionDtlController.java Normal file
View File

@ -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: <p> 员工提成明细表 控制器 </p>
*/
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<EmisCommissionDtl> 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<EmisCommissionDtl> list = emisCommissionDtlService.selectEmisCommissionDtlList(emisCommissionDtl);
ExcelUtil<EmisCommissionDtl> util = new ExcelUtil<EmisCommissionDtl>(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));
}
}

75
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionDtl.java Normal file
View File

@ -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: <p> 员工提成明细表 实体类 </p>
*/
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;
}

53
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionProfit.java
View File

@ -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: <p> 员工提成表 实体类 </p>
*/
@ -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;
/* 财务确认日期 */

80
emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCommissionDtlMapper.java Normal file
View File

@ -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: <p> 员工提成明细表 Mapper 接口 </p>
* <span style='color:red'> Warning : This file is generate by ai tools,don't edit!!! </span>
*/
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 <p> 员工提成明细表 Mapper 接口 </p>
* @author linfso
* @date 2024-10-24 08:54:58
*/
public interface EmisCommissionDtlMapper extends BaseMapper<EmisCommissionDtl>
{
/**
* 主键查询
* @param id
* @return
*/
public EmisCommissionDtl selectEmisCommissionDtlById(Long id);
/**
* 查询列表
*
* @param emisCommissionDtl
* @return 集合
*/
public List<EmisCommissionDtl> 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);
}

78
emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCommissionDtlService.java Normal file
View File

@ -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: <p> 员工提成明细表 服务类接口 </p>
*/
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<EmisCommissionDtl> 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);
}

117
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionDtlServiceImpl.java Normal file
View File

@ -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: <p> 员工提成明细表 实体类 </p>
*/
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<EmisCommissionDtl> 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);
}
}

5
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -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);

206
emis-biz/src/main/resources/mapper/EmisCommissionDtlMapper.xml Normal file
View File

@ -0,0 +1,206 @@
<?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.xdadan.erp.emis.mapper.EmisCommissionDtlMapper">
<resultMap type="EmisCommissionDtl" id="EmisCommissionDtlResult">
<result property="id" column="id" />
<result property="feeType" column="fee_type" />
<result property="money" column="money" />
<result property="billMonth" column="bill_month" />
<result property="billCode" column="bill_code" />
<result property="feeRemark" column="fee_remark" />
<result property="empCode" column="emp_code" />
<result property="empName" column="emp_name" />
<result property="blConfirmCenter" column="bl_confirm_center" />
<result property="confirmCenterDate" column="confirm_center_date" />
<result property="confirmCenterNote" column="confirm_center_note" />
<result property="confirmCenterManCode" column="confirm_center_man_code" />
<result property="confirmCenterCode" column="confirm_center_code" />
<result property="blConfirmSite" column="bl_confirm_site" />
<result property="confirmSiteDate" column="confirm_site_date" />
<result property="confirmSiteManCode" column="confirm_site_man_code" />
<result property="confirmSiteNote" column="confirm_site_note" />
<result property="confirmSiteCode" column="confirm_site_code" />
</resultMap>
<sql id="selectEmisCommissionDtlVo">
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
</sql>
<select id="selectEmisCommissionDtlList" parameterType="EmisCommissionDtl" resultMap="EmisCommissionDtlResult">
<include refid="selectEmisCommissionDtlVo"/>
<where>
del_flag='0'
<if test="id != null "> and id = #{id}</if>
<if test="feeType != null and feeType != ''"> and fee_type like concat('%', #{feeType}, '%')</if>
<if test="money != null "> and money = #{money}</if>
<if test="billMonth != null and billMonth != ''"> and bill_month like concat('%', #{billMonth}, '%')</if>
<if test="billCode != null and billCode != ''"> and bill_code like concat('%', #{billCode}, '%')</if>
<if test="feeRemark != null and feeRemark != ''"> and fee_remark like concat('%', #{feeRemark}, '%')</if>
<if test="empCode != null and empCode != ''"> and emp_code like concat('%', #{empCode}, '%')</if>
<if test="empName != null and empName != ''"> and emp_name like concat('%', #{empName}, '%')</if>
<if test="blConfirmCenter != null and blConfirmCenter != ''"> and bl_confirm_center like concat('%', #{blConfirmCenter}, '%')</if>
<if test="confirmCenterDate != null "> and confirm_center_date = #{confirmCenterDate}</if>
<if test="confirmCenterNote != null and confirmCenterNote != ''"> and confirm_center_note like concat('%', #{confirmCenterNote}, '%')</if>
<if test="confirmCenterManCode != null and confirmCenterManCode != ''"> and confirm_center_man_code like concat('%', #{confirmCenterManCode}, '%')</if>
<if test="confirmCenterCode != null and confirmCenterCode != ''"> and confirm_center_code like concat('%', #{confirmCenterCode}, '%')</if>
<if test="blConfirmSite != null and blConfirmSite != ''"> and bl_confirm_site like concat('%', #{blConfirmSite}, '%')</if>
<if test="confirmSiteDate != null "> and confirm_site_date = #{confirmSiteDate}</if>
<if test="confirmSiteManCode != null and confirmSiteManCode != ''"> and confirm_site_man_code like concat('%', #{confirmSiteManCode}, '%')</if>
<if test="confirmSiteNote != null and confirmSiteNote != ''"> and confirm_site_note like concat('%', #{confirmSiteNote}, '%')</if>
<if test="confirmSiteCode != null and confirmSiteCode != ''"> and confirm_site_code like concat('%', #{confirmSiteCode}, '%')</if>
<if test="remark != null and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
<if test="delFlag != null and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</if>
<if test="createBy != null and createBy != ''"> and create_by like concat('%', #{createBy}, '%')</if>
<if test="createTime != null "> and create_time = #{createTime}</if>
<if test="updateBy != null and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
<if test="updateTime != null "> and update_time = #{updateTime}</if>
<if test="createSite != null and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
<if test="updateSite != null and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
</where>
order by create_time desc
</select>
<select id="checkUnique" parameterType="EmisCommissionDtl" resultType="int">
select count(1) from emis_commission_dtl
where del_flag='0'
and id = #{id}
and fee_type = #{feeType}
and money = #{money}
and bill_month = #{billMonth}
and bill_code = #{billCode}
and fee_remark = #{feeRemark}
and emp_code = #{empCode}
and emp_name = #{empName}
and bl_confirm_center = #{blConfirmCenter}
and confirm_center_date = #{confirmCenterDate}
and confirm_center_note = #{confirmCenterNote}
and confirm_center_man_code = #{confirmCenterManCode}
and confirm_center_code = #{confirmCenterCode}
and bl_confirm_site = #{blConfirmSite}
and confirm_site_date = #{confirmSiteDate}
and confirm_site_man_code = #{confirmSiteManCode}
and confirm_site_note = #{confirmSiteNote}
and confirm_site_code = #{confirmSiteCode}
and remark = #{remark}
and del_flag = #{delFlag}
and create_by = #{createBy}
and create_time = #{createTime}
and update_by = #{updateBy}
and update_time = #{updateTime}
and create_site = #{createSite}
and update_site = #{updateSite}
limit 1
</select>
<select id="selectEmisCommissionDtlById" parameterType="Long" resultMap="EmisCommissionDtlResult">
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 a
where a.id = #{id}
</select>
<insert id="insertEmisCommissionDtl" parameterType="EmisCommissionDtl" useGeneratedKeys="true" keyProperty="id">
insert into emis_commission_dtl
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="feeType != null and feeType != ''">fee_type,</if>
<if test="money != null">money,</if>
<if test="billMonth != null and billMonth != ''">bill_month,</if>
<if test="billCode != null and billCode != ''">bill_code,</if>
<if test="feeRemark != null and feeRemark != ''">fee_remark,</if>
<if test="empCode != null and empCode != ''">emp_code,</if>
<if test="empName != null and empName != ''">emp_name,</if>
<if test="blConfirmCenter != null and blConfirmCenter != ''">bl_confirm_center,</if>
<if test="confirmCenterDate != null">confirm_center_date,</if>
<if test="confirmCenterNote != null and confirmCenterNote != ''">confirm_center_note,</if>
<if test="confirmCenterManCode != null and confirmCenterManCode != ''">confirm_center_man_code,</if>
<if test="confirmCenterCode != null and confirmCenterCode != ''">confirm_center_code,</if>
<if test="blConfirmSite != null and blConfirmSite != ''">bl_confirm_site,</if>
<if test="confirmSiteDate != null">confirm_site_date,</if>
<if test="confirmSiteManCode != null and confirmSiteManCode != ''">confirm_site_man_code,</if>
<if test="confirmSiteNote != null and confirmSiteNote != ''">confirm_site_note,</if>
<if test="confirmSiteCode != null and confirmSiteCode != ''">confirm_site_code,</if>
<if test="remark != null and remark != ''">remark,</if>
<if test="delFlag != null and delFlag != ''">del_flag,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null and updateBy != ''">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="createSite != null and createSite != ''">create_site,</if>
<if test="updateSite != null and updateSite != ''">update_site,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="feeType != null and feeType != ''">#{feeType},</if>
<if test="money != null">#{money},</if>
<if test="billMonth != null and billMonth != ''">#{billMonth},</if>
<if test="billCode != null and billCode != ''">#{billCode},</if>
<if test="feeRemark != null and feeRemark != ''">#{feeRemark},</if>
<if test="empCode != null and empCode != ''">#{empCode},</if>
<if test="empName != null and empName != ''">#{empName},</if>
<if test="blConfirmCenter != null and blConfirmCenter != ''">#{blConfirmCenter},</if>
<if test="confirmCenterDate != null">#{confirmCenterDate},</if>
<if test="confirmCenterNote != null and confirmCenterNote != ''">#{confirmCenterNote},</if>
<if test="confirmCenterManCode != null and confirmCenterManCode != ''">#{confirmCenterManCode},</if>
<if test="confirmCenterCode != null and confirmCenterCode != ''">#{confirmCenterCode},</if>
<if test="blConfirmSite != null and blConfirmSite != ''">#{blConfirmSite},</if>
<if test="confirmSiteDate != null">#{confirmSiteDate},</if>
<if test="confirmSiteManCode != null and confirmSiteManCode != ''">#{confirmSiteManCode},</if>
<if test="confirmSiteNote != null and confirmSiteNote != ''">#{confirmSiteNote},</if>
<if test="confirmSiteCode != null and confirmSiteCode != ''">#{confirmSiteCode},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="delFlag != null and delFlag != ''">#{delFlag},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null and updateBy != ''">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="createSite != null and createSite != ''">#{createSite},</if>
<if test="updateSite != null and updateSite != ''">#{updateSite},</if>
</trim>
</insert>
<update id="updateEmisCommissionDtl" parameterType="EmisCommissionDtl">
update emis_commission_dtl
<trim prefix="SET" suffixOverrides=",">
<if test="feeType != null and feeType != ''">fee_type = #{feeType},</if>
<if test="money != null">money = #{money},</if>
<if test="billMonth != null and billMonth != ''">bill_month = #{billMonth},</if>
<if test="billCode != null and billCode != ''">bill_code = #{billCode},</if>
<if test="feeRemark != null and feeRemark != ''">fee_remark = #{feeRemark},</if>
<if test="empCode != null and empCode != ''">emp_code = #{empCode},</if>
<if test="empName != null and empName != ''">emp_name = #{empName},</if>
<if test="blConfirmCenter != null and blConfirmCenter != ''">bl_confirm_center = #{blConfirmCenter},</if>
<if test="confirmCenterDate != null">confirm_center_date = #{confirmCenterDate},</if>
<if test="confirmCenterNote != null and confirmCenterNote != ''">confirm_center_note = #{confirmCenterNote},</if>
<if test="confirmCenterManCode != null and confirmCenterManCode != ''">confirm_center_man_code = #{confirmCenterManCode},</if>
<if test="confirmCenterCode != null and confirmCenterCode != ''">confirm_center_code = #{confirmCenterCode},</if>
<if test="blConfirmSite != null and blConfirmSite != ''">bl_confirm_site = #{blConfirmSite},</if>
<if test="confirmSiteDate != null">confirm_site_date = #{confirmSiteDate},</if>
<if test="confirmSiteManCode != null and confirmSiteManCode != ''">confirm_site_man_code = #{confirmSiteManCode},</if>
<if test="confirmSiteNote != null and confirmSiteNote != ''">confirm_site_note = #{confirmSiteNote},</if>
<if test="confirmSiteCode != null and confirmSiteCode != ''">confirm_site_code = #{confirmSiteCode},</if>
<if test="remark != null and remark != ''">remark = #{remark},</if>
<if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
<if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="createSite != null and createSite != ''">create_site = #{createSite},</if>
<if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteEmisCommissionDtlById" parameterType="Long">
delete from emis_commission_dtl where id = #{id}
</delete>
<delete id="deleteEmisCommissionDtlByIds" parameterType="String">
delete from emis_commission_dtl where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

144
emis-biz/src/main/resources/mapper/EmisCommissionProfitMapper.xml
View File

@ -1,30 +1,18 @@
<?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">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xdadan.erp.emis.mapper.EmisCommissionProfitMapper">
<resultMap type="EmisCommissionProfit" id="EmisCommissionProfitResult">
<result property="id" column="id" />
<result property="profitNo" column="profit_no" />
<result property="profitName" column="profit_name" />
<result property="settleType" column="settle_type" />
<result property="billMonth" column="bill_month" />
<result property="startDate" column="start_date" />
<result property="endDate" column="end_date" />
<result property="money" column="money" />
<result property="empCode" column="emp_code" />
<result property="empName" column="emp_name" />
<result property="blHasProfit" column="bl_has_profit" />
<result property="blAudit" column="bl_audit" />
<result property="auditDate" column="audit_date" />
<result property="auditNote" column="audit_note" />
<result property="auditManCode" column="audit_man_code" />
<result property="sendPieceSum" column="send_piece_sum" />
<result property="pieceNumber" column="piece_number" />
<result property="feeWeight" column="fee_weight" />
<result property="payee" column="payee" />
<result property="salesmen" column="salesmen" />
<result property="billMonth" column="bill_month" />
<result property="money" column="money" />
<result property="realMoney" column="real_money" />
<result property="payedMoney" column="payed_money" />
<result property="blConfirmCenter" column="bl_confirm_center" />
<result property="confirmCenterDate" column="confirm_center_date" />
<result property="confirmCenterNote" column="confirm_center_note" />
@ -38,33 +26,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectEmisCommissionProfitVo">
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
</sql>
<select id="selectEmisCommissionProfitList" parameterType="EmisCommissionProfit" resultMap="EmisCommissionProfitResult">
<include refid="selectEmisCommissionProfitVo"/>
<where>
del_flag='0'
<where>
del_flag='0'
<if test="id != null "> and id = #{id}</if>
<if test="profitNo != null and profitNo != ''"> and profit_no like concat('%', #{profitNo}, '%')</if>
<if test="profitName != null and profitName != ''"> and profit_name like concat('%', #{profitName}, '%')</if>
<if test="settleType != null and settleType != ''"> and settle_type like concat('%', #{settleType}, '%')</if>
<if test="billMonth != null and billMonth != ''"> and bill_month like concat('%', #{billMonth}, '%')</if>
<if test="startDate != null "> and start_date = #{startDate}</if>
<if test="endDate != null "> and end_date = #{endDate}</if>
<if test="money != null "> and money = #{money}</if>
<if test="empCode != null and empCode != ''"> and emp_code like concat('%', #{empCode}, '%')</if>
<if test="empName != null and empName != ''"> and emp_name like concat('%', #{empName}, '%')</if>
<if test="blHasProfit != null and blHasProfit != ''"> and bl_has_profit like concat('%', #{blHasProfit}, '%')</if>
<if test="blAudit != null and blAudit != ''"> and bl_audit like concat('%', #{blAudit}, '%')</if>
<if test="auditDate != null "> and audit_date = #{auditDate}</if>
<if test="auditNote != null and auditNote != ''"> and audit_note like concat('%', #{auditNote}, '%')</if>
<if test="auditManCode != null and auditManCode != ''"> and audit_man_code like concat('%', #{auditManCode}, '%')</if>
<if test="sendPieceSum != null "> and send_piece_sum = #{sendPieceSum}</if>
<if test="pieceNumber != null "> and piece_number = #{pieceNumber}</if>
<if test="feeWeight != null "> and fee_weight = #{feeWeight}</if>
<if test="payee != null and payee != ''"> and payee like concat('%', #{payee}, '%')</if>
<if test="salesmen != null and salesmen != ''"> and salesmen like concat('%', #{salesmen}, '%')</if>
<if test="billMonth != null and billMonth != ''"> and bill_month like concat('%', #{billMonth}, '%')</if>
<if test="money != null "> and money = #{money}</if>
<if test="realMoney != null "> and real_money = #{realMoney}</if>
<if test="payedMoney != null "> and payed_money = #{payedMoney}</if>
<if test="blConfirmCenter != null and blConfirmCenter != ''"> and bl_confirm_center like concat('%', #{blConfirmCenter}, '%')</if>
<if test="confirmCenterDate != null "> and confirm_center_date = #{confirmCenterDate}</if>
<if test="confirmCenterNote != null and confirmCenterNote != ''"> and confirm_center_note like concat('%', #{confirmCenterNote}, '%')</if>
@ -92,24 +68,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where del_flag='0'
and id = #{id}
and profit_no = #{profitNo}
and profit_name = #{profitName}
and settle_type = #{settleType}
and bill_month = #{billMonth}
and start_date = #{startDate}
and end_date = #{endDate}
and money = #{money}
and emp_code = #{empCode}
and emp_name = #{empName}
and bl_has_profit = #{blHasProfit}
and bl_audit = #{blAudit}
and audit_date = #{auditDate}
and audit_note = #{auditNote}
and audit_man_code = #{auditManCode}
and send_piece_sum = #{sendPieceSum}
and piece_number = #{pieceNumber}
and fee_weight = #{feeWeight}
and payee = #{payee}
and salesmen = #{salesmen}
and bill_month = #{billMonth}
and money = #{money}
and real_money = #{realMoney}
and payed_money = #{payedMoney}
and bl_confirm_center = #{blConfirmCenter}
and confirm_center_date = #{confirmCenterDate}
and confirm_center_note = #{confirmCenterNote}
@ -130,36 +94,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and update_site = #{updateSite}
limit 1
</select>
<select id="selectEmisCommissionProfitById" parameterType="Long" resultMap="EmisCommissionProfitResult">
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
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 a
where a.id = #{id}
</select>
<insert id="insertEmisCommissionProfit" parameterType="EmisCommissionProfit" useGeneratedKeys="true" keyProperty="id">
insert into emis_commission_profit
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="profitNo != null and profitNo != ''">profit_no,</if>
<if test="profitName != null and profitName != ''">profit_name,</if>
<if test="settleType != null and settleType != ''">settle_type,</if>
<if test="billMonth != null and billMonth != ''">bill_month,</if>
<if test="startDate != null">start_date,</if>
<if test="endDate != null">end_date,</if>
<if test="money != null">money,</if>
<if test="empCode != null and empCode != ''">emp_code,</if>
<if test="empName != null and empName != ''">emp_name,</if>
<if test="blHasProfit != null and blHasProfit != ''">bl_has_profit,</if>
<if test="blAudit != null and blAudit != ''">bl_audit,</if>
<if test="auditDate != null">audit_date,</if>
<if test="auditNote != null and auditNote != ''">audit_note,</if>
<if test="auditManCode != null and auditManCode != ''">audit_man_code,</if>
<if test="sendPieceSum != null">send_piece_sum,</if>
<if test="pieceNumber != null">piece_number,</if>
<if test="feeWeight != null">fee_weight,</if>
<if test="payee != null and payee != ''">payee,</if>
<if test="salesmen != null and salesmen != ''">salesmen,</if>
<if test="billMonth != null and billMonth != ''">bill_month,</if>
<if test="money != null">money,</if>
<if test="realMoney != null">real_money,</if>
<if test="payedMoney != null">payed_money,</if>
<if test="blConfirmCenter != null and blConfirmCenter != ''">bl_confirm_center,</if>
<if test="confirmCenterDate != null">confirm_center_date,</if>
<if test="confirmCenterNote != null and confirmCenterNote != ''">confirm_center_note,</if>
@ -178,28 +130,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">update_time,</if>
<if test="createSite != null and createSite != ''">create_site,</if>
<if test="updateSite != null and updateSite != ''">update_site,</if>
</trim>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="profitNo != null and profitNo != ''">#{profitNo},</if>
<if test="profitName != null and profitName != ''">#{profitName},</if>
<if test="settleType != null and settleType != ''">#{settleType},</if>
<if test="billMonth != null and billMonth != ''">#{billMonth},</if>
<if test="startDate != null">#{startDate},</if>
<if test="endDate != null">#{endDate},</if>
<if test="money != null">#{money},</if>
<if test="empCode != null and empCode != ''">#{empCode},</if>
<if test="empName != null and empName != ''">#{empName},</if>
<if test="blHasProfit != null and blHasProfit != ''">#{blHasProfit},</if>
<if test="blAudit != null and blAudit != ''">#{blAudit},</if>
<if test="auditDate != null">#{auditDate},</if>
<if test="auditNote != null and auditNote != ''">#{auditNote},</if>
<if test="auditManCode != null and auditManCode != ''">#{auditManCode},</if>
<if test="sendPieceSum != null">#{sendPieceSum},</if>
<if test="pieceNumber != null">#{pieceNumber},</if>
<if test="feeWeight != null">#{feeWeight},</if>
<if test="payee != null and payee != ''">#{payee},</if>
<if test="salesmen != null and salesmen != ''">#{salesmen},</if>
<if test="billMonth != null and billMonth != ''">#{billMonth},</if>
<if test="money != null">#{money},</if>
<if test="realMoney != null">#{realMoney},</if>
<if test="payedMoney != null">#{payedMoney},</if>
<if test="blConfirmCenter != null and blConfirmCenter != ''">#{blConfirmCenter},</if>
<if test="confirmCenterDate != null">#{confirmCenterDate},</if>
<if test="confirmCenterNote != null and confirmCenterNote != ''">#{confirmCenterNote},</if>
@ -218,31 +158,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">#{updateTime},</if>
<if test="createSite != null and createSite != ''">#{createSite},</if>
<if test="updateSite != null and updateSite != ''">#{updateSite},</if>
</trim>
</trim>
</insert>
<update id="updateEmisCommissionProfit" parameterType="EmisCommissionProfit">
update emis_commission_profit
<trim prefix="SET" suffixOverrides=",">
<if test="profitNo != null and profitNo != ''">profit_no = #{profitNo},</if>
<if test="profitName != null and profitName != ''">profit_name = #{profitName},</if>
<if test="settleType != null and settleType != ''">settle_type = #{settleType},</if>
<if test="billMonth != null and billMonth != ''">bill_month = #{billMonth},</if>
<if test="startDate != null">start_date = #{startDate},</if>
<if test="endDate != null">end_date = #{endDate},</if>
<if test="money != null">money = #{money},</if>
<if test="empCode != null and empCode != ''">emp_code = #{empCode},</if>
<if test="empName != null and empName != ''">emp_name = #{empName},</if>
<if test="blHasProfit != null and blHasProfit != ''">bl_has_profit = #{blHasProfit},</if>
<if test="blAudit != null and blAudit != ''">bl_audit = #{blAudit},</if>
<if test="auditDate != null">audit_date = #{auditDate},</if>
<if test="auditNote != null and auditNote != ''">audit_note = #{auditNote},</if>
<if test="auditManCode != null and auditManCode != ''">audit_man_code = #{auditManCode},</if>
<if test="sendPieceSum != null">send_piece_sum = #{sendPieceSum},</if>
<if test="pieceNumber != null">piece_number = #{pieceNumber},</if>
<if test="feeWeight != null">fee_weight = #{feeWeight},</if>
<if test="payee != null and payee != ''">payee = #{payee},</if>
<if test="salesmen != null and salesmen != ''">salesmen = #{salesmen},</if>
<if test="billMonth != null and billMonth != ''">bill_month = #{billMonth},</if>
<if test="money != null">money = #{money},</if>
<if test="realMoney != null">real_money = #{realMoney},</if>
<if test="payedMoney != null">payed_money = #{payedMoney},</if>
<if test="blConfirmCenter != null and blConfirmCenter != ''">bl_confirm_center = #{blConfirmCenter},</if>
<if test="confirmCenterDate != null">confirm_center_date = #{confirmCenterDate},</if>
<if test="confirmCenterNote != null and confirmCenterNote != ''">confirm_center_note = #{confirmCenterNote},</if>
@ -270,7 +198,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteEmisCommissionProfitByIds" parameterType="String">
delete from emis_commission_profit where id in
delete from emis_commission_profit where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>