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

同步代码结算和成套设备

This commit is contained in:
sxu 2024-08-23 13:06:23 +08:00
parent 2910295b67
commit 87b898f1bd
9 changed files with 220 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/controller/MaWholeSetController.java
View File

@ -4,10 +4,12 @@ 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.material.config.PageResultVo;
import com.bonus.sgzb.material.domain.LeaseApplyDetails;
import com.bonus.sgzb.material.domain.MaWholeSetDto;
import com.bonus.sgzb.material.domain.MaWholeTreeVo;
import com.bonus.sgzb.material.domain.MaWholeVo;
import com.bonus.sgzb.material.service.MaWholeSetService;
import com.github.pagehelper.PageHelper;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
@ -51,11 +53,11 @@ public class MaWholeSetController extends BaseController {
* @return
*/
@ApiOperation("查询整套抱杆管理")
@PostMapping("/selectList")
public AjaxResult selectList(@ApiParam(value = "查询信息") @RequestBody MaWholeSetDto dto) {
log.info("查询整套抱杆管理：{}", dto);
PageResultVo<MaWholeVo> result = maWholeSetService.selectList(dto);
return AjaxResult.success(result);
@GetMapping("/selectList")
public TableDataInfo selectList(MaWholeSetDto dto) {
PageHelper.startPage(dto.getPageNum() == 0 ? 1 : dto.getPageNum(), dto.getPageSize());
List<MaWholeVo> maWholeVos = maWholeSetService.selectList(dto);
return getDataTable(maWholeVos);
}
/**
@ -96,4 +98,16 @@ public class MaWholeSetController extends BaseController {
log.info("根据id删除整套抱杆：{}", dto);
return maWholeSetService.deleteById(dto);
}
/**
* 查询整套抱杆明细
* @param wholeTypeName
* @return
*/
@ApiOperation("领料申请查询成套抱杆设备")
@GetMapping("/selectListByWholeTypeName")
public AjaxResult selectListByWholeTypeName(MaWholeSetDto wholeTypeName) {
List<LeaseApplyDetails> list = maWholeSetService.selectListByWholeTypeName(wholeTypeName);
return AjaxResult.success(list);
}
}

34
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MaWhole.java
View File

@ -1,9 +1,13 @@
package com.bonus.sgzb.material.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
* 整套抱杆表单集合实体类
@ -20,10 +24,38 @@ public class MaWhole {
private Integer id;
/** 父级ID */
@ApiModelProperty(value = "父级ID")
@ApiModelProperty(value = "父级类型ID")
private Integer parentId;
/** 父级ID */
@ApiModelProperty(value = "类型ID")
private Integer typeId;
@ApiModelProperty(value = "数量")
private Integer deviceNum;
/** 配套数量 */
@ApiModelProperty(value = "配套数量")
private Integer totalNum;
/** 设备id */
@ApiModelProperty(value = "设备id")
private Integer deviceTypeId;
/** 设备类型 */
@ApiModelProperty(value = "设备类型（1主体设备 2配套设备）")
private Integer ascriptionType;
/** 配套名称 */
@ApiModelProperty(value = "配套名称")
private String wholeTypeName;
/** 配套名称 */
@ApiModelProperty(value = "所属公司")
private String companyId;
/** 创建时间 */
@ApiModelProperty(value = "创建时间")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/** 创建人 */
@ApiModelProperty(value = "创建人")
private Integer createBy;
}

15
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MaWholeSetDto.java
View File

@ -36,9 +36,22 @@ public class MaWholeSetDto {
/** 关键字 */
@ApiModelProperty(value = "关键字")
private String keyWord;
/** 配套名称 */
@ApiModelProperty(value = "配套名称")
private String wholeTypeName;
/** 关键字 */
@ApiModelProperty(value = "所属公司")
private String companyId;
/** 关键字 */
@ApiModelProperty(value = "创建人")
private Integer createBy;
@ApiModelProperty(value = "开始时间")
private String startTime;
@ApiModelProperty(value = "结束时间")
private String endTime;
/** 表单对象集合 */
@ApiModelProperty(value = "表单对象集合")
private List<MaWhole> wholeList;
private List<MaWhole> deviceInfo;
}

13
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/MaWholeSetMapper.java
View File

@ -1,10 +1,7 @@
package com.bonus.sgzb.material.mapper;
import com.bonus.sgzb.base.api.domain.MaType;
import com.bonus.sgzb.material.domain.MaWhole;
import com.bonus.sgzb.material.domain.MaWholeSetDto;
import com.bonus.sgzb.material.domain.MaWholeVo;
import com.bonus.sgzb.material.domain.TreeSelectId;
import com.bonus.sgzb.material.domain.*;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -46,10 +43,10 @@ public interface MaWholeSetMapper {
/**
* 根据id删除
* @param id
* @param
* @return
*/
int deleteById(@Param("id") Integer id);
int deleteById(MaWholeSetDto dto);
/**
* 根据id去ma_whole_set表中查询typeid
@ -78,4 +75,8 @@ public interface MaWholeSetMapper {
* @return
*/
List<TreeSelectId> selectId(@Param("typeId") List<Integer> typeId);
int selectByWholeTypeName(MaWholeSetDto wholeTypeName);
List<LeaseApplyDetails> selectListByWholeTypeName(MaWholeSetDto wholeTypeName);
}

5
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/MaWholeSetService.java
View File

@ -2,6 +2,7 @@ package com.bonus.sgzb.material.service;
import com.bonus.sgzb.common.core.web.domain.AjaxResult;
import com.bonus.sgzb.material.config.PageResultVo;
import com.bonus.sgzb.material.domain.LeaseApplyDetails;
import com.bonus.sgzb.material.domain.MaWholeSetDto;
import com.bonus.sgzb.material.domain.MaWholeTreeVo;
import com.bonus.sgzb.material.domain.MaWholeVo;
@ -27,7 +28,7 @@ public interface MaWholeSetService {
* @param dto
* @return
*/
PageResultVo<MaWholeVo> selectList(MaWholeSetDto dto);
List<MaWholeVo> selectList(MaWholeSetDto dto);
/**
* 查询整套抱杆明细
@ -56,4 +57,6 @@ public interface MaWholeSetService {
* @return
*/
MaWholeTreeVo selectListTree(Integer id);
List<LeaseApplyDetails> selectListByWholeTypeName(MaWholeSetDto wholeTypeName);
}

93
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/MaWholeSetServiceImpl.java
View File

@ -39,21 +39,24 @@ public class MaWholeSetServiceImpl implements MaWholeSetService {
if (dto == null) {
return AjaxResult.error("参数不能为空！！！");
}
if (dto.getParentId() == null) {
return AjaxResult.error("父级id不能为空");
//先查询是否有重复的配套名称
if (selectByWholeTypeName(dto) > 0) {
return AjaxResult.error("成套名称已存在");
}
int count = selectByParentId(dto.getParentId());
if (count != 0) {
return AjaxResult.error("该物品类型已经绑定相关配件，无法再次绑定，请重新选择！！！");
}
if (CollectionUtils.isNotEmpty(dto.getWholeList())) {
for (MaWhole maWhole : dto.getWholeList()) {
if (CollectionUtils.isNotEmpty(dto.getDeviceInfo())) {
for (MaWhole maWhole : dto.getDeviceInfo()) {
maWhole.setCreateBy(dto.getCreateBy());
maWhole.setCompanyId(dto.getCompanyId());
maWhole.setTypeId(maWhole.getDeviceTypeId());
maWhole.setTotalNum(maWhole.getDeviceNum());
maWhole.setWholeTypeName(dto.getWholeTypeName());
maWhole.setParentId(dto.getParentId());
}
}
int res = 0;
try {
res = insertMaWholeSet(dto.getWholeList());
res = insertMaWholeSet(dto.getDeviceInfo());
if (res == 0) {
log.error("insertMaWholeSet方法插入异常");
throw new RuntimeException("insertMaWholeSet方法插入异常");
@ -63,26 +66,24 @@ public class MaWholeSetServiceImpl implements MaWholeSetService {
return AjaxResult.error(ExceptionEnum.SAVE_TO_DATABASE.getCode(), ExceptionEnum.SAVE_TO_DATABASE.getMsg());
}
return AjaxResult.success("新增成功", res);
} else {
return AjaxResult.error("请选择主/配套设备");
}
}
private int selectByWholeTypeName(MaWholeSetDto wholeTypeName) {
return mapper.selectByWholeTypeName(wholeTypeName);
}
/**
* 查询整套抱杆管理
*
* @param dto
* @return
*/
@Override
public PageResultVo<MaWholeVo> selectList(MaWholeSetDto dto) {
List<MaWholeVo> list = mapper.selectList(dto);
PageHelper.startPage(dto.getPageNum() == 0 ? 1 : dto.getPageNum(), dto.getPageSize());
PageResultVo pageResult = new PageResultVo();
// 分页信息
PageInfo<MaWholeVo> pageInfo = new PageInfo<>(list);
pageResult.setTotalCount(pageInfo.getTotal());
pageResult.setTotalPageCount(pageInfo.getPages());
pageResult.setResult(list);
pageResult.setPageNum(dto.getPageNum());
pageResult.setPageSize(dto.getPageSize());
return pageResult;
public List<MaWholeVo> selectList(MaWholeSetDto dto) {
return mapper.selectList(dto);
}
/**
@ -103,12 +104,12 @@ public class MaWholeSetServiceImpl implements MaWholeSetService {
@Override
@Transactional(rollbackFor = Exception.class)
public AjaxResult deleteById(MaWholeSetDto dto) {
if (dto.getId() == null) {
if (dto == null) {
return AjaxResult.error("删除标识id为空，无法进行删除");
}
int res = 0;
try {
res = deleteMaWhole(dto.getId());
res = deleteMaWhole(dto);
if (res == 0) {
throw new RuntimeException("删除失败");
}
@ -121,11 +122,11 @@ public class MaWholeSetServiceImpl implements MaWholeSetService {
/**
* 根据id删除整套配件信息
* @param id
* @param
* @return
*/
private int deleteMaWhole(Integer id) {
return mapper.deleteById(id);
private int deleteMaWhole(MaWholeSetDto dto) {
return mapper.deleteById(dto);
}
/**
@ -137,32 +138,34 @@ public class MaWholeSetServiceImpl implements MaWholeSetService {
@Transactional(rollbackFor = Exception.class)
public AjaxResult update(MaWholeSetDto dto) {
log.info("修改整套抱杆管理传参：{}", dto);
int count = selectByParentId(dto.getParentId());
if (!dto.getId().equals(dto.getParentId()) && count != 0) {
return AjaxResult.error("该物品类型已经配套相关配件，无法再次绑定，请重新提交修改！！！");
}
if (CollectionUtils.isNotEmpty(dto.getWholeList())) {
for (MaWhole maWhole : dto.getWholeList()) {
if (CollectionUtils.isNotEmpty(dto.getDeviceInfo())) {
for (MaWhole maWhole : dto.getDeviceInfo()) {
maWhole.setCreateBy(dto.getCreateBy());
maWhole.setTypeId(maWhole.getDeviceTypeId());
maWhole.setTotalNum(maWhole.getDeviceNum());
maWhole.setWholeTypeName(dto.getWholeTypeName());
maWhole.setParentId(dto.getParentId());
}
}
int res = 0;
try {
res = deleteMaWhole(dto.getId());
if (res == 0) {
log.error("deleteById方法删除异常");
throw new RuntimeException("deleteById方法删除异常");
}
res = insertMaWholeSet(dto.getWholeList());
deleteMaWhole(dto);
res = insertMaWholeSet(dto.getDeviceInfo());
if (res == 0) {
log.error("insertMaWholeSet方法插入异常");
throw new RuntimeException("insertMaWholeSet方法插入异常");
}
/* int count = selectByWholeTypeName(dto);
if (count > 1) {
throw new RuntimeException("配套名称已重复，请重新输入");
}*/
} catch (Exception e) {
e.printStackTrace();
return AjaxResult.error(ExceptionEnum.UPDATE_TO_DATABASE.getCode(), ExceptionEnum.UPDATE_TO_DATABASE.getMsg());
}
return AjaxResult.success("修改成功", res);
} else {
return AjaxResult.error("请选择主/配套设备");
}
}
/**
@ -186,12 +189,20 @@ public class MaWholeSetServiceImpl implements MaWholeSetService {
return treeVo;
}
@Override
public List<LeaseApplyDetails> selectListByWholeTypeName(MaWholeSetDto wholeTypeName) {
return mapper.selectListByWholeTypeName(wholeTypeName);
}
/**
* 方法提取，新增ma_whole_set表
*
* @param wholeList
* @return
*/
private int insertMaWholeSet(List<MaWhole> wholeList) { return mapper.insert(wholeList); }
private int insertMaWholeSet(List<MaWhole> wholeList) {
return mapper.insert(wholeList);
}
/**
* 根据parentId查询，去重

24
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/SltAgreementInfoServiceImpl.java
View File

@ -136,30 +136,8 @@ public class SltAgreementInfoServiceImpl implements SltAgreementInfoService {
@Override
@Transactional
public int settlementReview(SltAgreementApply apply) {
Long userid = SecurityUtils.getLoginUser().getUserid();
apply.setAuditor(String.valueOf(userid));
int i = sltAgreementInfoMapper.updateRelation(apply);
int j = 0;
if (i > 0) {
List<SltAgreementRelation> relations = sltAgreementInfoMapper.getRelations(apply);
List<AgreementInfo> infos = new ArrayList<>();
for (SltAgreementRelation bean : relations) {
AgreementInfo info = new AgreementInfo();
info.setAgreementId(Long.valueOf(bean.getAgreementId()));
infos.add(info);
}
List<SltAgreementInfo> loseList = getLoseList(infos);
for (SltAgreementInfo agreementInfo : loseList) {
if (agreementInfo.getMaId() != null && agreementInfo.getMaId().isEmpty()) {
sltAgreementInfoMapper.updateMaStatus(agreementInfo);
}
}
j = sltAgreementInfoMapper.updateApply(apply);
} else {
throw new ServiceException("结算审核失败");
//throw new ServiceException(ExceptionDict.SETTLEMENT_REVIEW_ERROR_MSG,ExceptionDict.SETTLEMENT_REVIEW_ERROR);
}
return j;
return i;
}
@Override

87
sgzb-modules/sgzb-material/src/main/resources/mapper/material/MaWholeSetMapper.xml
View File

@ -41,24 +41,13 @@
<insert id="insert">
<foreach item="item" index="index" collection="wholeList" separator=";">
insert into ma_whole_set
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="item.id != null">type_id,</if>
<if test="item.parentId != null">parent_id,</if>
<if test="item.totalNum != null">part_num,</if>
status
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="item.id != null">#{item.id},</if>
<if test="item.parentId != null">#{item.parentId},</if>
<if test="item.totalNum != null">#{item.totalNum},</if>
1
</trim>
insert into ma_whole_set (type_id,parent_id,part_num,whole_type_name,create_by,ascription_type,create_time,status,company_id)
values(#{item.typeId},#{item.parentId},#{item.totalNum},#{item.wholeTypeName},#{item.createBy},#{item.ascriptionType}, now(),1,#{item.companyId})
</foreach>
</insert>
<delete id="deleteById" parameterType="java.lang.Integer">
delete from ma_whole_set
where parent_id = #{id}
where parent_id = #{id} and whole_type_name = #{wholeTypeName}
</delete>
<select id="selectByParentId" resultType="java.lang.Integer">
@ -68,10 +57,14 @@
<select id="selectList" resultType="com.bonus.sgzb.material.domain.MaWholeVo">
SELECT
mws.parent_id AS id,
mws.whole_type_name AS wholeTypeName,
mws.create_time AS createTime,
SUM(CASE WHEN mws.ascription_type = 2 THEN 1 ELSE 0 END) AS totalNum,
mt2.type_name AS typeName,
mt.type_name AS typeModelName,
SUM(mws.part_num) AS totalNum
su.nick_name AS nickName
FROM ma_whole_set mws
JOIN sys_user su ON su.user_id = mws.create_by
JOIN ma_type mt ON mws.parent_id = mt.type_id
JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
JOIN ma_type mt3 ON mt3.type_id = mt2.parent_id
@ -79,20 +72,28 @@
WHERE
mt.`status` = '0'
AND mt.del_flag = '0'
<if test="keyWord != null and keyWord != ''">
and (
mt2.type_name like concat('%', #{keyWord}, '%') or
mt.type_name like concat('%', #{keyWord}, '%')
)
<if test="wholeTypeName != null and wholeTypeName != ''">
and mws.whole_type_name like concat('%', #{wholeTypeName}, '%')
</if>
GROUP BY mws.parent_id
<if test="parentId != null and parentId != ''">
and mws.parent_id = #{parentId}
</if>
<if test="startTime != null and startTime != '' and endTime != null and endTime != '' ">
and mws.create_time BETWEEN CONCAT(#{startTime}, ' 00:00:00') AND CONCAT(#{endTime}, ' 23:59:59')
</if>
GROUP BY mws.parent_id,mws.whole_type_name
order by mws.create_time desc
</select>
<select id="selectListById" resultType="com.bonus.sgzb.material.domain.MaWholeVo">
SELECT
mws.parent_id AS id,
mt.type_id as deviceTypeId,
mt2.type_name AS typeName,
mt.type_name AS typeModelName,
mws.part_num AS totalNum
mt.type_name AS deviceType,
mws.whole_type_name as wholeTypeName,
case when mws.ascription_type = 1 then '主体设备' else '配套设备' end as deviceAscription,
mws.ascription_type as ascriptionType,
mws.part_num AS deviceNum
FROM
ma_whole_set mws
JOIN ma_type mt ON mws.type_id = mt.type_id
@ -100,17 +101,8 @@
JOIN ma_type mt3 ON mt3.type_id = mt2.parent_id
JOIN ma_type mt4 ON mt4.type_id = mt3.parent_id
WHERE
mt.`status` = '0'
AND mt.del_flag = '0'
<if test="id != null and id != ''">
and mws.parent_id = #{id}
</if>
<if test="keyWord != null and keyWord != ''">
and (
mt2.type_name like concat('%', #{keyWord}, '%') or
mt.type_name like concat('%', #{keyWord}, '%')
)
</if>
mws.parent_id = #{id} AND
mws.whole_type_name = #{wholeTypeName}
</select>
<select id="selectTypeTree" resultType="com.bonus.sgzb.material.domain.TreeSelectId">
@ -148,10 +140,8 @@
JOIN ma_type mt3 ON mt3.type_id = mt2.parent_id
JOIN ma_type mt4 ON mt4.type_id = mt3.parent_id
WHERE
mt.`status` = '0'
AND mt.del_flag = '0'
<if test="id != null and id != ''">
and mws.parent_id = #{id}
mws.parent_id = #{id}
</if>
</select>
<select id="selectId" resultType="com.bonus.sgzb.material.domain.TreeSelectId">
@ -173,5 +163,28 @@
#{item}
</foreach>
</select>
<select id="selectByWholeTypeName" resultType="java.lang.Integer">
select COUNT(*) from ma_whole_set
where whole_type_name = #{wholeTypeName}
</select>
<select id="selectListByWholeTypeName" resultType="com.bonus.sgzb.material.domain.LeaseApplyDetails">
SELECT
mt.unit_name unitName,
mt.type_id typeId,
mt.num,
mt.type_name typeModelName,
mt2.type_name typeName,
mws2.part_num partNum
FROM
ma_type mt
LEFT JOIN ma_type mt2 ON mt.parent_id = mt2.type_id
LEFT JOIN ma_whole_set mws2 ON mws2.type_id = mt.type_id
AND mws2.whole_type_name = #{wholeTypeName}
AND mws2.company_id = #{companyId}
WHERE
mt.type_id IN ( SELECT mws.type_id FROM ma_whole_set mws WHERE mws.whole_type_name = #{wholeTypeName})
AND mt.`status` = '0'
AND mt.del_flag = '0'
</select>
</mapper>

26
sgzb-modules/sgzb-material/src/main/resources/mapper/material/SltAgreementInfoMapper.xml
View File

@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update id="updateRelation">
update slt_agreement_relation
set status = #{status}
where apply_id = #{id}
where agreement_id = #{agreementId}
</update>
<update id="updateApply">
update slt_agreement_apply
@ -265,16 +265,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select count(*) from slt_agreement_apply where DATE_FORMAT(create_time,'%y%m') = DATE_FORMAT(#{date},'%y%m')
</select>
<select id="getSltExam" resultType="com.bonus.sgzb.base.api.domain.SltAgreementApply">
select saa.id,
saa.code,
GROUP_CONCAT(DISTINCT sar.agreement_id) as agreementId,
GROUP_CONCAT(DISTINCT bui.unit_name) as unitName,
GROUP_CONCAT(DISTINCT bp.lot_name) as projectName,
saa.cost,
saa.status
from slt_agreement_apply saa
left join slt_agreement_relation sar on saa.id = sar.apply_id
LEFT JOIN bm_agreement_info bai on sar.agreement_id = bai.agreement_id
SELECT
sar.agreement_id AS agreementId,
bui.unit_name AS unitName,
bp.lot_name AS projectName,
sar.cost,
sar.STATUS
FROM
slt_agreement_relation sar
LEFT JOIN bm_agreement_info bai ON sar.agreement_id = bai.agreement_id
LEFT JOIN bm_project_lot bp ON bp.lot_id = bai.project_id
LEFT JOIN bm_unit_info bui ON bui.unit_id = bai.unit_id
where 1=1
@ -284,10 +283,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="projectId != null and projectId != ''">
and bp.lot_id = #{projectId}
</if>
<if test="sltStatus != null and sltStatus != ''">
and saa.status = #{sltStatus}
<if test="sltStatus != null">
and sar.status = #{sltStatus}
</if>
GROUP BY saa.id
</select>
<select id="getRelations" resultType="com.bonus.sgzb.base.api.domain.SltAgreementRelation">
select sar.id,