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

物资LOG日志修订

This commit is contained in:
syruan 2024-04-29 16:50:07 +08:00
parent 38ebf1ded7
commit 7cef74aa24
5 changed files with 44 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/BmNumLogs.java
View File

@ -44,12 +44,27 @@ public class BmNumLogs extends BaseEntity {
@Excel(name = "实例/任务") @Excel(name = "实例/任务")
private String task; private String task;
/**
* 任务名称
*/
private String taskName;
/** /**
* 规格id * 规格id
*/ */
@Excel(name = "规格id") @Excel(name = "规格id")
private Integer typeId; private Integer typeId;
/**
* 规格名称
*/
private String typeName;
/**
* 父级规格名称
*/
private String typeParentName;
/** /**
* 数量 * 数量
*/ */

4
sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/controller/BmNumLogsController.java
View File

@ -27,9 +27,9 @@ public class BmNumLogsController extends BaseController {
private BmNumLogsService bmNumLogsService; private BmNumLogsService bmNumLogsService;
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list() { public TableDataInfo list(BmNumLogs record) {
startPage(); startPage();
List<BmNumLogs> list = bmNumLogsService.selectAll(); List<BmNumLogs> list = bmNumLogsService.selectAll(record);
return getDataTable(list); return getDataTable(list);
} }

2
sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/mapper/BmNumLogsMapper.java
View File

@ -15,7 +15,7 @@ public interface BmNumLogsMapper {
BmNumLogs selectByPrimaryKey(Integer id); BmNumLogs selectByPrimaryKey(Integer id);
List<BmNumLogs> selectAll(); List<BmNumLogs> selectAll(BmNumLogs record);
int updateByPrimaryKeySelective(BmNumLogs record); int updateByPrimaryKeySelective(BmNumLogs record);

4
sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/BmNumLogsService.java
View File

@ -24,8 +24,8 @@ public class BmNumLogsService{
return bmNumLogsMapper.insert(record); return bmNumLogsMapper.insert(record);
} }
public List<BmNumLogs> selectAll() { public List<BmNumLogs> selectAll(BmNumLogs record) {
return bmNumLogsMapper.selectAll(); return bmNumLogsMapper.selectAll(record);
} }
public int insertSelective(BmNumLogs record) { public int insertSelective(BmNumLogs record) {

29
sgzb-modules/sgzb-system/src/main/resources/mapper/system/BmNumLogsMapper.xml
View File

@ -8,7 +8,10 @@
<result column="model_title" jdbcType="VARCHAR" property="modelTitle" /> <result column="model_title" jdbcType="VARCHAR" property="modelTitle" />
<result column="method" jdbcType="VARCHAR" property="method" /> <result column="method" jdbcType="VARCHAR" property="method" />
<result column="task" jdbcType="VARCHAR" property="task" /> <result column="task" jdbcType="VARCHAR" property="task" />
<result column="task_name" jdbcType="VARCHAR" property="taskName" />
<result column="type_id" jdbcType="INTEGER" property="typeId" /> <result column="type_id" jdbcType="INTEGER" property="typeId" />
<result column="type_name" jdbcType="VARCHAR" property="typeName" />
<result column="type_parent_name" jdbcType="VARCHAR" property="typeParentName" />
<result column="num" jdbcType="VARCHAR" property="num" /> <result column="num" jdbcType="VARCHAR" property="num" />
<result column="description" jdbcType="VARCHAR" property="description" /> <result column="description" jdbcType="VARCHAR" property="description" />
<result column="json_result" jdbcType="VARCHAR" property="jsonResult" /> <result column="json_result" jdbcType="VARCHAR" property="jsonResult" />
@ -25,18 +28,32 @@
</sql> </sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap"> <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
<!--@mbg.generated-->
select select
<include refid="Base_Column_List" /> bnl.id, bnl.model_title, bnl.`method`, bnl.task, bnl.type_id, bnl.num, bnl.`description`, bnl.json_result, bnl.`time`, bnl.creator,
from bm_num_logs bnl.remark, bnl.`status`, mt.type_name, mt1.type_name as type_parent_name, tt.code as task_name
from bm_num_logs bnl
left join ma_type mt on bnl.type_id = mt.type_id
inner join ma_type mt1 on mt.parent_id = mt1.type_id
left join tm_task tt on bnl.task = tt.task_id
where id = #{id,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER}
</select> </select>
<select id="selectAll" resultMap="BaseResultMap"> <select id="selectAll" resultMap="BaseResultMap">
select select
<include refid="Base_Column_List" /> bnl.id, bnl.model_title, bnl.`method`, bnl.task, bnl.type_id, bnl.num, bnl.`description`, bnl.json_result, bnl.`time`, bnl.creator,
from bm_num_logs bnl.remark, bnl.`status`, mt.type_name, mt1.type_name as type_parent_name, tt.code as task_name
from bm_num_logs bnl
left join ma_type mt on bnl.type_id = mt.type_id
inner join ma_type mt1 on mt.parent_id = mt1.type_id
left join tm_task tt on bnl.task = tt.task_id
<where>
<if test="modelTitle != null and modelTitle != ''">
and bnl.model_title like concat('%', #{modelTitle}, '%')
</if>
<if test="typeName != null and typeName != ''">
and mt1.type_name like concat('%', #{typeName}, '%')
</if>
</where>
</select> </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer"> <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">