From 62c58c4196ab56da692b2a0a1bf88d3fd0a55d17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Fri, 15 Aug 2025 15:58:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=8C=85=E5=9F=BA=E7=A1=80=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E7=AE=A1=E7=90=86=EF=BC=8C=E5=88=86=E5=8C=85=E5=87=BA?= =?UTF-8?q?=E5=85=A5=E5=9C=BA=EF=BC=88=E5=90=88=E5=90=8C=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BmSubContractController.java | 16 +++++ .../bmw/controller/PmAttDeviceController.java | 51 ++++++++++++++++ .../PmSubTeamContractController.java | 25 ++++++-- .../com/bonus/bmw/domain/po/PmAttDevice.java | 61 +++++++++++++++++++ .../bmw/domain/po/PmSubTeamContract.java | 9 ++- .../bonus/bmw/mapper/BmSubContractMapper.java | 2 + .../bonus/bmw/mapper/PmAttDeviceMapper.java | 9 +++ .../bmw/service/BmSubContractService.java | 2 + .../bonus/bmw/service/PmAttDeviceService.java | 9 +++ .../impl/BmSubContractServiceImpl.java | 5 ++ .../service/impl/PmAttDeviceServiceImpl.java | 27 ++++++++ .../mapper/bmw/BmSubContractMapper.xml | 16 +++++ .../mapper/bmw/PmAttDeviceMapper.xml | 8 +++ .../main/resources/mapper/bmw/PmSubMapper.xml | 13 +++- 14 files changed, 246 insertions(+), 7 deletions(-) create mode 100644 bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmAttDeviceController.java create mode 100644 bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmAttDevice.java create mode 100644 bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmAttDeviceMapper.java create mode 100644 bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmAttDeviceService.java create mode 100644 bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmAttDeviceServiceImpl.java create mode 100644 bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmAttDeviceMapper.xml diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmSubContractController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmSubContractController.java index 53af5ea..2f59a85 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmSubContractController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/BmSubContractController.java @@ -98,6 +98,22 @@ public class BmSubContractController extends BaseController { return error("系统异常,请联系管理员"); } + /** + * 分包商合同信息详情 + */ + @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("sub:contract:list")) + @GetMapping("/getSubContractById") + @SysLog(title = "分包商合同信息详情", businessType = OperaType.QUERY, logType = 0, module = "分包商合同信息->项目部列表") + public AjaxResult getSubContractById(BmSubContract bmSubContract) { + try { + BmSubContractVo bmSubContractVo = bmSubContractService.getSubContractById(bmSubContract); + return success(bmSubContractVo); + } catch (Exception e) { + log.error(e.toString(), e); + } + return error(); + } + /** * 导出分包商合同信息 */ diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmAttDeviceController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmAttDeviceController.java new file mode 100644 index 0000000..f4f931a --- /dev/null +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmAttDeviceController.java @@ -0,0 +1,51 @@ +package com.bonus.bmw.controller; + +import com.bonus.bmw.domain.po.PmAttDevice; +import com.bonus.bmw.service.PmAttDeviceService; +import com.bonus.common.core.web.controller.BaseController; +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.common.security.annotation.InnerAuth; +import com.bonus.common.security.annotation.RequiresPermissions; +import com.bonus.common.security.annotation.RequiresPermissionsOrInnerAuth; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * @author 马三炮 + * @date 2025/8/15 + */ +@Slf4j +@RestController +@RequestMapping("/pmAttDevice") +public class PmAttDeviceController extends BaseController { + + @Resource + private PmAttDeviceService pmAttDeviceService; + + /** + * 考勤机列表 + */ + @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("sub:contract:list")) + @GetMapping("/list") + @SysLog(title = "考勤机", businessType = OperaType.QUERY, logType = 0, module = "考勤机->考勤机列表") + public TableDataInfo list(PmAttDevice pmAttDevice) { + try { + startPage(); + List list = pmAttDeviceService.selectPmAttDeviceList(pmAttDevice); + return getDataTable(list); + } catch (Exception e) { + log.error(e.toString(), e); + } + return getDataTableError(new ArrayList<>()); + } + + +} diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubTeamContractController.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubTeamContractController.java index 0828f8c..143f3c4 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubTeamContractController.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/controller/PmSubTeamContractController.java @@ -5,6 +5,7 @@ import com.bonus.bmw.domain.dto.WebFileDto; import com.bonus.bmw.domain.po.PmSubTeamContract; import com.bonus.bmw.service.PmSubTeamContractService; import com.bonus.common.core.utils.json.FastJsonHelper; +import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.core.web.page.TableDataInfo; @@ -18,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; @@ -51,11 +53,11 @@ public class PmSubTeamContractController extends BaseController { } /** - * 班组出场 + * 新增和出场班组 */ /* @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("pm:company:edit"))*/ @PostMapping("/addOrUpdateSubTeamContract") - @SysLog(title = "分包商合同信息", businessType = OperaType.UPDATE, logType = 0, module = "分包商合同信息->新增和修改分包商合同信息") + @SysLog(title = "分包班组入场信息管理", businessType = OperaType.UPDATE, logType = 0, module = "分包班组入场信息管理->新增和修改分包班组信息") public AjaxResult addOrUpdateSubTeamContract(@RequestParam(value = "files") MultipartFile[] files, @RequestParam(value = "fileMsg") String fileMsg, @RequestParam(value = "params")String params) { try { List listFile = FastJsonHelper.jsonArrStrToBeanList(fileMsg, WebFileDto.class); @@ -74,11 +76,11 @@ public class PmSubTeamContractController extends BaseController { } /** - * 分包班组信息入场信息列表 + * 分包班组信息入场详情 */ @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("sub:teamContract:list")) @GetMapping("/getSubTeamContractById") - @SysLog(title = "分包班组入场信息管理", businessType = OperaType.QUERY, logType = 0, module = "分包班组入场信息管理->分包班组入场信息列表") + @SysLog(title = "分包班组入场信息管理", businessType = OperaType.QUERY, logType = 0, module = "分包班组入场信息管理->分包班组信息入场详情") public AjaxResult getSubTeamContractById(PmSubTeamContract pmSubTeamContract) { try { PmSubTeamContract pmSubTeamContractRes = pmSubTeamContractService.getSubTeamContractById(pmSubTeamContract); @@ -89,4 +91,19 @@ public class PmSubTeamContractController extends BaseController { return error(); } + /** + * 导出分包班组入场信息 + */ + @PostMapping("/export") + @SysLog(title = "分包班组入场信息", businessType = OperaType.EXPORT, logType = 0, module = "分包班组信息->导出分包班组入场信息") + public void export(HttpServletResponse response, PmSubTeamContract pmSubTeamContract) { + try { + List list = pmSubTeamContractService.selectSubTeamContractList(pmSubTeamContract); + ExcelUtil util = new ExcelUtil(PmSubTeamContract.class); + util.exportExcel(response, list, "分包班组入场信息"); + } catch (Exception e) { + logger.error(e.toString(), e); + } + } + } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmAttDevice.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmAttDevice.java new file mode 100644 index 0000000..1af8638 --- /dev/null +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmAttDevice.java @@ -0,0 +1,61 @@ +package com.bonus.bmw.domain.po; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; + +/** + * @author 马三炮 + * @date 2025/8/15 + */ +@Data +public class PmAttDevice { + + /** + * 设备编码(唯一、必填-从硬件上获取查看) + */ + private String deviceCode; + + /** + * 设备名 + */ + private String deviceName; + + /** + * 工程id + */ + private Integer proId; + + /** + *创建人 + */ + private String createUser; + + /** + *修改人 + */ + private String updateUser; + + /** + * 创建时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + /** + * 修改时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; + + /** + * 设备型号 + */ + private String devModel; + + /** + * 在线状态 + */ + private String onLine; +} diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmSubTeamContract.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmSubTeamContract.java index eab8b61..3820eaf 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmSubTeamContract.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmSubTeamContract.java @@ -1,5 +1,6 @@ package com.bonus.bmw.domain.po; +import com.bonus.common.core.annotation.Excel; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -25,6 +26,7 @@ public class PmSubTeamContract { /** * 班组名称 */ + @Excel(name = "班组名称",sort = 2) private String teamName; /** @@ -33,8 +35,9 @@ public class PmSubTeamContract { private Integer subId; /** - * 分包名称 + * 分包商名称 */ + @Excel(name = "分包商名称",sort = 1) private String subName; /** @@ -45,21 +48,25 @@ public class PmSubTeamContract { /** * 工程名称 */ + @Excel(name = "班组入场工程名称",sort = 3) private String proName; /** * 班组入场时间 */ + @Excel(name = "班组入场时间",sort = 5) private String teamEinTime; /** * 1 已入场 2 已离场 */ + @Excel(name = "出入场状态",sort = 4,readConverterExp = "1=在场,2=出场") private Integer teamEinStatus; /** * 班组出场时间 */ + @Excel(name = "班组出场时间",sort = 6) private String teamExitTime; /** diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/BmSubContractMapper.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/BmSubContractMapper.java index d6e1897..abec7f2 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/BmSubContractMapper.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/BmSubContractMapper.java @@ -15,4 +15,6 @@ public interface BmSubContractMapper { BmSubContract getSubContractBySubContractName(BmSubContract bmSubContract); int delSubContract(BmSubContract bmSubContract); + + BmSubContractVo getSubContractById(BmSubContract bmSubContract); } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmAttDeviceMapper.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmAttDeviceMapper.java new file mode 100644 index 0000000..2d1f8ac --- /dev/null +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/mapper/PmAttDeviceMapper.java @@ -0,0 +1,9 @@ +package com.bonus.bmw.mapper; + +import com.bonus.bmw.domain.po.PmAttDevice; + +import java.util.List; + +public interface PmAttDeviceMapper { + List selectPmAttDeviceList(PmAttDevice pmAttDevice); +} diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/BmSubContractService.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/BmSubContractService.java index dd4311b..2cd5d11 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/BmSubContractService.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/BmSubContractService.java @@ -12,4 +12,6 @@ public interface BmSubContractService { int addOrUpdateSubContract(BmSubContract bmSubContract, FileBasicMsgDto fileBasicMsgDto); int delSubContract(BmSubContract bmSubContract); + + BmSubContractVo getSubContractById(BmSubContract bmSubContract); } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmAttDeviceService.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmAttDeviceService.java new file mode 100644 index 0000000..6ceb45f --- /dev/null +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/PmAttDeviceService.java @@ -0,0 +1,9 @@ +package com.bonus.bmw.service; + +import com.bonus.bmw.domain.po.PmAttDevice; + +import java.util.List; + +public interface PmAttDeviceService { + List selectPmAttDeviceList(PmAttDevice pmAttDevice); +} diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/BmSubContractServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/BmSubContractServiceImpl.java index fbd3d42..8e4534b 100644 --- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/BmSubContractServiceImpl.java +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/BmSubContractServiceImpl.java @@ -86,4 +86,9 @@ public class BmSubContractServiceImpl implements BmSubContractService { fileUploadUtils.delFileListById("", bmSubContract.getId().toString(), Constants.BM_SUB_CONTRACT,""); return i; } + + @Override + public BmSubContractVo getSubContractById(BmSubContract bmSubContract) { + return bmSubContractMapper.getSubContractById(bmSubContract); + } } diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmAttDeviceServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmAttDeviceServiceImpl.java new file mode 100644 index 0000000..ef102f1 --- /dev/null +++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmAttDeviceServiceImpl.java @@ -0,0 +1,27 @@ +package com.bonus.bmw.service.impl; + +import com.bonus.bmw.domain.po.PmAttDevice; +import com.bonus.bmw.mapper.PmAttDeviceMapper; +import com.bonus.bmw.service.PmAttDeviceService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @author 马三炮 + * @date 2025/8/15 + */ +@Service +@Slf4j +public class PmAttDeviceServiceImpl implements PmAttDeviceService { + + @Resource + private PmAttDeviceMapper pmAttDeviceMapper; + + @Override + public List selectPmAttDeviceList(PmAttDevice pmAttDevice) { + return pmAttDeviceMapper.selectPmAttDeviceList(pmAttDevice); + } +} diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmSubContractMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmSubContractMapper.xml index fe58248..39c0ab5 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmSubContractMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/BmSubContractMapper.xml @@ -71,4 +71,20 @@ where bsc.is_active = '1' and (bsc.sub_contract_code = #{subContractCode} or bsc.sub_contract_name = #{subContractName}) + diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmAttDeviceMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmAttDeviceMapper.xml new file mode 100644 index 0000000..13615da --- /dev/null +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmAttDeviceMapper.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubMapper.xml index 02cccf0..76c7d0e 100644 --- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubMapper.xml +++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmSubMapper.xml @@ -55,8 +55,17 @@