diff --git a/emis-biz/src/main/resources/mapper/EmisWriteoffApplyDetailMapper.xml b/emis-biz/src/main/resources/mapper/EmisWriteoffApplyDetailMapper.xml index ef0063c87..c1c653a36 100644 --- a/emis-biz/src/main/resources/mapper/EmisWriteoffApplyDetailMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWriteoffApplyDetailMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -194,7 +194,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select wad.id, wad.apply_id, wad.apply_no, wad.bill_code, wad.apply_money, wad.settle_bill_no, + select wad.id, wad.apply_id, wad.apply_no, wad.bill_code, wad.apply_money, wad.settle_bill_no, wad.del_flag, CONCAT(IFNULL(send_site.site_name, ''), '-', IFNULL(dest_site.site_name, '')) as express_type, w.id as w_id, w.order_sn as w_order_sn, w.cust_order_id as w_cust_order_id, w.bill_code as w_bill_code, w.bill_code_sub as w_bill_code_sub, w.order_status as w_order_status, w.waybill_status as w_waybill_status, w.order_type as w_order_type, w.order_date as w_order_date, @@ -255,6 +255,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - where id = #{id} + where wad.id = #{id} and wad.del_flag = '0' @@ -283,6 +284,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bill_code, apply_money, settle_bill_no, + del_flag, #{applyId}, @@ -290,14 +292,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{billCode}, #{applyMoney}, #{settleBillNo}, + #{delFlag}, - insert into emis_writeoff_apply_detail (apply_id, apply_no, bill_code, apply_money, settle_bill_no) + insert into emis_writeoff_apply_detail (apply_id, apply_no, bill_code, apply_money, settle_bill_no, del_flag) values - (#{item.applyId}, #{item.applyNo}, #{item.billCode}, #{item.applyMoney}, #{item.settleBillNo}) + (#{item.applyId}, #{item.applyNo}, #{item.billCode}, #{item.applyMoney}, #{item.settleBillNo}, '0') @@ -313,25 +316,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - - delete from emis_writeoff_apply_detail where id = #{id} - + + update emis_writeoff_apply_detail set del_flag = '2' where id = #{id} + - - delete from emis_writeoff_apply_detail where apply_id = #{applyId} - + + update emis_writeoff_apply_detail set del_flag = '2' where apply_id = #{applyId} + - - delete from emis_writeoff_apply_detail where id in + + update emis_writeoff_apply_detail set del_flag = '2' where id in #{id} - + diff --git a/emis-biz/src/main/resources/mapper/EmisWriteoffApplyImageMapper.xml b/emis-biz/src/main/resources/mapper/EmisWriteoffApplyImageMapper.xml index 452234f6a..893e9c5de 100644 --- a/emis-biz/src/main/resources/mapper/EmisWriteoffApplyImageMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWriteoffApplyImageMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -15,20 +15,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - - - - select id, apply_id, apply_no, image_name, image_path, image_size, image_type, upload_date, upload_man_code, upload_man_name, create_by, create_time, update_by, update_time, remark from emis_writeoff_apply_image + select id, apply_id, apply_no, image_name, image_path, image_size, image_type, upload_date, upload_man_code, upload_man_name, del_flag, create_by, create_time, update_by, update_time, remark from emis_writeoff_apply_image - where id = #{id} + where id = #{id} and del_flag = '0' @@ -65,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" upload_date, upload_man_code, upload_man_name, + del_flag, create_by, create_time, update_by, @@ -81,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{uploadDate}, #{uploadManCode}, #{uploadManName}, + #{delFlag}, #{createBy}, #{createTime}, #{updateBy}, @@ -90,10 +88,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into emis_writeoff_apply_image (apply_id, apply_no, image_name, image_path, image_size, image_type, upload_date, upload_man_code, upload_man_name, create_by, create_time, update_by, update_time, remark) + insert into emis_writeoff_apply_image (apply_id, apply_no, image_name, image_path, image_size, image_type, upload_date, upload_man_code, upload_man_name, del_flag, create_by, create_time, update_by, update_time, remark) values - (#{item.applyId}, #{item.applyNo}, #{item.imageName}, #{item.imagePath}, #{item.imageSize}, #{item.imageType}, #{item.uploadDate}, #{item.uploadManCode}, #{item.uploadManName}, #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.remark}) + (#{item.applyId}, #{item.applyNo}, #{item.imageName}, #{item.imagePath}, #{item.imageSize}, #{item.imageType}, #{item.uploadDate}, #{item.uploadManCode}, #{item.uploadManName}, '0', #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime}, #{item.remark}) @@ -116,20 +114,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - - delete from emis_writeoff_apply_image where id = #{id} - + + update emis_writeoff_apply_image set del_flag = '2' where id = #{id} + - - delete from emis_writeoff_apply_image where apply_id = #{applyId} - + + update emis_writeoff_apply_image set del_flag = '2' where apply_id = #{applyId} + - - delete from emis_writeoff_apply_image where id in + + update emis_writeoff_apply_image set del_flag = '2' where id in #{id} - + diff --git a/emis-biz/src/main/resources/mapper/EmisWriteoffApplyMapper.xml b/emis-biz/src/main/resources/mapper/EmisWriteoffApplyMapper.xml index 4fc7e16fc..f0b1d904c 100644 --- a/emis-biz/src/main/resources/mapper/EmisWriteoffApplyMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWriteoffApplyMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -33,11 +33,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - - - - select id, apply_no, apply_man_code, apply_man_name, apply_site_code, apply_site_name, apply_date, writeoff_amount, pay_type, trade_date, recipient, apply_memo, bl_center_confirmed, center_confirm_man_code, center_confirm_man_name, center_confirm_date, center_confirm_note, center_reject_reason, bl_headquarters_confirmed, headquarters_confirm_man_code, headquarters_confirm_man_name, headquarters_confirm_date, headquarters_confirm_note, headquarters_reject_reason, revoke_date, revoke_man_code, revoke_man_name, revoke_reason, create_by, create_time, update_by, update_time, remark from emis_writeoff_apply + select id, apply_no, apply_man_code, apply_man_name, apply_site_code, apply_site_name, apply_date, writeoff_amount, pay_type, trade_date, recipient, apply_memo, bl_center_confirmed, center_confirm_man_code, center_confirm_man_name, center_confirm_date, center_confirm_note, center_reject_reason, bl_headquarters_confirmed, headquarters_confirm_man_code, headquarters_confirm_man_name, headquarters_confirm_date, headquarters_confirm_note, headquarters_reject_reason, revoke_date, revoke_man_code, revoke_man_name, revoke_reason, del_flag, create_by, create_time, update_by, update_time, remark from emis_writeoff_apply