白蚁-日志管理-BUG修改
parent
15366b6b1e
commit
aa7edf82e7
|
|
@ -44,8 +44,6 @@ public class ByLogController extends AbstractCommonFileController {
|
||||||
@Autowired
|
@Autowired
|
||||||
private FileAssociationsService fileService;
|
private FileAssociationsService fileService;
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private SysUserServiceImpl sysUserService;
|
|
||||||
|
|
||||||
@Operation(summary = "新增")
|
@Operation(summary = "新增")
|
||||||
@PostMapping("/insert")
|
@PostMapping("/insert")
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@ public interface ByLogDetailMapper extends BaseMapper<ByLogDetail> {
|
||||||
|
|
||||||
@Select("""
|
@Select("""
|
||||||
<script>
|
<script>
|
||||||
select t1.id,t1.by_log_id,t1.pre_place_detail_id as ppdi,t1.pre_person,t1.pre_method,t1.pre_effect,t1.pre_person_name,
|
select t1.id,t1.by_log_id,t1.pre_place_detail_id as ppdi,t1.pre_person,t1.pre_method,t1.pre_effect,
|
||||||
t2.detail_name as ppdn,t3.id as ppi,t3.pre_name as ppn
|
t2.detail_name as ppdn,t3.id as ppi,t3.pre_name as ppn
|
||||||
from by_log_detail t1
|
from by_log_detail t1
|
||||||
join pre_place_detail t2
|
join pre_place_detail t2
|
||||||
|
|
@ -31,7 +31,7 @@ public interface ByLogDetailMapper extends BaseMapper<ByLogDetail> {
|
||||||
List<ByLogDetail> selectDetail(@Param("logId") Long id,@Param("dto") ByLogPageSo pageSo);
|
List<ByLogDetail> selectDetail(@Param("logId") Long id,@Param("dto") ByLogPageSo pageSo);
|
||||||
|
|
||||||
@Select("""
|
@Select("""
|
||||||
select t1.id,t1.by_log_id,t1.pre_place_detail_id as ppdi,t1.pre_person,t1.pre_method,t1.pre_effect,t1.pre_person_name,
|
select t1.id,t1.by_log_id,t1.pre_place_detail_id as ppdi,t1.pre_person,t1.pre_method,t1.pre_effect,
|
||||||
t2.detail_name as ppdn,t3.id as ppi,t3.pre_name as ppn
|
t2.detail_name as ppdn,t3.id as ppi,t3.pre_name as ppn
|
||||||
from by_log_detail t1
|
from by_log_detail t1
|
||||||
join pre_place_detail t2
|
join pre_place_detail t2
|
||||||
|
|
|
||||||
|
|
@ -51,14 +51,9 @@ public class ByLogDetail {
|
||||||
private String ppn;
|
private String ppn;
|
||||||
|
|
||||||
@TableField(value = "pre_person")
|
@TableField(value = "pre_person")
|
||||||
@Schema(description = "防治人员id")
|
@Schema(description = "防治人员")
|
||||||
private String prePerson;
|
private String prePerson;
|
||||||
|
|
||||||
|
|
||||||
@TableField(value = "pre_person_name")
|
|
||||||
@Schema(description = "防治人员名称")
|
|
||||||
private String prePersonName;
|
|
||||||
|
|
||||||
@TableField(value = "pre_method")
|
@TableField(value = "pre_method")
|
||||||
@Schema(description = "防治方法")
|
@Schema(description = "防治方法")
|
||||||
private String preMethod;
|
private String preMethod;
|
||||||
|
|
|
||||||
|
|
@ -38,8 +38,6 @@ public class ByLogService extends ServiceImpl<ByLogMapper, ByLog> {
|
||||||
@Autowired
|
@Autowired
|
||||||
private ByLogDetailMapper byLogDetailMapper;
|
private ByLogDetailMapper byLogDetailMapper;
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private SysUserMapper sysUserMapper;
|
|
||||||
|
|
||||||
public boolean update(ByLog dto) {
|
public boolean update(ByLog dto) {
|
||||||
ByLog byId = getById(dto.getId());
|
ByLog byId = getById(dto.getId());
|
||||||
|
|
@ -301,7 +299,7 @@ public class ByLogService extends ServiceImpl<ByLogMapper, ByLog> {
|
||||||
private void fillDetailInfo(Row row, ByLogDetail detail, CellStyle style) {
|
private void fillDetailInfo(Row row, ByLogDetail detail, CellStyle style) {
|
||||||
createCell(row, 6, detail.getPpdn(), style); // 防治部位
|
createCell(row, 6, detail.getPpdn(), style); // 防治部位
|
||||||
createCell(row, 7, detail.getPpn(), style); // 防治点
|
createCell(row, 7, detail.getPpn(), style); // 防治点
|
||||||
createCell(row, 8, detail.getPrePersonName(), style); // 防治人员
|
createCell(row, 8, detail.getPrePerson(), style); // 防治人员
|
||||||
createCell(row, 9, detail.getPreMethod(), style); // 防治方法
|
createCell(row, 9, detail.getPreMethod(), style); // 防治方法
|
||||||
createCell(row, 10, detail.getPreEffect(), style); // 防治效果
|
createCell(row, 10, detail.getPreEffect(), style); // 防治效果
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue