Skip to content

D
dd_school
Commit 518c3482 by wangjian
Options

2024-06-14 修改 1人日

parent 381582e6
Showing with 34 additions and 18 deletions
smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolEquipment/SchoolEquipmentLedger.java
...@@ -31,16 +31,16 @@ public class SchoolEquipmentLedger extends OurBaseEntity ...@@ -31,16 +31,16 @@ public class SchoolEquipmentLedger extends OurBaseEntity
@Excel(name = "型号") @Excel(name = "型号")
private String model; private String model;
/** 规格 */ /** 规格 改为 出厂编号 */
@Excel(name = "规格") @Excel(name = "出厂编号")
private String specification; private String specification;
/** 分类编码 */ /** 分类编码 */
@Excel(name = "分类编码") @Excel(name = "分类编码")
private String classificationCode; private String classificationCode;
/** 单位 */ /** 单位 改为 设备编码 */
@Excel(name = "单位") @Excel(name = "设备编码")
private String unit; private String unit;
/** 归属类型（1公共区域，2信息中心，3个人） */ /** 归属类型（1公共区域，2信息中心，3个人） */
...@@ -87,4 +87,8 @@ public class SchoolEquipmentLedger extends OurBaseEntity ...@@ -87,4 +87,8 @@ public class SchoolEquipmentLedger extends OurBaseEntity
/** 备注 */ /** 备注 */
@Excel(name = "备注") @Excel(name = "备注")
private String remark; private String remark;
/** 批号 */
@Excel(name = "批号")
private String ph;
} }
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolEquipment/SchoolEquipmentLedgerDcVo.java
...@@ -26,7 +26,7 @@ public class SchoolEquipmentLedgerDcVo extends OurBaseEntity ...@@ -26,7 +26,7 @@ public class SchoolEquipmentLedgerDcVo extends OurBaseEntity
private Integer serialNumber; private Integer serialNumber;
/** 自编码 */ /** 自编码 */
@Excel(name = "设备名称") @Excel(name = "自编码")
private String encode; private String encode;
/** 设备名称 */ /** 设备名称 */
...@@ -37,18 +37,22 @@ public class SchoolEquipmentLedgerDcVo extends OurBaseEntity ...@@ -37,18 +37,22 @@ public class SchoolEquipmentLedgerDcVo extends OurBaseEntity
@Excel(name = "型号") @Excel(name = "型号")
private String model; private String model;
/** 规格 */ /** 规格 改为 出厂编号 */
@Excel(name = "规格") @Excel(name = "出厂编号")
private String specification; private String specification;
/** 分类编码 */ /** 分类编码 */
@Excel(name = "分类编码") @Excel(name = "分类编码")
private String classificationCode; private String classificationCode;
/** 单位 */ /** 单位 改为 设备编码 */
@Excel(name = "单位") @Excel(name = "设备编码")
private String unit; private String unit;
/** 批号 */
@Excel(name = "批号")
private String ph;
/** 归属类型（1公共区域，2信息中心，3个人） */ /** 归属类型（1公共区域，2信息中心，3个人） */
@Excel(name = "归属类型", readConverterExp = "1=公共区域,2=信息中心,3=个人", combo = {"公共区域","信息中心","个人"}) @Excel(name = "归属类型", readConverterExp = "1=公共区域,2=信息中心,3=个人", combo = {"公共区域","信息中心","个人"})
private String affiliationType; private String affiliationType;
......
smart-campus/src/main/java/yangtz/cs/liu/campus/vo/schoolEquipment/SchoolEquipmentLedgerVo.java
...@@ -37,16 +37,16 @@ public class SchoolEquipmentLedgerVo extends BaseEntity ...@@ -37,16 +37,16 @@ public class SchoolEquipmentLedgerVo extends BaseEntity
@Excel(name = "型号") @Excel(name = "型号")
private String model; private String model;
/** 规格 */ /** 规格 改为 出厂编号 */
@Excel(name = "规格") @Excel(name = "出厂编号")
private String specification; private String specification;
/** 分类编码 */ /** 分类编码 */
@Excel(name = "分类编码") @Excel(name = "分类编码")
private String classificationCode; private String classificationCode;
/** 单位 */ /** 单位 改为 设备编码 */
@Excel(name = "单位") @Excel(name = "设备编码")
private String unit; private String unit;
/** 归属类型（1公共区域，2信息中心，3个人） */ /** 归属类型（1公共区域，2信息中心，3个人） */
...@@ -92,4 +92,8 @@ public class SchoolEquipmentLedgerVo extends BaseEntity ...@@ -92,4 +92,8 @@ public class SchoolEquipmentLedgerVo extends BaseEntity
/** 备注 */ /** 备注 */
@Excel(name = "备注") @Excel(name = "备注")
private String remark; private String remark;
/** 批号 */
@Excel(name = "批号")
private String ph;
} }
smart-campus/src/main/resources/mapper/schoolEquipment/EquipmentLedgerMapper.xml
...@@ -28,11 +28,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -28,11 +28,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateBy" column="update_by" /> <result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" /> <result property="updateTime" column="update_time" />
<result property="delFalg" column="del_flag" /> <result property="delFalg" column="del_flag" />
<result property="ph" column="ph" />
</resultMap> </resultMap>
<select id="selectSchoolEquipmentLedgerList" parameterType="SchoolEquipmentLedgerVo" resultMap="schoolEquipmentLedgerResult"> <select id="selectSchoolEquipmentLedgerList" parameterType="SchoolEquipmentLedgerVo" resultMap="schoolEquipmentLedgerResult">
select el.id,el.encode,el.equipment_name,el.model,el.specification,el.classification_code,el.unit,el.affiliation_type,el.equipment_state,el.is_allow_lend,el.is_lend,el.date_of_production, select el.id,el.encode,el.equipment_name,el.model,el.specification,el.classification_code,el.unit,el.affiliation_type,
el.price,el.life_of_utility,el.place,el.use_id,el.use_name,el.remark,el.create_by,el.create_time,el.update_by,el.update_time el.equipment_state,el.is_allow_lend,el.is_lend,el.date_of_production, el.ph,
el.price,el.life_of_utility,el.place,el.use_id,el.use_name,el.remark,el.create_by,el.create_time,el.update_by,el.update_time
from school_equipment_ledger el from school_equipment_ledger el
left join school_product_category pc on el.classification_code = pc.classification_code left join school_product_category pc on el.classification_code = pc.classification_code
left join sys_user u on pc.admin_id = u.user_id left join sys_user u on pc.admin_id = u.user_id
...@@ -46,8 +48,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -46,8 +48,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="selectSchoolEquipmentLedgerListGr" parameterType="SchoolEquipmentLedgerVo" resultMap="schoolEquipmentLedgerResult"> <select id="selectSchoolEquipmentLedgerListGr" parameterType="SchoolEquipmentLedgerVo" resultMap="schoolEquipmentLedgerResult">
select el.id,el.encode,el.equipment_name,el.model,el.specification,el.classification_code,el.unit,el.affiliation_type,el.equipment_state,el.is_allow_lend,el.is_lend,el.date_of_production, select el.id,el.encode,el.equipment_name,el.model,el.specification,el.classification_code,el.unit, el.ph,
el.price,el.life_of_utility,el.place,el.use_id,el.use_name,el.remark,el.create_by,el.create_time,el.update_by,el.update_time el.affiliation_type,el.equipment_state,el.is_allow_lend,el.is_lend,el.date_of_production,
el.price,el.life_of_utility,el.place,el.use_id,el.use_name,el.remark,el.create_by,el.create_time,el.update_by,el.update_time
from school_equipment_ledger el from school_equipment_ledger el
left join school_product_category pc on el.classification_code = pc.classification_code left join school_product_category pc on el.classification_code = pc.classification_code
left join sys_user u on pc.admin_id = u.user_id left join sys_user u on pc.admin_id = u.user_id
...@@ -83,7 +86,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -83,7 +86,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select> </select>
<select id="getEquipmentledger" parameterType="String" resultType="Map"> <select id="getEquipmentledger" parameterType="String" resultType="Map">
select id as id, encode as encode, equipment_name as equipmentName, model as model, place as place from school_equipment_ledger where id in select id as id, encode as encode, equipment_name as equipmentName, model as model, place as place, ph, unit, specification
from school_equipment_ledger where id in
<foreach item="id" collection="array" open="(" separator="," close=")"> <foreach item="id" collection="array" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment