bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

退料申请表数据问题修改

This commit is contained in:
liang.chao 2024-03-11 18:45:55 +08:00
parent f88d224f0a
commit 5623ac3199
9 changed files with 79 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/SltAgreementInfo.java
View File

@ -16,6 +16,23 @@ public class SltAgreementInfo {
*协议id
*/
private String agreementId;
/**
*编码
*/
private String maCode;
/**
*直转数量
*/
private Integer rotationNum;
/**
*当前在用量
*/
private Integer useNum;
/**
* 机具规格
*/
private String typeModelName;
/**
*机具规格id
*/

4
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackApplyServiceImpl.java
View File

@ -103,12 +103,10 @@ public class BackApplyServiceImpl implements BackApplyService {
String username = SecurityUtils.getLoginUser().getUsername();
record.setCreateBy(username);
if (roles.contains("jjfgs") || roles.contains("admin")) {
record.setCompanyId("101");
record.setStatus("1");
return backApplyMapper.audit(record);
}
if (roles.contains("tsfgs") || roles.contains("admin")) {
record.setCompanyId("102");
record.setStatus("3");
return backApplyMapper.audit(record);
}
@ -134,12 +132,10 @@ public class BackApplyServiceImpl implements BackApplyService {
String username = SecurityUtils.getLoginUser().getUsername();
record.setCreateBy(username);
if (roles.contains("jjfgs") || roles.contains("admin")) {
record.setCompanyId("101");
record.setStatus("2");
return backApplyMapper.refuse(record);
}
if (roles.contains("tsfgs") || roles.contains("admin")) {
record.setCompanyId("102");
record.setStatus("4");
return backApplyMapper.refuse(record);
}

8
sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackApplyAppMapper.xml
View File

@ -280,20 +280,21 @@
LEFT JOIN back_apply_details bad on bad.parent_id=bai.id
SET bai.status = #{status},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bai.direct_audit_time=NOW()
WHERE
bai.id = #{id} and bai.company_id = #{companyId}
bai.id = #{id}
</update>
<update id="refuse">
UPDATE tm_task tt
LEFT JOIN back_apply_info bai ON bai.task_id = tt.task_id
LEFT JOIN back_apply_details bad on bad.parent_id=bai.id
SET bai.status = #{status},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bai.direct_audit_time=NOW()
SET bai.status = #{status},bai.direct_audit_remark=#{directAuditRemark},bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bai.direct_audit_time=NOW()
WHERE
bai.id = #{id} and bai.company_id = #{companyId}
bai.id = #{id}
</update>
<update id="examineListByUser">
SELECT
bai.id,
bai.status,
bai.back_person as backPerson,
bai.phone,
bpl.lot_name as lotName,
@ -481,6 +482,7 @@
<select id="examineList" resultType="com.bonus.sgzb.app.domain.BackApplyInfo">
SELECT
bai.id,
bai.status,
bai.back_person as backPerson,
bai.phone,
bpl.lot_name as lotName,

36
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/WorkSiteDirectManageController.java
View File

@ -8,10 +8,8 @@ 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.core.web.page.TableDataInfo;
import com.bonus.sgzb.common.security.utils.SecurityUtils;
import com.bonus.sgzb.material.domain.DirectApplyInfoDetails;
import com.bonus.sgzb.material.domain.LeaseApplyDetails;
import com.bonus.sgzb.material.domain.LeaseApplyInfo;
import com.bonus.sgzb.material.domain.TmTask;
import com.bonus.sgzb.material.service.ApplyInfoService;
import com.bonus.sgzb.material.service.TaskService;
import com.bonus.sgzb.material.service.WorkSiteDirectManageService;
@ -21,6 +19,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@ -73,20 +72,25 @@ public class WorkSiteDirectManageController extends BaseController {
*/
@ApiOperation(value = "保存直转方和接收方数据")
@PostMapping("/submit")
public AjaxResult submit(@RequestBody List<DirectApplyInfoDetails> directApplyInfoDetails) {
if (CollUtil.isNotEmpty(directApplyInfoDetails)) {
for (DirectApplyInfoDetails directApplyInfoDetail : directApplyInfoDetails) {
if (directApplyInfoDetail.getDirectApplyInfos() != null) {
DirectApplyInfo directApplyInfos = directApplyInfoDetail.getDirectApplyInfos();
int i = workSiteDirectManageService.saveDirectApplyInfo(directApplyInfos);
if (i < 0) {
return AjaxResult.success("保存失败");
}
public AjaxResult submit(@RequestBody DirectApplyInfoDetails directApplyInfoDetails) {
int id = 0;
if (directApplyInfoDetails != null) {
if (directApplyInfoDetails.getDirectApplyInfo() != null) {
DirectApplyInfo directApplyInfos = directApplyInfoDetails.getDirectApplyInfo();
directApplyInfos.setCode(workSiteDirectManageService.genderLeaseCode());
directApplyInfos.setCreateTime(new Date());
int i = workSiteDirectManageService.saveDirectApplyInfo(directApplyInfos);
if (i < 0) {
return AjaxResult.success("保存失败");
}
id = directApplyInfos.getId();
}
if (directApplyInfoDetail.getDirectApplyInfoDetails() != null) {
DirectApplyDetails directApplyDetails = directApplyInfoDetail.getDirectApplyInfoDetails();
int i = workSiteDirectManageService.saveDirectApplyDetails(directApplyDetails);
if (directApplyInfoDetails.getDirectApplyInfoDetails() != null) {
List<DirectApplyDetails> directApplyDetails = directApplyInfoDetails.getDirectApplyInfoDetails();
for (DirectApplyDetails directApplyDetail : directApplyDetails) {
directApplyDetail.setDirectId(id);
int i = workSiteDirectManageService.saveDirectApplyDetails(directApplyDetail);
if (i < 0) {
return AjaxResult.success("保存失败");
}
@ -197,6 +201,8 @@ public class WorkSiteDirectManageController extends BaseController {
public AjaxResult refuse(@RequestBody DirectApplyInfo directApplyInfo) {
if (directApplyInfo != null) {
directApplyInfo.setStatus("2");
directApplyInfo.setAuditor(SecurityUtils.getLoginUser().getUsername());
directApplyInfo.setAuditTime(new Date().toString());
workSiteDirectManageService.refuseDirectApplyInfo(directApplyInfo);
} else {
return AjaxResult.error("参数为空，审核失败");

5
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/DirectApplyInfoDetails.java
View File

@ -15,10 +15,9 @@ import java.util.List;
public class DirectApplyInfoDetails extends BaseEntity {
private static final long serialVersionUID = 1L;
private DirectApplyInfo directApplyInfo;
private DirectApplyDetails directApplyInfoDetails;
private DirectApplyInfo directApplyInfos;
private List<DirectApplyDetails> directApplyInfoDetails;
private TmTask task;

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/WorkSiteDirectManageMapper.java
View File

@ -6,6 +6,7 @@ import com.bonus.sgzb.base.api.domain.SltAgreementInfo;
import com.bonus.sgzb.base.api.domain.SltAgreementRelation;
import org.apache.ibatis.annotations.Mapper;
import java.util.Date;
import java.util.List;
/**
@ -31,4 +32,5 @@ public interface WorkSiteDirectManageMapper {
int refuseDirectApplyInfo(DirectApplyInfo directApplyInfos);
List<DirectApplyInfo> getList();
}

2
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/WorkSiteDirectManageService.java
View File

@ -20,4 +20,6 @@ public interface WorkSiteDirectManageService {
int refuseDirectApplyInfo(DirectApplyInfo directApplyInfos);
List<DirectApplyInfo> getList();
String genderLeaseCode();
}

15
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/WorkSiteDirectManageImpl.java
View File

@ -3,6 +3,7 @@ package com.bonus.sgzb.material.service.impl;
import com.bonus.sgzb.base.api.domain.DirectApplyDetails;
import com.bonus.sgzb.base.api.domain.DirectApplyInfo;
import com.bonus.sgzb.base.api.domain.SltAgreementInfo;
import com.bonus.sgzb.common.core.utils.DateUtils;
import com.bonus.sgzb.material.mapper.WorkSiteDirectManageMapper;
import com.bonus.sgzb.material.service.WorkSiteDirectManageService;
import lombok.extern.slf4j.Slf4j;
@ -11,6 +12,9 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.Date;
import java.util.List;
/**
@ -50,4 +54,15 @@ public class WorkSiteDirectManageImpl implements WorkSiteDirectManageService {
public List<DirectApplyInfo> getList() {
return workSiteDirectManageMapper.getList();
}
@Override
public String genderLeaseCode() {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
Date date = new Date();
String format = simpleDateFormat.format(date);
List<DirectApplyInfo> list = workSiteDirectManageMapper.getList();
int i = list.size() + 1;
String code = "ZZ" + format + "-" + list.size() + i;
return code;
}
}

17
sgzb-modules/sgzb-material/src/main/resources/mapper/material/WorkSiteDirectManageMapper.xml
View File

@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.sgzb.material.mapper.WorkSiteDirectManageMapper">
<insert id="saveDirectApplyInfo" parameterType="com.bonus.sgzb.base.api.domain.DirectApplyInfo">
<insert id="saveDirectApplyInfo" parameterType="com.bonus.sgzb.base.api.domain.DirectApplyInfo" keyColumn="id" keyProperty="id" useGeneratedKeys="true">
insert into direct_apply_info
(
<if test="code != null and code != ''">
@ -98,7 +98,20 @@
</update>
<select id="getUseringData" resultType="com.bonus.sgzb.base.api.domain.SltAgreementInfo">
select * from slt_agreement_info where agreement_id = #{agreementId} and status = '0'
SELECT
sai.*,
mt.type_name AS typeModelName,
mt2.type_name AS typeName,
mm.ma_code AS maCode,
sum(sai.num) AS useNum
FROM
slt_agreement_info sai
LEFT JOIN ma_type mt on sai.type_id = mt.type_id
LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
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
</select>
<select id="getList" resultType="com.bonus.sgzb.base.api.domain.DirectApplyInfo">
select * from direct_apply_info