bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新购优化

This commit is contained in:
sxu 2024-11-07 09:26:21 +08:00
parent 6e13f55e07
commit 9b2007f8eb
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/PurchaseCheckDetails.java
View File

@ -134,5 +134,8 @@ public class PurchaseCheckDetails extends BaseEntity {
@ApiModelProperty(value = "数据所属组织")
private Long companyId;
/** 是否是固定资产编号(0 否，1 是) */
@ApiModelProperty(value = "是否是固定资产编号(0 否，1 是)")
private String fixCode;
}

4
bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/domain/dto/PurchaseDto.java
View File

@ -74,8 +74,8 @@ public class PurchaseDto {
@ApiModelProperty(value = "提交绑定数据集合")
private List<PurchaseDto> dtoList;
/** 是否是固定资产编号(0,是 1,否) */
@ApiModelProperty(value = "是否是固定资产编号(0,是 1,否)")
/** 是否是固定资产编号(0 否，1 是) */
@ApiModelProperty(value = "是否是固定资产编号(0 否，1 是)")
private String fixCode;
/** 编号类型 */

13
bonus-modules/bonus-material/src/main/resources/mapper/material/purchase/PurchaseCheckDetailsMapper.xml
View File

@ -32,17 +32,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="fileName" column="file_name" />
<result property="fileUrl" column="file_url" />
<result property="companyId" column="company_id" />
<result property="fixCode" column="fix_code" />
</resultMap>
<sql id="selectPurchaseCheckDetailsVo">
select id, task_id, type_id, purchase_price, purchase_tax_price, purchase_num, check_num, bind_num, check_result, supplier_id, status, create_by, production_time, create_time, update_by, update_time, remark, check_url_name, check_url, input_num, input_status, input_time, file_name, file_url, company_id from purchase_check_details
select id, task_id, type_id, purchase_price, purchase_tax_price, purchase_num, check_num, bind_num, check_result, supplier_id, status, create_by, production_time, create_time, update_by, update_time, remark, check_url_name, check_url, input_num, input_status, input_time, file_name, file_url, company_id, fix_code from purchase_check_details
</sql>
<sql id="selectPurchaseCheckDetailsJoinVo">
select pcd.id, pcd.task_id, pcd.type_id, pcd.purchase_price, pcd.purchase_tax_price, pcd.purchase_num, pcd.check_num, pcd.bind_num, pcd.check_result,
pcd.supplier_id, pcd.status, pcd.create_by, pcd.production_time, pcd.create_time, pcd.update_by, pcd.update_time,
pcd.remark, pcd.check_url_name, pcd.check_url, pcd.input_num, pcd.input_status, pcd.input_time, pcd.file_name,
pcd.file_url, pcd.company_id, mt.type_name, mt.unit_name, mtp.type_name as ma_type_name
pcd.file_url, pcd.company_id, pcd.fix_code, mt.type_name, mt.unit_name, mtp.type_name as ma_type_name
from purchase_check_details pcd
left join ma_type mt on pcd.type_id = mt.type_id
left join ma_type mtp on mt.parent_id = mtp.type_id
@ -70,6 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="fileName != null and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
<if test="fileUrl != null and fileUrl != ''"> and file_url = #{fileUrl}</if>
<if test="companyId != null "> and company_id = #{companyId}</if>
<if test="fixCode != null "> and fix_code = #{fixCode}</if>
</where>
</select>
@ -132,6 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="fileName != null">file_name,</if>
<if test="fileUrl != null">file_url,</if>
<if test="companyId != null">company_id,</if>
<if test="fixCode != null">fix_code,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="taskId != null">#{taskId},</if>
@ -158,6 +161,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="fileName != null">#{fileName},</if>
<if test="fileUrl != null">#{fileUrl},</if>
<if test="companyId != null">#{companyId},</if>
<if test="fixCode != null">#{fixCode},</if>
</trim>
</insert>
@ -188,6 +192,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="fileName != null">file_name = #{fileName},</if>
<if test="fileUrl != null">file_url = #{fileUrl},</if>
<if test="companyId != null">company_id = #{companyId},</if>
<if test="fixCode != null">fix_code = #{fixCode},</if>
</trim>
where id = #{id}
</update>
@ -227,14 +232,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
purchase_num,check_num,bind_num,check_result,supplier_id,
status,production_time,create_by,create_time,update_by,
update_time,remark,check_url_name,check_url,input_num,
input_status,input_time,file_name,file_url,company_id)
input_status,input_time,file_name,file_url,company_id,fix_code)
values
<foreach collection="list" item="item" index="index" separator=",">
(#{item.taskId},#{item.typeId},#{item.purchasePrice},#{item.purchaseTaxPrice},
#{item.purchaseNum},#{item.checkNum},#{item.bindNum},#{item.checkResult},#{item.supplierId},
#{item.status},#{item.productionTime},#{item.createBy},#{item.createTime},#{item.updateBy},
#{item.updateTime},#{item.remark},#{item.checkUrlName},#{item.checkUrl},#{item.inputNum},
#{item.inputStatus},#{item.inputTime},#{item.fileName},#{item.fileUrl},#{item.companyId})
#{item.inputStatus},#{item.inputTime},#{item.fileName},#{item.fileUrl},#{item.companyId},#{item.fixCode})
</foreach>
</insert>