bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

功能优化

This commit is contained in:
hayu 2024-04-07 15:52:57 +08:00
parent 816857a29d
commit 29df08846a
3 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/PurchaseMacodeInfo.java
View File

@ -116,6 +116,12 @@ public class PurchaseMacodeInfo extends BaseEntity
@ApiModelProperty(value = "单位名称") @ApiModelProperty(value = "单位名称")
private String unitName; private String unitName;
/**
* 类型管理方式
*/
@ApiModelProperty(value = "类型管理方式")
private String manageType;
public String getUnitName() { public String getUnitName() {
return unitName; return unitName;
} }
@ -335,6 +341,14 @@ public class PurchaseMacodeInfo extends BaseEntity
this.dictName = dictName; this.dictName = dictName;
} }
public String getManageType() {
return manageType;
}
public void setManageType(String manageType) {
this.manageType = manageType;
}
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

14
sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseCheckInfoMapper.xml
View File

@ -190,6 +190,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="arrivalTime != null and arrivalTime != ''"> and pci.arrival_time = #{arrivalTime}</if> <if test="arrivalTime != null and arrivalTime != ''"> and pci.arrival_time = #{arrivalTime}</if>
<if test="purchaser != null "> and pci.purchaser = #{purchaser}</if> <if test="purchaser != null "> and pci.purchaser = #{purchaser}</if>
<if test="companyId != null "> and pci.company_id = #{companyId}</if> <if test="companyId != null "> and pci.company_id = #{companyId}</if>
<if test="typeId != null">AND #{typeId} IN (SELECT mt2.type_id
FROM purchase_check_details pcd
LEFT JOIN ma_type mt on mt.type_id=pcd.type_id
LEFT JOIN ma_type mt2 on mt2.type_id=mt.parent_id
WHERE pcd.task_id = pci.task_id
)
</if>
order by pci.id desc order by pci.id desc
</select> </select>
<select id="exportList" resultType="com.bonus.sgzb.material.domain.PurchaseCheckInfo"> <select id="exportList" resultType="com.bonus.sgzb.material.domain.PurchaseCheckInfo">
@ -279,6 +286,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="arrivalTime != null and arrivalTime != ''"> and pci.arrival_time = #{arrivalTime}</if> <if test="arrivalTime != null and arrivalTime != ''"> and pci.arrival_time = #{arrivalTime}</if>
<if test="purchaser != null "> and pci.purchaser = #{purchaser}</if> <if test="purchaser != null "> and pci.purchaser = #{purchaser}</if>
<if test="companyId != null "> and pci.company_id = #{companyId}</if> <if test="companyId != null "> and pci.company_id = #{companyId}</if>
<if test="typeId != null">AND #{typeId} IN (SELECT mt2.type_id
FROM purchase_check_details pcd
LEFT JOIN ma_type mt on mt.type_id=pcd.type_id
LEFT JOIN ma_type mt2 on mt2.type_id=mt.parent_id
WHERE pcd.task_id = pci.task_id
)
</if>
order by pci.id desc order by pci.id desc
</select> </select>
<select id="selectTypeNameAndManageTypeByTaskId" <select id="selectTypeNameAndManageTypeByTaskId"

1
sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
View File

@ -354,6 +354,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select pcd.production_time productionTime, select pcd.production_time productionTime,
mt.type_name specificationType, mt.type_name specificationType,
mt1.type_name typeName, mt1.type_name typeName,
mt.manage_type as manageType,
pmi.ma_code maCode, pmi.ma_code maCode,
mm.assets_code assetsCode, mm.assets_code assetsCode,
pmi.fix_code fixCode, pmi.fix_code fixCode,