9/19 追溯码备份查询1.0
parent
01028cc67f
commit
415ec8729b
@ -0,0 +1,100 @@
|
||||
package com.glxp.api.controller.collect;
|
||||
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.glxp.api.common.enums.ResultEnum;
|
||||
import com.glxp.api.common.res.BaseResponse;
|
||||
import com.glxp.api.common.util.ResultVOUtils;
|
||||
import com.glxp.api.controller.BaseController;
|
||||
import com.glxp.api.entity.collect.IoCollectCodeBackup;
|
||||
import com.glxp.api.entity.collect.IoCollectOrder;
|
||||
import com.glxp.api.req.collect.IoCollectCodeRequest;
|
||||
import com.glxp.api.res.PageSimpleResponse;
|
||||
import com.glxp.api.res.collect.IoCollectCodeResponse;
|
||||
import com.glxp.api.service.collect.IoCollectCodeBackService;
|
||||
import com.glxp.api.service.collect.IoCollectOrderService;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.validation.BindingResult;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@Slf4j
|
||||
@RestController
|
||||
public class IoCollectCodeBackupController extends BaseController {
|
||||
|
||||
@Resource
|
||||
IoCollectCodeBackService ioCollectCodeBackService;
|
||||
|
||||
@Resource
|
||||
IoCollectOrderService collectOrderService;
|
||||
|
||||
/**
|
||||
* 追溯码备份查询
|
||||
*/
|
||||
@GetMapping("/udiwms/basic/collect/ioCollectCodeBackup/list")
|
||||
public BaseResponse manuCodeList(IoCollectCodeRequest IoCollectCodeRequest,
|
||||
BindingResult bindingResult) {
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
List<IoCollectCodeResponse> collectOrderCodeManResponses = ioCollectCodeBackService.filterList(IoCollectCodeRequest);
|
||||
for (IoCollectCodeResponse ioCollectCodeResponse : collectOrderCodeManResponses){
|
||||
if (StrUtil.isEmpty(ioCollectCodeResponse.getManufactory())) {
|
||||
ioCollectCodeResponse.setManufactory(ioCollectCodeResponse.getYlqxzcrbarmc());
|
||||
}
|
||||
IoCollectOrder byBillNo = collectOrderService.getByBillNo(ioCollectCodeResponse.getBillNo());
|
||||
ioCollectCodeResponse.setBillTime(byBillNo.getBillTime());
|
||||
if (byBillNo.getRemark() != null){
|
||||
ioCollectCodeResponse.setRemark(byBillNo.getRemark());
|
||||
}
|
||||
}
|
||||
PageInfo<IoCollectCodeResponse> pageInfo = new PageInfo<>(collectOrderCodeManResponses);
|
||||
PageSimpleResponse<IoCollectCodeResponse> pageSimpleResponse = new PageSimpleResponse<>();
|
||||
pageSimpleResponse.setTotal(pageInfo.getTotal());
|
||||
pageSimpleResponse.setList(collectOrderCodeManResponses);
|
||||
return ResultVOUtils.success(pageSimpleResponse);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 根据id删除追溯码表
|
||||
* @param IoCollectCodeBackup
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/udiwms/basic/collect/ioCollectCodeBackup/deleteCollectCode")
|
||||
public BaseResponse deleteCollectCode(@RequestBody IoCollectCodeBackup IoCollectCodeBackup) {
|
||||
boolean b = ioCollectCodeBackService.removeById(IoCollectCodeBackup);
|
||||
if (!b){
|
||||
return ResultVOUtils.error(500,"删除失败");
|
||||
}
|
||||
return ResultVOUtils.success("删除成功");
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 根据id删除追溯码表
|
||||
* @param IoCollectCodeBackup
|
||||
* @param bindingResult
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/udiwms/basic/collect/ioCollectCodeBackup/updateCollectCode")
|
||||
public BaseResponse updateCollectCode(@RequestBody IoCollectCodeBackup IoCollectCodeBackup,
|
||||
BindingResult bindingResult) {
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
|
||||
}
|
||||
boolean b = ioCollectCodeBackService.updateById(IoCollectCodeBackup);
|
||||
if (!b){
|
||||
return ResultVOUtils.error(500,"更新失败");
|
||||
}
|
||||
return ResultVOUtils.success("更新成功");
|
||||
}
|
||||
|
||||
}
|
@ -0,0 +1,15 @@
|
||||
package com.glxp.api.dao.collect;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.glxp.api.entity.collect.IoCollectCodeBackup;
|
||||
import com.glxp.api.req.collect.IoCollectCodeRequest;
|
||||
import com.glxp.api.res.collect.IoCollectCodeResponse;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mapper
|
||||
public interface IoCollectCodeBackMapper extends BaseMapper<IoCollectCodeBackup> {
|
||||
|
||||
List<IoCollectCodeResponse> filterList(IoCollectCodeRequest ioCollectCodeRequest);
|
||||
}
|
@ -0,0 +1,34 @@
|
||||
package com.glxp.api.service.collect;
|
||||
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.glxp.api.dao.collect.IoCollectCodeBackMapper;
|
||||
import com.glxp.api.entity.collect.*;
|
||||
import com.glxp.api.req.collect.IoCollectCodeRequest;
|
||||
import com.glxp.api.res.collect.IoCollectCodeResponse;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
@Service
|
||||
public class IoCollectCodeBackService extends ServiceImpl<IoCollectCodeBackMapper, IoCollectCodeBackup> {
|
||||
|
||||
/**
|
||||
* 追溯码查询
|
||||
*
|
||||
* @param ioCollectCodeRequest
|
||||
* @return
|
||||
*/
|
||||
public List<IoCollectCodeResponse> filterList(IoCollectCodeRequest ioCollectCodeRequest) {
|
||||
if (ioCollectCodeRequest == null) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
if (ioCollectCodeRequest.getPage() != null) {
|
||||
int offset = (ioCollectCodeRequest.getPage() - 1) * ioCollectCodeRequest.getLimit();
|
||||
PageHelper.offsetPage(offset, ioCollectCodeRequest.getLimit());
|
||||
}
|
||||
return super.baseMapper.filterList(ioCollectCodeRequest);
|
||||
}
|
||||
}
|
@ -0,0 +1,39 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.glxp.api.dao.collect.IoCollectCodeBackMapper">
|
||||
|
||||
<select id="filterList" resultType="com.glxp.api.res.collect.IoCollectCodeResponse">
|
||||
SELECT iccb.*,sw.workplaceName,
|
||||
COALESCE(thr_bustype_origin.name, basic_bussiness_type.name) as busTypeName,
|
||||
bp.nameCode,
|
||||
bp.cpmctymc,
|
||||
COALESCE(bp.ggxh, bp.bzgg) AS ggxh,
|
||||
bp.zczbhhzbapzbh,
|
||||
bp.ylqxzcrbarmc,
|
||||
bp.manufactory
|
||||
from io_collect_code_backup iccb
|
||||
left join sys_workplace sw on sw.workplaceId = iccb.workPlaceCode
|
||||
left join thr_bustype_origin on iccb.busType = thr_bustype_origin.action
|
||||
left join basic_bussiness_type on iccb.busType = basic_bussiness_type.action
|
||||
left join basic_udirel bu on iccb.relId = bu.id
|
||||
left join basic_products bp on bu.uuid = bp.uuid
|
||||
<where>
|
||||
<if test="workPlaceCode != '' and workPlaceCode != null">
|
||||
AND iccb.workPlaceCode LIKE concat('%', #{workPlaceCode}, '%')
|
||||
</if>
|
||||
<if test="code != '' and code != null">
|
||||
AND iccb.code LIKE concat('%', #{code}, '%')
|
||||
</if>
|
||||
<if test="billNo != null and billNo != ''">
|
||||
AND iccb.billNo LIKE concat('%', #{billNo}, '%')
|
||||
</if>
|
||||
<if test="fromType != null and fromType != ''">
|
||||
AND iccb.fromType LIKE concat('%', #{fromType}, '%')
|
||||
</if>
|
||||
<if test="fromCorp != null and fromCorp != ''">
|
||||
AND iccb.fromCorp LIKE concat('%', #{fromCorp}, '%')
|
||||
</if>
|
||||
</where>
|
||||
group by iccb.id
|
||||
</select>
|
||||
</mapper>
|
Loading…
Reference in New Issue