bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

基础管理

This commit is contained in:
itcast 2026-01-09 10:12:11 +08:00
parent ba18d88a9d
commit fb3938a1a3
17 changed files with 95 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmAssetAttributesController.java
View File

@ -10,6 +10,7 @@ import com.bonus.common.security.annotation.RequiresPermissions;
import com.bonus.material.basic.domain.BmAssetAttributes;
import com.bonus.material.basic.service.BmAssetAttributesService;
import com.bonus.material.common.annotation.PreventRepeatSubmit;
import com.bonus.material.ma.service.ITypeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.validation.annotation.Validated;
@ -35,6 +36,9 @@ public class BmAssetAttributesController extends BaseController {
@Resource
private BmAssetAttributesService bmAssetAttributesService;
@Resource
private ITypeService typeService;
/**
* 分页查询
*
@ -49,6 +53,10 @@ public class BmAssetAttributesController extends BaseController {
if (bmAssetAttributes.getIsAll() != null) {
return AjaxResult.success(bmAssetAttributesService.queryByPage(bmAssetAttributes));
}
Long deptId = typeService.getUserDeptId();
bmAssetAttributes.setCompanyId(deptId);
startPage();
List<BmAssetAttributes> list = bmAssetAttributesService.queryByPage(bmAssetAttributes);
return AjaxResult.success(getDataTable(list));
@ -79,6 +87,8 @@ public class BmAssetAttributesController extends BaseController {
@SysLog(title = "资产属性管理", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->新增资产属性管理")
@PostMapping
public AjaxResult add(@Validated @RequestBody BmAssetAttributes bmAssetAttributes) {
Long deptId = typeService.getUserDeptId();
bmAssetAttributes.setCompanyId(deptId);
return bmAssetAttributesService.insert(bmAssetAttributes);
}
@ -122,6 +132,8 @@ public class BmAssetAttributesController extends BaseController {
@PostMapping("/export")
public void export(HttpServletResponse response, BmAssetAttributes bmAssetAttributes)
{
Long deptId = typeService.getUserDeptId();
bmAssetAttributes.setCompanyId(deptId);
List<BmAssetAttributes> list = bmAssetAttributesService.queryByPage(bmAssetAttributes);
ExcelUtil<BmAssetAttributes> util = new ExcelUtil<BmAssetAttributes>(BmAssetAttributes.class);
util.exportExcel(response, list, "资产属性管理数据");

10
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmProjectController.java
View File

@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONObject;
import com.bonus.common.log.enums.OperaType;
import com.bonus.material.common.annotation.PreventRepeatSubmit;
import com.bonus.material.common.utils.HttpClient;
import com.bonus.material.ma.service.ITypeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@ -44,6 +45,9 @@ public class BmProjectController extends BaseController
@Autowired
private IBmProjectService bmProjectService;
@Autowired
private ITypeService typeService;
/**
* 查询标段工程管理列表
*/
@ -52,6 +56,8 @@ public class BmProjectController extends BaseController
@GetMapping("/list")
public TableDataInfo list(BmProject bmProject)
{
Long deptId = typeService.getUserDeptId();
bmProject.setCompanyId(deptId);
startPage();
List<BmProject> list = bmProjectService.selectBmProjectList(bmProject);
return getDataTable(list);
@ -67,6 +73,8 @@ public class BmProjectController extends BaseController
@PostMapping("/export")
public void export(HttpServletResponse response, BmProject bmProject)
{
Long deptId = typeService.getUserDeptId();
bmProject.setCompanyId(deptId);
List<BmProject> list = bmProjectService.selectBmProjectList(bmProject);
ExcelUtil<BmProject> util = new ExcelUtil<BmProject>(BmProject.class);
util.exportExcel(response, list, "标段工程管理数据");
@ -93,6 +101,8 @@ public class BmProjectController extends BaseController
@PostMapping
public AjaxResult add(@Validated @RequestBody BmProject bmProject)
{
Long deptId = typeService.getUserDeptId();
bmProject.setCompanyId(deptId);
return bmProjectService.insertBmProject(bmProject);
}

8
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmUnitController.java
View File

@ -5,6 +5,7 @@ import javax.servlet.http.HttpServletResponse;
import com.bonus.common.log.enums.OperaType;
import com.bonus.material.common.annotation.PreventRepeatSubmit;
import com.bonus.material.ma.service.ITypeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@ -40,6 +41,9 @@ public class BmUnitController extends BaseController
@Autowired
private IBmUnitService bmUnitService;
@Autowired
private ITypeService typeService;
/**
* 查询往来单位管理列表
*/
@ -63,6 +67,8 @@ public class BmUnitController extends BaseController
@PostMapping("/export")
public void export(HttpServletResponse response, BmUnit bmUnit)
{
Long deptId = typeService.getUserDeptId();
bmUnit.setCompanyId(deptId);
List<BmUnit> list = bmUnitService.selectBmUnitList(bmUnit);
ExcelUtil<BmUnit> util = new ExcelUtil<BmUnit>(BmUnit.class);
util.exportExcel(response, list, "往来单位管理数据");
@ -89,6 +95,8 @@ public class BmUnitController extends BaseController
@PostMapping
public AjaxResult add(@Validated @RequestBody BmUnit bmUnit)
{
Long deptId = typeService.getUserDeptId();
bmUnit.setCompanyId(deptId);
return bmUnitService.insertBmUnit(bmUnit);
}

6
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmUnitPersonController.java
View File

@ -34,6 +34,9 @@ public class BmUnitPersonController extends BaseController
@Autowired
private IBmUnitPersonService bmUnitPersonService;
@Autowired
private ITypeService typeService;
/**
* 查询往来单位绑定管理列表
@ -43,6 +46,9 @@ public class BmUnitPersonController extends BaseController
@GetMapping("/list")
public TableDataInfo list(BmUnitPerson bmUnitPerson)
{
Long deptId = typeService.getUserDeptId();
bmUnitPerson.setCompanyIdL(deptId);
startPage();
List<BmUnit> list = bmUnitPersonService.selectBmUnitList(bmUnitPerson);
return getDataTable(list);

4
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmAssetAttributes.java
View File

@ -49,5 +49,9 @@ public class BmAssetAttributes extends BaseEntity implements Serializable {
*/
private Integer isAll;
/**
* 公司id
*/
private Long companyId;
}

2
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/BmUnitPerson.java
View File

@ -38,6 +38,8 @@ public class BmUnitPerson extends BaseEntity
@ApiModelProperty(value = "数据所属组织")
private String companyId;
private Long companyIdL;
/** 单位类型名称 */
@ApiModelProperty(value = "单位类型名称")
private String unitName;

5
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmUnitPersonServiceImpl.java
View File

@ -9,6 +9,7 @@ import com.bonus.common.core.utils.encryption.Sm4Utils;
import com.bonus.common.core.web.domain.AjaxResult;
import com.bonus.material.basic.domain.BmUnit;
import com.bonus.material.basic.mapper.BmUnitMapper;
import com.bonus.material.ma.service.ITypeService;
import com.bonus.material.purchase.config.RemoteConfig;
import com.bonus.system.api.RemoteDeptService;
import com.bonus.system.api.domain.SysDept;
@ -45,6 +46,9 @@ public class BmUnitPersonServiceImpl implements IBmUnitPersonService
@Resource
private RemoteDeptService remoteDeptService;
@Resource
private ITypeService typeService;
/**
* 新增往来单位管理
*
@ -92,6 +96,7 @@ public class BmUnitPersonServiceImpl implements IBmUnitPersonService
@Override
public List<BmUnit> selectBmUnitList(BmUnitPerson bmUnitPerson) {
Long paramId = bmUnitPerson.getUserId();
List<BmUnit> bmUnitList = bmUnitPersonMapper.selectBmUnitList(bmUnitPerson);
Long[] array = bmUnitList.stream()
// 提取 createBy 字段

9
bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/controller/ScrapApplyDetailsController.java
View File

@ -9,11 +9,13 @@ import com.bonus.common.core.utils.DateUtils;
import com.bonus.common.core.utils.ServletUtils;
import com.bonus.common.log.enums.OperaType;
import com.bonus.material.common.annotation.PreventRepeatSubmit;
import com.bonus.material.ma.service.ITypeService;
import com.bonus.material.scrap.domain.vo.ScrapDetailsListVo;
import com.bonus.material.scrap.domain.vo.ScrapTaskListVo;
import com.bonus.material.scrap.domain.vo.ScrapTotalListVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -45,6 +47,9 @@ public class ScrapApplyDetailsController extends BaseController {
@Autowired
private IScrapApplyDetailsService scrapApplyDetailsService;
@Autowired
private ITypeService typeService;
/**
* 查询报废任务详细列表
*/
@ -69,6 +74,8 @@ public class ScrapApplyDetailsController extends BaseController {
// @RequiresPermissions("scrap:details:list")
@GetMapping("/inventoryList")
public AjaxResult inventoryList(ScrapApplyDetails scrapApplyDetails) {
Long deptId = typeService.getUserDeptId();
scrapApplyDetails.setCompanyId(deptId);
Integer pageIndex = Convert.toInt(ServletUtils.getParameter("pageNum"), 1);
Integer pageSize = Convert.toInt(ServletUtils.getParameter("pageSize"), 10);
List<ScrapTaskListVo> list = scrapApplyDetailsService.selectInventoryList(scrapApplyDetails);
@ -109,6 +116,8 @@ public class ScrapApplyDetailsController extends BaseController {
@ApiOperation(value = "新增盘点报废")
@PostMapping("/addList")
public AjaxResult savePutInfo(@RequestBody ScrapApplyDetails scrapApplyDetails) {
Long deptId = typeService.getUserDeptId();
scrapApplyDetails.setCompanyId(deptId);
return scrapApplyDetailsService.savePutInfo(scrapApplyDetails);
}

8
bonus-modules/bonus-material/src/main/java/com/bonus/material/scrap/service/impl/ScrapApplyDetailsServiceImpl.java
View File

@ -20,6 +20,7 @@ import com.bonus.material.basic.mapper.BmFileInfoMapper;
import com.bonus.material.ma.domain.Type;
import com.bonus.material.ma.domain.vo.MachineVo;
import com.bonus.material.ma.mapper.MachineMapper;
import com.bonus.material.ma.service.ITypeService;
import com.bonus.material.scrap.domain.MaCodeInfo;
import com.bonus.material.scrap.domain.vo.ScrapDetailsListVo;
import com.bonus.material.scrap.domain.vo.ScrapTaskListVo;
@ -61,6 +62,9 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService {
@Resource
private MachineMapper machineMapper;
@Resource
private ITypeService typeService;
/**
* 查询报废任务详细
*
@ -674,8 +678,10 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService {
int thisMonthMaxOrder = taskMapper.getMonthMaxOrderByDate(DateUtils.getCurrentYear(), DateUtils.getCurrentMonth(), TmTaskTypeEnum.TM_TASK_PART_SCRAP.getTaskTypeId());
// 生成盘点报废单号
String code = genderBfTaskCode(thisMonthMaxOrder);
Long deptId = typeService.getUserDeptId();
TmTask tmTask = new TmTask(null, TmTaskTypeEnum.TM_TASK_PART_SCRAP.getTaskTypeId(), RepairInputStatusEnum.INPUT_TASK_NO_FINISHED.getStatus(),
null,thisMonthMaxOrder + 1, code);
deptId,thisMonthMaxOrder + 1, code);
tmTask.setCreateTime(DateUtils.getNowDate());
tmTask.setCreateBy(SecurityUtils.getLoginUser().getSysUser().getNickName());
// 插入任务

8
bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/controller/UseMaintenanceWarningController.java
View File

@ -6,6 +6,7 @@ import com.bonus.common.core.web.page.TableDataInfo;
import com.bonus.common.log.annotation.SysLog;
import com.bonus.common.log.enums.OperaType;
import com.bonus.material.common.annotation.PreventRepeatSubmit;
import com.bonus.material.ma.service.ITypeService;
import com.bonus.material.warningAnalysis.domain.UseMaintenanceWarningBean;
import com.bonus.material.warningAnalysis.service.UseMaintenanceWarningService;
import io.swagger.annotations.Api;
@ -29,6 +30,9 @@ public class UseMaintenanceWarningController extends BaseController
@Autowired
private UseMaintenanceWarningService service;
@Autowired
private ITypeService typeService;
/**
* 查询工程在用检修预警
*/
@ -50,6 +54,8 @@ public class UseMaintenanceWarningController extends BaseController
@GetMapping("/getOverTimeList")
public TableDataInfo getOverTimeList(UseMaintenanceWarningBean bean)
{
Long deptId = typeService.getUserDeptId();
bean.setCompanyId(deptId);
startPage();
List<UseMaintenanceWarningBean> list = service.getOverTimeListList(bean);
return getDataTable(list);
@ -66,6 +72,8 @@ public class UseMaintenanceWarningController extends BaseController
@PostMapping("/exportOverTimeList")
public void exportOverTimeList(HttpServletResponse response, UseMaintenanceWarningBean bean)
{
Long deptId = typeService.getUserDeptId();
bean.setCompanyId(deptId);
List<UseMaintenanceWarningBean> list = service.getOverTimeListList(bean);
ExcelUtil<UseMaintenanceWarningBean> util = new ExcelUtil<UseMaintenanceWarningBean>(UseMaintenanceWarningBean.class);
util.exportExcel(response, list, "安全工器具检修过期列表");

3
bonus-modules/bonus-material/src/main/java/com/bonus/material/warningAnalysis/domain/UseMaintenanceWarningBean.java
View File

@ -147,4 +147,7 @@ public class UseMaintenanceWarningBean extends BaseEntity {
@ApiModelProperty(value = "状态筛选")
private Integer status;
@ApiModelProperty(value = "数据所属组织")
private Long companyId;
}

5
bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmAssetAttributesMapper.xml
View File

@ -33,6 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="assetName != null and assetName != ''">asset_name,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="companyId != null">company_id,</if>
del_flag
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
@ -40,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="assetName != null and assetName != ''">#{assetName},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="companyId != null">#{companyId},</if>
0
</trim>
</insert>
@ -64,6 +66,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bma.create_time as createTime, bma.del_flag as delFlag, bma.update_by as updateBy, bma.update_time as updateTime
from bm_asset_attributes bma
where bma.del_flag = '0'
<if test="companyId != null and companyId!= ''">
and bma.company_id =#{companyId}
</if>
<if test="assetName != null and assetName!= ''">
and bma.asset_name like concat('%', #{assetName}, '%')
</if>

6
bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmProjectMapper.xml
View File

@ -57,7 +57,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
bp.pro_status,
bp.contract_part,
bp.pro_center,
bp.is_slt as isSlt
bp.is_slt as isSlt,
bp.company_id
from bm_project bp
</sql>
@ -65,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectBmProjectVo"/>
<where>
bp.del_flag = 0
<if test="companyId != null and companyId != ''"> and company_id =#{companyId}</if>
<if test="proName != null and proName != ''"> and pro_name like concat('%', #{proName}, '%')</if>
<if test="externalId != null and externalId != ''"> and external_id = #{externalId}</if>
<if test="externalInfo != null and externalInfo != ''"> and external_info = #{externalInfo}</if>
@ -136,6 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="contractPart != null">contract_part,</if>
<if test="proCenter != null">pro_center,</if>
<if test="isSlt != null">is_slt</if>
<if test="companyId != null">company_id</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="proId != null">#{proId},</if>
@ -164,6 +167,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="contractPart != null">#{contractPart},</if>
<if test="proCenter != null">#{proCenter},</if>
<if test="isSlt != null">#{isSlt}</if>
<if test="companyId != null">#{companyId}</if>
</trim>
</insert>

3
bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmUnitMapper.xml
View File

@ -55,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update_by as updateBy, update_time as updateTime, remark as remark from bm_unit
where
del_flag = 0
<if test="companyId != null and companyId !=''"> and company_id=#{companyId}</if>
<if test="unitName != null and unitName != ''">and unit_name like concat('%', #{unitName}, '%')</if>
</select>
@ -91,6 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if>
<if test="companyId != null">company_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="unitName != null and unitName != ''">#{unitName},</if>
@ -105,6 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="remark != null">#{remark},</if>
<if test="companyId != null">#{companyId},</if>
</trim>
</insert>

4
bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmUnitPersonMapper.xml
View File

@ -49,8 +49,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="userId != null and userId != ''">
AND bup.user_id = #{userId}
</if>
WHERE
bu.del_flag = 0
<if test="companyIdL !=null and companyIdL != ''">
AND bu.company_id=#{companyIdL}
</if>
<if test="unitName != null and unitName != ''">
and bu.unit_name like concat('%', #{unitName}, '%')
</if>

1
bonus-modules/bonus-material/src/main/resources/mapper/material/scrap/ScrapApplyDetailsMapper.xml
View File

@ -452,6 +452,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN tm_task tt on sad.task_id = tt.task_id
AND tt.task_type = 15
where sad.scrap_source = '3'
<if test=" companyId != null"> and tt.company_id =#{companyId}</if>
<if test="taskStatus != null "> and tt.task_status = #{taskStatus}</if>
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
<![CDATA[and DATE_FORMAT( sad.create_time, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime} ]]>

3
bonus-modules/bonus-material/src/main/resources/mapper/material/warningAnalysis/UseMaintenanceWarningMapper.xml
View File

@ -249,6 +249,9 @@
AND mm.next_check_time is not null
AND mt.jiju_type = 2
AND mt2.type_id not in (6032,6008,6270)
<if test="companyId != null">
AND sd.dept_id=#{companyId}
</if>
/*AND DATEDIFF(mm.next_check_time, CURDATE()) &lt;= 30*/
<if test="status != null and status == 0">
AND mm.next_check_time &gt;= NOW()