From f20bb2ee9bfd48d519d8d0d7529b51a6c8a1da09 Mon Sep 17 00:00:00 2001 From: "1539530615@qq.com" <1539530615@qq.com> Date: Wed, 24 Jan 2024 11:16:21 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E9=AA=8C=E6=A3=80=E9=AA=8C=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E9=A9=B3=E5=9B=9E=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 +- sgzb-modules/sgzb-material/pom.xml | 18 +----------------- .../material/domain/RepairInputDetails.java | 2 +- .../material/domain/ScrapApplyDetails.java | 1 - .../sgzb/material/domain/TmTaskAgreement.java | 2 ++ .../impl/RepairAuditDetailsServiceImpl.java | 12 ++++++------ .../impl/ScrapApplyDetailsServiceImpl.java | 2 +- .../mapper/material/RepairTestInputMapper.xml | 2 -- .../material/ScrapApplyDetailsMapper.xml | 8 ++++---- 9 files changed, 16 insertions(+), 33 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 66e81ff1..3c151dca 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 @@ -57,7 +57,7 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService { if (StringUtils.isNull(record)) { return AjaxResult.error("领料出库失败,请检查参数是否填写完整!"); } - if (!(Integer.valueOf(0) == record.getMaId() || record.getMaId() == null)) { + if (!(Objects.equals(Integer.valueOf(0), record.getMaId()) || record.getMaId() == null)) { String status = leaseOutDetailsMapper.getMachineStatus(record); if (!maStatus.equals(status)) { return AjaxResult.error("领料出库失败,该设备不是在库状态！"); diff --git a/sgzb-modules/sgzb-material/pom.xml b/sgzb-modules/sgzb-material/pom.xml index f430af58..0c30b0f3 100644 --- a/sgzb-modules/sgzb-material/pom.xml +++ b/sgzb-modules/sgzb-material/pom.xml @@ -113,6 +113,7 @@ 3.6.3 compile + @@ -120,21 +121,4 @@ 8 - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - \ No newline at end of file diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairInputDetails.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairInputDetails.java index 739a763e..9490a839 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairInputDetails.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/RepairInputDetails.java @@ -56,7 +56,7 @@ public class RepairInputDetails extends BaseEntity /** 数据所属组织 */ @Excel(name = "数据所属组织") private Long companyId; - private Long createById; + public void setId(Long id) { diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ScrapApplyDetails.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ScrapApplyDetails.java index 2279aaed..fd42e833 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ScrapApplyDetails.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/ScrapApplyDetails.java @@ -107,7 +107,6 @@ public class ScrapApplyDetails extends BaseEntity private String keyword; private String typeName; - private Long createById; public void setId(Long id) diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/TmTaskAgreement.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/TmTaskAgreement.java index 64ff2e38..f5898cf3 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/TmTaskAgreement.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/TmTaskAgreement.java @@ -2,6 +2,7 @@ package com.bonus.sgzb.material.domain; import com.bonus.sgzb.common.core.annotation.Excel; import com.bonus.sgzb.common.core.web.domain.BaseEntity; +import lombok.Data; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -11,6 +12,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; * @author bonus * @date 2023-12-16 */ +@Data public class TmTaskAgreement extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java index 45fc2283..03575674 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java @@ -219,7 +219,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService repairInputDetails.setTypeId(inputDetails.getTypeId()); repairInputDetails.setMaId(inputDetails.getMaId()); repairInputDetails.setStatus("0"); - repairInputDetails.setCreateById(SecurityUtils.getUserId()); + repairInputDetails.setCreateBy(String.valueOf(SecurityUtils.getUserId())); repairInputDetails.setCreateTime(new Date()); repairTestInputMapper.insertRepairInputDetails(repairInputDetails); } @@ -246,7 +246,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService scrapApplyDetails.setScrapSource("2"); scrapApplyDetails.setStatus("0"); scrapApplyDetails.setParentId(scrapDetails.getId()); - scrapApplyDetails.setCreateById(SecurityUtils.getUserId()); + scrapApplyDetails.setCreateBy(String.valueOf(SecurityUtils.getUserId())); scrapApplyDetails.setCreateTime(new Date()); scrapApplyDetailsMapper.insertScrapApplyDetails(scrapApplyDetails); } @@ -266,7 +266,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService task1.setTaskStatus(47); } task1.setUpdateTime(new Date()); - task1.setUpdateBy(SecurityUtils.getUsername()); + task1.setUpdateBy(String.valueOf(SecurityUtils.getUserId())); taskMapper.updateTmTask(task1); } else { status = "2"; @@ -306,7 +306,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService tmTask.setTaskStatus(48); } tmTask.setUpdateTime(new Date()); - tmTask.setUpdateBy(SecurityUtils.getUsername()); + tmTask.setUpdateBy(String.valueOf(SecurityUtils.getUserId())); taskMapper.updateTmTask(tmTask); } if (scrapAudit.getAuditDetailList() != null && scrapAudit.getAuditDetailList().size() > 0){ @@ -327,7 +327,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService task.setTaskType(taskType); task.setCompanyId(companyId); task.setCreateTime(new Date()); - task.setCreateBy(SecurityUtils.getUsername()); + task.setCreateBy(String.valueOf(SecurityUtils.getUserId())); taskMapper.insertTmTask(task); // 添加协议信息表 TmTaskAgreement taskAgreement = new TmTaskAgreement(); @@ -338,7 +338,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService }else { taskAgreement.setAgreementId(tmTaskAgreement.getAgreementId()); } - taskAgreement.setCreateBy(SecurityUtils.getUsername()); + taskAgreement.setCreateBy(String.valueOf(SecurityUtils.getUserId())); agreementMapper.insertTmTaskAgreement(taskAgreement); return taskId; } 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 712d090d..41c44ab7 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 @@ -164,7 +164,7 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService task.setRemark(scrapAudit.getRemark()); } task.setUpdateTime(new Date()); - task.setUpdateBy(SecurityUtils.getUsername()); + task.setUpdateBy(String.valueOf(SecurityUtils.getUserId())); taskMapper.updateTmTask(task); } return 1; diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairTestInputMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairTestInputMapper.xml index 5484b824..368cc4f2 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairTestInputMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/RepairTestInputMapper.xml @@ -229,7 +229,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" repair_num, input_num, create_by, - create_by, create_time, update_by, update_time, @@ -247,7 +246,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{repairNum}, #{inputNum}, #{createBy}, - #{createById}, #{createTime}, #{updateBy}, #{updateTime}, diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml index bf2f3b04..5d4b486a 100644 --- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml +++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml @@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dic.NAME taskStatusName, bui.unit_name unitName, bpl.lot_name projectName, - tk.create_by createBy, + su.user_name createBy, tk.create_time createTime, tk.remark, tk1.CODE repairNum, @@ -64,6 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" p_id IN ( SELECT id FROM sys_dic WHERE VALUE = 'bf_task' )) dic ON tk.task_status = dic.id LEFT JOIN ma_type mt ON sad.type_id = mt.type_id LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id + LEFT JOIN sys_user su ON su.user_id = tk.create_by WHERE sad.scrap_source IN ( '1', '2' ) AND tk.task_type = 57 @@ -103,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dic.NAME taskStatusName, bui.unit_name unitName, bpl.lot_name projectName, - tk.create_by createBy, + su.user_name createBy, tk.create_time createTime, tk.remark, tk1.CODE repairNum, @@ -132,6 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN ma_type mt ON sad.type_id = mt.type_id LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id left join ma_machine mma on sad.ma_id= mma.ma_id + LEFT JOIN sys_user su ON su.user_id = tk.create_by WHERE sad.scrap_source IN ( '1', '2' ) AND tk.task_type = 57 @@ -185,7 +187,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" audit_time, audit_remark, create_by, - create_by, create_time, update_by, update_time, @@ -208,7 +209,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{auditTime}, #{auditRemark}, #{createBy}, - #{createById}, #{createTime}, #{updateBy}, #{updateTime},