Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
1452c252 由 康伟
选项

kangwei ： 设备台账关联备品备件 

           修改bug
1 个父辈 e89392f5
内嵌 并排
正在显示 20 个修改的文件 包含 366 行增加 和 33 行删除
sk-module-biz/src/main/java/com/skua/modules/ajh/controller/AjhMeetingSendController.java
......@@ -10,6 +10,7 @@ import javax.servlet.http.HttpServletResponse;
import com.skua.core.api.vo.Result;
import com.skua.core.aspect.annotation.AutoLog;
import com.skua.core.context.BaseContextHandler;
import com.skua.core.query.QueryGenerator;
import com.skua.core.util.ConvertUtils;
import com.skua.modules.ajh.entity.AjhMeetingSend;
......@@ -91,6 +92,8 @@ public class AjhMeetingSendController {
ajhMeetingSend.getMeetStartTime()+" 00:00:00",ajhMeetingSend.getMeetEndTime()+" 23:59:59");
Page<AjhMeetingSend> page = new Page<AjhMeetingSend>(pageNo, pageSize);
IPage<AjhMeetingSend> pageList = ajhMeetingSendService.queryPage(page, queryWrapper);
result.setSuccess(true);
result.setResult(pageList);
return result;
......@@ -344,7 +347,7 @@ public class AjhMeetingSendController {
//导出文件名称
mv.addObject(NormalExcelConstants.FILE_NAME, "会议记录列表");
mv.addObject(NormalExcelConstants.CLASS, AjhMeetingSend.class);
mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("会议记录列表数据", "导出人:Jeecg", "导出信息"));
mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("会议记录列表数据", "", "会议记录列表"));
mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
return mv;
}
......
sk-module-biz/src/main/java/com/skua/modules/ajh/entity/AjhMeeting.java
......@@ -31,7 +31,7 @@ public class AjhMeeting {
@ApiModelProperty(value = "主键")
private String id;
/**组织单位*/
@Excel(name = "组织单位", width = 15)
@Excel(name = "所属机构", width = 15 )
@ApiModelProperty(value = "组织单位")
@Dict(dictTable = "sys_depart", dicCode="id", dicText = "depart_name")
private String departId;
......@@ -40,7 +40,7 @@ public class AjhMeeting {
@ApiModelProperty(value = "通知单位")
private String departIds;
/**会议标题*/
@Excel(name = "会议标题", width = 15)
@Excel(name = "任务主题", width = 15 ,orderNum="2")
@ApiModelProperty(value = "会议标题")
private String meetTitile;
/**会议内容*/
......
sk-module-biz/src/main/java/com/skua/modules/ajh/entity/AjhMeetingSend.java
......@@ -34,78 +34,78 @@ public class AjhMeetingSend {
@ApiModelProperty(value = "会议ID")
private String meetId;
/**机构ID*/
@Excel(name = "机构ID", width = 15)
@Excel(name = "所属机构", width = 15 ,dictTable = "sys_depart", dicCode="id", dicText = "depart_name" ,orderNum="1")
@ApiModelProperty(value = "机构ID")
@Dict(dictTable = "sys_depart", dicCode="id", dicText = "depart_name")
private String departId;
/**会议时间*/
@Excel(name = "会议时间", width = 15)
@ApiModelProperty(value = "会议时间")
@Excel(name = "拟定任务时间", width = 40 , orderNum = "3")
@ApiModelProperty(value = "会议时间" )
private String meetTime;
/**会议开始时间*/
@Excel(name = "会议开始时间", width = 15)
@Excel(name = "开始时间", width = 15,orderNum = "4")
@ApiModelProperty(value = "会议开始时间")
private String meetStartTime;
/**会议结束时间*/
@Excel(name = "会议结束时间", width = 15)
@Excel(name = "结束时间", width = 15 ,orderNum = "5")
@ApiModelProperty(value = "会议结束时间")
private String meetEndTime;
/**主持人*/
@Excel(name = "主持人", width = 15)
@Excel(name = "主持人", width = 15,orderNum = "8")
@ApiModelProperty(value = "主持人")
@Dict(dicCode = "id", dicText = "realname", dictTable = "sys_user")
private String meetCompere;
/**会议主题*/
@Excel(name = "会议主题", width = 15)
@Excel(name = "任务主题", width = 15 ,orderNum = "2")
@ApiModelProperty(value = "会议主题")
private String meetTitle;
/**会议地点*/
@Excel(name = "会议地点", width = 15)
@Excel(name = "任务地点", width = 15,orderNum = "6")
@ApiModelProperty(value = "会议地点")
private String meetLocation;
/**会议内容*/
@Excel(name = "会议内容", width = 15)
@Excel(name = "会议内容", width = 15,orderNum = "11")
@ApiModelProperty(value = "会议内容")
private String meetContent;
/**回执二维码*/
@Excel(name = "回执二维码", width = 15)
//@Excel(name = "回执二维码", width = 15)
@ApiModelProperty(value = "回执二维码")
private String meetHzQrcode;
/**签到二维码*/
@Excel(name = "签到二维码", width = 15)
//@Excel(name = "签到二维码", width = 15)
@ApiModelProperty(value = "签到二维码")
private String meetQdQrcode;
/**纪要模版*/
@Excel(name = "纪要模版", width = 15)
//@Excel(name = "纪要模版", width = 15)
@ApiModelProperty(value = "纪要模版")
private String minutesTemplate;
/**参会人类型*/
@Excel(name = "参会人类型", width = 15)
//@Excel(name = "参会人类型", width = 15)
@ApiModelProperty(value = "参会人类型")
@Dict(dicCode = "meetting_user_type")
private String meetingType;
/**参与人*/
@Excel(name = "参与人", width = 15)
//@Excel(name = "参与人", width = 15)
@ApiModelProperty(value = "参与人")
private String userIds;
/**接受状态（0拒绝，1接受，2暂定）*/
@Excel(name = "接受状态（0拒绝，1接受，2暂定）", width = 15)
//@Excel(name = "接受状态（0拒绝，1接受，2暂定）", width = 15)
@ApiModelProperty(value = "接受状态（0拒绝，1接受，2暂定）")
@Dict(dicCode = "accept_flag")
private String acceptFlag;
/**发布状态（0未发布，1已发布，2已撤销）*/
@Excel(name = "发布状态（0未发布，1已发布，2已撤销）", width = 15)
@Excel(name = "发布状态（0未发布，1已发布，2已撤销）", width = 15 ,dicCode = "meet_status" ,orderNum = "10")
@ApiModelProperty(value = "发布状态（0未发布，1已发布，2已撤销）")
@Dict(dicCode = "meet_status")
private String sendStatus;
/**接受时间*/
@Excel(name = "接受时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
//@Excel(name = "接受时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "接受时间")
private Date acceptTime;
/**会议状态*/
@Excel(name = "会议状态", width = 15)
@Excel(name = "任务状态", width = 15 ,dicCode = "meetting_status",orderNum = "9")
@ApiModelProperty(value = "会议状态")
@Dict(dicCode = "meetting_status")
private Integer meetStatus;
......@@ -131,10 +131,12 @@ public class AjhMeetingSend {
@ApiModelProperty(value = "机构名称")
private java.lang.String departName;
/**邀请人数*/
@Excel(name = "邀请人数", width = 15,orderNum = "7")
@TableField(exist = false)
@ApiModelProperty(value = "邀请人数")
private java.lang.String inviteNum;
/**参与人数*/
@Excel(name = "参与人数", width = 15,orderNum = "8")
@TableField(exist = false)
@ApiModelProperty(value = "参与人数")
private java.lang.String particNum;
......
sk-module-biz/src/main/java/com/skua/modules/ajh/mapper/xml/AjhMeetingMapper.xml
......@@ -43,6 +43,7 @@
<if test="ajhMeeting.meetCategory !=null and ajhMeeting.meetCategory!=''">
AND m.meet_category = #{ajhMeeting.meetCategory}
</if>
order by m.create_time desc
</select>
<select id="getDataById" resultType="com.skua.modules.ajh.vo.AjhMeetingVO">
......
sk-module-biz/src/main/java/com/skua/modules/edu/entity/Paper.java
......@@ -127,8 +127,6 @@ public class Paper {
@ApiModelProperty(value = "delFlag")
private Integer delFlag;
@TableField(exist=false)
@ApiModelProperty(value = "考试人次")
private Integer userCount ;
......
sk-module-biz/src/main/java/com/skua/modules/edu/mapper/xml/PaperMapper.xml
......@@ -4,7 +4,7 @@
<!-- 我的考试列表 -->
<select id="queryMyPaperByList" resultType="com.skua.modules.edu.entity.Paper">
select d.depart_name ,p.*,( select count(1) from edu_user_paper up where up.paper_id = p.id ) 'user_count'
select d.depart_name ,p.*
from edu_paper p
left join sys_depart d on p.depart_id = d.id
where
......
sk-module-biz/src/main/java/com/skua/modules/edu/service/impl/PaperServiceImpl.java
......@@ -34,6 +34,8 @@ public class PaperServiceImpl extends ServiceImpl<PaperMapper, Paper> implements
private QuestionMapper questionMapper ;
@Resource
private PaperMapper paperMapper;
@Resource
private UserPaperMapper userPaperMapper;
@Resource
private UserAnswerMapper userAnswerMapper;
......@@ -183,6 +185,7 @@ public class PaperServiceImpl extends ServiceImpl<PaperMapper, Paper> implements
* 交卷
* @param paperVO
*/
@Transactional
public String submitPaper(UserPaperVO paperVO){
//创建用户答题记录
......@@ -207,6 +210,11 @@ public class PaperServiceImpl extends ServiceImpl<PaperMapper, Paper> implements
userPaper.setScore(totalScore ) ;
userPaperMapper.updateById( userPaper);
// 修改开始人次
Paper paper = paperMapper.selectById( paperVO.getPaperId() ) ;
paper.setUserCount( paper.getUserCount() + 1 ) ;
paperMapper.updateById( paper ) ;
//计算分数
// answer.setScore( totalScore );
// answerMapper.updateById( answer ) ;
......
sk-module-biz/src/main/java/com/skua/modules/erp/mapper/xml/MaterialINMapper.xml
......@@ -41,7 +41,7 @@
purchase_price,distribut_price,sum(purchase_total_price) 'purchase_total_price',sum(distribut_total_price) 'distribut_total_price',sum(total_price_tax) 'total_price_tax'
from erp_material_in
<where>
mi.audit_status =3
audit_status =3
<if test="materialIN.startTime != null and materialIN.startTime !=''">
and arrive_time &gt;= #{materialIN.startTime}
</if>
......
sk-module-biz/src/main/java/com/skua/modules/erp/mapper/xml/PurchaseMaterialMapper.xml
......@@ -60,18 +60,18 @@
<!-- 药剂入库查询结果：物料清单-->
<select id="queryPurchaseMaterialListByIn" resultType="com.skua.modules.erp.vo.PurchaseMaterialVO">
select dm.distribut_price ,dm.distribut_total_price ,ss.sparepart_name, st.item_text as 'sparepart_type_name',sm.supp_name as 'supplier_name',
aaa.* from (
select pm.* ,pc.depart_id
select dm.distribut_price ,dm.distribut_total_price , st.item_text as 'sparepart_type_name',sm.supp_name as 'supplier_name',
aaa.*
from (
select pm.* ,pc.depart_id,pc.contract_code 'purchase_contract_code',pc.project_name
from erp_purchase_material pm , erp_purchase_contract pc
where pm.contract_id =pc.id
<if test="param.sparepartCode != null and param.sparepartCode !=''"> and pc.departs like concat('%', #{param.departId}, '%')</if>
where pm.contract_id =pc.id and pc.id = #{param.purchaseContractId}
<if test="param.sparepartCode != null and param.sparepartCode !=''"> and pc.departs like '%' #{param.departId}'%'</if>
<if test="param.sparepartCode != null and param.sparepartCode !=''"> and pm.sparepart_code =#{param.sparepartCode}</if>
<if test="param.sparepartType != null and param.sparepartType !=''"> and pm.sparepart_type in (${param.sparepartType}) </if>
<if test="param.sparepartName != null and param.sparepartName !=''"> and pm.sparepart_name like concat('%', #{param.sparepartName}, '%')</if>
<if test="param.sparepartName != null and param.sparepartName !=''"> and pm.sparepart_name like '%' #{param.sparepartName}'%'</if>
)aaa
left join erp_distribut_material dm on (aaa.good_code = dm.good_code and aaa.depart_id)
left join equipment_sparepart_supplies ss on aaa.sparepart_id = ss.id
left join equipment_sparepart_type st on st.id = aaa.sparepart_type
left join ajh_supplier_manage sm on sm.id = aaa.supplier_id
......
sk-module-biz/src/main/java/com/skua/modules/erp/vo/MaterialSearchVO.java
......@@ -12,6 +12,10 @@ import lombok.experimental.Accessors;
@Accessors(chain = true)
@ApiModel(value="Material物料查询对象", description="Material物料查询对象")
public class MaterialSearchVO {
@ApiModelProperty(value = "采购合同编号")
private String purchaseContractId;
@ApiModelProperty(value = "物料编号")
private String sparepartCode;
......
sk-module-biz/src/main/java/com/skua/modules/erp/vo/PurchaseMaterialVO.java
......@@ -95,4 +95,17 @@ public class PurchaseMaterialVO {
@ApiModelProperty(value = "厂站名称")
private String departName;
@ApiModelProperty(value = "转换属性:单价")
private String purchasePrice;
@ApiModelProperty(value = "转换属性：采购总价")
private String purchaseTotalPrice;
public String getPurchasePrice() {
return this.unitPrice;
}
public String getPurchaseTotalPrice() {
return this.totalPrice;
}
}
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/controller/EquipmentBindSparepartController.java 0 → 100644
package com.skua.modules.equipment.controller;
import javax.servlet.http.HttpServletRequest;
import com.skua.core.api.vo.Result;
import com.skua.core.aspect.annotation.AutoLog;
import com.skua.modules.equipment.entity.EquipmentBindSparepart;
import com.skua.modules.equipment.entity.EquipmentSparepart;
import com.skua.modules.equipment.service.IEquipmentBindSparepartService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
/**
* <pre>
* 设备关联备品备件
* </pre>
* @author 开发者姓名
* @version V0.1, 开发时间
*/
@Slf4j
@Api(tags="设备关联备品备件")
@RestController("webEquipmentBindSparepartController")
@RequestMapping("/web/equipment/equipmentBindSparepart")
public class EquipmentBindSparepartController {
@Autowired
private IEquipmentBindSparepartService equipmentBindSparepartService;
@AutoLog(value = "设备关联备品备件-分页列表查询")
@ApiOperation(value="设备关联备品备件-分页列表查询", notes="设备关联备品备件-分页列表查询")
@GetMapping(value = "/list")
public Result<IPage<EquipmentSparepart>> queryPageList(
@RequestParam(name="equipmentId", defaultValue="1") String equipmentId,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
Result<IPage<EquipmentSparepart>> result = new Result<IPage<EquipmentSparepart>>();
Page<EquipmentSparepart> page = new Page<EquipmentSparepart>(pageNo, pageSize);
IPage<EquipmentSparepart> pageList = equipmentBindSparepartService.querySparepartListByEquipmentId(page,equipmentId);
result.setSuccess(true);
result.setResult(pageList);
return result;
}
@AutoLog(value = "设备关联备品备件-添加修改")
@ApiOperation(value="设备关联备品备件-添加修改", notes="设备关联备品备件-添加修改")
@PostMapping(value = "/saveOrUpdate")
public Result<EquipmentBindSparepart> saveOrUpdate(@RequestBody EquipmentBindSparepart equipmentBindSparepart) {
Result<EquipmentBindSparepart> result = new Result<EquipmentBindSparepart>();
try {
equipmentBindSparepartService.updateEquipmentBindSparepart(equipmentBindSparepart);
result.success("添加成功！");
} catch (Exception e) {
log.error(e.getMessage(),e);
result.error500("操作失败");
}
return result;
}
}
sk-module-equipment/src/main/java/com/skua/modules/equipment/controller/EquipmentController.java
......@@ -441,6 +441,10 @@ public class EquipmentController {
String isSpecial = equipmentDTO.getEquipmentInfo().getIsSpecial();
String departId = equipmentDTO.getEquipmentInfo().getDepartId();
String energyLevel = equipmentDTO.getEquipmentInfo().getEnergyLevel();//能耗等级
//Integer isSpecial = equipmentDTO.getEquipmentInfo().getIsSpecial();
String isMeterage = equipmentDTO.getEquipmentInfo().getIsMeterage();//是否计量设备
List<String> equipmentLevelList = null;
Base base = BaseFactory.JOIN().select(EquipmentAsset.class).select(EquipmentInfo.class).select(EquipmentBrand.class).select(EquipmentCategory.class)
.select(" (SELECT MAX(real_start_time) FROM equipment_maintain_task WHERE equipment_id = equipment_info.id and results_enforcement='4') as equipmentExt_maintainLastTime ")
......@@ -456,13 +460,16 @@ public class EquipmentController {
.eq(StringUtils.isNotEmpty(installWay), "install_way", installWay)
.eq(StringUtils.isNotEmpty(equipmentId), "equipment_info.id", equipmentId)
.eq(StringUtils.isNotEmpty(equipmentLevel), "equipment_level", equipmentLevel)
.eq(StringUtils.isNotEmpty(isSpecial), "is_special", isSpecial)
.eq(StringUtils.isNotEmpty(isSpecial), "is_special", isSpecial)//特种设备
.eq(StringUtils.isNotEmpty(isMeterage), "is_meterage", isMeterage) //计量设备
.eq(StringUtils.isNotEmpty(energyLevel), "energy_level", energyLevel) // 能耗等级
.eq(StringUtils.isNotEmpty(departId), "depart_id", departId)
.eq(StringUtils.isNotEmpty(structures), "structures", structures)
.like(StringUtils.isNotEmpty(equipmentName), "equipment_name", equipmentName)
.like(StringUtils.isNotEmpty(equipmentCode), "equipment_code", equipmentCode)
.eq(StringUtils.isNotEmpty(equipmentStatus), "equipment_status", equipmentStatus)
.like(StringUtils.isNotEmpty(installPosition), EquipmentInfo::getInstallPosition, installPosition)
.eq(StringUtils.isNotEmpty(equipmentDTO.getEquipmentInfo().getId()), "equipment_info.id", equipmentDTO.getEquipmentInfo().getId());
Page<Map<String, Object>> mapPage = (Page<Map<String, Object>>) base.queryForPage(new Page<>(equipmentDTO.getPageNo(), equipmentDTO.getPageSize()));
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/entity/EquipmentBindSparepart.java 0 → 100644
package com.skua.modules.equipment.entity;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
/**
* 设备关联备品备件
*/
@Data
@TableName("equipment_info_bind_sparepart")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="equipment_info_bind_sparepart对象", description="设备关联备品备件")
public class EquipmentBindSparepart {
/**id*/
@TableId(type = IdType.ID_WORKER_STR)
@ApiModelProperty(value = "id")
private String id;
/**货主组织*/
@Excel(name = "货主组织", width = 15)
@ApiModelProperty(value = "货主组织")
private String departId;
/**备品备件id*/
@Excel(name = "备品备件id", width = 15)
@ApiModelProperty(value = "备品备件id")
private String equipmentId;
/**物料编号*/
@Excel(name = "物料编号", width = 15)
@ApiModelProperty(value = "备品备件编号")
private String sparepartId;
@TableField(exist=false)
@ApiModelProperty(value = "备品备件编号集合")
private String sparepartIdList;
}
sk-module-equipment/src/main/java/com/skua/modules/equipment/entity/EquipmentInfo.java
......@@ -157,6 +157,13 @@ public class EquipmentInfo {
@ApiModelProperty(value = "是否为特种设备")
@Dict(dicCode = "yn")
private String isSpecial;
/**
* 是否为特种设备
*/
@ApiModelProperty(value = "是否为计量设备")
@Dict(dicCode = "yn")
private String isMeterage;
/**
* 创建人id
*/
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/mapper/EquipmentBindSparepartMapper.java 0 → 100644
package com.skua.modules.equipment.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.skua.modules.equipment.entity.EquipmentSparepart;
import org.apache.ibatis.annotations.Param;
import com.skua.modules.equipment.entity.EquipmentBindSparepart;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* 设备关联备品备件
*/
public interface EquipmentBindSparepartMapper extends BaseMapper<EquipmentBindSparepart> {
/**
* 删除
* @param equipmentId
*/
public void delByEquipmentId(@Param("equipmentId") String equipmentId);
/***
* 根据设备台账编号，查询关联的备品备件
* @param equipmentId
* @return
*/
public IPage<EquipmentSparepart> querySparepartListByEquipmentId(Page<EquipmentSparepart> page, @Param("equipmentId") String equipmentId);
}
sk-module-equipment/src/main/java/com/skua/modules/equipment/mapper/xml/EquipmentBindSparepartMapper.xml 0 → 100644
<?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.skua.modules.equipment.mapper.EquipmentBindSparepartMapper">
<delete id="delByEquipmentId">
delete from equipment_info_bind_sparepart where equipment_id =#{equipmentId}
</delete>
<!-- 根据设备台账编号,查询备件库 -->
<select id="querySparepartListByEquipmentId" resultType="com.skua.modules.equipment.entity.EquipmentSparepart">
select s.* from equipment_info_bind_sparepart t , equipment_sparepart s
where t.sparepart_id = s.supplies_id and t.depart_id = s.depart_id
and t.equipment_id = #{equipmentId}
order by s.create_time desc
</select>
</mapper>
\ No newline at end of file
sk-module-equipment/src/main/java/com/skua/modules/equipment/service/IEquipmentBindSparepartService.java 0 → 100644
package com.skua.modules.equipment.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.skua.modules.equipment.entity.EquipmentBindSparepart;
import com.baomidou.mybatisplus.extension.service.IService;
import com.skua.modules.equipment.entity.EquipmentSparepart;
/**
* 设备关联备品备件
*/
public interface IEquipmentBindSparepartService extends IService<EquipmentBindSparepart> {
/**
* 新增
* @param equipmentBindSparepart
*/
void saveEquipmentBindSparepart(EquipmentBindSparepart equipmentBindSparepart);
/**
* 修改
* @param equipmentBindSparepart
*/
void updateEquipmentBindSparepart(EquipmentBindSparepart equipmentBindSparepart);
/***
* 根据设备台账编号，查询关联的备品备件
* @param equipmentId
* @return
*/
IPage<EquipmentSparepart> querySparepartListByEquipmentId(Page<EquipmentSparepart> page, String equipmentId);
}
sk-module-equipment/src/main/java/com/skua/modules/equipment/service/impl/EquipmentBindSparepartServiceImpl.java 0 → 100644
package com.skua.modules.equipment.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.skua.modules.equipment.entity.EquipmentBindSparepart;
import com.skua.modules.equipment.entity.EquipmentSparepart;
import com.skua.modules.equipment.mapper.EquipmentBindSparepartMapper;
import com.skua.modules.equipment.service.IEquipmentBindSparepartService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Transactional;
/**
* 设备关联备品备件
*/
@Service
public class EquipmentBindSparepartServiceImpl extends ServiceImpl<EquipmentBindSparepartMapper, EquipmentBindSparepart> implements IEquipmentBindSparepartService {
/***
* 新增绑定
* @param equipmentBindSparepart
*/
@Transactional
public void saveEquipmentBindSparepart(EquipmentBindSparepart equipmentBindSparepart){
if(StringUtils.isNotEmpty( equipmentBindSparepart.getSparepartId() ) ){
this.baseMapper.insert( equipmentBindSparepart);
}
if(StringUtils.isNotEmpty( equipmentBindSparepart.getSparepartIdList() ) ){
String[] sparepartIdList = equipmentBindSparepart.getSparepartIdList().split(",");
for(String sparepartId : sparepartIdList){
if(StringUtils.isNotEmpty(sparepartId)){
equipmentBindSparepart.setId(null);
equipmentBindSparepart.setSparepartId(sparepartId);
this.baseMapper.insert(equipmentBindSparepart ) ;
}
}
}
}
/***
* 修改
* @param equipmentBindSparepart
*/
@Transactional
public void updateEquipmentBindSparepart(EquipmentBindSparepart equipmentBindSparepart){
//根据设备编号删除关联备品备件
this.baseMapper.delByEquipmentId( equipmentBindSparepart.getEquipmentId() );
this.saveEquipmentBindSparepart(equipmentBindSparepart);
}
/***
* 根据设备台账编号，查询关联的备品备件
* @param equipmentId
* @return
*/
public IPage<EquipmentSparepart> querySparepartListByEquipmentId(Page<EquipmentSparepart> page,String equipmentId){
return this.baseMapper.querySparepartListByEquipmentId(page,equipmentId);
}
}
sk-module-equipment/src/main/java/com/skua/modules/equipment/vo/EquipmentBindSparepartVO.java 0 → 100644
package com.skua.modules.equipment.vo;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
/**
* 设备关联备品备件
*/
@Data
@ApiModel(value="equipment_info_bind_sparepart数据传输对象", description="设备关联备品备件")
public class EquipmentBindSparepartVO {
/**id*/
@ApiModelProperty(value = "id")
private String id;
/**货主组织*/
@Excel(name = "货主组织", width = 15)
@ApiModelProperty(value = "货主组织")
private String departId;
/**备品备件id*/
@Excel(name = "备品备件id", width = 15)
@ApiModelProperty(value = "备品备件id")
private String equipmentId;
/**物料编号*/
@Excel(name = "物料编号", width = 15)
@ApiModelProperty(value = "物料编号")
private String sparepartId;
}
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!