From 84b27e2e19c40c48b1928961de22e57f063f34dd Mon Sep 17 00:00:00 2001 From: liuchuan <1084917737@qq.com> Date: Thu, 14 Dec 2023 16:01:48 +0800 Subject: [PATCH 1/8] =?UTF-8?q?app=E9=A6=96=E9=A1=B5=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/app/controller/AppController.java | 42 ++++++++++++ .../app/controller/SysNoticeController.java | 31 +++++++++ .../bonus/sgzb/app/domain/CriticalData.java | 34 ++++++++++ .../com/bonus/sgzb/app/domain/SysNotice.java | 65 +++++++++++++++++++ .../com/bonus/sgzb/app/domain/ToDoList.java | 34 ++++++++++ .../com/bonus/sgzb/app/mapper/AppMapper.java | 28 ++++++++ .../sgzb/app/mapper/SysNoticeMapper.java | 15 +++++ .../bonus/sgzb/app/service/AppService.java | 15 +++++ .../sgzb/app/service/SysNoticeService.java | 13 ++++ .../sgzb/app/service/impl/AppServiceImpl.java | 52 +++++++++++++++ .../service/impl/SysNoticeServiceImpl.java | 30 +++++++++ .../base/controller/RepairController.java | 27 ++++++++ .../bonus/sgzb/base/domain/RepairTask.java | 59 +++++++++++++++++ .../bonus/sgzb/base/mapper/RepairMapper.java | 13 ++++ .../sgzb/base/service/RepairService.java | 10 +++ .../base/service/impl/RepairServiceImpl.java | 18 +++++ .../main/resources/mapper/base/AppMapper.xml | 46 +++++++++++++ .../resources/mapper/base/RepairMapper.xml | 7 ++ .../resources/mapper/base/SysNoticeMapper.xml | 19 ++++++ 19 files changed, 558 insertions(+) create mode 100644 sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/AppController.java create mode 100644 sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/SysNoticeController.java create mode 100644 sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/CriticalData.java create mode 100644 sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/SysNotice.java create mode 100644 sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/ToDoList.java create mode 100644 sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/AppMapper.java create mode 100644 sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/SysNoticeMapper.java create mode 100644 sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/AppService.java create mode 100644 sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/SysNoticeService.java create mode 100644 sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/AppServiceImpl.java create mode 100644 sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/SysNoticeServiceImpl.java create mode 100644 sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java create mode 100644 sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTask.java create mode 100644 sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/RepairMapper.java create mode 100644 sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/RepairService.java create mode 100644 sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java create mode 100644 sgzb-modules/sgzb-base/src/main/resources/mapper/base/AppMapper.xml create mode 100644 sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml create mode 100644 sgzb-modules/sgzb-base/src/main/resources/mapper/base/SysNoticeMapper.xml diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/AppController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/AppController.java new file mode 100644 index 00000000..02f4bf21 --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/AppController.java @@ -0,0 +1,42 @@ +package com.bonus.sgzb.app.controller; + +import com.bonus.sgzb.app.domain.CriticalData; +import com.bonus.sgzb.app.domain.ToDoList; +import com.bonus.sgzb.app.service.AppService; +import com.bonus.sgzb.common.core.web.domain.AjaxResult; +import com.bonus.sgzb.common.log.annotation.Log; +import com.bonus.sgzb.common.log.enums.BusinessType; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author c liu + * @date 2023/12/11 + */ +@RestController +@RequestMapping("/app") +public class AppController { + @Autowired + private AppService service; + + @ApiOperation(value = "查询关键数据") + @Log(title = "关键数据", businessType = BusinessType.QUERY) + @GetMapping("/getCriticalData") + public AjaxResult getCriticalData() + { + CriticalData data = service.getCriticalData(); + return AjaxResult.success("操作成功",data); + } + + @ApiOperation(value = "查询待办事项") + @Log(title = "待办事项", businessType = BusinessType.QUERY) + @GetMapping("/getToDoList") + public AjaxResult getToDoList() + { + ToDoList data = service.getToDoList(); + return AjaxResult.success("操作成功",data); + } +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/SysNoticeController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/SysNoticeController.java new file mode 100644 index 00000000..f4fce101 --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/SysNoticeController.java @@ -0,0 +1,31 @@ +package com.bonus.sgzb.app.controller; + +import com.bonus.sgzb.app.domain.SysNotice; +import com.bonus.sgzb.app.service.SysNoticeService; +import com.bonus.sgzb.common.core.web.domain.AjaxResult; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @author c liu + * @date 2023/12/11 + */ +@RestController +@RequestMapping("/sysNotice") +public class SysNoticeController { + @Autowired + private SysNoticeService service; + + @ApiOperation(value = "查询通知公告列表") + @GetMapping("/getList") + public AjaxResult getList() + { + List list = service.getList(); + return AjaxResult.success("操作成功",list); + } +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/CriticalData.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/CriticalData.java new file mode 100644 index 00000000..d7cc6d52 --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/CriticalData.java @@ -0,0 +1,34 @@ +package com.bonus.sgzb.app.domain; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author c liu + * @date 2023/12/11 + */ +@Data +@ApiModel(value="关键数据") +public class CriticalData { + /** + * 当日领料 + */ + @ApiModelProperty(value = "当日领料") + private int dayLeaseNum; + /** + * 当日退料 + */ + @ApiModelProperty(value = "当日退料") + private int dayBackNum; + /** + * 当日入库 + */ + @ApiModelProperty(value = "当日入库") + private int dayInputNum; + /** + * 当日出库 + */ + @ApiModelProperty(value = "当日出库") + private int dayOutNum; +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/SysNotice.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/SysNotice.java new file mode 100644 index 00000000..03b369b4 --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/SysNotice.java @@ -0,0 +1,65 @@ +package com.bonus.sgzb.app.domain; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author c liu + * @date 2023/12/11 + */ +@Data +@ApiModel(value="通知公告") +public class SysNotice { + /** + * 公告ID + */ + @ApiModelProperty(value = "公告ID") + private Long noticeId; + /** + * 公告标题 + */ + @ApiModelProperty(value = "公告标题") + private String noticeTitle; + /** + * 公告类型（1通知 2公告） + */ + @ApiModelProperty(value = "公告类型（1通知 2公告）") + private String noticeType; + /** + * 公告内容 + */ + @ApiModelProperty(value = "公告内容") + private byte[] noticeContent; + private String noticeContentStr; + /** + * 公告状态（0正常 1关闭） + */ + @ApiModelProperty(value = "公告状态（0正常 1关闭）") + private String status; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者") + private String createBy; + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间") + private String createTime; + /** + * 更新者 + */ + @ApiModelProperty(value = "更新者") + private String updateBy; + /** + * 更新时间 + */ + @ApiModelProperty(value = "更新时间") + private String updateTime; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark; +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/ToDoList.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/ToDoList.java new file mode 100644 index 00000000..4396498d --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/ToDoList.java @@ -0,0 +1,34 @@ +package com.bonus.sgzb.app.domain; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author c liu + * @date 2023/12/11 + */ +@Data +@ApiModel(value="代办事项") +public class ToDoList { + /** + * 领料待审批 + */ + @ApiModelProperty(value = "领料待审批") + private int leaseNum; + /** + * 退料待审批 + */ + @ApiModelProperty(value = "退料待审批") + private int backNum; + /** + * 报废待审核 + */ + @ApiModelProperty(value = "报废待审核") + private int scrapNum; + /** + * 试验检验待审核 + */ + @ApiModelProperty(value = "试验检验待审核") + private int trialNum; +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/AppMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/AppMapper.java new file mode 100644 index 00000000..6c1b53ba --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/AppMapper.java @@ -0,0 +1,28 @@ +package com.bonus.sgzb.app.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @author c liu + * @date 2023/12/11 + */ +@Mapper +public interface AppMapper { + + int getDayLeaseNum(@Param("startTime") String startTime, @Param("endTime")String endTime); + + int getDayBackNum(@Param("startTime") String startTime, @Param("endTime")String endTime); + + int getDayInputNum(@Param("startTime") String startTime, @Param("endTime")String endTime); + + int getDayOutNum(@Param("startTime") String startTime, @Param("endTime")String endTime); + + int getLeaseNum(); + + int getBackNum(); + + int getScrapNum(); + + int getTrialNum(); +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/SysNoticeMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/SysNoticeMapper.java new file mode 100644 index 00000000..464e96ee --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/SysNoticeMapper.java @@ -0,0 +1,15 @@ +package com.bonus.sgzb.app.mapper; + +import com.bonus.sgzb.app.domain.SysNotice; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * @author c liu + * @date 2023/12/11 + */ +@Mapper +public interface SysNoticeMapper { + List getList(); +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/AppService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/AppService.java new file mode 100644 index 00000000..b7f05cdf --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/AppService.java @@ -0,0 +1,15 @@ +package com.bonus.sgzb.app.service; + +import com.bonus.sgzb.app.domain.CriticalData; +import com.bonus.sgzb.app.domain.ToDoList; + +/** + * @author c liu + * @date 2023/12/11 + */ +public interface AppService { + + CriticalData getCriticalData(); + + ToDoList getToDoList(); +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/SysNoticeService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/SysNoticeService.java new file mode 100644 index 00000000..8199bbc3 --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/SysNoticeService.java @@ -0,0 +1,13 @@ +package com.bonus.sgzb.app.service; + +import com.bonus.sgzb.app.domain.SysNotice; + +import java.util.List; + +/** + * @author c liu + * @date 2023/12/11 + */ +public interface SysNoticeService { + List getList(); +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/AppServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/AppServiceImpl.java new file mode 100644 index 00000000..619c4700 --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/AppServiceImpl.java @@ -0,0 +1,52 @@ +package com.bonus.sgzb.app.service.impl; + +import com.bonus.sgzb.app.domain.CriticalData; +import com.bonus.sgzb.app.domain.ToDoList; +import com.bonus.sgzb.app.mapper.AppMapper; +import com.bonus.sgzb.app.service.AppService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.time.LocalDate; + +/** + * @author c liu + * @date 2023/12/11 + */ +@Service("AppService") +public class AppServiceImpl implements AppService { + @Autowired + private AppMapper mapper; + + + @Override + public CriticalData getCriticalData() { + CriticalData data = new CriticalData(); + LocalDate current_date = LocalDate.now(); + String startTime = current_date + " 00:00:00"; + String endTime = current_date + " 23:59:59"; + int dayLeaseNum = mapper.getDayLeaseNum(startTime,endTime); + int dayBackNum = mapper.getDayBackNum(startTime,endTime); + int dayInputNum = mapper.getDayInputNum(startTime,endTime); + int dayOutNum = mapper.getDayOutNum(startTime,endTime); + data.setDayLeaseNum(dayLeaseNum); + data.setDayBackNum(dayBackNum); + data.setDayInputNum(dayInputNum); + data.setDayOutNum(dayOutNum); + return data; + } + + @Override + public ToDoList getToDoList() { + ToDoList data = new ToDoList(); + int leaseNum = mapper.getLeaseNum(); + int backNum = mapper.getBackNum(); + int scrapNum = mapper.getScrapNum(); + int trialNum = mapper.getTrialNum(); + data.setLeaseNum(leaseNum); + data.setBackNum(backNum); + data.setScrapNum(scrapNum); + data.setTrialNum(trialNum); + return data; + } +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/SysNoticeServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/SysNoticeServiceImpl.java new file mode 100644 index 00000000..07376a64 --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/SysNoticeServiceImpl.java @@ -0,0 +1,30 @@ +package com.bonus.sgzb.app.service.impl; + +import com.bonus.sgzb.app.domain.SysNotice; +import com.bonus.sgzb.app.mapper.SysNoticeMapper; +import com.bonus.sgzb.app.service.SysNoticeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Base64; +import java.util.List; + +/** + * @author c liu + * @date 2023/12/11 + */ +@Service("SysNoticeService") +public class SysNoticeServiceImpl implements SysNoticeService { + @Autowired + private SysNoticeMapper mapper; + + @Override + public List getList() { + List list = mapper.getList(); + for (SysNotice bean : list){ + String noticeContent = Base64.getEncoder().encodeToString(bean.getNoticeContent()); + bean.setNoticeContentStr(noticeContent); + } + return list; + } +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java new file mode 100644 index 00000000..3e77e873 --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java @@ -0,0 +1,27 @@ +package com.bonus.sgzb.base.controller; + +import com.bonus.sgzb.base.service.RepairService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author c liu + * @date 2023/12/11 + */ +@RestController +@RequestMapping("/repair") +public class RepairController { + @Autowired + private RepairService service; + +// @ApiOperation(value = "查询关键数据") +// @Log(title = "关键数据", businessType = BusinessType.QUERY) +// @GetMapping("/getCriticalData") +// public AjaxResult getCriticalData() +// { +// CriticalData data = service.getCriticalData(); +// return AjaxResult.success("操作成功",data); +// } + +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTask.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTask.java new file mode 100644 index 00000000..6c61c96d --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTask.java @@ -0,0 +1,59 @@ +package com.bonus.sgzb.base.domain; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author c liu + * @date 2023/12/11 + */ +@Data +@ApiModel(value="维修任务") +public class RepairTask { + /** + * 任务id + */ + @ApiModelProperty(value = "任务id") + private String taskId; + /** + * 维修单号 + */ + @ApiModelProperty(value = "维修单号") + private String repairCode; + /** + * 退料单位名称 + */ + @ApiModelProperty(value = "退料单位名称") + private String backUnit; + /** + * 退料工程名称 + */ + @ApiModelProperty(value = "退料工程名称") + private String backPro; + /** + * 维修机具类型 + */ + @ApiModelProperty(value = "维修机具类型") + private String type; + /** + * 任务创建人 + */ + @ApiModelProperty(value = "任务创建人") + private String createBy; + /** + * 任务创建时间 + */ + @ApiModelProperty(value = "任务创建时间") + private String createTime; + /** + * 退料单号 + */ + @ApiModelProperty(value = "退料单号") + private String backCode; + /** + * 维修状态 + */ + @ApiModelProperty(value = "维修状态") + private String repairStatus; +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/RepairMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/RepairMapper.java new file mode 100644 index 00000000..39e16600 --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/RepairMapper.java @@ -0,0 +1,13 @@ +package com.bonus.sgzb.base.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @author c liu + * @date 2023/12/11 + */ +@Mapper +public interface RepairMapper { + +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/RepairService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/RepairService.java new file mode 100644 index 00000000..9faab51d --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/RepairService.java @@ -0,0 +1,10 @@ +package com.bonus.sgzb.base.service; + +/** + * @author c liu + * @date 2023/12/11 + */ +public interface RepairService { + + +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java new file mode 100644 index 00000000..0ac22ba0 --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java @@ -0,0 +1,18 @@ +package com.bonus.sgzb.base.service.impl; + +import com.bonus.sgzb.base.mapper.RepairMapper; +import com.bonus.sgzb.base.service.RepairService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @author c liu + * @date 2023/12/11 + */ +@Service("RepairService") +public class RepairServiceImpl implements RepairService { + @Autowired + private RepairMapper mapper; + + +} diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/AppMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/AppMapper.xml new file mode 100644 index 00000000..a0e88288 --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/AppMapper.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml new file mode 100644 index 00000000..b377e82a --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/SysNoticeMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/SysNoticeMapper.xml new file mode 100644 index 00000000..a98186fd --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/SysNoticeMapper.xml @@ -0,0 +1,19 @@ + + + + + + + From 007b2a92204083315402e753f934b5af7dfc6497 Mon Sep 17 00:00:00 2001 From: liuchuan <1084917737@qq.com> Date: Thu, 14 Dec 2023 17:25:17 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/controller/RepairController.java | 46 ++++++++++++--- .../bonus/sgzb/base/domain/RepairTask.java | 5 +- .../sgzb/base/domain/RepairTaskDetails.java | 57 +++++++++++++++++++ .../bonus/sgzb/base/mapper/RepairMapper.java | 8 +++ .../sgzb/base/service/RepairService.java | 9 +++ .../base/service/impl/RepairServiceImpl.java | 15 +++++ .../mapper/{base => app}/AppMapper.xml | 0 .../mapper/{base => app}/SysNoticeMapper.xml | 0 .../resources/mapper/base/RepairMapper.xml | 25 ++++++++ 9 files changed, 155 insertions(+), 10 deletions(-) create mode 100644 sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTaskDetails.java rename sgzb-modules/sgzb-base/src/main/resources/mapper/{base => app}/AppMapper.xml (100%) rename sgzb-modules/sgzb-base/src/main/resources/mapper/{base => app}/SysNoticeMapper.xml (100%) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java index 3e77e873..25e9c4bb 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java @@ -1,27 +1,55 @@ package com.bonus.sgzb.base.controller; +import com.bonus.sgzb.base.domain.BmProjectLot; +import com.bonus.sgzb.base.domain.RepairTask; +import com.bonus.sgzb.base.domain.RepairTaskDetails; import com.bonus.sgzb.base.service.RepairService; +import com.bonus.sgzb.common.core.web.controller.BaseController; +import com.bonus.sgzb.common.core.web.page.TableDataInfo; +import com.bonus.sgzb.common.log.annotation.Log; +import com.bonus.sgzb.common.log.enums.BusinessType; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * @author c liu * @date 2023/12/11 */ @RestController @RequestMapping("/repair") -public class RepairController { +public class RepairController extends BaseController { @Autowired private RepairService service; -// @ApiOperation(value = "查询关键数据") -// @Log(title = "关键数据", businessType = BusinessType.QUERY) -// @GetMapping("/getCriticalData") -// public AjaxResult getCriticalData() -// { -// CriticalData data = service.getCriticalData(); -// return AjaxResult.success("操作成功",data); -// } + /** + * 获取维修任务列表 + */ + @ApiOperation(value = "获取维修任务列表") + @Log(title = "维修任务列表", businessType = BusinessType.QUERY) + @GetMapping("/getRepairTaskList") + public TableDataInfo getRepairTaskList(RepairTask bean) + { + startPage(); + List list = service.getRepairTaskList(bean); + return getDataTable(list); + } + + /** + * 获取维修任务机具列表 + */ + @ApiOperation(value = "获取维修任务机具列表") + @Log(title = "维修任务机具列表", businessType = BusinessType.QUERY) + @GetMapping("/getRepairMaTypeList") + public TableDataInfo getRepairMaTypeList(RepairTask bean) + { + startPage(); + List list = service.getRepairMaTypeList(bean); + return getDataTable(list); + } } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTask.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTask.java index 6c61c96d..c0cd5948 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTask.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTask.java @@ -30,7 +30,7 @@ public class RepairTask { * 退料工程名称 */ @ApiModelProperty(value = "退料工程名称") - private String backPro; + private String backProName; /** * 维修机具类型 */ @@ -56,4 +56,7 @@ public class RepairTask { */ @ApiModelProperty(value = "维修状态") private String repairStatus; + private String keyword;//关键字 + private String startTime;//开始时间 + private String endTime;//结束时间 } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTaskDetails.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTaskDetails.java new file mode 100644 index 00000000..d48665d4 --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTaskDetails.java @@ -0,0 +1,57 @@ +package com.bonus.sgzb.base.domain; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author c liu + * @date 2023/12/11 + */ +@Data +@ApiModel(value="维修任务明细") +public class RepairTaskDetails { + /** + * 类型名称 + */ + @ApiModelProperty(value = "类型名称") + private String taskId; + /** + * 规格型号 + */ + @ApiModelProperty(value = "规格型号") + private String repairCode; + /** + * 编码 + */ + @ApiModelProperty(value = "编码") + private String backUnit; + /** + * 待修数量 + */ + @ApiModelProperty(value = "待修数量") + private String repairNum; + /** + * 已修数量 + */ + @ApiModelProperty(value = "已修数量") + private String repairedNum; + /** + * 待修状态 + */ + @ApiModelProperty(value = "待修状态") + private String status; + /** + * 维修人员 + */ + @ApiModelProperty(value = "维修人员") + private String createTime; + /** + * 维修时间 + */ + @ApiModelProperty(value = "维修时间") + private String backCode; + + private String keyword;//关键字 + +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/RepairMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/RepairMapper.java index 39e16600..75b60e54 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/RepairMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/RepairMapper.java @@ -1,8 +1,12 @@ package com.bonus.sgzb.base.mapper; +import com.bonus.sgzb.base.domain.RepairTask; +import com.bonus.sgzb.base.domain.RepairTaskDetails; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * @author c liu * @date 2023/12/11 @@ -10,4 +14,8 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface RepairMapper { + List getRepairTaskList(RepairTask bean); + + + List getRepairMaTypeList(RepairTask bean); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/RepairService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/RepairService.java index 9faab51d..cccc393a 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/RepairService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/RepairService.java @@ -1,5 +1,10 @@ package com.bonus.sgzb.base.service; +import com.bonus.sgzb.base.domain.RepairTask; +import com.bonus.sgzb.base.domain.RepairTaskDetails; + +import java.util.List; + /** * @author c liu * @date 2023/12/11 @@ -7,4 +12,8 @@ package com.bonus.sgzb.base.service; public interface RepairService { + List getRepairTaskList(RepairTask bean); + + + List getRepairMaTypeList(RepairTask bean); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java index 0ac22ba0..dbf12310 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java @@ -1,10 +1,14 @@ package com.bonus.sgzb.base.service.impl; +import com.bonus.sgzb.base.domain.RepairTask; +import com.bonus.sgzb.base.domain.RepairTaskDetails; import com.bonus.sgzb.base.mapper.RepairMapper; import com.bonus.sgzb.base.service.RepairService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author c liu * @date 2023/12/11 @@ -15,4 +19,15 @@ public class RepairServiceImpl implements RepairService { private RepairMapper mapper; + @Override + public List getRepairTaskList(RepairTask bean) { + return mapper.getRepairTaskList(bean); + } + + @Override + public List getRepairMaTypeList(RepairTask bean) { + return mapper.getRepairMaTypeList(bean); + } + + } diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/AppMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/AppMapper.xml similarity index 100% rename from sgzb-modules/sgzb-base/src/main/resources/mapper/base/AppMapper.xml rename to sgzb-modules/sgzb-base/src/main/resources/mapper/app/AppMapper.xml diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/SysNoticeMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/SysNoticeMapper.xml similarity index 100% rename from sgzb-modules/sgzb-base/src/main/resources/mapper/base/SysNoticeMapper.xml rename to sgzb-modules/sgzb-base/src/main/resources/mapper/app/SysNoticeMapper.xml diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml index b377e82a..001a009d 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml @@ -3,5 +3,30 @@ + + From 0533581024f31916c6ece0088f7165d56e1e2e3a Mon Sep 17 00:00:00 2001 From: liuchuan <1084917737@qq.com> Date: Sat, 16 Dec 2023 21:12:55 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BmProjectInfoController.java | 12 ++ .../base/controller/BmUnitInfoController.java | 12 ++ .../base/controller/MaPartTypeController.java | 3 +- .../controller/MaSupplierInfoController.java | 11 ++ .../base/controller/RepairController.java | 76 +++++++- .../sgzb/base/domain/RepairApplyRecord.java | 125 +++++++++++++ .../sgzb/base/domain/RepairPartDetails.java | 98 +++++++++++ .../bonus/sgzb/base/domain/RepairTask.java | 12 +- .../sgzb/base/domain/RepairTaskDetails.java | 58 ++++-- .../bonus/sgzb/base/mapper/RepairMapper.java | 33 +++- .../sgzb/base/service/RepairService.java | 15 ++ .../base/service/impl/RepairServiceImpl.java | 146 +++++++++++++++- .../resources/mapper/base/RepairMapper.xml | 165 ++++++++++++++++-- .../impl/PurchaseCheckInfoServiceImpl.java | 1 - 14 files changed, 726 insertions(+), 41 deletions(-) create mode 100644 sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairApplyRecord.java create mode 100644 sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairPartDetails.java diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmProjectInfoController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmProjectInfoController.java index 4b4a677d..9a0bbe10 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmProjectInfoController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmProjectInfoController.java @@ -47,6 +47,18 @@ public class BmProjectInfoController extends BaseController{ } + /** + * 获取工程项目下拉选 + */ + @ApiOperation(value = "获取工程项目下拉选") + @GetMapping("/getProjectSelect") + public AjaxResult getProjectSelect(BmProjectInfo bmProjectInfo) + { + List list = bmProjectInfoService.getProjectInfoAll(bmProjectInfo); + return AjaxResult.success(list); + + } + /** * 根据条件进行查询 */ diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmUnitInfoController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmUnitInfoController.java index 7fc479b1..124b017c 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmUnitInfoController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmUnitInfoController.java @@ -47,6 +47,18 @@ public class BmUnitInfoController extends BaseController{ } + /** + * 获取往来单位下拉选 + */ + @ApiOperation(value = "获取往来单位下拉选") + @GetMapping("/getUnitInfoSelect") + public AjaxResult getUnitInfoSelect(BmUnitInfo bmUnitInfo) + { + List list = bmUnitInfoService.getUnitInfoAll(bmUnitInfo); + return AjaxResult.success(list); + + } + /** * 根据条件进行查询往来单位 */ diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPartTypeController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPartTypeController.java index ab00d0a8..a0074f16 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPartTypeController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaPartTypeController.java @@ -23,7 +23,7 @@ import java.util.List; * @since 2023-11-27 16:44:02 */ @RestController -@RequestMapping("/maPartType") +@RequestMapping("maPartType") public class MaPartTypeController extends BaseController { /** * 服务对象 @@ -39,7 +39,6 @@ public class MaPartTypeController extends BaseController { @GetMapping("/list") public AjaxResult list(MaPartType maPartType) { - startPage(); List list = maPartTypeService.selectMaPartList(maPartType); return AjaxResult.success(list); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaSupplierInfoController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaSupplierInfoController.java index 1b6ac137..15d56ba6 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaSupplierInfoController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaSupplierInfoController.java @@ -51,6 +51,17 @@ public class MaSupplierInfoController extends BaseController return getDataTable(list); } + /** + * 查询供应商管理下拉选 + */ + @ApiOperation(value = "查询供应商管理下拉选") + @GetMapping("/getSupplierSelect") + public AjaxResult getSupplierSelect(MaSupplierInfo maSupplierInfo) + { + List list = maSupplierInfoService.selectMaSupplierInfoList(maSupplierInfo); + return AjaxResult.success(list); + } + /** * 导出供应商管理列表 */ diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java index 25e9c4bb..7cbcf8d3 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java @@ -1,20 +1,25 @@ package com.bonus.sgzb.base.controller; -import com.bonus.sgzb.base.domain.BmProjectLot; -import com.bonus.sgzb.base.domain.RepairTask; -import com.bonus.sgzb.base.domain.RepairTaskDetails; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.bonus.sgzb.base.domain.*; +import com.bonus.sgzb.base.domain.vo.TreeSelect; import com.bonus.sgzb.base.service.RepairService; import com.bonus.sgzb.common.core.web.controller.BaseController; +import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.core.web.page.TableDataInfo; import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; +import com.bonus.sgzb.common.security.annotation.RequiresPermissions; +import com.bonus.sgzb.system.api.domain.SysUser; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; +import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; /** * @author c liu @@ -52,4 +57,63 @@ public class RepairController extends BaseController { return getDataTable(list); } + /** + * 新增维修记录 + */ + @ApiOperation(value = "新增维修记录") + @Log(title = "新增维修记录", businessType = BusinessType.INSERT) + @PostMapping("/submitRepairApply") + public AjaxResult submitRepairApply(@RequestBody RepairApplyRecord bean) { + String partStrList = bean.getPartStrList(); + List repairPartDetails = JSONObject.parseArray(partStrList, RepairPartDetails.class); + bean.setPartList(repairPartDetails); + AjaxResult ajaxResult = service.submitRepairApply(bean); + return ajaxResult; + } + + /** + * 快捷维修记录 + */ + @ApiOperation(value = "快捷维修记录") + @Log(title = "快捷维修记录", businessType = BusinessType.INSERT) + @PostMapping("/fastRepairApply") + public AjaxResult fastRepairApply(List list) { + AjaxResult ajaxResult = service.fastRepairApply(list); + return ajaxResult; + } + + /** + * 完成维修 + */ + @ApiOperation(value = "完成维修") + @Log(title = "完成维修", businessType = BusinessType.INSERT) + @PostMapping("/completeRepair") + public AjaxResult completeRepair(List ids) { + + return toAjax(service.completeRepair(ids)); + } + + /** + * 提交审核 + */ + @ApiOperation(value = "提交审核") + @Log(title = "提交审核", businessType = BusinessType.INSERT) + @PostMapping("/endRepairTask") + public AjaxResult endRepairTask(List taskList) { + + return toAjax(service.endRepairTask(taskList)); + } + + /** + * 获取用户下拉选 + */ + @GetMapping("/getUserSelect") + public AjaxResult getUserSelect() + { + List list = service.selectUserList(); + return AjaxResult.success(list); + } + + + } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairApplyRecord.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairApplyRecord.java new file mode 100644 index 00000000..fcc5ff41 --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairApplyRecord.java @@ -0,0 +1,125 @@ +package com.bonus.sgzb.base.domain; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author c liu + * @date 2023/12/11 + */ +@Data +@ApiModel(value="维修任务详细") +public class RepairApplyRecord { + private Long id; + /** + * 任务ID + */ + @ApiModelProperty(value = "任务ID") + private String taskId; + /** + * 机具ID + */ + @ApiModelProperty(value = "机具ID") + private String maId; + /** + * 规格ID + */ + @ApiModelProperty(value = "规格ID") + private String typeId; + /** + * 维修数量 + */ + @ApiModelProperty(value = "维修数量") + private int repairNum; + /** + * 报废数量 + */ + @ApiModelProperty(value = "报废数量") + private int scrapNum; + /** + * 维修方式（1内部2返厂3报废） + */ + @ApiModelProperty(value = "维修方式（1内部2返厂3报废）") + private String repairType; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者") + private Long createBy; + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间") + private String createTime; + /** + * 更新者 + */ + @ApiModelProperty(value = "更新者") + private String updateBy; + /** + * 更新时间 + */ + @ApiModelProperty(value = "更新时间") + private String updateTime; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark;// + /** + * 报废原因 + */ + @ApiModelProperty(value = "报废原因") + private String scrapReason;// + /** + * 报废类型（0：自然报废，1任务报废） + */ + @ApiModelProperty(value = "报废类型（0：自然报废，1任务报废）") + private String scrapType; + /** + * 返厂id + */ + @ApiModelProperty(value = "返厂id") + private String supplierId; + /** + * 配件数量 + */ + @ApiModelProperty(value = "配件数量") + private int partNum; + /** + * 配件单价 + */ + @ApiModelProperty(value = "配件单价") + private String partPrice; + /** + * 维修内容 + */ + @ApiModelProperty(value = "维修内容") + private String repairContent; + /** + * 类型（0不收费，1收费） + */ + @ApiModelProperty(value = "类型（0不收费，1收费）") + private String partType; + /** + * 配件名称 + */ + @ApiModelProperty(value = "配件名称") + private String partName; + /** + * 维修人 + */ + @ApiModelProperty(value = "维修人") + private Long repairer; + private List partList; + private String partStrList; + private Long companyId; + /** + * 损坏照片id + */ + @ApiModelProperty(value = "损坏照片id") + private String fileId; +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairPartDetails.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairPartDetails.java new file mode 100644 index 00000000..90e4a6ce --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairPartDetails.java @@ -0,0 +1,98 @@ +package com.bonus.sgzb.base.domain; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author c liu + * @date 2023/12/11 + */ +@Data +@ApiModel(value="维修配件") +public class RepairPartDetails { + /** + * 任务ID + */ + @ApiModelProperty(value = "任务ID") + private String taskId; + /** + * 机具ID + */ + @ApiModelProperty(value = "机具ID") + private String maId; + /** + * 规格ID + */ + @ApiModelProperty(value = "规格ID") + private String typeId; + /** + * 配件ID + */ + @ApiModelProperty(value = "配件ID") + private Long partId; + /** + * 配件名称 + */ + @ApiModelProperty(value = "配件名称") + private String partName; + /** + * 返厂id + */ + @ApiModelProperty(value = "返厂id") + private String supplierId; + /** + * 配件数量 + */ + @ApiModelProperty(value = "配件数量") + private int partNum; + /** + * 配件费用 + */ + @ApiModelProperty(value = "配件费用") + private String partCost; + /** + * 配件单价 + */ + @ApiModelProperty(value = "配件单价") + private String partPrice; + /** + * 类型（0不收费，1收费） + */ + @ApiModelProperty(value = "类型（0不收费，1收费）") + private String partType; + /** + * 创建者 + */ + @ApiModelProperty(value = "创建者") + private Long createBy; + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间") + private String createTime; + /** + * 更新者 + */ + @ApiModelProperty(value = "更新者") + private String updateBy; + /** + * 更新时间 + */ + @ApiModelProperty(value = "更新时间") + private String updateTime; + /** + * 备注 + */ + @ApiModelProperty(value = "备注") + private String remark;// + /** + * 维修内容 + */ + @ApiModelProperty(value = "维修内容") + private String repairContent; + private Long companyId; + private Long repairer; + @ApiModelProperty(value = "维修数量") + private int repairNum; +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTask.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTask.java index c0cd5948..6e0c7104 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTask.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTask.java @@ -30,7 +30,7 @@ public class RepairTask { * 退料工程名称 */ @ApiModelProperty(value = "退料工程名称") - private String backProName; + private String backPro; /** * 维修机具类型 */ @@ -40,7 +40,13 @@ public class RepairTask { * 任务创建人 */ @ApiModelProperty(value = "任务创建人") - private String createBy; + private Long createBy; + /** + * 任务创建人 + */ + @ApiModelProperty(value = "任务创建人") + private String createUser; + /** * 任务创建时间 */ @@ -59,4 +65,6 @@ public class RepairTask { private String keyword;//关键字 private String startTime;//开始时间 private String endTime;//结束时间 + private String companyId;// + private Long agreementId;// } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTaskDetails.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTaskDetails.java index d48665d4..30950890 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTaskDetails.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTaskDetails.java @@ -11,47 +11,73 @@ import lombok.Data; @Data @ApiModel(value="维修任务明细") public class RepairTaskDetails { + /** + * id + */ + @ApiModelProperty(value = "id") + private Long id; + /** + * 任务ID + */ + @ApiModelProperty(value = "任务ID") + private String taskId; + /** + * 机具ID + */ + @ApiModelProperty(value = "机具ID") + private String maId; /** * 类型名称 */ @ApiModelProperty(value = "类型名称") - private String taskId; + private String typeName; /** * 规格型号 */ @ApiModelProperty(value = "规格型号") - private String repairCode; + private String type; /** * 编码 */ @ApiModelProperty(value = "编码") - private String backUnit; + private String code; /** - * 待修数量 + * 维修总量 */ - @ApiModelProperty(value = "待修数量") - private String repairNum; + @ApiModelProperty(value = "维修总量") + private int repairNum; /** - * 已修数量 + * 维修合格数量 */ - @ApiModelProperty(value = "已修数量") - private String repairedNum; + @ApiModelProperty(value = "维修合格数量") + private int repairedNum; + /** + * 维修报废数量 + */ + @ApiModelProperty(value = "维修报废数量") + private int scrapNum; /** * 待修状态 */ @ApiModelProperty(value = "待修状态") private String status; /** - * 维修人员 + * 更新者 */ - @ApiModelProperty(value = "维修人员") - private String createTime; + @ApiModelProperty(value = "更新者") + private String updateBy; /** - * 维修时间 + * 更新时间 */ - @ApiModelProperty(value = "维修时间") - private String backCode; - + @ApiModelProperty(value = "更新时间") + private String updateTime; + /** + * 维修人 + */ + @ApiModelProperty(value = "维修人") + private Long repairer; private String keyword;//关键字 + private String typeId;//规格ID + private Long companyId;//规格ID } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/RepairMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/RepairMapper.java index 75b60e54..0ba105b0 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/RepairMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/RepairMapper.java @@ -1,7 +1,10 @@ package com.bonus.sgzb.base.mapper; +import com.bonus.sgzb.base.domain.RepairApplyRecord; +import com.bonus.sgzb.base.domain.RepairPartDetails; import com.bonus.sgzb.base.domain.RepairTask; import com.bonus.sgzb.base.domain.RepairTaskDetails; +import com.bonus.sgzb.system.api.domain.SysUser; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -16,6 +19,34 @@ public interface RepairMapper { List getRepairTaskList(RepairTask bean); - List getRepairMaTypeList(RepairTask bean); + + List getTypeList(String taskId); + + String getType(String typeId); + + + int addRecord(RepairApplyRecord bean); + + RepairTaskDetails getById(Long id); + + int updateRepairedNum(@Param("id") Long id, @Param("repairNum")int repairNum,@Param("repairer") Long repairer,@Param("userId") Long userId); + + int updateScrapNum(@Param("id")Long id, @Param("scrapNum")int scrapNum,@Param("userId")Long userId); + + int addPart(RepairPartDetails partDetails); + + int completeRepair(List ids,Long userId); + + List selectUserList(); + + int updateTaskStatus(List taskList, Long userid); + + int addTask(RepairTask task); + + Long getAgreementId(RepairTask task); + + int createAgreementTask(RepairTask task); + + int updateRepairedNumTwo(@Param("id")Long id, @Param("repairNum")int repairNum, @Param("userId")Long userid); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/RepairService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/RepairService.java index cccc393a..5d185d45 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/RepairService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/RepairService.java @@ -1,7 +1,11 @@ package com.bonus.sgzb.base.service; +import com.bonus.sgzb.base.domain.RepairApplyRecord; import com.bonus.sgzb.base.domain.RepairTask; import com.bonus.sgzb.base.domain.RepairTaskDetails; +import com.bonus.sgzb.base.domain.vo.TreeSelect; +import com.bonus.sgzb.common.core.web.domain.AjaxResult; +import com.bonus.sgzb.system.api.domain.SysUser; import java.util.List; @@ -16,4 +20,15 @@ public interface RepairService { List getRepairMaTypeList(RepairTask bean); + + AjaxResult submitRepairApply(RepairApplyRecord bean); + + + AjaxResult fastRepairApply(List list); + + int completeRepair(List ids); + + List selectUserList(); + + int endRepairTask(List taskList); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java index dbf12310..1e4db56e 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java @@ -1,13 +1,23 @@ package com.bonus.sgzb.base.service.impl; +import com.bonus.sgzb.base.domain.RepairApplyRecord; +import com.bonus.sgzb.base.domain.RepairPartDetails; import com.bonus.sgzb.base.domain.RepairTask; import com.bonus.sgzb.base.domain.RepairTaskDetails; +import com.bonus.sgzb.base.domain.vo.TreeSelect; import com.bonus.sgzb.base.mapper.RepairMapper; import com.bonus.sgzb.base.service.RepairService; +import com.bonus.sgzb.common.core.utils.SpringUtils; +import com.bonus.sgzb.common.core.web.domain.AjaxResult; +import com.bonus.sgzb.common.security.utils.SecurityUtils; +import com.bonus.sgzb.system.api.domain.SysUser; +import com.bonus.sgzb.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.stream.Collectors; /** * @author c liu @@ -21,13 +31,145 @@ public class RepairServiceImpl implements RepairService { @Override public List getRepairTaskList(RepairTask bean) { - return mapper.getRepairTaskList(bean); + List repairTaskList = mapper.getRepairTaskList(bean); + for (RepairTask repairTask : repairTaskList){ + List typeList = mapper.getTypeList(repairTask.getTaskId()); + if (typeList != null && typeList.size() > 0){ + StringBuilder type = new StringBuilder(); + for (String s : typeList){ + type.append(s); + type.append("；"); + } + repairTask.setType(String.valueOf(type)); + } + + } + return repairTaskList; } @Override public List getRepairMaTypeList(RepairTask bean) { - return mapper.getRepairMaTypeList(bean); + List repairMaTypeList = mapper.getRepairMaTypeList(bean); + for (RepairTaskDetails repairTaskDetails : repairMaTypeList){ + String typeName = mapper.getType(repairTaskDetails.getTypeId()); + repairTaskDetails.setTypeName(typeName); + } + return repairMaTypeList; + } + + @Override + @Transactional + public AjaxResult submitRepairApply(RepairApplyRecord bean) { + RepairTaskDetails details = mapper.getById(bean.getId()); + + LoginUser loginUser = SecurityUtils.getLoginUser(); + bean.setCreateBy(loginUser.getUserid()); + List partList = bean.getPartList(); + if (partList != null && partList.size()>0){ + bean.setRepairNum(partList.get(0).getRepairNum()); + } + switch (bean.getRepairType()) { + case "1":{ + int repairNum = details.getRepairedNum() + bean.getRepairNum(); + int num = repairNum + details.getScrapNum(); + if (num > details.getRepairNum()) { + return AjaxResult.error("维修数量大于维修总量"); + } + mapper.updateRepairedNum(bean.getId(), repairNum,bean.getRepairer(),loginUser.getUserid()); + break; + } + case "2": { + int repairNum = details.getRepairedNum() + bean.getRepairNum(); + int num = repairNum + details.getScrapNum(); + if (num > details.getRepairNum()) { + return AjaxResult.error("维修数量大于维修总量"); + } + mapper.updateRepairedNumTwo(bean.getId(), repairNum,loginUser.getUserid()); + break; + } + case "3": { + int scrapNum = details.getScrapNum() + bean.getScrapNum(); + int num = scrapNum + details.getRepairedNum(); + if (num > details.getRepairNum()) { + return AjaxResult.error("维修数量大于维修总量"); + } + mapper.updateScrapNum(bean.getId(), scrapNum,loginUser.getUserid()); + break; + } + } + if (partList != null && partList.size()>0){ + for (RepairPartDetails partDetails : partList){ + if (partDetails.getPartId() == null && bean.getRepairType().equals("1")){ + return AjaxResult.error("请选择配件"); + } + if (bean.getRepairType().equals("1")){ + partDetails.setTaskId(bean.getTaskId()); + partDetails.setMaId(bean.getMaId()); + partDetails.setTypeId(bean.getTypeId()); + partDetails.setCreateBy(loginUser.getUserid()); + partDetails.setCompanyId(bean.getCompanyId()); + mapper.addPart(partDetails); + } + } + if (!bean.getRepairType().equals("1")){ + bean.setPartName(partList.get(0).getPartName()); + bean.setPartType(partList.get(0).getPartType()); + bean.setRepairContent(partList.get(0).getRepairContent()); + bean.setSupplierId(partList.get(0).getSupplierId()); + bean.setPartPrice(partList.get(0).getPartPrice()); + bean.setPartNum(partList.get(0).getPartNum()); + } + bean.setRepairer(partList.get(0).getRepairer()); + } + mapper.addRecord(bean); + return AjaxResult.success(); + } + + @Override + public AjaxResult fastRepairApply(List list) { + LoginUser loginUser = SecurityUtils.getLoginUser(); + for (RepairTaskDetails bean : list){ + int repaired_num = bean.getRepairNum() - bean.getRepairedNum() - bean.getScrapNum(); + RepairApplyRecord partDetails = new RepairApplyRecord(); + partDetails.setTaskId(bean.getTaskId()); + partDetails.setMaId(bean.getMaId()); + partDetails.setTypeId(bean.getTypeId()); + partDetails.setRepairNum(repaired_num); + partDetails.setRepairType("1"); + partDetails.setCreateBy(loginUser.getUserid()); + partDetails.setCompanyId(bean.getCompanyId()); + mapper.addRecord(partDetails); + } + return AjaxResult.success(); + } + + @Override + @Transactional + public int endRepairTask(List taskList) { + LoginUser loginUser = SecurityUtils.getLoginUser(); + int i = mapper.updateTaskStatus(taskList,loginUser.getUserid()); + for (RepairTask task : taskList){ + task.setCreateBy(loginUser.getUserid()); + Long agreementId = mapper.getAgreementId(task); + mapper.addTask(task); + task.setAgreementId(agreementId); + mapper.createAgreementTask(task); + } + return i; + } + + @Override + public int completeRepair(List ids) { + LoginUser loginUser = SecurityUtils.getLoginUser(); + return mapper.completeRepair(ids,loginUser.getUserid()); + } + + @Override + public List selectUserList() { + return mapper.selectUserList(); } + + } diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml index 001a009d..f80b67f4 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml @@ -1,32 +1,175 @@ - + + insert into repair_apply_record (task_id,ma_id,type_id,repair_num,scrap_num,repair_type,create_by,create_time,repair_content,company_id,scrap_reason,scrap_type,supplier_id,part_num,part_price,part_type,part_name,repairer) + values (#{taskId},#{maId},#{typeId},#{repairNum},#{scrapNum},#{repairType},#{createBy},now(),#{repairContent},#{companyId},#{scrapReason},#{scrapType},#{supplierId},#{partNum},#{partPrice},#{partType},#{partName},#{repairer}); + + + insert into repair_part_details (task_id,ma_id,type_id,part_id,part_num,part_cost,part_type,create_by,create_time,company_id,repair_content) + values (#{taskId},#{maId},#{typeId},#{partId},#{partNum},#{partCost},#{partType},#{createBy},now(),#{companyId},#{repairContent}); + + + insert into tm_task (task_status,task_type,code,create_by,create_time,company_id) + values (45,46,#{repairCode},#{createBy},now(),#{companyId}); + + + insert into tm_task_agreement (task_id,agreement_id,create_by,create_time,company_id) + values (#{taskId},#{agreementId},#{createBy},now(),#{companyId}); + + + update repair_apply_details + set repaired_num = #{repairNum}, + repairer = #{repairer}, + update_by = #{userId}, + update_time = now() + where id = #{id} + + + update repair_apply_details + set scrap_num = #{scrapNum}, + update_by = #{userId}, + update_time = now() + where id = #{id} + + + update repair_apply_details + set status = '1', + update_by = #{userId}, + update_time = now() + where id in + + #{id} + + + + update tm_task + set task_status = '44', + update_by = #{userId}, + update_time = now() + where task_id in + + #{task.taskId} + + + + update repair_apply_details + set repaired_num = #{repairNum}, + update_by = #{userId}, + update_time = now() + where id = #{id} + + + + + + + + + diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java index 39a86375..1785868c 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseCheckInfoServiceImpl.java @@ -15,7 +15,6 @@ import com.bonus.sgzb.material.service.IPurchaseCheckInfoService; import com.bonus.sgzb.common.core.utils.DateUtils; import com.bonus.sgzb.material.vo.NoticeInfoVO; import com.bonus.sgzb.system.api.RemoteUserService; -import javafx.concurrent.Task; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; From 698e38e812a76d7eea022816c2e2812638f5695c Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Sun, 17 Dec 2023 18:45:35 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=A4=A7=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/bonus/sgzb/largeScreen/util/CommonUtil.java | 1 - 1 file changed, 1 deletion(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/util/CommonUtil.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/util/CommonUtil.java index 9b7b34d7..1d0162d5 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/util/CommonUtil.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/util/CommonUtil.java @@ -76,7 +76,6 @@ public class CommonUtil { valueList.add(0); return valueList; } - ; BigDecimal numberValue = new BigDecimal(new Double(0).toString()); BigDecimal countValue = new BigDecimal(new Double(0).toString()); for (int i = 0; i < list.size(); i++) { From eba9de34e8ef154e9cdbfac9f0ca325de2894ff0 Mon Sep 17 00:00:00 2001 From: liuchuan <1084917737@qq.com> Date: Sun, 17 Dec 2023 18:50:22 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/controller/MaTypeController.java | 11 +++ .../base/controller/RepairController.java | 22 ++++-- .../sgzb/base/domain/RepairApplyRecord.java | 2 +- .../sgzb/base/domain/RepairTaskDetails.java | 2 +- .../com/bonus/sgzb/base/domain/vo/dictVo.java | 17 ++++ .../bonus/sgzb/base/mapper/MaTypeMapper.java | 1 + .../bonus/sgzb/base/mapper/RepairMapper.java | 11 ++- .../bonus/sgzb/base/service/ITypeService.java | 3 + .../sgzb/base/service/RepairService.java | 8 +- .../base/service/impl/MaTypeServiceImpl.java | 10 +++ .../base/service/impl/RepairServiceImpl.java | 61 +++++++++------ .../mapper/base/MaMachineTypeMapper.xml | 11 +++ .../resources/mapper/base/RepairMapper.xml | 78 +++++++++++-------- 13 files changed, 169 insertions(+), 68 deletions(-) create mode 100644 sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/vo/dictVo.java diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java index e6420235..01dffced 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java @@ -46,6 +46,17 @@ public class MaTypeController extends BaseController { return AjaxResult.success(maTypeList); } + /** + * 工机具类型下拉树 + * @return 结果 + */ + @ApiOperation(value = "工机具类型下拉树") + @GetMapping("/getMaTypeSelect") + public AjaxResult getMaTypeSelect(@RequestParam(required = false, defaultValue = "", value = "typeName") String typeName, @RequestParam(required = false, defaultValue = "", value = "parentId") String parentId){ + List maTypeList = iTypeService.getMaTypeSelect(typeName, parentId); + return AjaxResult.success(maTypeList); + } + @ApiOperation(value = "获取机具设备的具体规格") @GetMapping(value = "/selectMaTypeTreeByLevel") public AjaxResult selectMaTypeTreeByLevel(@RequestParam(value = "typeId") String typeId) { diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java index 7cbcf8d3..bbef921f 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java @@ -1,10 +1,12 @@ package com.bonus.sgzb.base.controller; +import cn.hutool.http.server.HttpServerRequest; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.bonus.sgzb.base.domain.*; import com.bonus.sgzb.base.domain.vo.TreeSelect; +import com.bonus.sgzb.base.domain.vo.dictVo; import com.bonus.sgzb.base.service.RepairService; import com.bonus.sgzb.common.core.web.controller.BaseController; import com.bonus.sgzb.common.core.web.domain.AjaxResult; @@ -17,6 +19,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -77,7 +80,7 @@ public class RepairController extends BaseController { @ApiOperation(value = "快捷维修记录") @Log(title = "快捷维修记录", businessType = BusinessType.INSERT) @PostMapping("/fastRepairApply") - public AjaxResult fastRepairApply(List list) { + public AjaxResult fastRepairApply(@RequestBody List list) { AjaxResult ajaxResult = service.fastRepairApply(list); return ajaxResult; } @@ -88,8 +91,7 @@ public class RepairController extends BaseController { @ApiOperation(value = "完成维修") @Log(title = "完成维修", businessType = BusinessType.INSERT) @PostMapping("/completeRepair") - public AjaxResult completeRepair(List ids) { - + public AjaxResult completeRepair(@RequestBody ArrayList ids) { return toAjax(service.completeRepair(ids)); } @@ -99,9 +101,8 @@ public class RepairController extends BaseController { @ApiOperation(value = "提交审核") @Log(title = "提交审核", businessType = BusinessType.INSERT) @PostMapping("/endRepairTask") - public AjaxResult endRepairTask(List taskList) { - - return toAjax(service.endRepairTask(taskList)); + public AjaxResult endRepairTask(@RequestBody ArrayList taskList) { + return service.endRepairTask(taskList); } /** @@ -114,6 +115,15 @@ public class RepairController extends BaseController { return AjaxResult.success(list); } + /** + * 字典下拉选 + */ + @GetMapping("/getDicSelect") + public AjaxResult getDicSelect(@RequestParam String value) + { + List list = service.getDicSelect(value); + return AjaxResult.success(list); + } } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairApplyRecord.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairApplyRecord.java index fcc5ff41..2da8e416 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairApplyRecord.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairApplyRecord.java @@ -121,5 +121,5 @@ public class RepairApplyRecord { * 损坏照片id */ @ApiModelProperty(value = "损坏照片id") - private String fileId; + private String fileIds; } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTaskDetails.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTaskDetails.java index 30950890..a59c0f38 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTaskDetails.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairTaskDetails.java @@ -75,7 +75,7 @@ public class RepairTaskDetails { * 维修人 */ @ApiModelProperty(value = "维修人") - private Long repairer; + private String repairer; private String keyword;//关键字 private String typeId;//规格ID private Long companyId;//规格ID diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/vo/dictVo.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/vo/dictVo.java new file mode 100644 index 00000000..e5b232ab --- /dev/null +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/vo/dictVo.java @@ -0,0 +1,17 @@ +package com.bonus.sgzb.base.domain.vo; + +import com.bonus.sgzb.common.core.web.domain.BaseEntity; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author c liu + * @date 2023/12/17 + */ +@Data +public class dictVo extends BaseEntity { + private static final long serialVersionUID = 1L; + private Long id; + private String name; +} diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaTypeMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaTypeMapper.java index 3762224e..b659a772 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaTypeMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaTypeMapper.java @@ -74,4 +74,5 @@ public interface MaTypeMapper { List selectMaTypeListByLevelNotFour(String parentId); + List getMaTypeSelect(String parentId); } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/RepairMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/RepairMapper.java index 0ba105b0..358874c0 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/RepairMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/RepairMapper.java @@ -4,10 +4,12 @@ import com.bonus.sgzb.base.domain.RepairApplyRecord; import com.bonus.sgzb.base.domain.RepairPartDetails; import com.bonus.sgzb.base.domain.RepairTask; import com.bonus.sgzb.base.domain.RepairTaskDetails; +import com.bonus.sgzb.base.domain.vo.dictVo; import com.bonus.sgzb.system.api.domain.SysUser; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.ArrayList; import java.util.List; /** @@ -36,11 +38,11 @@ public interface RepairMapper { int addPart(RepairPartDetails partDetails); - int completeRepair(List ids,Long userId); + int completeRepair(@Param("ids") ArrayList ids, @Param("userId")Long userId); List selectUserList(); - int updateTaskStatus(List taskList, Long userid); + int updateTaskStatus(@Param("taskList")List taskList,@Param("userId") Long userid); int addTask(RepairTask task); @@ -49,4 +51,9 @@ public interface RepairMapper { int createAgreementTask(RepairTask task); int updateRepairedNumTwo(@Param("id")Long id, @Param("repairNum")int repairNum, @Param("userId")Long userid); + + + int getUnFinish(RepairTask task); + + List getDicSelect(String value); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/ITypeService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/ITypeService.java index 2e476f2b..cf8403ee 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/ITypeService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/ITypeService.java @@ -11,6 +11,7 @@ import java.util.List; public interface ITypeService { List getMaTypeList(String typeName, String parentId); + List getMaTypeSelect(String typeName, String parentId); List getListByMaType(Long typeId,String typeName); @@ -67,4 +68,6 @@ public interface ITypeService { List getListByParentId(Long typeId, String typeName); List getEquipmentType(Long typeId, String typeName); + + } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/RepairService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/RepairService.java index 5d185d45..8c7b5d27 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/RepairService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/RepairService.java @@ -4,9 +4,11 @@ import com.bonus.sgzb.base.domain.RepairApplyRecord; import com.bonus.sgzb.base.domain.RepairTask; import com.bonus.sgzb.base.domain.RepairTaskDetails; import com.bonus.sgzb.base.domain.vo.TreeSelect; +import com.bonus.sgzb.base.domain.vo.dictVo; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.system.api.domain.SysUser; +import java.util.ArrayList; import java.util.List; /** @@ -26,9 +28,11 @@ public interface RepairService { AjaxResult fastRepairApply(List list); - int completeRepair(List ids); + int completeRepair(ArrayList ids); List selectUserList(); - int endRepairTask(List taskList); + AjaxResult endRepairTask(List taskList); + + List getDicSelect(String value); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java index 4ca3042d..b53362c9 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java @@ -157,6 +157,16 @@ public class MaTypeServiceImpl implements ITypeService { return treeSelectList; } + @Override + public List getMaTypeSelect(String typeName, String parentId) { + List maTypes = maTypeMapper.getMaTypeSelect(parentId); + List treeSelectList = buildDeptTreeSelect(maTypes); + //如果没有查询到那么返回空 + return treeSelectList; + } + + + /** * 根据左列表类型id查询右表格 * diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java index 1e4db56e..e0d1a43c 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java @@ -1,14 +1,18 @@ package com.bonus.sgzb.base.service.impl; +import cn.hutool.http.server.HttpServerRequest; import com.bonus.sgzb.base.domain.RepairApplyRecord; import com.bonus.sgzb.base.domain.RepairPartDetails; import com.bonus.sgzb.base.domain.RepairTask; import com.bonus.sgzb.base.domain.RepairTaskDetails; import com.bonus.sgzb.base.domain.vo.TreeSelect; +import com.bonus.sgzb.base.domain.vo.dictVo; import com.bonus.sgzb.base.mapper.RepairMapper; import com.bonus.sgzb.base.service.RepairService; +import com.bonus.sgzb.common.core.constant.TokenConstants; import com.bonus.sgzb.common.core.utils.SpringUtils; import com.bonus.sgzb.common.core.web.domain.AjaxResult; +import com.bonus.sgzb.common.security.service.TokenService; import com.bonus.sgzb.common.security.utils.SecurityUtils; import com.bonus.sgzb.system.api.domain.SysUser; import com.bonus.sgzb.system.api.model.LoginUser; @@ -16,6 +20,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -28,45 +34,32 @@ public class RepairServiceImpl implements RepairService { @Autowired private RepairMapper mapper; + @Resource + private TokenService TokenService; + @Override public List getRepairTaskList(RepairTask bean) { List repairTaskList = mapper.getRepairTaskList(bean); - for (RepairTask repairTask : repairTaskList){ - List typeList = mapper.getTypeList(repairTask.getTaskId()); - if (typeList != null && typeList.size() > 0){ - StringBuilder type = new StringBuilder(); - for (String s : typeList){ - type.append(s); - type.append("；"); - } - repairTask.setType(String.valueOf(type)); - } - - } return repairTaskList; } @Override public List getRepairMaTypeList(RepairTask bean) { List repairMaTypeList = mapper.getRepairMaTypeList(bean); - for (RepairTaskDetails repairTaskDetails : repairMaTypeList){ - String typeName = mapper.getType(repairTaskDetails.getTypeId()); - repairTaskDetails.setTypeName(typeName); - } return repairMaTypeList; } @Override @Transactional - public AjaxResult submitRepairApply(RepairApplyRecord bean) { + public AjaxResult submitRepairApply( RepairApplyRecord bean) { RepairTaskDetails details = mapper.getById(bean.getId()); - LoginUser loginUser = SecurityUtils.getLoginUser(); bean.setCreateBy(loginUser.getUserid()); List partList = bean.getPartList(); if (partList != null && partList.size()>0){ bean.setRepairNum(partList.get(0).getRepairNum()); + bean.setRepairer(partList.get(0).getRepairer()); } switch (bean.getRepairType()) { case "1":{ @@ -92,6 +85,7 @@ public class RepairServiceImpl implements RepairService { int num = scrapNum + details.getRepairedNum(); if (num > details.getRepairNum()) { return AjaxResult.error("维修数量大于维修总量"); + //添加维修记录 } mapper.updateScrapNum(bean.getId(), scrapNum,loginUser.getUserid()); break; @@ -111,7 +105,7 @@ public class RepairServiceImpl implements RepairService { mapper.addPart(partDetails); } } - if (!bean.getRepairType().equals("1")){ + if (bean.getRepairType().equals("2")){ bean.setPartName(partList.get(0).getPartName()); bean.setPartType(partList.get(0).getPartType()); bean.setRepairContent(partList.get(0).getRepairContent()); @@ -119,34 +113,46 @@ public class RepairServiceImpl implements RepairService { bean.setPartPrice(partList.get(0).getPartPrice()); bean.setPartNum(partList.get(0).getPartNum()); } - bean.setRepairer(partList.get(0).getRepairer()); + } mapper.addRecord(bean); return AjaxResult.success(); } @Override + @Transactional public AjaxResult fastRepairApply(List list) { LoginUser loginUser = SecurityUtils.getLoginUser(); for (RepairTaskDetails bean : list){ - int repaired_num = bean.getRepairNum() - bean.getRepairedNum() - bean.getScrapNum(); + int repairedNum = bean.getRepairNum() - bean.getRepairedNum() - bean.getScrapNum(); + if (repairedNum <= 0){ + return AjaxResult.error("选中的数据中包含待维修数量为0的机具，请重新选择"); + } RepairApplyRecord partDetails = new RepairApplyRecord(); partDetails.setTaskId(bean.getTaskId()); partDetails.setMaId(bean.getMaId()); partDetails.setTypeId(bean.getTypeId()); - partDetails.setRepairNum(repaired_num); + partDetails.setRepairNum(repairedNum); partDetails.setRepairType("1"); partDetails.setCreateBy(loginUser.getUserid()); partDetails.setCompanyId(bean.getCompanyId()); mapper.addRecord(partDetails); + int i = repairedNum + bean.getRepairedNum(); + mapper.updateRepairedNumTwo(bean.getId(),i,loginUser.getUserid()); } return AjaxResult.success(); } @Override @Transactional - public int endRepairTask(List taskList) { + public AjaxResult endRepairTask(List taskList) { LoginUser loginUser = SecurityUtils.getLoginUser(); + for (RepairTask task : taskList){ + int i = mapper.getUnFinish(task); + if (i > 0){ + return AjaxResult.error("选中的数据中包含维修未完成的，请完成维修再进行审核"); + } + } int i = mapper.updateTaskStatus(taskList,loginUser.getUserid()); for (RepairTask task : taskList){ task.setCreateBy(loginUser.getUserid()); @@ -155,11 +161,16 @@ public class RepairServiceImpl implements RepairService { task.setAgreementId(agreementId); mapper.createAgreementTask(task); } - return i; + return AjaxResult.success(); } @Override - public int completeRepair(List ids) { + public List getDicSelect(String value) { + return mapper.getDicSelect(value); + } + + @Override + public int completeRepair(ArrayList ids) { LoginUser loginUser = SecurityUtils.getLoginUser(); return mapper.completeRepair(ids,loginUser.getUserid()); } diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml index ab00fb8b..c60984a1 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml @@ -293,6 +293,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" level != 4 and m.status = '0' + + \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml index f80b67f4..79889141 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml @@ -2,8 +2,8 @@ - insert into repair_apply_record (task_id,ma_id,type_id,repair_num,scrap_num,repair_type,create_by,create_time,repair_content,company_id,scrap_reason,scrap_type,supplier_id,part_num,part_price,part_type,part_name,repairer) - values (#{taskId},#{maId},#{typeId},#{repairNum},#{scrapNum},#{repairType},#{createBy},now(),#{repairContent},#{companyId},#{scrapReason},#{scrapType},#{supplierId},#{partNum},#{partPrice},#{partType},#{partName},#{repairer}); + insert into repair_apply_record (task_id,ma_id,type_id,repair_num,scrap_num,repair_type,create_by,create_time,repair_content,company_id,scrap_reason,scrap_type,supplier_id,part_num,part_price,part_type,part_name,repairer,file_ids) + values (#{taskId},#{maId},#{typeId},#{repairNum},#{scrapNum},#{repairType},#{createBy},now(),#{repairContent},#{companyId},#{scrapReason},#{scrapType},#{supplierId},#{partNum},#{partPrice},#{partType},#{partName},#{repairer},#{fileIds}); insert into repair_part_details (task_id,ma_id,type_id,part_id,part_num,part_cost,part_type,create_by,create_time,company_id,repair_content) @@ -62,29 +62,32 @@ - + + From 58fe071b38d6c66596caf5169daf8847ae763738 Mon Sep 17 00:00:00 2001 From: sliang <1589399930@qq.com> Date: Mon, 18 Dec 2023 13:08:34 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=B7=A5=E6=9C=BA=E5=85=B7=E7=AE=A1?= =?UTF-8?q?=E7=90=86-=E5=BA=93=E7=AE=A1=E5=91=98=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=EF=BC=9B=E7=BB=B4=E4=BF=AE=E7=8F=AD=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/BackApplyController.java | 12 ++++ .../sgzb/app/mapper/BackApplyMapper.java | 2 + .../sgzb/app/service/BackApplyService.java | 2 + .../service/impl/BackApplyServiceImpl.java | 5 ++ .../resources/mapper/app/BackApplyMapper.xml | 5 +- .../ReturnOfMaterialsInfoController.java | 37 +++++++++++ .../domain/ReturnOfMaterialsInfo.java | 64 +++++++++++++++++++ .../mapper/ReturnOfMaterialsInfoMapper.java | 17 +++++ .../service/ReturnOfMaterialsInfoService.java | 14 ++++ .../ReturnOfMaterialsInfoServiceImpl.java | 24 +++++++ .../material/ReturnOfMaterialsInfoMapper.xml | 29 +++++++++ 11 files changed, 210 insertions(+), 1 deletion(-) create mode 100644 sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ReturnOfMaterialsInfoController.java create mode 100644 sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ReturnOfMaterialsInfo.java create mode 100644 sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ReturnOfMaterialsInfoMapper.java create mode 100644 sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/ReturnOfMaterialsInfoService.java create mode 100644 sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ReturnOfMaterialsInfoServiceImpl.java create mode 100644 sgzb-modules/sgzb-material/src/main/resources/mapper/material/ReturnOfMaterialsInfoMapper.xml diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java index 4c8584e7..8c7e2afe 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackApplyController.java @@ -10,12 +10,15 @@ import com.bonus.sgzb.app.service.TmTaskService; import com.bonus.sgzb.base.api.domain.LeaseApplyDetails; import com.bonus.sgzb.base.api.domain.LeaseApplyInfo; import com.bonus.sgzb.base.api.domain.TmTask; +import com.bonus.sgzb.base.domain.WarehouseKeeper; import com.bonus.sgzb.common.core.utils.DateUtils; import com.bonus.sgzb.common.core.utils.StringUtils; import com.bonus.sgzb.common.core.web.controller.BaseController; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.log.annotation.Log; import com.bonus.sgzb.common.log.enums.BusinessType; +import io.swagger.annotations.ApiOperation; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -272,4 +275,13 @@ public class BackApplyController extends BaseController { } } + + @ApiOperation("退料审核列表-审核") + @Log(title = "退料审核列表-审核", businessType = BusinessType.UPDATE) + @PostMapping("/audit") + public AjaxResult audit(String id) + { + return toAjax(backApplyService.audit(id)); + } + } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackApplyMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackApplyMapper.java index 369e5484..d9c0355c 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackApplyMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/mapper/BackApplyMapper.java @@ -40,4 +40,6 @@ public interface BackApplyMapper { List examineList(BackApplyInfo record); List examineView(BackApplyInfo record); + + int audit(String id); } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackApplyService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackApplyService.java index d68fb2ec..5cbf9735 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackApplyService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/BackApplyService.java @@ -43,4 +43,6 @@ public interface BackApplyService { List examineList(BackApplyInfo record); List examineView(BackApplyInfo record); + + int audit(String id); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java index 8f6730d8..d9ed5357 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java @@ -81,4 +81,9 @@ public class BackApplyServiceImpl implements BackApplyService { return backApplyMapper.examineView(record); } + @Override + public int audit(String id) { + return backApplyMapper.audit(id); + } + } diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml index 39b0de21..f067c8a7 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyMapper.xml @@ -268,7 +268,10 @@ NOW() ) - + + UPDATE tm_task SET task_status = 38 WHERE task_id = #{id} + + DELETE FROM back_apply_info WHERE id = #{id} diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ReturnOfMaterialsInfoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ReturnOfMaterialsInfoController.java new file mode 100644 index 00000000..7bf076dd --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ReturnOfMaterialsInfoController.java @@ -0,0 +1,37 @@ +package com.bonus.sgzb.material.controller; + +import com.bonus.sgzb.common.core.web.controller.BaseController; +import com.bonus.sgzb.common.core.web.page.TableDataInfo; +import com.bonus.sgzb.material.domain.ReturnOfMaterialsInfo; +import com.bonus.sgzb.material.service.ReturnOfMaterialsInfoService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.bonus.sgzb.material.domain.AgreementInfo; +import java.util.List; + +/** + * @author lsun + */ +@Api(tags = " 退料入库") +@RestController +@RequestMapping("/returnOfMaterialsInfo") +public class ReturnOfMaterialsInfoController extends BaseController { + @Autowired + private ReturnOfMaterialsInfoService returnOfMaterialsInfoService; + + /** + * 获取协议管理列表 + */ + @ApiOperation(value = "获取协议管理列表") + @GetMapping("/getReturnOfMaterialsInfoAll") + public TableDataInfo getReturnOfMaterialsInfoAll(ReturnOfMaterialsInfo bean) + { + startPage(); + List list = returnOfMaterialsInfoService.getReturnOfMaterialsInfoAll(bean); + return getDataTable(list); + } +} diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ReturnOfMaterialsInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ReturnOfMaterialsInfo.java new file mode 100644 index 00000000..c33984b2 --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ReturnOfMaterialsInfo.java @@ -0,0 +1,64 @@ +package com.bonus.sgzb.material.domain; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author lsun + * 退料入库 + */ +@Data +public class ReturnOfMaterialsInfo { + + + @ApiModelProperty(value = "id") + private Long id; + + /** 退料单号 */ + @ApiModelProperty(value = "退料单号") + private String code; + + /** 退料单位 */ + @ApiModelProperty(value = "退料单位") + private String unitName; + + /** 退料工程 */ + @ApiModelProperty(value = "退料工程") + private String lotName; + + + @ApiModelProperty(value = "机具id") + private Long kindId; + @ApiModelProperty(value = "机具名称") + private String kindName; + @ApiModelProperty(value = "类型id") + private Long typeId; + @ApiModelProperty(value = "类型ids") + private String typeIds; + @ApiModelProperty(value = "类型名称") + private String typeName; + @ApiModelProperty(value = "规格型号id") + private Long modelId; + @ApiModelProperty(value = "规格型号") + private String modelName; + + + @ApiModelProperty(value = "入库数量") + private String inputNum; + + @ApiModelProperty(value = "编号") + private String maCode; + + @ApiModelProperty(value = "退料时间") + private String returnTime; + + @ApiModelProperty(value = "提交入库时间") + private String submitStorageTime; + + @ApiModelProperty(value = "提交入库人员") + private String submitToStoragePersonnel; + + @ApiModelProperty(value = "备注") + private String remark; + +} diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ReturnOfMaterialsInfoMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ReturnOfMaterialsInfoMapper.java new file mode 100644 index 00000000..7d941cab --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ReturnOfMaterialsInfoMapper.java @@ -0,0 +1,17 @@ +package com.bonus.sgzb.material.mapper; + + +import com.bonus.sgzb.material.domain.ReturnOfMaterialsInfo; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + + +/** + * @author lsun + */ +@Mapper +public interface ReturnOfMaterialsInfoMapper { + + List getReturnOfMaterialsInfoAll(ReturnOfMaterialsInfo bean); +} diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/ReturnOfMaterialsInfoService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/ReturnOfMaterialsInfoService.java new file mode 100644 index 00000000..6912da12 --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/ReturnOfMaterialsInfoService.java @@ -0,0 +1,14 @@ +package com.bonus.sgzb.material.service; + + +import com.bonus.sgzb.material.domain.ReturnOfMaterialsInfo; + +import java.util.List; + +/** + * @author lsun + */ +public interface ReturnOfMaterialsInfoService { + + List getReturnOfMaterialsInfoAll(ReturnOfMaterialsInfo bean); +} diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ReturnOfMaterialsInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ReturnOfMaterialsInfoServiceImpl.java new file mode 100644 index 00000000..afe61f02 --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ReturnOfMaterialsInfoServiceImpl.java @@ -0,0 +1,24 @@ +package com.bonus.sgzb.material.service.impl; + +import com.bonus.sgzb.material.domain.ReturnOfMaterialsInfo; +import com.bonus.sgzb.material.mapper.ReturnOfMaterialsInfoMapper; +import com.bonus.sgzb.material.service.ReturnOfMaterialsInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author lsun + */ +@Service +public class ReturnOfMaterialsInfoServiceImpl implements ReturnOfMaterialsInfoService { + + @Autowired + private ReturnOfMaterialsInfoMapper returnOfMaterialsInfoMapper; + + @Override + public List getReturnOfMaterialsInfoAll(ReturnOfMaterialsInfo bean) { + return returnOfMaterialsInfoMapper.getReturnOfMaterialsInfoAll(bean); + } +} diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ReturnOfMaterialsInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ReturnOfMaterialsInfoMapper.xml new file mode 100644 index 00000000..830f1d68 --- /dev/null +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ReturnOfMaterialsInfoMapper.xml @@ -0,0 +1,29 @@ + + + + + + + \ No newline at end of file From c4e3627aa1f44771ba74f6155d8791a9463cceae Mon Sep 17 00:00:00 2001 From: dingjie Date: Mon, 18 Dec 2023 15:39:15 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=BB=93=E5=82=A8=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/sgzb/base/api/domain/MaMachine.java | 13 +++ .../base/controller/MaTypeController.java | 34 +++++++- .../bonus/sgzb/base/service/ITypeService.java | 2 +- .../service/impl/MaMachineServiceImpl.java | 7 +- .../base/service/impl/MaTypeServiceImpl.java | 38 +++++--- .../resources/mapper/base/MaMachineMapper.xml | 86 ++++--------------- .../mapper/base/MaMachineTypeMapper.xml | 6 +- .../mapper/base/MaSupplierInfoMapper.xml | 2 +- 8 files changed, 89 insertions(+), 99 deletions(-) diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaMachine.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaMachine.java index 3a59e2e9..0e5b16dd 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaMachine.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaMachine.java @@ -47,6 +47,11 @@ public class MaMachine extends BaseEntity { */ @ApiModelProperty(value = "机具状态（数据字典）") private String maStatus; + /** + * 机具状态（数据字典） + */ + @ApiModelProperty(value = "机具状态（数据字典）名称") + private String maStatusName; /** * 二维码 */ @@ -354,4 +359,12 @@ public class MaMachine extends BaseEntity { public void setSpecificationType(String specificationType) { this.specificationType = specificationType; } + + public String getMaStatusName() { + return maStatusName; + } + + public void setMaStatusName(String maStatusName) { + this.maStatusName = maStatusName; + } } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java index e6420235..97452c15 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java @@ -53,6 +53,20 @@ public class MaTypeController extends BaseController { return AjaxResult.success(maTypeList); } + /** + * 根据左列表类型id查询右表格 + * @param typeId + * @return + */ + + @ApiOperation(value = "工器具类型") + @GetMapping("/equipmentType") + public AjaxResult equipmentType(@RequestParam(required = false) Long typeId, + @RequestParam(required = false) String typeName){ + List listByMaType = iTypeService.getEquipmentType(typeId,typeName); + return success(listByMaType); + } + /** * 获取规格层级为3的设备列表 * @return 结果 @@ -150,6 +164,19 @@ public class MaTypeController extends BaseController { */ @ApiOperation(value = "根据左列表类型id查询右表格") @GetMapping("/getListByMaType") + public AjaxResult getListByMaType(@RequestParam(required = false) Long typeId, + @RequestParam(required = false) String typeName){ + List listByMaType = iTypeService.getListByParentId(typeId,typeName); + return success(listByMaType); + } + +/* *//** + * 根据左列表类型id查询右表格 + * @param typeId + * @return + *//* + @ApiOperation(value = "根据左列表类型id查询右表格") + @GetMapping("/getListByMaType") public TableDataInfo getListByMaType(@RequestParam(required = false) Long typeId, @RequestParam(required = false) String typeName, @RequestParam(required = false) Integer pageSize, @@ -161,12 +188,12 @@ public class MaTypeController extends BaseController { TableDataInfo rspData = new TableDataInfo(); rspData.setTotal(listByMaType.size()); rspData.setCode(HttpStatus.SUCCESS); - listByMaType = listByMaType.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); +// listByMaType = listByMaType.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); rspData.setRows(listByMaType); rspData.setMsg("查询成功"); return rspData; - } + }*/ /** * 获取机具类型管理ma_type详细信息 @@ -206,8 +233,7 @@ public class MaTypeController extends BaseController { @ApiOperation(value = "删除机具类型管理ma_type") @Log(title = "机具类型管理ma_type", businessType = BusinessType.DELETE) @DeleteMapping("/{typeId}") - public AjaxResult remove(@PathVariable Long typeId) - { + public AjaxResult remove(@PathVariable Long typeId) throws Exception { return toAjax(iTypeService.deleteMaTypeByTypeId(typeId)); } diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/ITypeService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/ITypeService.java index 2e476f2b..70ac1638 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/ITypeService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/ITypeService.java @@ -45,7 +45,7 @@ public interface ITypeService { * @param typeId 机具类型管理ma_type主键 * @return 结果 */ - public int deleteMaTypeByTypeId(Long typeId); + public int deleteMaTypeByTypeId(Long typeId) throws Exception; /** * 构建前端所需要树结构 diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java index d1322b2d..b52d6306 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java @@ -22,12 +22,7 @@ public class MaMachineServiceImpl implements MaMachineService { @Override public List getMaMachine(MaMachine maMachine) { - List maMachineList = maMachineMapper.getMaMachine(maMachine); - for (MaMachine machine : maMachineList) { - // 添加查询物品种类,设备类型,规格型号 - getType(machine); - } - return maMachineList; + return maMachineMapper.getMaMachine(maMachine); } /** diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java index 4ca3042d..143e7df7 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaTypeServiceImpl.java @@ -48,23 +48,31 @@ public class MaTypeServiceImpl implements ITypeService { @Override @Transactional public int insertMaType(MaType maType) { + Long parentId = maType.getParentId(); + MaType maType1 = maTypeMapper.selectMaTypeByTypeId(parentId); + String level = maType1.getLevel(); + maType.setLevel(String.valueOf(Integer.parseInt(level) + 1)); maType.setCreateTime(DateUtils.getNowDate()); int i = maTypeMapper.insertType(maType); Long typeId = maType.getTypeId(); // 图片路径保存 - MaTypeFile typeFile = new MaTypeFile(); - typeFile.setTypeId(typeId); - typeFile.setFileName(maType.getPhotoName()); - typeFile.setFileUrl(maType.getPhotoUrl()); - typeFile.setFileType(""); - typeFileMapper.insertMaTypeFile(typeFile); + if (StringUtils.isNotEmpty(maType.getPhotoName()) && StringUtils.isNotEmpty(maType.getPhotoUrl())) { + MaTypeFile typeFile = new MaTypeFile(); + typeFile.setTypeId(typeId); + typeFile.setFileName(maType.getPhotoName()); + typeFile.setFileUrl(maType.getPhotoUrl()); + typeFile.setFileType(""); + typeFileMapper.insertMaTypeFile(typeFile); + } // 文档路径保存 - MaTypeFile typeFile1 = new MaTypeFile(); - typeFile1.setTypeId(typeId); - typeFile1.setFileName(maType.getDocumentName()); - typeFile1.setFileUrl(maType.getDocumentUrl()); - typeFile1.setFileType(""); - typeFileMapper.insertMaTypeFile(typeFile1); + if (StringUtils.isNotEmpty(maType.getDocumentName()) && StringUtils.isNotEmpty(maType.getDocumentUrl())) { + MaTypeFile typeFile1 = new MaTypeFile(); + typeFile1.setTypeId(typeId); + typeFile1.setFileName(maType.getDocumentName()); + typeFile1.setFileUrl(maType.getDocumentUrl()); + typeFile1.setFileType(""); + typeFileMapper.insertMaTypeFile(typeFile1); + } // 库管员配置 MaTypeKeeper typeKeeper = new MaTypeKeeper(); typeKeeper.setUserId(maType.getKeeperUserId()); @@ -145,7 +153,11 @@ public class MaTypeServiceImpl implements ITypeService { * @return 结果 */ @Override - public int deleteMaTypeByTypeId(Long typeId) { + public int deleteMaTypeByTypeId(Long typeId) throws Exception { + List listByParentId = maTypeMapper.getListByParentId(typeId, ""); + if (listByParentId.size() > 0) { + throw new Exception("子级类型不为空!!!"); + } return maTypeMapper.deleteTypeById(typeId); } diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml index 8372e64b..3d49ec35 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml @@ -37,11 +37,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -276,7 +215,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml index ab00fb8b..7933b2f8 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml @@ -289,9 +289,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" m.holding_time, m.warn_num, m.del_flag, m.create_by, m.create_time, m.remark, m.company_id from ma_type m - - level != 4 and m.status = '0' - + where level != 4 and m.status = '0' and del_flag = '0' - and supplier = #{supplier} + and supplier like concat('%',#{supplier},'%') and address = #{address} and legal_person = #{legalPerson} and primary_contact = #{primaryContact} From 48008bcf695dbb35b22bb4079102361847122235 Mon Sep 17 00:00:00 2001 From: liuchuan <1084917737@qq.com> Date: Mon, 18 Dec 2023 16:20:21 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/controller/RepairController.java | 2 +- .../sgzb/base/domain/RepairApplyRecord.java | 5 +- .../bonus/sgzb/base/mapper/RepairMapper.java | 6 +-- .../sgzb/base/service/RepairService.java | 2 +- .../base/service/impl/RepairServiceImpl.java | 5 +- .../resources/mapper/base/RepairMapper.xml | 53 +++++++------------ 6 files changed, 30 insertions(+), 43 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java index bbef921f..840311e0 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/RepairController.java @@ -53,7 +53,7 @@ public class RepairController extends BaseController { @ApiOperation(value = "获取维修任务机具列表") @Log(title = "维修任务机具列表", businessType = BusinessType.QUERY) @GetMapping("/getRepairMaTypeList") - public TableDataInfo getRepairMaTypeList(RepairTask bean) + public TableDataInfo getRepairMaTypeList(RepairTaskDetails bean) { startPage(); List list = service.getRepairMaTypeList(bean); diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairApplyRecord.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairApplyRecord.java index 2da8e416..5e3d2aae 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairApplyRecord.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/RepairApplyRecord.java @@ -1,9 +1,11 @@ package com.bonus.sgzb.base.domain; +import com.bonus.sgzb.common.core.web.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.io.Serializable; import java.util.List; /** @@ -12,7 +14,8 @@ import java.util.List; */ @Data @ApiModel(value="维修任务详细") -public class RepairApplyRecord { +public class RepairApplyRecord implements Serializable { + private static final long serialVersionUID = 1L; private Long id; /** * 任务ID diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/RepairMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/RepairMapper.java index 358874c0..3333ab68 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/RepairMapper.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/RepairMapper.java @@ -21,11 +21,7 @@ public interface RepairMapper { List getRepairTaskList(RepairTask bean); - List getRepairMaTypeList(RepairTask bean); - - List getTypeList(String taskId); - - String getType(String typeId); + List getRepairMaTypeList(RepairTaskDetails bean); int addRecord(RepairApplyRecord bean); diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/RepairService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/RepairService.java index 8c7b5d27..296b86b8 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/RepairService.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/RepairService.java @@ -21,7 +21,7 @@ public interface RepairService { List getRepairTaskList(RepairTask bean); - List getRepairMaTypeList(RepairTask bean); + List getRepairMaTypeList(RepairTaskDetails bean); AjaxResult submitRepairApply(RepairApplyRecord bean); diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java index e0d1a43c..f537380c 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java @@ -45,7 +45,7 @@ public class RepairServiceImpl implements RepairService { } @Override - public List getRepairMaTypeList(RepairTask bean) { + public List getRepairMaTypeList(RepairTaskDetails bean) { List repairMaTypeList = mapper.getRepairMaTypeList(bean); return repairMaTypeList; } @@ -128,6 +128,9 @@ public class RepairServiceImpl implements RepairService { if (repairedNum <= 0){ return AjaxResult.error("选中的数据中包含待维修数量为0的机具，请重新选择"); } + } + for (RepairTaskDetails bean : list){ + int repairedNum = bean.getRepairNum() - bean.getRepairedNum() - bean.getScrapNum(); RepairApplyRecord partDetails = new RepairApplyRecord(); partDetails.setTaskId(bean.getTaskId()); partDetails.setMaId(bean.getMaId()); diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml index 79889141..864bbe8e 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/RepairMapper.xml @@ -11,7 +11,7 @@ insert into tm_task (task_status,task_type,code,create_by,create_time,company_id) - values (45,46,#{repairCode},#{createBy},now(),#{companyId}); + values (46,45,#{repairCode},#{createBy},now(),#{companyId}); insert into tm_task_agreement (task_id,agreement_id,create_by,create_time,company_id) @@ -84,7 +84,7 @@ LEFT JOIN bm_project_info bpi ON bai2.project_id = bpi.pro_id left join sys_user su on rd.create_by = su.user_id left join sys_dic sd on sd.id = tt.task_status - GROUP BY rd.task_id,bui.unit_name,bpi.pro_name,bai.code,su.user_name + where 1=1 AND (locate(#{keyword}, su.user_name) > 0 or locate(#{keyword}, tt.CODE) > 0) @@ -95,8 +95,11 @@ AND bpi.pro_id = #{backPro} + + AND mt2.type_id = #{type} + - AND locate(#{backCode}, bai.CODE) > 0) + AND locate(#{backCode}, bai.CODE) > 0 AND tt.task_status = #{repairStatus} @@ -104,6 +107,7 @@ AND ts.create_time between #{startTime} and #{endTime} + GROUP BY rd.task_id,bui.unit_name,bpi.pro_name,bai.code,su.user_name - - +