后台维修代码提交
This commit is contained in:
parent
48008bcf69
commit
d62ed9f26b
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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;//
|
||||
}
|
||||
|
|
|
|||
|
|
@ -79,5 +79,10 @@ public class RepairTaskDetails {
|
|||
private String keyword;//关键字
|
||||
private String typeId;//规格ID
|
||||
private Long companyId;//规格ID
|
||||
/**
|
||||
* 任务创建人
|
||||
*/
|
||||
@ApiModelProperty(value = "任务创建人")
|
||||
private Long createBy;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -52,4 +52,8 @@ public interface RepairMapper {
|
|||
int getUnFinish(RepairTask task);
|
||||
|
||||
List<dictVo> getDicSelect(String value);
|
||||
|
||||
List<RepairTaskDetails> getDetailsListByTaskId(RepairTask task);
|
||||
|
||||
int addAuditDetails(RepairTaskDetails details);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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<RepairTaskDetails> 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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
</select>
|
||||
<select id="getTrialNum" resultType="java.lang.Integer">
|
||||
select count(1)
|
||||
from scrap_apply_details
|
||||
from repair_audit_details
|
||||
where status = '0'
|
||||
</select>
|
||||
</mapper>
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||
<mapper namespace="com.bonus.sgzb.base.mapper.RepairMapper">
|
||||
<insert id="addRecord">
|
||||
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>
|
||||
<insert id="addPart">
|
||||
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>
|
||||
<insert id="addAuditDetails">
|
||||
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});
|
||||
</insert>
|
||||
<update id="updateRepairedNum">
|
||||
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
|
||||
</select>
|
||||
<select id="getDetailsListByTaskId" resultType="com.bonus.sgzb.base.domain.RepairTaskDetails">
|
||||
select id,
|
||||
ma_id as maId,
|
||||
type_id as typeId,
|
||||
repair_num as repairNum,
|
||||
repaired_num as repairedNum,
|
||||
scrap_num as scrapNum
|
||||
from repair_apply_details
|
||||
where task_id = #{taskId}
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
|
|
|
|||
Loading…
Reference in New Issue