From d62ed9f26b26404f571f14f0209fe5c26f4f0cc1 Mon Sep 17 00:00:00 2001 From: liuchuan <1084917737@qq.com> Date: Mon, 18 Dec 2023 17:59:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=BB=B4=E4=BF=AE=E4=BB=A3?= =?UTF-8?q?=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 | 7 ------- .../bonus/sgzb/base/domain/RepairTask.java | 8 ++------ .../sgzb/base/domain/RepairTaskDetails.java | 5 +++++ .../bonus/sgzb/base/mapper/RepairMapper.java | 4 ++++ .../base/service/impl/RepairServiceImpl.java | 9 ++++++++- .../main/resources/mapper/app/AppMapper.xml | 2 +- .../resources/mapper/base/RepairMapper.xml | 19 +++++++++++++++++-- 7 files changed, 37 insertions(+), 17 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 840311e0..eaf34708 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,11 +1,7 @@ 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; @@ -13,16 +9,13 @@ 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.*; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; -import java.util.stream.Collectors; /** * @author c liu 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 6e0c7104..d2cedb8a 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 @@ -41,11 +41,6 @@ public class RepairTask { */ @ApiModelProperty(value = "任务创建人") private Long createBy; - /** - * 任务创建人 - */ - @ApiModelProperty(value = "任务创建人") - private String createUser; /** * 任务创建时间 @@ -65,6 +60,7 @@ public class RepairTask { private String keyword;//关键字 private String startTime;//开始时间 private String endTime;//结束时间 - private String companyId;// + private Long companyId;// private Long agreementId;// + private String repairStatusCode;// } 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 a59c0f38..b8d8eb2d 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 @@ -79,5 +79,10 @@ public class RepairTaskDetails { private String keyword;//关键字 private String typeId;//规格ID private Long companyId;//规格ID + /** + * 任务创建人 + */ + @ApiModelProperty(value = "任务创建人") + private Long createBy; } 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 3333ab68..1edbae02 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 @@ -52,4 +52,8 @@ public interface RepairMapper { int getUnFinish(RepairTask task); List getDicSelect(String value); + + List getDetailsListByTaskId(RepairTask task); + + int addAuditDetails(RepairTaskDetails details); } 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 f537380c..54eeec15 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 @@ -153,14 +153,21 @@ public class RepairServiceImpl implements RepairService { for (RepairTask task : taskList){ int i = mapper.getUnFinish(task); if (i > 0){ - return AjaxResult.error("选中的数据中包含维修未完成的，请完成维修再进行审核"); + return AjaxResult.error("选中的数据中包含维修未完成的，请完成维修再进行提交审核"); } } int i = mapper.updateTaskStatus(taskList,loginUser.getUserid()); for (RepairTask task : taskList){ task.setCreateBy(loginUser.getUserid()); Long agreementId = mapper.getAgreementId(task); + List detailsList = mapper.getDetailsListByTaskId(task); mapper.addTask(task); + for (RepairTaskDetails details : detailsList){ + details.setCreateBy(loginUser.getUserid()); + details.setTaskId(task.getTaskId()); + details.setCompanyId(task.getCompanyId()); + mapper.addAuditDetails(details); + } task.setAgreementId(agreementId); mapper.createAgreementTask(task); } diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/AppMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/AppMapper.xml index a0e88288..90c2d7ef 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/AppMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/AppMapper.xml @@ -40,7 +40,7 @@ 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 864bbe8e..e5cb7b69 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,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_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,remark) + values (#{taskId},#{maId},#{typeId},#{repairNum},#{scrapNum},#{repairType},#{createBy},now(),#{repairContent},#{companyId},#{scrapReason},#{scrapType},#{supplierId},#{partNum},#{partPrice},#{partType},#{partName},#{repairer},#{fileIds},#{remark}); 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) @@ -17,6 +17,10 @@ insert into tm_task_agreement (task_id,agreement_id,create_by,create_time,company_id) values (#{taskId},#{agreementId},#{createBy},now(),#{companyId}); + + insert into repair_audit_details (task_id,repair_id,ma_id,type_id,repair_num,repaired_num,scrap_num,status,create_by,create_time,company_id) + values (#{taskId},#{id},#{maId},#{typeId},#{repairNum},#{repairedNum},#{scrapNum},'0',#{createBy},now(),#{companyId}); + update repair_apply_details set repaired_num = #{repairNum}, @@ -70,6 +74,7 @@ tt.create_time AS createTime, bai.CODE AS backCode, sd.name AS repairStatus, + tt.task_status AS repairStatusCode, tt.company_id AS companyId, GROUP_CONCAT(DISTINCT mt2.type_name) as type FROM @@ -172,5 +177,15 @@ left join sys_dic s2 on s2.p_id = s1.id where s1.value = #{value} and s2.status = 0 +