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

bug修复

This commit is contained in:
hongchao 2025-04-17 14:04:37 +08:00
parent 8deba884a6
commit bf1db37305
8 changed files with 78 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/BackRecordController.java
View File

@ -1,5 +1,8 @@
package com.bonus.sgzb.material.controller;
import com.bonus.sgzb.common.core.text.Convert;
import com.bonus.sgzb.common.core.utils.ListPagingUtil;
import com.bonus.sgzb.common.core.utils.ServletUtils;
import com.bonus.sgzb.common.core.utils.poi.ExcelUtil;
import com.bonus.sgzb.common.core.web.controller.BaseController;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
@ -21,6 +24,9 @@ import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import static com.bonus.sgzb.common.core.web.page.TableSupport.PAGE_NUM;
import static com.bonus.sgzb.common.core.web.page.TableSupport.PAGE_SIZE;
/**
* @description 综合查询--退料记录查询
* @author hay
@ -41,9 +47,12 @@ public class BackRecordController extends BaseController {
@GetMapping("/getBackRecordList")
@RequiresPermissions("return:list:query")
public AjaxResult getBackRecordList(BackRecord bean) {
startPage();
// startPage();
List<BackRecord> list = backRecordService.getBackRecordList(bean);
return AjaxResult.success(getDataTable(list));
Integer pageIndex = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list));
// return AjaxResult.success(getDataTable(list));
}
/**

13
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/InputRecordController.java
View File

@ -1,5 +1,8 @@
package com.bonus.sgzb.material.controller;
import com.bonus.sgzb.common.core.text.Convert;
import com.bonus.sgzb.common.core.utils.ListPagingUtil;
import com.bonus.sgzb.common.core.utils.ServletUtils;
import com.bonus.sgzb.common.core.utils.poi.ExcelUtil;
import com.bonus.sgzb.common.core.web.controller.BaseController;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
@ -22,6 +25,9 @@ import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import static com.bonus.sgzb.common.core.web.page.TableSupport.PAGE_NUM;
import static com.bonus.sgzb.common.core.web.page.TableSupport.PAGE_SIZE;
/**
* @author hay
* @description 综合查询--机具入库查询
@ -49,9 +55,12 @@ public class InputRecordController extends BaseController {
@ApiOperation(value = "综合查询--机具出库查询列表")
@GetMapping("/getOutputRecordList")
public AjaxResult getOutputRecordList(OutRecord bean) {
startPage();
// startPage();
List<OutRecord> list = inputRecordService.getOutputRecordList(bean);
return AjaxResult.success(getDataTable(list));
Integer pageIndex = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list));
// return AjaxResult.success(getDataTable(list));
}
/**

14
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/LeaseRecordController.java
View File

@ -1,5 +1,8 @@
package com.bonus.sgzb.material.controller;
import com.bonus.sgzb.common.core.text.Convert;
import com.bonus.sgzb.common.core.utils.ListPagingUtil;
import com.bonus.sgzb.common.core.utils.ServletUtils;
import com.bonus.sgzb.common.core.utils.poi.ExcelUtil;
import com.bonus.sgzb.common.core.web.controller.BaseController;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
@ -16,6 +19,9 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import static com.bonus.sgzb.common.core.web.page.TableSupport.PAGE_NUM;
import static com.bonus.sgzb.common.core.web.page.TableSupport.PAGE_SIZE;
/**
* @description 综合查询--领料记录查询
* @author hay
@ -35,9 +41,13 @@ public class LeaseRecordController extends BaseController {
@GetMapping("/getLeaseRecordList")
@RequiresPermissions("picking:list:query")
public AjaxResult getLeaseRecordList(LeaseRecord bean) {
startPage();
// startPage();
List<LeaseRecord> list = leaseRecordService.getLeaseRecordList(bean);
return AjaxResult.success(getDataTable(list));
Integer pageIndex = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list));
// return AjaxResult.success(getDataTable(list));
}
/**

13
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ProjUsingRecordController.java
View File

@ -1,5 +1,8 @@
package com.bonus.sgzb.material.controller;
import com.bonus.sgzb.common.core.text.Convert;
import com.bonus.sgzb.common.core.utils.ListPagingUtil;
import com.bonus.sgzb.common.core.utils.ServletUtils;
import com.bonus.sgzb.common.core.utils.poi.ExcelUtil;
import com.bonus.sgzb.common.core.web.controller.BaseController;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
@ -21,6 +24,9 @@ import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import static com.bonus.sgzb.common.core.web.page.TableSupport.PAGE_NUM;
import static com.bonus.sgzb.common.core.web.page.TableSupport.PAGE_SIZE;
/**
* @description 综合查询--工程机具使用查询
* @author hay
@ -40,9 +46,12 @@ public class ProjUsingRecordController extends BaseController {
@GetMapping("/getProjUsingRecordList")
@RequiresPermissions("stquery:projUsingRecord:list")
public AjaxResult getProjUsingRecordList(ProjUsingRecord bean) {
startPage();
// startPage();
List<ProjUsingRecord> list = projUsingRecordService.getProjUsingRecordList(bean);
return AjaxResult.success(getDataTable(list));
Integer pageIndex = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list));
// return AjaxResult.success(getDataTable(list));
}
/**

13
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairRecordController.java
View File

@ -1,5 +1,8 @@
package com.bonus.sgzb.material.controller;
import com.bonus.sgzb.common.core.text.Convert;
import com.bonus.sgzb.common.core.utils.ListPagingUtil;
import com.bonus.sgzb.common.core.utils.ServletUtils;
import com.bonus.sgzb.common.core.utils.poi.ExcelUtil;
import com.bonus.sgzb.common.core.web.controller.BaseController;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
@ -21,6 +24,9 @@ import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import static com.bonus.sgzb.common.core.web.page.TableSupport.PAGE_NUM;
import static com.bonus.sgzb.common.core.web.page.TableSupport.PAGE_SIZE;
/**
* @description 综合查询--维修记录查询
* @author hay
@ -40,9 +46,12 @@ public class RepairRecordController extends BaseController {
@GetMapping("/getRepairRecordList")
@RequiresPermissions("tools:repair:list")
public AjaxResult getRepairRecordList(RepairRecord bean) {
startPage();
// startPage();
List<RepairRecord> list = repairRecordService.getRepairRecordList(bean);
return AjaxResult.success(getDataTable(list));
Integer pageIndex = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list));
// return AjaxResult.success(getDataTable(list));
}
/**

13
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ScrapRecordController.java
View File

@ -1,5 +1,8 @@
package com.bonus.sgzb.material.controller;
import com.bonus.sgzb.common.core.text.Convert;
import com.bonus.sgzb.common.core.utils.ListPagingUtil;
import com.bonus.sgzb.common.core.utils.ServletUtils;
import com.bonus.sgzb.common.core.utils.poi.ExcelUtil;
import com.bonus.sgzb.common.core.web.controller.BaseController;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
@ -21,6 +24,9 @@ import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import static com.bonus.sgzb.common.core.web.page.TableSupport.PAGE_NUM;
import static com.bonus.sgzb.common.core.web.page.TableSupport.PAGE_SIZE;
/**
* @description 综合查询--机具报废查询
* @author hay
@ -40,9 +46,12 @@ public class ScrapRecordController extends BaseController {
@GetMapping("/getScrapRecordList")
@RequiresPermissions("stquery:deviceScrapQuery:list")
public AjaxResult getBackRecordList(ScrapRecord bean) {
startPage();
// startPage();
List<ScrapRecord> list = scrapRecordService.getScrapRecordList(bean);
return AjaxResult.success(getDataTable(list));
Integer pageIndex = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
return AjaxResult.success(ListPagingUtil.paging(pageIndex, pageSize, list));
// return AjaxResult.success(getDataTable(list));
}
/**

3
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/StorageStatusServiceImpl.java
View File

@ -24,6 +24,7 @@ public class StorageStatusServiceImpl implements StorageStatusService {
@Override
public List<StorageStatus> getStorageStatusList(StorageStatus bean) {
return storageStatusMapper.getStorageStatusList(bean);
List<StorageStatus> list = storageStatusMapper.getStorageStatusList(bean);
return list;
}
}

10
sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairAuditDetailsMapper.xml
View File

@ -542,15 +542,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="getRepairPartIdList" resultType="com.bonus.sgzb.material.domain.RepairPart">
SELECT
concat( mpt2.pa_name, '-', mpt1.pa_name, '-', mpt.pa_name ) AS partName,
CASE
WHEN mpt.parent_id = 0 THEN mpt.pa_name
WHEN mpt1.parent_id = 0 THEN CONCAT(mpt1.pa_name, '-', mpt.pa_name)
ELSE CONCAT(mpt2.pa_name, '-', mpt1.pa_name, '-', mpt.pa_name)
END AS partName,
IFNULL(rar.part_num, 0) AS partNum,
IFNULL(rar.part_num, 0) * IFNULL(rar.part_price, 0) AS partCost,
rar.repair_remark AS remark
FROM
repair_apply_record rar
LEFT JOIN ma_part_type mpt ON mpt.pa_id = rar.part_id
LEFT JOIN ma_part_type mpt1 ON mpt1.pa_id = mpt.parent_id
LEFT JOIN ma_part_type mpt2 ON mpt2.pa_id = mpt1.parent_id
LEFT JOIN ma_part_type mpt1 ON mpt1.pa_id = mpt.parent_id AND mpt.parent_id != 0
LEFT JOIN ma_part_type mpt2 ON mpt2.pa_id = mpt1.parent_id AND mpt1.parent_id != 0
WHERE
rar.id = #{id}
</select>