From a9627e18d2689ebd77a87fc9d73212d376b6f4eb Mon Sep 17 00:00:00 2001 From: "liang.chao" Date: Wed, 13 Mar 2024 20:10:57 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E9=80=80=E6=96=99=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/LeaseOutDetailsServiceImpl.java | 2 +- .../RepairAuditDetailsController.java | 32 ++++++++----------- .../ScrapApplyDetailsController.java | 2 +- .../SecondaryWarehouseController.java | 1 - .../impl/ScrapApplyDetailsServiceImpl.java | 2 +- 5 files changed, 16 insertions(+), 23 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java index f27fd2ad..37a9ab1e 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java @@ -197,7 +197,7 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { String agreementId = leaseOutDetailsMapper.getAgreementId(taskId); String protocol = leaseOutDetailsMapper.getProtocol(agreementId); MaType ma = leaseOutDetailsMapper.getMaType(record.getTypeId()); - if (protocol.isEmpty()) { + if (StringUtils.isEmpty(protocol)) { ma.setFinalPrice(ma.getLeasePrice()); } else { if (protocol.equals("1")) { diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairAuditDetailsController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairAuditDetailsController.java index 19193ba1..e2ce7543 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairAuditDetailsController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/RepairAuditDetailsController.java @@ -27,14 +27,13 @@ import com.bonus.sgzb.common.core.web.page.TableDataInfo; /** * 修试审核详细 - * + * * @author bonus * @date 2023-12-16 */ @RestController @RequestMapping("/details") -public class RepairAuditDetailsController extends BaseController -{ +public class RepairAuditDetailsController extends BaseController { @Autowired private IRepairAuditDetailsService repairAuditDetailsService; @@ -43,15 +42,14 @@ public class RepairAuditDetailsController extends BaseController */ @ApiOperation("查询修试审核任务列表") @GetMapping("/questList") - public TableDataInfo questList(RepairAuditDetails repairAuditDetails) - { + public TableDataInfo questList(RepairAuditDetails repairAuditDetails) { startPage(); Map params = repairAuditDetails.getParams(); - if (!params.isEmpty()){ + if (params != null && !params.isEmpty()) { String beginTime = (String) params.get("beginTime"); String endTime = (String) params.get("endTime"); - params.put("beginTime", beginTime+" 00:00:00"); - params.put("endTime", endTime+" 23:59:59"); + params.put("beginTime", beginTime + " 00:00:00"); + params.put("endTime", endTime + " 23:59:59"); repairAuditDetails.setParams(params); } List list = repairAuditDetailsService.selectRepairQuestList(repairAuditDetails); @@ -63,14 +61,13 @@ public class RepairAuditDetailsController extends BaseController */ @Log(title = "导出修试审核任务列表", businessType = BusinessType.EXPORT) @PostMapping("/export") - public void export(HttpServletResponse response, RepairAuditDetails bean) - { + public void export(HttpServletResponse response, RepairAuditDetails bean) { Map params = bean.getParams(); - if (!params.isEmpty()){ + if (!params.isEmpty()) { String beginTime = (String) params.get("beginTime"); String endTime = (String) params.get("endTime"); - params.put("beginTime", beginTime+" 00:00:00"); - params.put("endTime", endTime+" 23:59:59"); + params.put("beginTime", beginTime + " 00:00:00"); + params.put("endTime", endTime + " 23:59:59"); bean.setParams(params); } List list = repairAuditDetailsService.exportRepairQuestList(bean); @@ -83,8 +80,7 @@ public class RepairAuditDetailsController extends BaseController */ @ApiOperation("查看修饰审核任务详细列表") @GetMapping("/getRepairAuditList") - public TableDataInfo getRepairAuditList(RepairAuditDetails repairAuditDetails) - { + public TableDataInfo getRepairAuditList(RepairAuditDetails repairAuditDetails) { startPage(); List list = repairAuditDetailsService.getRepairAuditList(repairAuditDetails); return getDataTable(list); @@ -95,8 +91,7 @@ public class RepairAuditDetailsController extends BaseController */ @ApiOperation("查看维修记录") @GetMapping("/getRepairRecord") - public TableDataInfo getRepairRecord(RepairAuditDetails repairAuditDetails) - { + public TableDataInfo getRepairRecord(RepairAuditDetails repairAuditDetails) { startPage(); List list = repairAuditDetailsService.getRepairRecord(repairAuditDetails); return getDataTable(list); @@ -107,8 +102,7 @@ public class RepairAuditDetailsController extends BaseController */ @ApiOperation("查看配件记录") @GetMapping("/getPartRecord") - public TableDataInfo getPartRecord(RepairAuditDetails repairAuditDetails) - { + public TableDataInfo getPartRecord(RepairAuditDetails repairAuditDetails) { startPage(); List list = repairAuditDetailsService.getPartRecord(repairAuditDetails); return getDataTable(list); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ScrapApplyDetailsController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ScrapApplyDetailsController.java index f0308d36..73c325dc 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ScrapApplyDetailsController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/ScrapApplyDetailsController.java @@ -71,7 +71,7 @@ public class ScrapApplyDetailsController extends BaseController public void export(HttpServletResponse response, ScrapApplyDetails bean) { Map params = bean.getParams(); - if (!params.isEmpty()){ + if (params!=null && !params.isEmpty()){ String beginTime = (String) params.get("beginTime"); String endTime = (String) params.get("endTime"); params.put("beginTime", beginTime+" 00:00:00"); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SecondaryWarehouseController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SecondaryWarehouseController.java index 5a9785dc..665ae744 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SecondaryWarehouseController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/SecondaryWarehouseController.java @@ -1,7 +1,6 @@ package com.bonus.sgzb.material.controller; import cn.hutool.core.convert.Convert; -import com.bonus.sgzb.base.api.domain.SltAgreementInfo; import com.bonus.sgzb.common.core.utils.poi.ExcelUtil; import com.bonus.sgzb.common.core.web.controller.BaseController; import com.bonus.sgzb.common.core.web.domain.AjaxResult; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java index b3858919..5d4e04bc 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java @@ -72,7 +72,7 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService { @Override public List getFileUrl(String fileIds) { List fileUrlList = new ArrayList<>(); - if (fileIds.isEmpty()){ + if (fileIds!=null &&fileIds.isEmpty()){ for (String s : fileIds.split(",")) { String url = scrapApplyDetailsMapper.getFileUrl(s); fileUrlList.add(url); From c5475985b9a0d472d8eb349dc0a8599ad767db3a Mon Sep 17 00:00:00 2001 From: "liang.chao" Date: Thu, 14 Mar 2024 09:09:03 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E9=80=80=E6=96=99=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ScrapApplyDetailsServiceImpl.java | 2 +- .../sgzb/system/service/impl/SysFileServiceImpl.java | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java index 5d4e04bc..db127df3 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java @@ -72,7 +72,7 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService { @Override public List getFileUrl(String fileIds) { List fileUrlList = new ArrayList<>(); - if (fileIds!=null &&fileIds.isEmpty()){ + if (fileIds != null && !fileIds.isEmpty()) { for (String s : fileIds.split(",")) { String url = scrapApplyDetailsMapper.getFileUrl(s); fileUrlList.add(url); diff --git a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysFileServiceImpl.java b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysFileServiceImpl.java index 225cd82d..1df54485 100644 --- a/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysFileServiceImpl.java +++ b/sgzb-modules/sgzb-system/src/main/java/com/bonus/sgzb/system/service/impl/SysFileServiceImpl.java @@ -12,6 +12,7 @@ import org.apache.poi.hwpf.extractor.WordExtractor; import org.apache.poi.openxml4j.util.ZipSecureFile; import org.apache.poi.xwpf.extractor.XWPFWordExtractor; import org.apache.poi.xwpf.usermodel.XWPFDocument; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -37,6 +38,11 @@ public class SysFileServiceImpl implements SysFileService { @Resource private FileInfoMapper dao; + /** + * 上传文件存储在本地的根路径 + */ + @Value("${file.path}") + private String localFilePath; /** * 本地文件上传接口 @@ -133,7 +139,7 @@ public class SysFileServiceImpl implements SysFileService { String tmpName = multipartFile.getOriginalFilename(); tmpName = tmpName.substring(tmpName.lastIndexOf("\\") + 1); tmpName = IdUtil.fastSimpleUUID() + System.currentTimeMillis() + tmpName.substring(tmpName.lastIndexOf("."), tmpName.length()); - String imageFiles = "/data/sgzb/" + fileType + "/"; + String imageFiles = localFilePath + fileType + "/"; String os = System.getProperty("os.name"); if (os.toLowerCase().startsWith(GlobalConstants.STRING_WIN)) { imageFiles = "D://files/" + fileType + "/"; @@ -172,7 +178,7 @@ public class SysFileServiceImpl implements SysFileService { String tmpName = multipartFile.getOriginalFilename(); tmpName = tmpName.substring(tmpName.lastIndexOf("\\") + 1); tmpName = IdUtil.fastSimpleUUID() + System.currentTimeMillis() + tmpName.substring(tmpName.lastIndexOf("."), tmpName.length()); - String imageFiles = "/data/sgzb/" + fileType + "/"; + String imageFiles = localFilePath + fileType + "/"; String os = System.getProperty("os.name"); if (os.toLowerCase().startsWith(GlobalConstants.STRING_WIN)) { imageFiles = "D://files/" + fileType + "/"; From e24109076c798974a1f0c9247ebebae67de3f2ef Mon Sep 17 00:00:00 2001 From: "liang.chao" Date: Thu, 14 Mar 2024 09:51:15 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=B7=A5=E5=9C=B0=E7=9B=B4=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WorkSiteDirectManageController.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java index e17740db..ed31f054 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java @@ -41,11 +41,6 @@ public class WorkSiteDirectManageController extends BaseController { @Resource private WorkSiteDirectManageService workSiteDirectManageService; - @Resource - private ApplyInfoService leaseApplyInfoService; - /* @Resource - private LeaseApplyDetailsService leaseApplyDetailsService;*/ - @Resource private TaskService tmTaskService; @@ -214,7 +209,7 @@ public class WorkSiteDirectManageController extends BaseController { @ApiOperation(value = "查看详情") @GetMapping("/getInfo") - public AjaxResult refuse(String id) { + public AjaxResult getInfo(String id) { return AjaxResult.success(workSiteDirectManageService.getInfoById(id)); } } From ca1980fdd62720e83c949870c090ab9d4ba80c84 Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Thu, 14 Mar 2024 13:36:51 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=EF=BC=8C=E6=A0=BC=E5=BC=8F=E5=8C=96=E6=97=B6=E9=97=B4=EF=BC=8C?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus/sgzb/base/api/domain/MaType.java | 2 + .../base/controller/MaTypeController.java | 47 +++++++++---------- .../PurchaseCheckInfoController.java | 25 +++++----- .../impl/AgreementInfoServiceImpl.java | 3 +- .../impl/PurchaseCheckInfoServiceImpl.java | 23 ++++++--- 5 files changed, 54 insertions(+), 46 deletions(-) diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java index a54bcd41..c76133f0 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java @@ -122,6 +122,7 @@ public class MaType extends BaseEntity { private String createBy; /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "创建时间") private Date createTime; @@ -130,6 +131,7 @@ public class MaType extends BaseEntity { private String updateBy; /** 更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新时间") private Date updateTime; 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 883f9581..b4b62d88 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 @@ -4,10 +4,8 @@ import com.bonus.sgzb.base.api.domain.MaType; import com.bonus.sgzb.base.domain.vo.TreeSelect; import com.bonus.sgzb.base.mapper.MaTypeMapper; import com.bonus.sgzb.base.service.ITypeService; -import com.bonus.sgzb.common.core.constant.HttpStatus; 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 io.swagger.annotations.Api; @@ -17,8 +15,6 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; /** * 工机具类型管理控制层 @@ -69,7 +65,6 @@ public class MaTypeController extends BaseController { * @param typeId * @return */ - @ApiOperation(value = "工器具类型") @GetMapping("/equipmentType") public AjaxResult equipmentType(@RequestParam(required = false) Long typeId, @@ -196,30 +191,30 @@ public class MaTypeController extends BaseController { 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, - @RequestParam(required = false) Integer pageNum){ - if(typeId==null){ - return null; - } - List listByMaType = iTypeService.getListByMaType(typeId, typeName); - 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()); - rspData.setRows(listByMaType); - rspData.setMsg("查询成功"); - - return rspData; - }*/ + */ +// @ApiOperation(value = "根据左列表类型id查询右表格") +// @GetMapping("/getListByMaType") +// public TableDataInfo getListByMaType(@RequestParam(required = false) Long typeId, +// @RequestParam(required = false) String typeName, +// @RequestParam(required = false) Integer pageSize, +// @RequestParam(required = false) Integer pageNum){ +// if(typeId==null){ +// return null; +// } +// List listByMaType = iTypeService.getListByMaType(typeId, typeName); +// 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()); +// rspData.setRows(listByMaType); +// rspData.setMsg("查询成功"); +// +// return rspData; +// } /** * 获取机具类型管理ma_type详细信息 diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckInfoController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckInfoController.java index 31bc3fc7..4f537e1e 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckInfoController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/PurchaseCheckInfoController.java @@ -1,21 +1,22 @@ package com.bonus.sgzb.material.controller; -import java.util.List; -import javax.servlet.http.HttpServletResponse; +import com.bonus.sgzb.common.core.utils.poi.ExcelUtil; +import com.bonus.sgzb.common.core.web.controller.BaseController; +import com.bonus.sgzb.common.core.web.domain.AjaxResult; +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.material.domain.PurchaseCheckInfo; import com.bonus.sgzb.material.domain.PurchaseInput; import com.bonus.sgzb.material.service.IPurchaseCheckInfoService; -import com.bonus.sgzb.material.domain.PurchaseCheckInfo; import com.bonus.sgzb.material.vo.NoticeInfoVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import com.bonus.sgzb.common.log.annotation.Log; -import com.bonus.sgzb.common.log.enums.BusinessType; -import com.bonus.sgzb.common.core.web.controller.BaseController; -import com.bonus.sgzb.common.core.web.domain.AjaxResult; -import com.bonus.sgzb.common.core.utils.poi.ExcelUtil; -import com.bonus.sgzb.common.core.web.page.TableDataInfo; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 新购验收任务 @@ -138,9 +139,9 @@ public class PurchaseCheckInfoController extends BaseController */ @ApiOperation("删除新购验收任务") @Log(title = "新购验收任务", businessType = BusinessType.DELETE) - @DeleteMapping("/{taskIds}") - public AjaxResult remove(@PathVariable Long[] taskIds) + @DeleteMapping("/{taskId}") + public AjaxResult remove(@PathVariable Long taskId) { - return toAjax(purchaseCheckInfoService.deletePurchaseCheckInfoByTaskIds(taskIds)); + return toAjax(purchaseCheckInfoService.deletePurchaseCheckInfoByTaskId(taskId)); } } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/AgreementInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/AgreementInfoServiceImpl.java index 1164b83a..f76c278b 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/AgreementInfoServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/AgreementInfoServiceImpl.java @@ -1,11 +1,10 @@ package com.bonus.sgzb.material.service.impl; -import com.bonus.sgzb.common.core.utils.StringHelper; +import com.bonus.sgzb.common.core.utils.DateUtils; import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.material.domain.AgreementInfo; import com.bonus.sgzb.material.mapper.AgreementInfoMapper; import com.bonus.sgzb.material.service.AgreementInfoService; -import com.bonus.sgzb.common.core.utils.DateUtils; import com.bonus.sgzb.material.vo.GlobalContants; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; 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 3fb7eb68..13d95e48 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 @@ -1,16 +1,12 @@ package com.bonus.sgzb.material.service.impl; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.List; - +import com.bonus.sgzb.common.core.utils.DateUtils; import com.bonus.sgzb.common.security.utils.SecurityUtils; import com.bonus.sgzb.material.domain.*; import com.bonus.sgzb.material.mapper.PurchaseCheckDetailsMapper; import com.bonus.sgzb.material.mapper.PurchaseCheckInfoMapper; import com.bonus.sgzb.material.mapper.TaskMapper; import com.bonus.sgzb.material.service.IPurchaseCheckInfoService; -import com.bonus.sgzb.common.core.utils.DateUtils; import com.bonus.sgzb.material.vo.GlobalContants; import com.bonus.sgzb.material.vo.NoticeInfoVO; import com.bonus.sgzb.system.api.RemoteUserService; @@ -18,6 +14,9 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; /** * 新购验收任务Service业务层处理 @@ -216,7 +215,19 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService { */ @Override public int deletePurchaseCheckInfoByTaskId(Long taskId) { - return purchaseCheckInfoMapper.deletePurchaseCheckInfoByTaskId(taskId); + int result = 0; + try { + // 第一步：删除验收任务表 + purchaseCheckInfoMapper.deletePurchaseCheckInfoByTaskId(taskId); + // 第二步：删除验收任务详情表 + purchaseCheckDetailsMapper.deleteCheckDetailsByTaskId(taskId); + // 第三步：删除任务表 + taskMapper.deleteTmTaskByTaskId(taskId); + result = 1; + } catch (Exception e) { + throw new RuntimeException(e); + } + return result; } /** From c723a725b25824b55c3f713ac32a08caa736630b Mon Sep 17 00:00:00 2001 From: "liang.chao" Date: Thu, 14 Mar 2024 17:58:50 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E9=80=80=E6=96=99=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WorkSiteDirectManageController.java | 2 +- .../domain/DirectPassApplyInfoDetails.java | 2 +- .../mapper/WorkSiteDirectManageMapper.java | 2 + .../impl/WorkSiteDirectManageImpl.java | 5 ++- .../material/WorkSiteDirectManageMapper.xml | 39 +++++++++++++------ 5 files changed, 36 insertions(+), 14 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java index ed31f054..1a0b759d 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java @@ -116,7 +116,7 @@ public class WorkSiteDirectManageController extends BaseController { return AjaxResult.error("直转信息为空，未通过"); } - TmTask task = directApplyInfoDetails.getTask(); + TmTask task = directApplyInfoDetails.getLeaseApplyInfo(); if (task == null) { return AjaxResult.error("领料任务参数为空"); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/DirectPassApplyInfoDetails.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/DirectPassApplyInfoDetails.java index 52717f26..9d52bbd2 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/DirectPassApplyInfoDetails.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/DirectPassApplyInfoDetails.java @@ -18,7 +18,7 @@ public class DirectPassApplyInfoDetails extends BaseEntity { private String id; - private TmTask task; + private TmTask leaseApplyInfo; private BackApplyInfo backApplyInfo; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/WorkSiteDirectManageMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/WorkSiteDirectManageMapper.java index c3d7c223..9f9f1158 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/WorkSiteDirectManageMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/WorkSiteDirectManageMapper.java @@ -58,4 +58,6 @@ public interface WorkSiteDirectManageMapper { int insertBackApplyInfo(TmTask task); DirectApplyInfo getInfoById(String id); + + List getDetailById(String id); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java index 602eb44a..25bd8168 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java @@ -330,7 +330,10 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService { @Override public DirectApplyInfo getInfoById(String id) { - return workSiteDirectManageMapper.getInfoById(id); + DirectApplyInfo directApplyInfo = workSiteDirectManageMapper.getInfoById(id); + List detailById = workSiteDirectManageMapper.getDetailById(id); + directApplyInfo.setDirectApplyDetails(detailById); + return directApplyInfo; } public int insertBcd(BackApplyInfo backApplyInfo) { diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml index 8cb56b2c..7f03de0b 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml @@ -369,7 +369,7 @@ LEFT JOIN ma_machine mm on sai.ma_id = mm.ma_id where sai.agreement_id = #{agreementId} and sai.status = '0' GROUP BY - sai.type_id,sai.ma_id + sai.ma_id,sai.type_id SELECT dai.*, - dad.direct_num AS directNum, + bai.agreement_code as backAgreementCode, + bai1.agreement_code as leaseAgreementCode, bpl.lot_id AS backProId, - mt3.type_name AS typeName, - mt2.type_name AS kindName, - mt.type_name AS modelName, - mt.unit_name AS unitName, - mm.ma_code AS maCode, bpl.lot_name AS backProName, bui.unit_id AS backUnitId, bui.unit_name AS backUnitName, @@ -429,17 +425,38 @@ FROM direct_apply_info dai LEFT JOIN direct_apply_details dad ON dai.id = dad.direct_id - LEFT JOIN ma_type mt ON mt.type_id = dad.type_id - LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id - LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id - LEFT JOIN ma_machine mm ON dad.ma_id = mm.ma_id LEFT JOIN bm_agreement_info bai ON dai.back_agreement_id = bai.agreement_id LEFT JOIN bm_agreement_info bai1 ON dai.lease_agreement_id = bai1.agreement_id LEFT JOIN bm_project_lot bpl ON bpl.lot_id = bai.project_id LEFT JOIN bm_project_lot bpl1 ON bpl1.lot_id = bai1.project_id LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id LEFT JOIN bm_unit_info bui1 ON bui1.unit_id = bai1.unit_id + WHERE + dai.id = #{id} GROUP BY dai.id + + \ No newline at end of file From 39c42e931f12c261d45c15292743a8a38fa52550 Mon Sep 17 00:00:00 2001 From: "liang.chao" Date: Fri, 15 Mar 2024 13:55:04 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=B7=A5=E5=9C=B0=E7=9B=B4=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/api/domain/DirectApplyDetails.java | 21 +++++++---- .../sgzb/base/api/domain/DirectApplyInfo.java | 16 +++++++-- .../WorkSiteDirectManageController.java | 35 ++++++++++++++----- .../sgzb/material/domain/BackApplyInfo.java | 6 ++++ .../material/domain/LeaseApplyDetails.java | 7 ++++ .../sgzb/material/mapper/ApplyInfoMapper.java | 2 ++ .../material/service/ApplyInfoService.java | 4 +++ .../service/WorkSiteDirectManageService.java | 2 +- .../service/impl/ApplyInfoServiceImpl.java | 6 ++++ .../impl/WorkSiteDirectManageImpl.java | 18 ++++------ .../mapper/material/ApplyInfoMapper.xml | 4 ++- .../material/WorkSiteDirectManageMapper.xml | 1 + 12 files changed, 92 insertions(+), 30 deletions(-) diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/DirectApplyDetails.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/DirectApplyDetails.java index 178623c1..47fc060e 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/DirectApplyDetails.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/DirectApplyDetails.java @@ -12,22 +12,29 @@ public class DirectApplyDetails extends BaseEntity { /** * id */ - private int id; + private Integer id; /** * 直转单号 */ - private int directId; + private Integer directId; /** - * 退料单位协议 + * 机具类型 */ - private int typeId; + private Integer typeId; /** - * 退料人 + * 机具id */ - private int maId; + private Integer maId; /** - * 手机号 + * 直转数量 */ private String directNum; + private String typeName; + private String kindName; + private String modelName; + private String maCode; + private String unitName; + private String useNum; + private String companyId; } diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/DirectApplyInfo.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/DirectApplyInfo.java index 1cd84db7..f6626151 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/DirectApplyInfo.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/DirectApplyInfo.java @@ -3,6 +3,8 @@ package com.bonus.sgzb.base.api.domain; import com.bonus.sgzb.common.core.web.domain.BaseEntity; import lombok.Data; +import java.util.List; + /** * @Author：梁超 * @date：2024/3/4 - 15:17 @@ -13,7 +15,7 @@ public class DirectApplyInfo extends BaseEntity { /** * id */ - private int id; + private Integer id; /** * 直转单号(ZZ20240226-1) */ @@ -21,7 +23,7 @@ public class DirectApplyInfo extends BaseEntity { /** * 退料单位协议 */ - private int backAgreementId; + private Integer backAgreementId; /** * 退料工程id @@ -105,5 +107,15 @@ public class DirectApplyInfo extends BaseEntity { * 审核备注 */ private String auditRemark; + /** + * 退料单位协议 + */ + private String backAgreementCode; + /** + * 领料单位协议 + */ + private String leaseAgreementCode; + + private List directApplyDetails; } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java index 1a0b759d..401050c0 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java @@ -11,10 +11,7 @@ import com.bonus.sgzb.common.core.web.domain.AjaxResult; import com.bonus.sgzb.common.core.web.page.TableDataInfo; import com.bonus.sgzb.common.log.enums.BusinessType; import com.bonus.sgzb.common.security.utils.SecurityUtils; -import com.bonus.sgzb.material.domain.BackApplyInfo; -import com.bonus.sgzb.material.domain.DirectApplyInfoDetails; -import com.bonus.sgzb.material.domain.DirectPassApplyInfoDetails; -import com.bonus.sgzb.material.domain.TmTask; +import com.bonus.sgzb.material.domain.*; import com.bonus.sgzb.material.service.ApplyInfoService; import com.bonus.sgzb.material.service.TaskService; import com.bonus.sgzb.material.service.WorkSiteDirectManageService; @@ -44,6 +41,9 @@ public class WorkSiteDirectManageController extends BaseController { @Resource private TaskService tmTaskService; + @Resource + private ApplyInfoService applyInfoService; + /** * 列表展示 @@ -145,12 +145,27 @@ public class WorkSiteDirectManageController extends BaseController { return AjaxResult.error("领料信息和详情新增失败"); } - List leaseOutDetails = directApplyInfoDetails.getLeaseOutDetails(); - if (CollUtil.isEmpty(leaseOutDetails)) { + List leaseApplyDetails = task.getLeaseApplyDetails(); + if (CollUtil.isEmpty(leaseApplyDetails)) { return AjaxResult.error("领料出库信息为空"); } + List leaseApplyInfoList = applyInfoService.selectIdByTaskId(task.getTaskId().intValue()); + List list = new ArrayList(); + for (LeaseApplyDetails leaseApplyDetail : leaseApplyDetails) { + LeaseOutDetails leaseOutDetails = new LeaseOutDetails(); + for (LeaseApplyInfo leaseApplyInfo : leaseApplyInfoList) { + if (leaseApplyInfo.getCompanyId().equals(leaseApplyDetail.getCompanyId())) { + leaseOutDetails.setParentId(leaseApplyInfo.getId()); + } + } + leaseOutDetails.setTypeId(leaseApplyDetail.getTypeId()); + leaseOutDetails.setMaId(leaseApplyDetail.getMaId()); + leaseOutDetails.setOutNum(leaseApplyDetail.getPreNum()); + leaseOutDetails.setCompanyId(leaseApplyDetail.getCompanyId()); + list.add(leaseOutDetails); + } // 新增出库记录 - int res4 = workSiteDirectManageService.insertLeaseOutDetail(leaseOutDetails); + int res4 = workSiteDirectManageService.insertLeaseOutDetail(list); if (res4 == 0) { return AjaxResult.error("新增出库记录失败"); } @@ -182,7 +197,11 @@ public class WorkSiteDirectManageController extends BaseController { return AjaxResult.error("退料信息和详情新增失败"); } - int res8 = workSiteDirectManageService.insertBackCheckDetails(backApplyInfo); + List backApplyDetails = backApplyInfo.getBackApplyDetails(); + if (CollUtil.isEmpty(backApplyDetails)) { + return AjaxResult.error("退料详情信息为空"); + } + int res8 = workSiteDirectManageService.insertBackCheckDetails(backApplyDetails); if (res8 == 0) { return AjaxResult.error("新增入库记录失败"); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java index fd5987fd..0f8b21b4 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/BackApplyInfo.java @@ -51,6 +51,12 @@ public class BackApplyInfo extends BaseEntity { */ private String backStatus; + /** + * 退料数量 + */ + private Integer backNum; + private Integer directNum; + /** 退料单号 */ @Excel(name = "退料单号") @ApiModelProperty(value = "退料单号") diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/LeaseApplyDetails.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/LeaseApplyDetails.java index a4d071c8..be73efdb 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/LeaseApplyDetails.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/LeaseApplyDetails.java @@ -36,6 +36,13 @@ public class LeaseApplyDetails implements Serializable { @ApiModelProperty(value = "规格ID") private Integer typeId; + + /** + * 机具ID + */ + @ApiModelProperty(value = "机具Id") + private Integer maId; + /** * 类型名称 */ diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ApplyInfoMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ApplyInfoMapper.java index 3f5572f7..244d79bf 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ApplyInfoMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/ApplyInfoMapper.java @@ -14,4 +14,6 @@ import java.util.List; public interface ApplyInfoMapper { int insertSelective(LeaseApplyInfo record); + + List selectIdByTaskId(Integer id); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/ApplyInfoService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/ApplyInfoService.java index 41fbbb16..db532bab 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/ApplyInfoService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/ApplyInfoService.java @@ -2,10 +2,14 @@ package com.bonus.sgzb.material.service; import com.bonus.sgzb.material.domain.LeaseApplyInfo; +import java.util.List; + /** * @Author：梁超 * @date：2024/3/6 - 17:41 */ public interface ApplyInfoService { int genderLeaseCode(LeaseApplyInfo record); + + List selectIdByTaskId(Integer id); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/WorkSiteDirectManageService.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/WorkSiteDirectManageService.java index 41ace409..654e4b0d 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/WorkSiteDirectManageService.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/WorkSiteDirectManageService.java @@ -39,7 +39,7 @@ public interface WorkSiteDirectManageService { int insertAgreementByBackInfo(BackApplyInfo backApplyInfo); - int insertBackCheckDetails(BackApplyInfo backApplyInfo); + int insertBackCheckDetails(List backApplyDetails); DirectApplyInfo getInfoById(String id); } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ApplyInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ApplyInfoServiceImpl.java index 39090697..a85d25e3 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ApplyInfoServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ApplyInfoServiceImpl.java @@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; /** * @Author：梁超 @@ -22,4 +23,9 @@ public class ApplyInfoServiceImpl implements ApplyInfoService { public int genderLeaseCode(LeaseApplyInfo record) { return leaseApplyInfoMapper.insertSelective(record); } + + @Override + public List selectIdByTaskId(Integer id) { + return leaseApplyInfoMapper.selectIdByTaskId(id); + } } diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java index 25bd8168..ae2f2d14 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java @@ -323,9 +323,9 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService { } @Override - public int insertBackCheckDetails(BackApplyInfo backApplyInfo) { + public int insertBackCheckDetails(List backApplyDetails) { //插入back_check_details - return insertBcd(backApplyInfo); + return insertBcd(backApplyDetails); } @Override @@ -336,16 +336,12 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService { return directApplyInfo; } - public int insertBcd(BackApplyInfo backApplyInfo) { + public int insertBcd(List backApplyDetails) { int res = 0; - BackApplyInfo[] arr = backApplyInfo.getArr(); - if (arr.length > 0) { - for (int i = 0; i < arr.length; i++) { - res = backRecordMapper.insertCheckDetails(arr[i]); - int maId = arr[i].getMaId(); - //退料完成状态改成在库 - backRecordMapper.updateMaStatus(maId, "15"); - } + for (BackApplyInfo backApplyDetail : backApplyDetails) { + backApplyDetail.setBackNum(Integer.valueOf(backApplyDetail.getDirectNum())); + backApplyDetail.setBackStatus("1"); + res = backRecordMapper.insertCheckDetails(backApplyDetail); } return res; } diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ApplyInfoMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ApplyInfoMapper.xml index ca47c1b6..7a54fe29 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ApplyInfoMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ApplyInfoMapper.xml @@ -112,5 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + \ No newline at end of file diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml index 7f03de0b..2679398a 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml @@ -438,6 +438,7 @@ SELECT dad.direct_num AS directNum, dad.type_id AS typeId, + mt.company_id AS companyId, mt3.type_name AS typeName, mt2.type_name AS kindName, mt.type_name AS modelName, From 0995bd6cb35f4f95e4e66f7de38709133821f8c1 Mon Sep 17 00:00:00 2001 From: "liang.chao" Date: Fri, 15 Mar 2024 16:03:11 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=B7=A5=E5=9C=B0=E7=9B=B4=E8=BD=AC?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WorkSiteDirectManageController.java | 2 +- .../material/mapper/BackRecordMapper.java | 1 - .../mapper/material/BackRecordMapper.xml | 3 --- .../material/WorkSiteDirectManageMapper.xml | 21 +++++++++++++++++++ 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java index 401050c0..6e7bcaba 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java @@ -180,7 +180,7 @@ public class WorkSiteDirectManageController extends BaseController { backApplyInfo.setCode(tcode); //创建退料任务（tm_task） backApplyInfo.setTaskType(36); - backApplyInfo.setTaskStatus("37"); + backApplyInfo.setTaskStatus("40"); int res5 = workSiteDirectManageService.insertTmTaskByBackInfo(backApplyInfo); if (res5 == 0) { return AjaxResult.error("退料任务新建失败"); diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackRecordMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackRecordMapper.java index 3e431154..61ec39ab 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackRecordMapper.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackRecordMapper.java @@ -23,7 +23,6 @@ public interface BackRecordMapper { */ List getBackRecordList(BackRecord bean); - int insertBcd(BackApplyInfo backApplyInfo); int insertCheckDetails(BackApplyInfo backApplyInfo); diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackRecordMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackRecordMapper.xml index 372bd129..1b45bd86 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackRecordMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackRecordMapper.xml @@ -3,9 +3,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - insert into back_check_details ( diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml index 2679398a..ee2be062 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml @@ -390,6 +390,27 @@ LEFT JOIN bm_project_lot bpl1 ON bpl1.lot_id = bai1.project_id LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id LEFT JOIN bm_unit_info bui1 ON bui1.unit_id = bai1.unit_id + WHERE + 1=1 + + and (bpl.lot_name like concat('%', #{keyWord}, '%') or + bui.unit_name like concat('%', #{keyWord}, '%')) + + + and bpl.lot_id = #{record.lotId} + + + and bui.unitId = #{record.unitId} + + + and dai.back_man like concat('%', #{backMan}, '%') + + + and dai.back_phone like concat('%', #{backPhone}, '%') + + + and dai.status = #{status} +